Allow nodes to be installed by path name

red/api/nodes.js

@@ -59,20 +59,17 @@ module.exports = {
             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));
-            } else if (node.file) {
-                log.audit({event: "nodes.install",file:node.file},req);
-                res.json(info.nodes[0]);
+                res.json(info);
             }
         }).otherwise(function(err) {
             if (err.code === 404) {
-                log.audit({event: "nodes.install",module:node.module,file:node.file,error:"not_found"},req);
+                log.audit({event: "nodes.install",module:node.module,error:"not_found"},req);
                 res.status(404).end();
             } else if (err.code) {
                 log.audit({event: "nodes.install",module:node.module,error:err.code},req);
                 res.status(400).json({error:err.code, message:err.message});
             } else {
-                log.audit({event: "nodes.install",module:node.module,file:node.file,error:err.code||"unexpected_error",message:err.toString()},req);
+                log.audit({event: "nodes.install",module:node.module,error:err.code||"unexpected_error",message:err.toString()},req);
                 res.status(400).json({error:err.code||"unexpected_error", message:err.toString()});
             }
         });

red/nodes/registry/installer.js

@@ -28,37 +28,74 @@ var child_process = require('child_process');
 
 var settings;
 
+var moduleRe = /^[^/]+$/;
+var slashRe = process.platform === "win32" ? /\\|[/]/ : /[/]/;
+
 function init(_settings) {
     settings = _settings;
 }
 
+function checkModulePath(folder) {
+    var moduleName;
+    var err;
+    var fullPath = path.resolve(folder);
+    var packageFile = path.join(fullPath,'package.json');
+    if (fs.existsSync(packageFile)) {
+        var pkg = require(packageFile);
+        moduleName = pkg.name;
+        if (!pkg['node-red']) {
+            // TODO: nls
+            err = new Error("Invalid Node-RED module");
+            err.code = 'invalid_module';
+            throw err;
+        }
+    } else {
+        err = new Error("Module not found");
+        err.code = 404;
+        throw err;
+    }
+    return moduleName;
+}
+
+function checkExistingModule(module) {
+    if (registry.getModuleInfo(module)) {
+        // TODO: nls
+        var err = new Error("Module already loaded");
+        err.code = "module_already_loaded";
+        throw err;
+    }
+}
+
 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;
+        var installName = module;
+
+        try {
+            if (moduleRe.test(module)) {
+                // Simple module name - assume it can be npm installed
+            } else if (slashRe.test(module)) {
+                // A path - check if there's a valid package.json
+                installName = module;
+                module = checkModulePath(module);
+            }
+            checkExistingModule(module);
+        } catch(err) {
+            return reject(err);
         }
         log.info(log._("server.install.installing",{name: module}));
 
         var installDir = settings.userDir || process.env.NODE_RED_HOME || ".";
-        var child = child_process.execFile('npm',['install','--production',module],
+        var child = child_process.execFile('npm',['install','--production',installName],
             {
                 cwd: installDir
             },
             function(err, stdin, stdout) {
                 if (err) {
-                    var lookFor404 = new RegExp(" 404 .*"+module+"$","m");
+                    var lookFor404 = new RegExp(" 404 .*"+installName+"$","m");
                     if (lookFor404.test(stdout)) {
                         log.warn(log._("server.install.install-failed-not-found",{name:module}));
-                        var e = new Error();
+                        var e = new Error("Module not found");
                         e.code = 404;
                         reject(e);
                     } else {

red/nodes/registry/loader.js

@@ -321,34 +321,6 @@ function addModule(module) {
     }
 }
 
-function addFile(file) {
-    if (!settings.available()) {
-        throw new Error("Settings unavailable");
-    }
-    var info = registry.getNodeInfo("node-red/"+path.basename(file).replace(/^\d+-/,"").replace(/\.js$/,""));
-    if (info) {
-        var err = new Error("File already loaded");
-        err.code = "file_already_loaded";
-        return when.reject(err);
-    }
-    var nodeFiles = localfilesystem.getLocalFile(file);
-    if (nodeFiles) {
-        var fileObj = {};
-        fileObj[nodeFiles.module] = {
-            name: nodeFiles.module,
-            version: nodeFiles.version,
-            nodes: {}
-        };
-        fileObj[nodeFiles.module].nodes[nodeFiles.name] = nodeFiles;
-
-        return loadNodeFiles(fileObj);
-    } else {
-        var e = new Error();
-        e.code = 404;
-        return when.reject(e);
-    }
-}
-
 function loadNodeHelp(node,lang) {
     var dir = path.dirname(node.template);
     var base = path.basename(node.template);
@@ -385,7 +357,6 @@ module.exports = {
     init: init,
     load: load,
     addModule: addModule,
-    addFile: addFile,
     loadNodeSet: loadNodeSet,
     getNodeHelp: getNodeHelp
 }