Move comms from runtime to api component

red/api/comms.js

@@ -15,7 +15,7 @@
  **/
 
 var ws = require("ws");
-var log = require("./log");
+var log;
 
 var server;
 var settings;
@@ -29,17 +29,24 @@ var retained = {};
 var heartbeatTimer;
 var lastSentTime;
 
+function handleStatus(event) {
+    publish("status/"+event.id,event.status,true);
+}
 
-function init(_server,_settings) {
+function init(_server,runtime) {
     server = _server;
-    settings = _settings;
+    settings = runtime.settings;
+    log = runtime.log;
+
+    runtime.events.removeListener("node-status",handleStatus);
+    runtime.events.on("node-status",handleStatus);
 }
 
 
 function start() {
-    var Tokens = require("../api/auth/tokens");
-    var Users = require("../api/auth/users");
-    var Permissions = require("../api/auth/permissions");
+    var Tokens = require("./auth/tokens");
+    var Users = require("./auth/users");
+    var Permissions = require("./auth/permissions");
     if (!settings.disableEditor) {
         Users.default().then(function(anonymousUser) {
             var webSocketKeepAliveTime = settings.webSocketKeepAliveTime || 15000;
@@ -151,15 +158,17 @@ function stop() {
 }
 
 function publish(topic,data,retain) {
-    if (retain) {
-        retained[topic] = data;
-    } else {
-        delete retained[topic];
+    if (server) {
+        if (retain) {
+            retained[topic] = data;
+        } else {
+            delete retained[topic];
+        }
+        lastSentTime = Date.now();
+        activeConnections.forEach(function(conn) {
+            publishTo(conn,topic,data);
+        });
     }
-    lastSentTime = Date.now();
-    activeConnections.forEach(function(conn) {
-        publishTo(conn,topic,data);
-    });
 }
 
 function publishTo(ws,topic,data) {

red/api/index.js

@@ -19,6 +19,7 @@ var bodyParser = require("body-parser");
 var util = require('util');
 var path = require('path');
 var passport = require('passport');
+var when = require('when');
 
 var ui = require("./ui");
 var nodes = require("./nodes");
@@ -28,6 +29,7 @@ var info = require("./info");
 var theme = require("./theme");
 var locales = require("./locales");
 var credentials = require("./credentials");
+var comms = require("./comms");
 
 var auth = require("./auth");
 var needsPermission = auth.needsPermission;
@@ -46,13 +48,14 @@ var errorHandler = function(err,req,res,next) {
     res.status(400).json({error:"unexpected_error", message:err.toString()});
 };
 
-function init(runtime) {
+function init(server,runtime) {
     var settings = runtime.settings;
     log = runtime.log;
     if (settings.httpNodeRoot !== false) {
         nodeApp = express();
     }
     if (settings.httpAdminRoot !== false) {
+        comms.init(server,runtime);
         adminApp = express();
         auth.init(runtime);
         credentials.init(runtime);
@@ -123,15 +126,27 @@ function init(runtime) {
         adminApp.use(errorHandler);
     }
 }
-
+function start() {
+    comms.start();
+    return when.resolve();
+}
+function stop() {
+    comms.stop();
+    return when.resolve();
+}
 module.exports = {
     init: init,
+    start: start,
+    stop: stop,
     library: {
         register: library.register
     },
     auth: {
         needsPermission: auth.needsPermission
     },
+    comms: {
+        publish: comms.publish
+    },
     adminApp: function() { return adminApp; },
     nodeApp: function() { return nodeApp; }
 };

red/red.js

@@ -25,6 +25,7 @@ process.env.NODE_RED_HOME = process.env.NODE_RED_HOME || path.resolve(__dirname+
 var nodeApp = null;
 var adminApp = null;
 var server = null;
+var apiEnabled = false;
 
 function checkBuild() {
     var editorFile = path.resolve(path.join(__dirname,"..","public","red","red.min.js"));
@@ -44,9 +45,9 @@ var RED = {
         if (!userSettings.SKIP_BUILD_CHECK) {
             checkBuild();
         }
-        runtime.init(httpServer,userSettings);
+        runtime.init(userSettings);
         if (userSettings.httpAdminRoot !== false || userSettings.httpNodeRoot !== false) {
-            api.init(runtime);
+            api.init(server,runtime);
             adminApp = api.adminApp();
             nodeApp = api.nodeApp();
         }
@@ -58,15 +59,29 @@ var RED = {
                 put: function(){},
                 delete: function(){}
             }
+        } else {
+            apiEnabled = true;
         }
         return runtime.app;
     },
-    start: runtime.start,
-    stop: runtime.stop,
+    start: function() {
+        return runtime.start().then(function() {
+            if (apiEnabled) {
+                return api.start();
+            }
+        });
+    },
+    stop: function() {
+        return runtime.stop().then(function() {
+            if (apiEnabled) {
+                return api.stop();
+            }
+        })
+    },
     nodes: runtime.api,
     events: runtime.events,
     log: runtime.log,
-    comms: runtime.comms,
+    comms: api.comms,
     settings:runtime.settings,
     util: runtime.util,
     version: runtime.version,

red/runtime/index.js

@@ -17,7 +17,6 @@
 var when = require('when');
 
 var redNodes = require("./nodes");
-var comms = require("./comms");
 var storage = require("./storage");
 var log = require("./log");
 var i18n = require("./i18n");
@@ -28,11 +27,10 @@ var fs = require("fs");
 
 var runtimeMetricInterval = null;
 
-function init(server,userSettings) {
+function init(userSettings) {
     userSettings.version = version();
     log.init(userSettings);
     settings.init(userSettings);
-    comms.init(server,settings);
 }
 
 function version() {
@@ -105,7 +103,6 @@ function start() {
                 }
                 log.info(log._("runtime.paths.settings",{path:settings.settingsFile}));
                 redNodes.loadFlows().then(redNodes.startFlows);
-                comms.start();
             }).otherwise(function(err) {
                 console.log(err);
             });
@@ -137,8 +134,7 @@ function stop() {
         clearInterval(runtimeMetricInterval);
         runtimeMetricInterval = null;
     }
-    redNodes.stopFlows();
-    comms.stop();
+    return redNodes.stopFlows();
 }
 
 var runtime = module.exports = {
@@ -152,7 +148,6 @@ var runtime = module.exports = {
     i18n: i18n,
     settings: settings,
     storage: storage,
-    comms: comms,
     events: events,
     api: redNodes,
     util: require("./util")

red/runtime/nodes/Node.js

@@ -22,7 +22,6 @@ var redUtil = require("../util");
 var Log = require("../log");
 
 var flows = require("./flows");
-var comms = require("../comms");
 
 function Node(n) {
     this.id = n.id;
@@ -250,7 +249,6 @@ Node.prototype.metric = function(eventname, msg, metricValue) {
  * status: { fill:"red|green", shape:"dot|ring", text:"blah" }
  */
 Node.prototype.status = function(status) {
-    comms.publish("status/" + this.id, status, true);
     flows.handleStatus(this,status);
 };
 module.exports = Node;

red/runtime/nodes/flows/index.js

@@ -182,6 +182,10 @@ function delegateStatus(node,statusMessage) {
     }
 }
 function handleStatus(node,statusMessage) {
+    events.emit("node-status",{
+        id: node.id,
+        status:statusMessage
+    });
     if (node.z) {
         delegateStatus(node,statusMessage);
     } else {