Merge pull request #511 from anna2130/nr-cli-enhancements

Updates to match cli changes

red/api/nodes.js

@@ -97,6 +97,9 @@ module.exports = {
         var result = null;
         if (req.get("accept") === "application/json") {
             result = redNodes.getNodeInfo(id);
+            if (result) {
+                result.version = redNodes.getModuleVersion(req.params.mod);
+            }
         } else {
             result = redNodes.getNodeConfig(id);
         }
@@ -113,7 +116,13 @@ module.exports = {
         if (result) {
             res.send(result);
         } else {
-            res.send(404);
+            // check if module is actually a node-set
+            var matching = getMatchingNodes(module);
+            if (matching.length > 0) {
+                res.json(matching);
+            } else {
+                res.send(404);
+            }
         }
     },
 
@@ -128,7 +137,7 @@ module.exports = {
             return;
         }
         try {
-            var id = req.params.mod+"/"+req.params.set;
+            var id = req.params.mod + "/" + req.params.set;
             var node = redNodes.getNodeInfo(id);
             var info;
             if (!node) {
@@ -136,22 +145,7 @@ module.exports = {
             } else if (!node.err && node.enabled === body.enabled) {
                 res.json(node);
             } else {
-                if (body.enabled) {
+                res.json(putNode(id, body.enabled));
-                    info = redNodes.enableNode(id);
-                } else {
-                    info = redNodes.disableNode(id);
-                }
-                if (info.enabled == body.enabled && !info.err) {
-                    comms.publish("node/"+(body.enabled?"enabled":"disabled"),info,false);
-                    util.log("[red] "+(body.enabled?"Enabled":"Disabled")+" node types:");
-                    for (var i=0;i<info.types.length;i++) {
-                        util.log("[red] - "+info.types[i]);
-                    }
-                } else if (body.enabled && info.err) {
-                    util.log("[red] Failed to enable node:");
-                    util.log("[red] - "+info.name+" : "+info.err);
-                }
-                res.json(info);
             }
         } catch(err) {
             res.send(400,err.toString());
@@ -172,9 +166,26 @@ module.exports = {
             var mod = req.params.mod;
             var module = redNodes.getModuleInfo(mod);
             if (!module) {
-                res.send(404);
+                var matching = getMatchingNodes(mod);
-                return;
+                if (matching.length === 1) {
+                    // One match, assume correct
+                    res.json(putNode(matching[0].id, body.enabled));
+                    return;
+                } else if (matching.length > 1) {
+                    // Multiple matches, need clarification
+                    result = {
+                        multipleMatches: true,
+                        matches: matching
+                    };
+                    res.json(result);
+                    return;
+                } else {
+                    // Doesn't exist
+                    res.send(404);
+                    return;
+                }
             }
+
             var nodes = module.nodes;
             for (var i = 0; i < nodes.length; ++i) {
                 var node = nodes[i];
@@ -203,3 +214,40 @@ module.exports = {
         }
     }
 };
+
+function getMatchingNodes(node) {
+    var nodes = redNodes.getNodeList();
+    var matching = [];
+
+    nodes.forEach(function(n) {
+        if (n.name === node) {
+            n.version = redNodes.getModuleVersion(n.module);
+            matching.push(n);
+        }
+    });
+
+    return matching;
+}
+
+function putNode(id, enabled) {
+    var info;
+
+    if (enabled) {
+        info = redNodes.enableNode(id);
+    } else {
+        info = redNodes.disableNode(id);
+    }
+
+    if (info.enabled === enabled && !info.err) {
+        comms.publish("node/"+(enabled?"enabled":"disabled"),info,false);
+        util.log("[red] "+(enabled?"Enabled":"Disabled")+" node types:");
+        for (var i=0;i<info.types.length;i++) {
+            util.log("[red] - "+info.types[i]);
+        }
+    } else if (enabled && info.err) {
+        util.log("[red] Failed to enable node:");
+        util.log("[red] - "+info.name+" : "+info.err);
+    }
+
+    return info;
+}

red/nodes/index.js

@@ -124,6 +124,7 @@ module.exports = {
 
     getModuleInfo: registry.getModuleInfo,
     getModuleList: registry.getModuleList,
+    getModuleVersion: registry.getModuleVersion,
 
     getNodeConfigs: registry.getNodeConfigs,
     getNodeConfig: registry.getNodeConfig,

red/nodes/registry.js

@@ -275,6 +275,9 @@ var registry = (function() {
                 return null;
             }
         },
+        getModuleVersion: function(module) {
+            return moduleConfigs[module].version;
+        },
         registerNodeConstructor: function(type,constructor) {
             if (nodeConstructors[type]) {
                 throw new Error(type+" already registered");
@@ -287,7 +290,6 @@ var registry = (function() {
             events.emit("type-registered",type);
         },
 
-
         /**
          * Gets all of the node template configs
          * @return all of the node templates in a single string
@@ -807,6 +809,7 @@ module.exports = {
 
     getModuleInfo: registry.getModuleInfo,
     getModuleList: registry.getModuleList,
+    getModuleVersion: registry.getModuleVersion,
 
     getNodeConfigs: registry.getAllNodeConfigs,
     getNodeConfig: registry.getNodeConfig,

test/red/api/nodes_spec.js

@@ -117,6 +117,9 @@ describe("nodes api", function() {
             var getNodeInfo = sinon.stub(redNodes,'getNodeInfo', function(id) {
                 return {"node-red/123":{id:"node-red/123"}}[id];
             });
+            var getModuleVersion = sinon.stub(redNodes,'getModuleVersion', function(module) {
+                return {"node-red": {version: "0.0.1"}}[module];
+            });
             request(app)
                 .get('/nodes/node-red/123')
                 .set('Accept', 'application/json')