Initialise nodeApp regardless of httpAdmin setting

Closes #1096 #1095

red/runtime/index.js

@@ -22,6 +22,8 @@ var log = require("./log");
 var i18n = require("./i18n");
 var events = require("./events");
 var settings = require("./settings");
+
+var express = require("express");
 var path = require('path');
 var fs = require("fs");
 var os = require("os");
@@ -47,19 +49,22 @@ var adminApi = {
         publish: function() {}
     },
     adminApp: stubbedExpressApp,
-    nodeApp: stubbedExpressApp,
     server: {}
 }
 
+var nodeApp;
+
 function init(userSettings,_adminApi) {
     userSettings.version = getVersion();
     log.init(userSettings);
     settings.init(userSettings);
+
+    nodeApp = express();
+
     if (_adminApi) {
         adminApi = _adminApi;
     }
     redNodes.init(runtime);
-
 }
 
 var version;
@@ -189,6 +194,7 @@ var runtime = module.exports = {
     nodes: redNodes,
     util: require("./util"),
     get adminApi() { return adminApi },
+    get nodeApp() { return nodeApp },
     isStarted: function() {
         return started;
     }

red/runtime/nodes/registry/loader.js

@@ -83,9 +83,11 @@ function createNodeApi(node) {
         red.library = runtime.adminApi.library;
         red.auth = runtime.adminApi.auth;
         red.httpAdmin = runtime.adminApi.adminApp;
-        red.httpNode = runtime.adminApi.nodeApp;
+        red.httpNode = runtime.nodeApp;
         red.server = runtime.adminApi.server;
     } else {
+        //TODO: runtime.adminApi is always stubbed if not enabled, so this block
+        // is unused - but may be needed for the unit tests
         red.comms = {
             publish: function() {}
         };