fix hardcoded port in MultiBrowser LiveDevelopment and minor fix in PerfUtil

src/LiveDevelopment/MultiBrowserImpl/transports/NodeSocketTransport.js

@@ -34,7 +34,11 @@ define(function (require, exports, module) {
 
     var FileUtils       = require("file/FileUtils"),
         EventDispatcher = require("utils/EventDispatcher"),
-        NodeDomain      = require("utils/NodeDomain");
+        NodeDomain      = require("utils/NodeDomain"),
+        PreferencesManager  = require("preferences/PreferencesManager");
+
+    var prefs = PreferencesManager.getExtensionPrefs("livedev");
+    var PREF_SOCKETPORT = "socketport";
 
     // The script that will be injected into the previewed HTML to handle the other side of the socket connection.
     var NodeSocketTransportRemote = require("text!LiveDevelopment/MultiBrowserImpl/transports/remote/NodeSocketTransportRemote.js");
@@ -46,9 +50,8 @@ define(function (require, exports, module) {
     var NodeSocketTransportDomain = new NodeDomain("nodeSocketTransport", domainPath);
 
     // This must match the port declared in NodeSocketTransportDomain.js.
-    // TODO: randomize this?
-    var SOCKET_PORT = 8123;
-
+    var SOCKET_PORT = prefs.get(PREF_SOCKETPORT) || 8123;
+
     /**
      * Returns the script that should be injected into the browser to handle the other end of the transport.
      * @return {string}
@@ -60,6 +63,12 @@ define(function (require, exports, module) {
             "</script>\n";
     }
 
+    function start () {
+        SOCKET_PORT = prefs.get(PREF_SOCKETPORT);
+        console.log("NodeSocketTransport - start on port:" + SOCKET_PORT);
+        NodeSocketTransportDomain.exec('start', SOCKET_PORT);
+    }
+
     // Events
 
     // We can simply retrigger the events we receive from the node domain directly, since they're in
@@ -77,10 +86,11 @@ define(function (require, exports, module) {
 
     // Exports
     exports.getRemoteScript = getRemoteScript;
+    exports.start = start;
 
     // Proxy the node domain methods directly through, since they have exactly the same
     // signatures as the ones we're supposed to provide.
-    ["start", "send", "close"].forEach(function (method) {
+    ["send", "close"].forEach(function (method) {
         exports[method] = function () {
             var args = Array.prototype.slice.call(arguments);
             args.unshift(method);

src/LiveDevelopment/MultiBrowserImpl/transports/node/NodeSocketTransportDomain.js

@@ -58,7 +58,7 @@
     var _clients = {};
 
     // This must match the port declared in NodeSocketTransport.js.
-    // TODO: randomize this?
+    // Default socket port number
     var SOCKET_PORT = 8123;
 
     /**
@@ -76,11 +76,13 @@
     /**
      * @private
      * Creates the WebSocketServer and handles incoming connections.
+     * @param {number} port
      */
-    function _createServer() {
+    function _createServer(port) {
         if (!_wsServer) {
             // TODO: make port configurable, or use random port
-            _wsServer = new WebSocketServer({port: SOCKET_PORT});
+            port = port || SOCKET_PORT;
+            _wsServer = new WebSocketServer({port: port});
             _wsServer.on("connection", function (ws) {
                 ws.on("message", function (msg) {
                     console.log("WebSocketServer - received - " + msg);
@@ -140,10 +142,10 @@
 
     /**
      * Initializes the socket server.
-     * @param {string} url
+     * @param {number} port
      */
-    function _cmdStart(url) {
-        _createServer();
+    function _cmdStart(port) {
+        _createServer(port);
     }
 
     /**
@@ -192,7 +194,9 @@
             _cmdStart,     // command handler function
             false,          // this command is synchronous in Node
             "Creates the WS server",
-            []
+            [
+                {name: "port", type: "number", description: "number of WS port"}
+            ]
         );
         domainManager.registerCommand(
             "nodeSocketTransport",      // domain name

src/LiveDevelopment/main.js

@@ -80,6 +80,10 @@ define(function main(require, exports, module) {
     var multiBrowserPref = prefs.definePreference(PREF_MULTIBROWSER, "boolean", false, {
         description: Strings.DESCRIPTION_LIVE_DEV_MULTIBROWSER
     });
+    var PREF_SOCKETPORT = "socketport";
+    var transportSocketPort = prefs.definePreference(PREF_SOCKETPORT, "number", 8123, {
+        description: Strings.DESCRIPTION_LIVE_DEV_SOCKETPORT
+    });
 
     /** Toggles or sets the preference **/
     function _togglePref(key, value) {
@@ -355,6 +359,14 @@ define(function main(require, exports, module) {
                     _setImplementation(prefs.get(PREF_MULTIBROWSER));
                 }
             });
+        transportSocketPort
+            .on("change", function () {
+                // Stop current session if it is open and multibrowser
+                if (LiveDevImpl && LiveDevImpl === MultiBrowserLiveDev &&
+                   LiveDevImpl.status >= LiveDevImpl.STATUS_ACTIVE) {
+                    LiveDevImpl.close();
+                }
+            });
 
     });
 

src/extensions/default/StaticServer/node/StaticServerDomain.js

@@ -469,7 +469,7 @@
             "requestFilter",
             [{
                 name: "location",
-                type: "{hostname: string, pathname: string, port: number, root: string: id: number}",
+                type: "{hostname: string, pathname: string, port: number, root: string, id: number}",
                 description: "request path"
             }]
         );

src/nls/root/strings.js

@@ -750,6 +750,7 @@ define({
     "DESCRIPTION_ASYNC_TIMEOUT"                      : "The time in milliseconds after which asynchronous linters time out",
     "DESCRIPTION_LINTING_PREFER"                     : "Array of linters to run first",
     "DESCRIPTION_LIVE_DEV_MULTIBROWSER"              : "true to enable experimental Live Preview",
+    "DESCRIPTION_LIVE_DEV_SOCKETPORT"                : "Experimental Live Preview communication socket port number",
     "DESCRIPTION_USE_PREFERED_ONLY"                  : "true to run providers specified in linting.prefer only",
     "DESCRIPTION_MAX_CODE_HINTS"                     : "Maximum code hints displayed at once",
     "DESCRIPTION_PATH"                               : "Path specific settings",

src/utils/PerfUtils.js

@@ -245,6 +245,9 @@ define(function (require, exports, module) {
      * @param {Object} id  Timer id.
      */
     function updateMeasurement(id) {
+        if (!enabled) {
+            return;
+        }
         var elapsedTime = brackets.app.getElapsedMilliseconds();
 
         if (updatableTests[id.id]) {
@@ -282,6 +285,9 @@ define(function (require, exports, module) {
      * @param {Object} id  Timer id.
      */
     function finalizeMeasurement(id) {
+        if (!enabled) {
+            return;
+        }
         if (activeTests[id.id]) {
             delete activeTests[id.id];
         }