Move node install/remove from server component to node engine

red/api/nodes.js

@@ -15,7 +15,6 @@
  **/
 var redNodes = require("../nodes");
 var comms = require("../comms");
-var server = require("../server");
 var log = require("../log");
 var i18n = require("../i18n");
 
@@ -50,15 +49,14 @@ module.exports = {
                 res.status(400).json({error:"module_already_loaded", message:"Module already loaded"});
                 return;
             }
-            promise = server.installModule(node.module);
-        } else if (node.file) {
-            promise = server.installNode(node.file);
+            promise = redNodes.installModule(node.module);
         } else {
             log.audit({event: "nodes.install",module:node.module,error:"invalid_request"},req);
             res.status(400).json({error:"invalid_request", message:"Invalid request"});
             return;
         }
         promise.then(function(info) {
+            comms.publish("node/added",info.nodes,false);
             if (node.module) {
                 log.audit({event: "nodes.install",module:node.module},req);
                 res.json(redNodes.getModuleInfo(node.module));
@@ -95,10 +93,11 @@ module.exports = {
                 res.status(404).end();
                 return;
             } else {
-                promise = server.uninstallModule(mod);
+                promise = redNodes.uninstallModule(mod);
             }
 
-            promise.then(function() {
+            promise.then(function(list) {
+                comms.publish("node/removed",list,false);
                 log.audit({event: "nodes.remove",module:mod},req);
                 res.status(204).end();
             }).otherwise(function(err) {

red/nodes/index.js

@@ -13,12 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+
+var when = require("when");
+var path = require("path");
+var fs = require("fs");
+
 var registry = require("./registry");
 var credentials = require("./credentials");
 var flows = require("./flows");
 var Node = require("./Node");
 var log = require("../log");
 
+var events = require("../events");
+
+var child_process = require('child_process');
+
+var settings;
+
 /**
  * Registers a node constructor
  * @param type - the string type name
@@ -54,6 +65,7 @@ function createNode(node,def) {
 }
 
 function init(_settings,storage) {
+    settings = _settings;
     credentials.init(storage);
     flows.init(_settings,storage);
     registry.init(_settings);
@@ -106,6 +118,116 @@ function disableNode(id) {
     return registry.disableNode(id);
 }
 
+function installModule(module) {
+    //TODO: ensure module is 'safe'
+    return when.promise(function(resolve,reject) {
+        if (/[\s;]/.test(module)) {
+            reject(new Error(log._("server.install.invalid")));
+            return;
+        }
+        if (registry.getModuleInfo(module)) {
+            // TODO: nls
+            var err = new Error("Module already loaded");
+            err.code = "module_already_loaded";
+            reject(err);
+            return;
+        }
+        log.info(log._("server.install.installing",{name: module}));
+
+        var installDir = settings.userDir || process.env.NODE_RED_HOME || ".";
+        var child = child_process.exec('npm install --production '+module,
+            {
+                cwd: installDir
+            },
+            function(err, stdin, stdout) {
+                if (err) {
+                    var lookFor404 = new RegExp(" 404 .*"+module+"$","m");
+                    if (lookFor404.test(stdout)) {
+                        log.warn(log._("server.install.install-failed-not-found",{name:module}));
+                        var e = new Error();
+                        e.code = 404;
+                        reject(e);
+                    } else {
+                        log.warn(log._("server.install.install-failed-long",{name:module}));
+                        log.warn("------------------------------------------");
+                        log.warn(err.toString());
+                        log.warn("------------------------------------------");
+                        reject(new Error(log._("server.install.install-failed")));
+                    }
+                } else {
+                    log.info(log._("server.install.installed",{name:module}));
+                    resolve(registry.addModule(module).then(reportAddedModules));
+                }
+            }
+        );
+    });
+}
+
+
+function reportAddedModules(info) {
+    //comms.publish("node/added",info.nodes,false);
+    if (info.nodes.length > 0) {
+        log.info(log._("server.added-types"));
+        for (var i=0;i<info.nodes.length;i++) {
+            for (var j=0;j<info.nodes[i].types.length;j++) {
+                log.info(" - "+
+                    (info.nodes[i].module?info.nodes[i].module+":":"")+
+                    info.nodes[i].types[j]+
+                    (info.nodes[i].err?" : "+info.nodes[i].err:"")
+                );
+            }
+        }
+    }
+    return info;
+}
+
+function reportRemovedModules(removedNodes) {
+    //comms.publish("node/removed",removedNodes,false);
+    log.info(log._("server.removed-types"));
+    for (var j=0;j<removedNodes.length;j++) {
+        for (var i=0;i<removedNodes[j].types.length;i++) {
+            log.info(" - "+(removedNodes[j].module?removedNodes[j].module+":":"")+removedNodes[j].types[i]);
+        }
+    }
+    return removedNodes;
+}
+
+function uninstallModule(module) {
+    return when.promise(function(resolve,reject) {
+        if (/[\s;]/.test(module)) {
+            reject(new Error(log._("server.install.invalid")));
+            return;
+        }
+        var installDir = settings.userDir || process.env.NODE_RED_HOME || ".";
+        var moduleDir = path.join(installDir,"node_modules",module);
+        if (!fs.existsSync(moduleDir)) {
+            return reject(new Error(log._("server.install.uninstall-failed",{name:module})));
+        }
+
+        var list = removeModule(module);
+        log.info(log._("server.install.uninstalling",{name:module}));
+        var child = child_process.exec('npm remove '+module,
+            {
+                cwd: installDir
+            },
+            function(err, stdin, stdout) {
+                if (err) {
+                    log.warn(log._("server.install.uninstall-failed-long",{name:module}));
+                    log.warn("------------------------------------------");
+                    log.warn(err.toString());
+                    log.warn("------------------------------------------");
+                    reject(new Error(log._("server.install.uninstall-failed",{name:module})));
+                } else {
+                    log.info(log._("server.install.uninstalled",{name:module}));
+                    reportRemovedModules(list);
+                    resolve(list);
+                }
+            }
+        );
+    });
+}
+
+
 module.exports = {
     // Lifecycle
     init: init,
@@ -116,9 +238,8 @@ module.exports = {
     getNode: flows.get,
     eachNode: flows.eachNode,
 
-    addFile: registry.addFile,
-    addModule: registry.addModule,
-    removeModule: removeModule,
+    installModule: installModule,
+    uninstallModule: uninstallModule,
 
     enableNode: registry.enableNode,
     disableNode: disableNode,

red/nodes/registry/index.js

@@ -36,12 +36,6 @@ function load(defaultNodesDir,disableNodePathScan) {
     return loader.load(defaultNodesDir,disableNodePathScan);
 }
 
-function addFile(file) {
-    var info = "node-red/"+path.basename(file).replace(/^\d+-/,"").replace(/\.js$/,"");
-    return loader.addFile(file).then(function() {
-        return registry.getNodeInfo(info);
-    });
-}
 function addModule(module) {
     return loader.addModule(module).then(function() {
         return registry.getModuleInfo(module);
@@ -79,9 +73,8 @@ module.exports = {
     enableNode: enableNodeSet,
     disableNode: registry.disableNodeSet,
 
-    addFile: addFile,
     addModule: addModule,
     removeModule: registry.removeModule,
-    
+
     cleanModuleList: registry.cleanModuleList
 };

red/server.js

@@ -16,9 +16,6 @@
 
 var express = require('express');
 var when = require('when');
-var child_process = require('child_process');
-var path = require("path");
-var fs = require("fs");
 
 var redNodes = require("./nodes");
 var comms = require("./comms");
@@ -94,7 +91,7 @@ function start() {
                         if (missingModules.hasOwnProperty(i)) {
                             log.warn(" - "+i+": "+missingModules[i].join(", "));
                             if (settings.autoInstallModules && i != "node-red") {
-                                serverAPI.installModule(i).otherwise(function(err) {
+                                redNodes.installModule(i).otherwise(function(err) {
                                     // Error already reported. Need the otherwise handler
                                     // to stop the error propagating any further
                                 });
@@ -115,128 +112,6 @@ function start() {
     });
 }
 
-
-function reportAddedModules(info) {
-    comms.publish("node/added",info.nodes,false);
-    if (info.nodes.length > 0) {
-        log.info(log._("server.added-types"));
-        for (var i=0;i<info.nodes.length;i++) {
-            for (var j=0;j<info.nodes[i].types.length;j++) {
-                log.info(" - "+
-                    (info.nodes[i].module?info.nodes[i].module+":":"")+
-                    info.nodes[i].types[j]+
-                    (info.nodes[i].err?" : "+info.nodes[i].err:"")
-                );
-            }
-        }
-    }
-    return info;
-}
-
-function reportRemovedModules(removedNodes) {
-    comms.publish("node/removed",removedNodes,false);
-    log.info(log._("server.removed-types"));
-    for (var j=0;j<removedNodes.length;j++) {
-        for (var i=0;i<removedNodes[j].types.length;i++) {
-            log.info(" - "+(removedNodes[j].module?removedNodes[j].module+":":"")+removedNodes[j].types[i]);
-        }
-    }
-    return removedNodes;
-}
-
-function installNode(file) {
-    return when.promise(function(resolve,reject) {
-        resolve(redNodes.addFile(file).then(function(info) {
-            var module = redNodes.getModuleInfo(info.module);
-            module.nodes = module.nodes.filter(function(d) {
-                return d.id==info.id;
-            });
-            return reportAddedModules(module);
-        }));
-    });
-}
-
-
-function installModule(module) {
-    //TODO: ensure module is 'safe'
-    return when.promise(function(resolve,reject) {
-        if (/[\s;]/.test(module)) {
-            reject(new Error(log._("server.install.invalid")));
-            return;
-        }
-        if (redNodes.getModuleInfo(module)) {
-            // TODO: nls
-            var err = new Error("Module already loaded");
-            err.code = "module_already_loaded";
-            reject(err);
-            return;
-        }
-        log.info(i18n._("server.install.installing",{name: module}));
-
-        var installDir = settings.userDir || process.env.NODE_RED_HOME || ".";
-        var child = child_process.exec('npm install --production '+module,
-            {
-                cwd: installDir
-            },
-            function(err, stdin, stdout) {
-                if (err) {
-                    var lookFor404 = new RegExp(" 404 .*"+module+"$","m");
-                    if (lookFor404.test(stdout)) {
-                        log.warn(log._("server.install.install-failed-not-found",{name:module}));
-                        var e = new Error();
-                        e.code = 404;
-                        reject(e);
-                    } else {
-                        log.warn(log._("server.install.install-failed-long",{name:module}));
-                        log.warn("------------------------------------------");
-                        log.warn(err.toString());
-                        log.warn("------------------------------------------");
-                        reject(new Error(log._("server.install.install-failed")));
-                    }
-                } else {
-                    log.info(log._("server.install.installed",{name:module}));
-                    resolve(redNodes.addModule(module).then(reportAddedModules));
-                }
-            }
-        );
-    });
-}
-
-function uninstallModule(module) {
-    return when.promise(function(resolve,reject) {
-        if (/[\s;]/.test(module)) {
-            reject(new Error(log._("server.install.invalid")));
-            return;
-        }
-        var installDir = settings.userDir || process.env.NODE_RED_HOME || ".";
-        var moduleDir = path.join(installDir,"node_modules",module);
-        if (!fs.existsSync(moduleDir)) {
-            return reject(new Error(log._("server.install.uninstall-failed",{name:module})));
-        }
-
-        var list = redNodes.removeModule(module);
-        log.info(log._("server.install.uninstalling",{name:module}));
-        var child = child_process.exec('npm remove '+module,
-            {
-                cwd: installDir
-            },
-            function(err, stdin, stdout) {
-                if (err) {
-                    log.warn(log._("server.install.uninstall-failed-long",{name:module}));
-                    log.warn("------------------------------------------");
-                    log.warn(err.toString());
-                    log.warn("------------------------------------------");
-                    reject(new Error(log._("server.install.uninstall-failed",{name:module})));
-                } else {
-                    log.info(log._("server.install.uninstalled",{name:module}));
-                    reportRemovedModules(list);
-                    resolve(list);
-                }
-            }
-        );
-    });
-}
-
 function reportMetrics() {
     var memUsage = process.memoryUsage();
 
@@ -271,12 +146,6 @@ var serverAPI = module.exports = {
     start: start,
     stop: stop,
 
-    reportAddedModules: reportAddedModules,
-    reportRemovedModules: reportRemovedModules,
-    installModule: installModule,
-    uninstallModule: uninstallModule,
-    installNode: installNode,
-
     get app() { return app },
     get nodeApp() { return nodeApp },
     get server() { return server }