1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

Handle subflow modules with their own npm dependencies

This commit is contained in:
Nick O'Leary 2020-11-25 19:07:30 +00:00
parent de15a1c36f
commit da96c85d32
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
15 changed files with 237 additions and 70 deletions

View File

@ -60,6 +60,7 @@ module.exports = {
runtimeAPI.nodes.addModule(opts).then(function(info) { runtimeAPI.nodes.addModule(opts).then(function(info) {
res.json(info); res.json(info);
}).catch(function(err) { }).catch(function(err) {
console.log(err.stack);
apiUtils.rejectHandler(req,res,err); apiUtils.rejectHandler(req,res,err);
}) })
}, },

View File

@ -386,6 +386,7 @@ var RED = (function() {
} }
}); });
RED.comms.subscribe("notification/node/#",function(topic,msg) { RED.comms.subscribe("notification/node/#",function(topic,msg) {
console.log(topic,msg);
var i,m; var i,m;
var typeList; var typeList;
var info; var info;

View File

@ -94,20 +94,6 @@ function checkModulePath(folder) {
version: moduleVersion version: moduleVersion
}; };
} }
function checkExistingModule(module,version) {
var info = registry.getModuleInfo(module);
if (info) {
if (!version || info.version === version) {
var err = new Error("Module already loaded");
err.code = "module_already_loaded";
throw err;
}
return true;
}
return false;
}
async function installModule(module,version,url) { async function installModule(module,version,url) {
if (Buffer.isBuffer(module)) { if (Buffer.isBuffer(module)) {
return installTarball(module) return installTarball(module)
@ -118,6 +104,7 @@ async function installModule(module,version,url) {
var installName = module; var installName = module;
let isRegistryPackage = true; let isRegistryPackage = true;
var isUpgrade = false; var isUpgrade = false;
var isExisting = false;
if (url) { if (url) {
if (pkgurlRe.test(url) || localtgzRe.test(url)) { if (pkgurlRe.test(url) || localtgzRe.test(url)) {
// Git remote url or Tarball url - check the valid package url // Git remote url or Tarball url - check the valid package url
@ -158,7 +145,21 @@ async function installModule(module,version,url) {
throw e; throw e;
} }
} }
isUpgrade = checkExistingModule(module,version);
var info = registry.getModuleInfo(module);
if (info) {
if (!info.user) {
log.debug(`Installing existing module: ${module}`)
isExisting = true;
} else if (!version || info.version === version) {
var err = new Error("Module already loaded");
err.code = "module_already_loaded";
throw err;
}
isUpgrade = true;
} else {
isUpgrade = false;
}
if (!isUpgrade) { if (!isUpgrade) {
log.info(log._("server.install.installing",{name: module,version: version||"latest"})); log.info(log._("server.install.installing",{name: module,version: version||"latest"}));
@ -172,7 +173,17 @@ async function installModule(module,version,url) {
return exec.run(npmCommand,args,{ return exec.run(npmCommand,args,{
cwd: installDir cwd: installDir
}, true).then(result => { }, true).then(result => {
if (!isUpgrade) { if (isExisting) {
// This is a module we already have installed as a non-user module.
// That means it was discovered when loading, but was not listed
// in package.json and has been hidden from the editor.
// The user has requested to install this module. Having run
// the npm install above, it will now be listed in package.json.
// Update the registry to mark it as a user module so it will
// be available to the editor.
log.info(log._("server.install.installed",{name:module}));
return require("./registry").setUserInstalled(module,true).then(reportAddedModules);
} else if (!isUpgrade) {
log.info(log._("server.install.installed",{name:module})); log.info(log._("server.install.installed",{name:module}));
return require("./index").addModule(module).then(reportAddedModules); return require("./index").addModule(module).then(reportAddedModules);
} else { } else {
@ -212,7 +223,6 @@ async function installModule(module,version,url) {
} }
function reportAddedModules(info) { function reportAddedModules(info) {
//comms.publish("node/added",info.nodes,false);
if (info.nodes.length > 0) { if (info.nodes.length > 0) {
log.info(log._("server.added-types")); log.info(log._("server.added-types"));
for (var i=0;i<info.nodes.length;i++) { for (var i=0;i<info.nodes.length;i++) {

View File

@ -308,15 +308,37 @@ function addModule(module) {
throw new Error("Settings unavailable"); throw new Error("Settings unavailable");
} }
var nodes = []; var nodes = [];
if (registry.getModuleInfo(module)) { var existingInfo = registry.getModuleInfo(module);
if (existingInfo) {
// TODO: nls // TODO: nls
var e = new Error("module_already_loaded"); var e = new Error("module_already_loaded");
e.code = "module_already_loaded"; e.code = "module_already_loaded";
return Promise.reject(e); return Promise.reject(e);
} }
try { try {
var moduleFiles = localfilesystem.getModuleFiles(module); var moduleFiles = {};
return loadNodeFiles(moduleFiles); var moduleStack = [module];
while(moduleStack.length > 0) {
var moduleToLoad = moduleStack.shift();
var files = localfilesystem.getModuleFiles(moduleToLoad);
if (files[moduleToLoad]) {
moduleFiles[moduleToLoad] = files[moduleToLoad];
if (moduleFiles[moduleToLoad].dependencies) {
log.debug(`Loading dependencies for ${module}`)
for (var i=0; i<moduleFiles[moduleToLoad].dependencies.length; i++) {
var dep = moduleFiles[moduleToLoad].dependencies[i]
if (!registry.getModuleInfo(dep)) {
log.debug(` - load ${dep}`)
moduleStack.push(dep);
} else {
log.debug(` - already loaded ${dep}`)
registry.addModuleDependency(dep,moduleToLoad)
}
}
}
}
}
return loadNodeFiles(moduleFiles).then(() => module)
} catch(err) { } catch(err) {
return Promise.reject(err); return Promise.reject(err);
} }

View File

@ -28,6 +28,7 @@ let loadDenyList = [];
var settings; var settings;
var disableNodePathScan = false; var disableNodePathScan = false;
var iconFileExtensions = [".png", ".gif", ".svg"]; var iconFileExtensions = [".png", ".gif", ".svg"];
var packageList = {};
function init(_settings) { function init(_settings) {
settings = _settings; settings = _settings;
@ -187,9 +188,17 @@ function scanTreeForNodesModules(moduleName) {
var userDir; var userDir;
if (settings.userDir) { if (settings.userDir) {
packageList = getPackageList();
userDir = path.join(settings.userDir,"node_modules"); userDir = path.join(settings.userDir,"node_modules");
results = scanDirForNodesModules(userDir,moduleName); results = scanDirForNodesModules(userDir,moduleName);
results.forEach(function(r) { r.local = true; }); results.forEach(function(r) {
// If it was found in <userDir>/node_modules then it is considered
// a local module.
// Also check to see if it is listed in the package.json file as a user-installed
// module. This distinguishes modules installed as a dependency
r.local = true;
r.user = !!packageList[r.package.name];
});
} }
if (dir) { if (dir) {
@ -288,20 +297,19 @@ function getNodeFiles(disableNodePathScan) {
} }
} }
var nodeList = { var nodeList = {};
"node-red": { var coreNodeEntry = {
name: "node-red", name: "node-red",
version: settings.version, version: settings.version,
nodes: {}, nodes: {},
icons: iconList icons: iconList
} }
}
nodeFiles.forEach(function(node) { nodeFiles.forEach(function(node) {
nodeList["node-red"].nodes[node.name] = node; coreNodeEntry.nodes[node.name] = node;
}); });
if (settings.coreNodesDir) { if (settings.coreNodesDir) {
var examplesDir = path.join(settings.coreNodesDir,"examples"); var examplesDir = path.join(settings.coreNodesDir,"examples");
nodeList["node-red"].examples = {path: examplesDir}; coreNodeEntry.examples = {path: examplesDir};
} }
if (!disableNodePathScan) { if (!disableNodePathScan) {
@ -310,7 +318,6 @@ function getNodeFiles(disableNodePathScan) {
// Filter the module list to ignore global modules // Filter the module list to ignore global modules
// that have also been installed locally - allowing the user to // that have also been installed locally - allowing the user to
// update a module they may not otherwise be able to touch // update a module they may not otherwise be able to touch
moduleFiles.sort(function(A,B) { moduleFiles.sort(function(A,B) {
if (A.local && !B.local) { if (A.local && !B.local) {
return -1 return -1
@ -323,7 +330,7 @@ function getNodeFiles(disableNodePathScan) {
moduleFiles = moduleFiles.filter(function(mod) { moduleFiles = moduleFiles.filter(function(mod) {
var result; var result;
if (!knownModules[mod.package.name]) { if (!knownModules[mod.package.name]) {
knownModules[mod.package.name] = true; knownModules[mod.package.name] = mod;
result = true; result = true;
} else { } else {
result = false; result = false;
@ -332,48 +339,62 @@ function getNodeFiles(disableNodePathScan) {
return result; return result;
}); });
moduleFiles.forEach(function(moduleFile) { // Do a second pass to check we have all the declared node dependencies
var nodeModuleFiles = getModuleNodeFiles(moduleFile); // As this is only done as part of the initial palette load, `knownModules` will
nodeList[moduleFile.package.name] = { // contain a list of everything discovered during this phase. This means
name: moduleFile.package.name, // we can check for missing dependencies here.
version: moduleFile.package.version, moduleFiles = moduleFiles.filter(function(mod) {
path: moduleFile.dir, if (Array.isArray(mod.package["node-red"].dependencies)) {
local: moduleFile.local||false, const deps = mod.package["node-red"].dependencies;
nodes: {}, const missingDeps = mod.package["node-red"].dependencies.filter(dep => {
icons: nodeModuleFiles.icons, if (knownModules[dep]) {
examples: nodeModuleFiles.examples knownModules[dep].usedBy = knownModules[dep].usedBy || [];
}; knownModules[dep].usedBy.push(mod.package.name)
if (moduleFile.package['node-red'].version) { } else {
nodeList[moduleFile.package.name].redVersion = moduleFile.package['node-red'].version; return true;
} }
nodeModuleFiles.files.forEach(function(node) { })
node.local = moduleFile.local||false; if (missingDeps.length > 0) {
nodeList[moduleFile.package.name].nodes[node.name] = node; log.error(`Module: ${mod.package.name} missing dependencies:`);
}); missingDeps.forEach(m => { log.error(` - ${m}`)});
nodeFiles = nodeFiles.concat(nodeModuleFiles.files); return false;
}
}
return true;
}); });
nodeList = convertModuleFileListToObject(moduleFiles);
} else { } else {
// console.log("node path scan disabled"); // console.log("node path scan disabled");
} }
nodeList["node-red"] = coreNodeEntry;
return nodeList; return nodeList;
} }
function getModuleFiles(module) { function getModuleFiles(module) {
var nodeList = {}; // Update the package list
var moduleFiles = scanTreeForNodesModules(module); var moduleFiles = scanTreeForNodesModules(module);
if (moduleFiles.length === 0) { if (moduleFiles.length === 0) {
var err = new Error(log._("nodes.registry.localfilesystem.module-not-found", {module:module})); var err = new Error(log._("nodes.registry.localfilesystem.module-not-found", {module:module}));
err.code = 'MODULE_NOT_FOUND'; err.code = 'MODULE_NOT_FOUND';
throw err; throw err;
} }
// Unlike when doing the initial palette load, this call cannot verify the
// dependencies of the new module as it doesn't have visiblity of what
// is in the registry. That will have to be done be the caller in loader.js
return convertModuleFileListToObject(moduleFiles);
}
function convertModuleFileListToObject(moduleFiles) {
const nodeList = {};
moduleFiles.forEach(function(moduleFile) { moduleFiles.forEach(function(moduleFile) {
var nodeModuleFiles = getModuleNodeFiles(moduleFile); var nodeModuleFiles = getModuleNodeFiles(moduleFile);
nodeList[moduleFile.package.name] = { nodeList[moduleFile.package.name] = {
name: moduleFile.package.name, name: moduleFile.package.name,
version: moduleFile.package.version, version: moduleFile.package.version,
path: moduleFile.dir, path: moduleFile.dir,
local: moduleFile.local||false,
user: moduleFile.user||false,
nodes: {}, nodes: {},
icons: nodeModuleFiles.icons, icons: nodeModuleFiles.icons,
examples: nodeModuleFiles.examples examples: nodeModuleFiles.examples
@ -381,7 +402,14 @@ function getModuleFiles(module) {
if (moduleFile.package['node-red'].version) { if (moduleFile.package['node-red'].version) {
nodeList[moduleFile.package.name].redVersion = moduleFile.package['node-red'].version; nodeList[moduleFile.package.name].redVersion = moduleFile.package['node-red'].version;
} }
if (moduleFile.package['node-red'].dependencies) {
nodeList[moduleFile.package.name].dependencies = moduleFile.package['node-red'].dependencies;
}
if (moduleFile.usedBy) {
nodeList[moduleFile.package.name].usedBy = moduleFile.usedBy;
}
nodeModuleFiles.files.forEach(function(node) { nodeModuleFiles.files.forEach(function(node) {
node.local = moduleFile.local||false;
nodeList[moduleFile.package.name].nodes[node.name] = node; nodeList[moduleFile.package.name].nodes[node.name] = node;
nodeList[moduleFile.package.name].nodes[node.name].local = moduleFile.local || false; nodeList[moduleFile.package.name].nodes[node.name].local = moduleFile.local || false;
}); });
@ -412,6 +440,23 @@ function scanIconDir(dir) {
}) })
return iconList; return iconList;
} }
/**
* Gets the list of modules installed in this runtime as reported by package.json
* Note: these may include non-Node-RED modules
*/
function getPackageList() {
var list = {};
if (settings.userDir) {
try {
var userPackage = path.join(settings.userDir,"package.json");
var pkg = JSON.parse(fs.readFileSync(userPackage,"utf-8"));
return pkg.dependencies;
} catch(err) {
log.error(err);
}
}
return list;
}
module.exports = { module.exports = {
init: init, init: init,

View File

@ -58,7 +58,8 @@ function filterNodeInfo(n) {
name: n.name, name: n.name,
types: n.types, types: n.types,
enabled: n.enabled, enabled: n.enabled,
local: n.local||false local: n.local||false,
user: n.user || false
}; };
if (n.hasOwnProperty("module")) { if (n.hasOwnProperty("module")) {
r.module = n.module; r.module = n.module;
@ -94,6 +95,7 @@ function saveNodeList() {
name: module, name: module,
version: moduleConfigs[module].version, version: moduleConfigs[module].version,
local: moduleConfigs[module].local||false, local: moduleConfigs[module].local||false,
user: moduleConfigs[module].user||false,
nodes: {} nodes: {}
}; };
if (moduleConfigs[module].hasOwnProperty('pending_version')) { if (moduleConfigs[module].hasOwnProperty('pending_version')) {
@ -179,6 +181,7 @@ function loadNodeConfigs() {
function addModule(module) { function addModule(module) {
moduleNodes[module.name] = []; moduleNodes[module.name] = [];
moduleConfigs[module.name] = module; moduleConfigs[module.name] = module;
// console.log("registry.js.addModule",module.name,"user?",module.user,"usedBy",module.usedBy,"dependencies",module.dependencies)
for (var setName in module.nodes) { for (var setName in module.nodes) {
if (module.nodes.hasOwnProperty(setName)) { if (module.nodes.hasOwnProperty(setName)) {
var set = module.nodes[setName]; var set = module.nodes[setName];
@ -240,21 +243,47 @@ function removeNode(id) {
return filterNodeInfo(config); return filterNodeInfo(config);
} }
function removeModule(module) { function removeModule(name,skipSave) {
if (!settings.available()) { if (!settings.available()) {
throw new Error("Settings unavailable"); throw new Error("Settings unavailable");
} }
var nodes = moduleNodes[module];
if (!nodes) {
throw new Error("Unrecognised module: "+module);
}
var infoList = []; var infoList = [];
for (var i=0;i<nodes.length;i++) { var module = moduleConfigs[name];
infoList.push(removeNode(module+"/"+nodes[i])); var nodes = moduleNodes[name];
if (!nodes) {
throw new Error("Unrecognised module: "+name);
} }
delete moduleNodes[module]; if (module.usedBy && module.usedBy > 0) {
delete moduleConfigs[module]; // We are removing a module that is used by other modules... so whilst
// this module should be removed from the editor palette, it needs to
// stay in the runtime... for now.
module.user = false;
for (var i=0;i<nodes.length;i++) {
infoList.push(filterNodeInfo(nodes[i]));
}
} else {
if (module.dependencies) {
module.dependencies.forEach(function(dep) {
// Check each dependency of this module to see if it is a non-user-installed
// module that we can expect to disappear once npm uninstall is run
if (!moduleConfigs[dep].user) {
moduleConfigs[dep].usedBy = moduleConfigs[dep].usedBy.filter(m => m !== name);
if (moduleConfigs[dep].usedBy.length === 0) {
// Remove the dependency
removeModule(dep,true);
}
}
});
}
for (var i=0;i<nodes.length;i++) {
infoList.push(removeNode(name+"/"+nodes[i]));
}
delete moduleNodes[name];
delete moduleConfigs[name];
}
if (!skipSave) {
saveNodeList(); saveNodeList();
}
return infoList; return infoList;
} }
@ -307,6 +336,9 @@ function getNodeList(filter) {
for (var module in moduleConfigs) { for (var module in moduleConfigs) {
/* istanbul ignore else */ /* istanbul ignore else */
if (moduleConfigs.hasOwnProperty(module)) { if (moduleConfigs.hasOwnProperty(module)) {
if (!moduleConfigs[module].user && (moduleConfigs[module].usedBy && moduleConfigs[module].usedBy.length > 0)) {
continue;
}
var nodes = moduleConfigs[module].nodes; var nodes = moduleConfigs[module].nodes;
for (var node in nodes) { for (var node in nodes) {
/* istanbul ignore else */ /* istanbul ignore else */
@ -346,9 +378,13 @@ function getModuleInfo(module) {
name: module, name: module,
version: moduleConfigs[module].version, version: moduleConfigs[module].version,
local: moduleConfigs[module].local, local: moduleConfigs[module].local,
user: moduleConfigs[module].user,
path: moduleConfigs[module].path, path: moduleConfigs[module].path,
nodes: [] nodes: []
}; };
if (moduleConfigs[module].dependencies) {
m.dependencies = moduleConfigs[module].dependencies;
}
if (moduleConfigs[module] && moduleConfigs[module].pending_version) { if (moduleConfigs[module] && moduleConfigs[module].pending_version) {
m.pending_version = moduleConfigs[module].pending_version; m.pending_version = moduleConfigs[module].pending_version;
} }
@ -425,7 +461,13 @@ function getAllNodeConfigs(lang) {
var script = ""; var script = "";
for (var i=0;i<nodeList.length;i++) { for (var i=0;i<nodeList.length;i++) {
var id = nodeList[i]; var id = nodeList[i];
var config = moduleConfigs[getModule(id)].nodes[getNode(id)];
var module = moduleConfigs[getModule(id)]
if (!module.user && (module.usedBy && module.usedBy.length > 0)) {
continue;
}
var config = module.nodes[getNode(id)];
if (config.enabled && !config.err) { if (config.enabled && !config.err) {
result += "\n<!-- --- [red-module:"+id+"] --- -->\n"; result += "\n<!-- --- [red-module:"+id+"] --- -->\n";
result += config.config; result += config.config;
@ -587,6 +629,17 @@ function setModulePendingUpdated(module,version) {
}); });
} }
function setUserInstalled(module,userInstalled) {
moduleConfigs[module].user = userInstalled;
return saveNodeList().then(function() {
return getModuleInfo(module);
});
}
function addModuleDependency(module,usedBy) {
moduleConfigs[module].usedBy = moduleConfigs[module].usedBy || [];
moduleConfigs[module].usedBy.push(usedBy);
}
var icon_paths = { }; var icon_paths = { };
var iconCache = {}; var iconCache = {};
@ -648,6 +701,9 @@ var registry = module.exports = {
disableNodeSet: disableNodeSet, disableNodeSet: disableNodeSet,
setModulePendingUpdated: setModulePendingUpdated, setModulePendingUpdated: setModulePendingUpdated,
setUserInstalled: setUserInstalled,
addModuleDependency:addModuleDependency,
removeModule: removeModule, removeModule: removeModule,
getNodeInfo: getNodeInfo, getNodeInfo: getNodeInfo,

View File

@ -194,7 +194,7 @@ var api = module.exports = {
} }
if (opts.module) { if (opts.module) {
var existingModule = runtime.nodes.getModuleInfo(opts.module); var existingModule = runtime.nodes.getModuleInfo(opts.module);
if (existingModule) { if (existingModule && existingModule.user) {
if (!opts.version || existingModule.version === opts.version) { if (!opts.version || existingModule.version === opts.version) {
runtime.log.audit({event: "nodes.install",module:opts.module, version:opts.version, error:"module_already_loaded"}, opts.req); runtime.log.audit({event: "nodes.install",module:opts.module, version:opts.version, error:"module_already_loaded"}, opts.req);
var err = new Error("Module already loaded"); var err = new Error("Module already loaded");

View File

@ -181,11 +181,12 @@ function installModule(module,version,url) {
function uninstallModule(module) { function uninstallModule(module) {
var info = registry.getModuleInfo(module); var info = registry.getModuleInfo(module);
if (!info) { if (!info || !info.user) {
throw new Error(log._("nodes.index.unrecognised-module", {module:module})); throw new Error(log._("nodes.index.unrecognised-module", {module:module}));
} else { } else {
for (var i=0;i<info.nodes.length;i++) { var nodeTypesToCheck = info.nodes.map(n => `${module}/${n.name}`);
flows.checkTypeInUse(module+"/"+info.nodes[i].name); for (var i=0;i<nodeTypesToCheck.length;i++) {
flows.checkTypeInUse(nodeTypesToCheck[i]);
} }
return registry.uninstallModule(module).then(function(list) { return registry.uninstallModule(module).then(function(list) {
events.emit("runtime-event",{id:"node/removed",retain:false,payload:list}); events.emit("runtime-event",{id:"node/removed",retain:false,payload:list});

View File

@ -0,0 +1,3 @@
curl -H "Content-Type: application/json" --request POST --data '{"url":"/Users/nol/code/node-red/node-red/test/resources/subflow/test-subflow-mod-1.0.0.tgz","module":"test-subflow-mod"}' http://localhost:1880/nodes
curl --request DELETE http://localhost:1880/nodes/test-subflow-mod

View File

@ -0,0 +1,18 @@
{
"name": "test-subflow-mod",
"version": "1.0.1",
"description": "",
"keywords": [],
"license": "ISC",
"node-red": {
"nodes": {
"test-subflow": "subflow.js"
},
"dependencies": [
"node-red-node-random"
]
},
"dependencies": {
"node-red-node-random": "*"
}
}

View File

@ -0,0 +1,4 @@
module.exports = function(RED) {
RED.nodes.registerSubflow(JSON.parse(require('fs').readFileSync(require("path").join(__dirname,"subflow.json"))))
}

View File

@ -0,0 +1,4 @@
{"id":"caf258cc.4e2c48","type":"subflow","name":"Test Subflow","info":"","category":"common","in":[{"x":120,"y":100,"wires":[{"id":"2f1d674f.a02d28"}]}],"out":[{"x":560,"y":100,"wires":[{"id":"1497236e.07f12d","port":0}]},{"x":360,"y":200,"wires":[{"id":"f4334f5f.4905c","port":0}]}],"env":[{"name":"FOO","type":"cred","ui":{"icon":"font-awesome/fa-thermometer-0"}},{"name":"BAR","type":"str","value":"1","ui":{"icon":"font-awesome/fa-thermometer-2","type":"select","opts":{"opts":[{"l":{"en-US":"option 1"},"v":"1"},{"l":{"en-US":"option 2"},"v":"2"},{"l":{"en-US":"option 3"},"v":"3"}]}}},{"name":"onewithaverylongname","type":"str","value":""},{"name":"BARRY","type":"bool","value":"true","ui":{"icon":"font-awesome/fa-thermometer-4","type":"checkbox"}},{"name":"WILMA","type":"num","value":"10","ui":{"icon":"font-awesome/fbomb","type":"spinner"}},{"name":"awg","type":"num","value":"","ui":{"icon":"font-awesome/fa-address-book-o","type":"spinner"}},{"name":"awf","type":"str","value":"","ui":{"type":"select","opts":{"opts":[{"l":{"en-US":"one"},"v":"1"},{"l":{"en-US":"two"},"v":"2"},{"l":{"en-US":"three"},"v":"3"}]}}},{"name":"aawf","type":"bool","value":"true","ui":{"type":"checkbox"}},{"name":"awgawgawg","type":"str","value":"","ui":{"type":"none"}},{"name":"seagseg","type":"str","value":"","ui":{"type":"hide"}}],"meta":{},"color":"#A6BBCF","icon":"font-awesome/fa-space-shuttle","status":{"x":500,"y":300,"wires":[{"id":"8252d1cc.54f94","port":0}]},
"flow":
[{"id":"2f1d674f.a02d28","type":"function","z":"caf258cc.4e2c48","name":"","func":"node.error(\"subflow error \"+msg.payload,msg);\nmsg.payload = {\n FOO: env.get(\"FOO\"),\n BAR: env.get(\"BAR\"),\n WILMA: env.get(\"WILMA\"),\n BARRY: env.get(\"BARRY\")\n}\nnode.warn(\"warning\");\n\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","x":240,"y":100,"wires":[["1497236e.07f12d"]]},{"id":"f4334f5f.4905c","type":"catch","z":"caf258cc.4e2c48","name":"","scope":null,"uncaught":false,"x":220,"y":200,"wires":[["8252d1cc.54f94"]]},{"id":"8252d1cc.54f94","type":"change","z":"caf258cc.4e2c48","name":"","rules":[{"t":"set","p":"payload","pt":"msg","to":"error.message","tot":"msg"}],"action":"","property":"","from":"","to":"","reg":false,"x":350,"y":300,"wires":[[]]},{"id":"1497236e.07f12d","type":"random","z":"caf258cc.4e2c48","name":"","low":"1","high":"10","inte":"true","property":"random","x":420,"y":100,"wires":[[]]},{"id":"876fc49e.f15268","type":"subflow:caf258cc.4e2c48","z":"d607ce33.4fa5a","name":"","x":200,"y":760,"wires":[[],[]]}]
}

Binary file not shown.

View File

@ -131,6 +131,7 @@ describe('nodes/registry/installer', function() {
it("rejects when update requested to existing version", function(done) { it("rejects when update requested to existing version", function(done) {
sinon.stub(typeRegistry,"getModuleInfo", function() { sinon.stub(typeRegistry,"getModuleInfo", function() {
return { return {
user: true,
version: "0.1.1" version: "0.1.1"
} }
}); });
@ -142,6 +143,7 @@ describe('nodes/registry/installer', function() {
it("rejects when update requested to existing version and url", function(done) { it("rejects when update requested to existing version and url", function(done) {
sinon.stub(typeRegistry,"getModuleInfo", function() { sinon.stub(typeRegistry,"getModuleInfo", function() {
return { return {
user: true,
version: "0.1.1" version: "0.1.1"
} }
}); });

View File

@ -528,7 +528,7 @@ describe("red/nodes/registry/loader",function() {
stubs.push(sinon.stub(nodes,"registerType")); stubs.push(sinon.stub(nodes,"registerType"));
loader.init({nodes:nodes,log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}}); loader.init({nodes:nodes,log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
loader.addModule("TestNodeModule").then(function(result) { loader.addModule("TestNodeModule").then(function(result) {
result.should.eql("a node list"); result.should.eql("TestNodeModule");
registry.addModule.called.should.be.true(); registry.addModule.called.should.be.true();
var module = registry.addModule.lastCall.args[0]; var module = registry.addModule.lastCall.args[0];
@ -585,7 +585,7 @@ describe("red/nodes/registry/loader",function() {
stubs.push(sinon.stub(nodes,"registerType")); stubs.push(sinon.stub(nodes,"registerType"));
loader.init({log:{"_":function(){},warn:function(){}},nodes:nodes,version: function() { return "0.12.0"}, settings:{available:function(){return true;}}}); loader.init({log:{"_":function(){},warn:function(){}},nodes:nodes,version: function() { return "0.12.0"}, settings:{available:function(){return true;}}});
loader.addModule("TestNodeModule").then(function(result) { loader.addModule("TestNodeModule").then(function(result) {
result.should.eql("a node list"); result.should.eql("TestNodeModule");
registry.addModule.called.should.be.false(); registry.addModule.called.should.be.false();
nodes.registerType.called.should.be.false(); nodes.registerType.called.should.be.false();
done(); done();