frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Change node config load to be async

This commit is contained in:
Nick O'Leary 2015-04-07 23:46:52 +01:00
parent 9dd7e2e43d
commit 2fe9c1e55f
1 changed files with 63 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
red/nodes/registry/loader.js
View File

@ -36,7 +36,7 @@ function load(defaultNodesDir,disableNodePathScan) {
} }
function loadNodeFiles(nodeFiles) { function loadNodeFiles(nodeFiles) {
var nodes = []; var promises = [];
for (var module in nodeFiles) { for (var module in nodeFiles) {
/* istanbul ignore else */ /* istanbul ignore else */
if (nodeFiles.hasOwnProperty(module)) { if (nodeFiles.hasOwnProperty(module)) {
@ -45,7 +45,7 @@ function loadNodeFiles(nodeFiles) {
/* istanbul ignore else */ /* istanbul ignore else */
if (nodeFiles[module].nodes.hasOwnProperty(node)) { if (nodeFiles[module].nodes.hasOwnProperty(node)) {
try { try {
nodes.push(loadNodeConfig(nodeFiles[module].nodes[node])) promises.push(loadNodeConfig(nodeFiles[module].nodes[node]))
} catch(err) { } catch(err) {
// //
} }
@ -54,10 +54,14 @@ function loadNodeFiles(nodeFiles) {
} }
} }
} }
return when.settle(promises).then(function(results) {
var nodes = results.map(function(r) { return r.value; });
return loadNodeSetList(nodes); return loadNodeSetList(nodes);
});
} }
function loadNodeConfig(fileInfo) { function loadNodeConfig(fileInfo) {
return when.promise(function(resolve) {
var file = fileInfo.file; var file = fileInfo.file;
var module = fileInfo.module; var module = fileInfo.module;
var name = fileInfo.name; var name = fileInfo.name;
@ -83,9 +87,15 @@ function loadNodeConfig(fileInfo) {
loaded:false loaded:false
}; };
try { fs.readFile(node.template,'utf8', function(err,content) {
var content = fs.readFileSync(node.template,'utf8'); if (err) {
node.types = [];
if (err.code === 'ENOENT') {
node.err = "Error: "+file+" does not exist";
} else {
node.err = err.toString();
}
} else {
var types = []; var types = [];
var regExp = /<script ([^>]*)data-template-name=['"]([^'"]*)['"]/gi; var regExp = /<script ([^>]*)data-template-name=['"]([^'"]*)['"]/gi;
@ -105,17 +115,11 @@ function loadNodeConfig(fileInfo) {
break; break;
} }
} }
} catch(err) {
node.types = [];
if (err.code === 'ENOENT') {
node.err = "Error: "+file+" does not exist";
} else {
node.err = err.toString();
} }
}
registry.addNodeSet(id,node,version); registry.addNodeSet(id,node,version);
return node; resolve(node);
});
});
} }