[feature] null transport support, sse prep

apla · Sep 6, 2019 · 0173b54 · 0173b54
1 parent 17756ac
commit 0173b54
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 8 deletions.
diff --git a/src/livereload.js b/src/livereload.js
@@ -26,12 +26,6 @@ class LiveReload {
  error () {}
  };
 
- // i can haz sockets?
- if (!(this.WebSocket = this.window.WebSocket || this.window.MozWebSocket)) {
- this.console.error('LiveReload disabled because the browser does not seem to support web sockets');
- return;
- }
-
  // i can haz options?
  if ('LiveReloadOptions' in window) {
  this.options = new Options();
@@ -47,9 +41,32 @@ class LiveReload {
  }
  }
 
+ // i can haz sockets?
+ if (this.options.transport === 'ws' && !(this.WebSocket = this.window.WebSocket || this.window.MozWebSocket)) {
+ this.console.error('LiveReload disabled because the browser does not seem to support web sockets');
+ return;
+ // } else if (this.options.transport === 'sse' && !(this.EventSource = this.window.EventSource)) {
+ // this.console.error('LiveReload disabled because the browser does not seem to support EventSource');
+ // return;
+ }
+
  // i can haz reloader?
  this.reloader = new Reloader(this.window, this.console, Timer);
 
+ if (this.options.transport === null) {
+ // page will generate reload events itself by LiveReload.performReload()
+ // } else if (this.options.transport === 'sse') {
+ // this.initSSETransport();
+ } else if (this.options.transport === 'ws') {
+ this.initWSTransport();
+ }
+
+ this.initialized = true;
+
+ }
+
+ initWSTransport () {
+
  // i can haz connection?
  this.connector = new Connector(this.options, this.WebSocket, Timer, {
  connecting: () => {},
@@ -107,8 +124,6 @@ class LiveReload {
  }
  }
  });
-
- this.initialized = true;
  }
 
  on (eventName, handler) {

diff --git a/src/options.js b/src/options.js
@@ -4,6 +4,9 @@ class Options {
  this.host = null;
  this.port = 35729;
 
+ this.transport = 'ws';
+ this.path = 'livereload';
+
  this.snipver = null;
  this.ext = null;
  this.extver = null;
@@ -22,6 +25,18 @@ class Options {
  value = +value;
  }
 
+ if (value === 'null') {
+ value = null;
+ }
+
+ if (value === 'true') {
+ value = true;
+ }
+
+ if (value === 'false') {
+ value = false;
+ }
+
  this[name] = value;
  }
 }

diff --git a/test/options_test.js b/test/options_test.js
@@ -10,6 +10,7 @@ describe('Options', function () {
  const options = Options.extract(dom.window.document);
  assert.ok(options);
  assert.strictEqual('somewhere.com', options.host);
+ assert.strictEqual('ws', options.transport);
  return assert.strictEqual(9876, options.port);
  });
 
@@ -100,6 +101,15 @@ describe('Options', function () {
  return assert.strictEqual('somewhere.org', options.host);
  });
 
+ it('should allow to set null transport', function () {
+ const dom = new JSDOM('<script src="//somewhere.com/132324324/23243443/4343/livereload.js?transport=null"></script>', {
+ url: 'https://somewhere.org/'
+ });
+ const options = Options.extract(dom.window.document);
+ assert.ok(options);
+ return assert.strictEqual(null, options.transport);
+ });
+
  return it('should recognize protocol-relative https URL', function () {
  const dom = new JSDOM('<script src="//somewhere.com/132324324/23243443/4343/livereload.js"></script>', {
  url: 'https://somewhere.org/'