Respect liveReloadPort even if same as ember server port (#113)

Respect liveReloadPort even if same as ember server port

Author: Robert Jackson

lib/index.js

@@ -22,22 +22,18 @@ module.exports = {
     }
 
     let liveReloadPath = buildLiveReloadPath(options.liveReloadPrefix) || '/';
-    let liveReloadPort;
     let path = '';
-    if (options.liveReloadPort !== options.port) {
-      liveReloadPort = options.liveReloadPort
-    }
     if (options.isLatestEmber && options.liveReloadPrefix) {
       path = `&path=${options.liveReloadPrefix}/livereload`;
     }
     return `(function() {${liveReloadOptions ? "\n  window.LiveReloadOptions = " + JSON.stringify(liveReloadOptions) + ";" : ''}
   var srcUrl = ${options.liveReloadJsUrl ? "'" + options.liveReloadJsUrl + "'" : null};
-  var host= location.hostname || 'localhost';
-  var liveReloadPort = ${liveReloadPort};
-  var defaultPort = location.protocol === 'https:' ? 443 : 80;
-  var port = liveReloadPort || location.port || defaultPort;
+  var host = location.hostname || 'localhost';
+  var useCustomPort = ${options.liveReloadPort !== options.port} || location.port !== ${options.liveReloadPort};
+  var defaultPort = location.port || (location.protocol === 'https:' ? 443 : 80);
+  var port = useCustomPort ? ${options.liveReloadPort} : defaultPort;
   var path = '${path}';
-  var prefixURL = ${liveReloadPort ? "(location.protocol || 'http:') + '//' + host + ':' + " + liveReloadPort : "''"};
+  var prefixURL = useCustomPort ? (location.protocol || 'http:') + '//' + host + ':' + ${options.liveReloadPort} : '';
   var src = srcUrl || prefixURL + '${liveReloadPath + 'livereload.js?port='}' + port + '&host=' + host + path;
   var script    = document.createElement('script');
   script.type   = 'text/javascript';

tests/inject-live-reload-test.js

@@ -95,6 +95,15 @@ describe('dynamicScript returns right script when', hooks => {
     assert.strictEqual(actual, 'http://localhost:35729/_lr/livereload.js?port=35729&host=localhost&path=_lr/livereload');
   });
 
+  it('liveReloadPort and port are same, but both are different from location.port', assert => {
+    options.liveReloadPort = '9999';
+    options.port = '9999';
+    let script = InjectLiveReload.dynamicScript(options);
+    let actual = getScriptSrc(script);
+
+    assert.strictEqual(actual, 'http://localhost:9999/_lr/livereload.js?port=9999&host=localhost&path=_lr/livereload');
+  });
+
   it('liveReloadPrefix is provided', assert => {
     options.liveReloadPrefix = 'other-lr-path';
     let script = InjectLiveReload.dynamicScript(options);
@@ -161,12 +170,12 @@ describe('serverMiddleware', hooks => {
       response.on('end', () => {
       assert.equal(buf, `(function() {
   var srcUrl = null;
-  var host= location.hostname || 'localhost';
-  var liveReloadPort = undefined;
-  var defaultPort = location.protocol === 'https:' ? 443 : 80;
-  var port = liveReloadPort || location.port || defaultPort;
+  var host = location.hostname || 'localhost';
+  var useCustomPort = false || location.port !== 4200;
+  var defaultPort = location.port || (location.protocol === 'https:' ? 443 : 80);
+  var port = useCustomPort ? 4200 : defaultPort;
   var path = '';
-  var prefixURL = '';
+  var prefixURL = useCustomPort ? (location.protocol || 'http:') + '//' + host + ':' + 4200 : '';
   var src = srcUrl || prefixURL + '/livereload.js?port=' + port + '&host=' + host + path;
   var script    = document.createElement('script');
   script.type   = 'text/javascript';