frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up API passed to node modules

Browse Source
This commit is contained in:
Nick O'Leary
2015-11-24 22:38:42 +00:00
parent 043b8a3105
commit f03aff7006
18 changed files with 195 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
red/runtime/index.js
View File

@@ -27,10 +27,36 @@ var fs = require("fs");
var runtimeMetricInterval = null;
function init(userSettings) {
var stubbedExpressApp = {
get: function() {},
post: function() {},
put: function() {},
delete: function(){}
}
var adminApi = {
library: {
register: function(){}
},
auth: {
needsPermission: function(){}
},
comms: {
publish: function(){}
},
adminApp: stubbedExpressApp,
nodeApp: stubbedExpressApp,
server: {}
}
function init(userSettings,_adminApi) {
userSettings.version = getVersion();
log.init(userSettings);
settings.init(userSettings);
if (_adminApi) {
adminApi = _adminApi;
}
redNodes.init(runtime);
}
var version;
@@ -69,7 +95,6 @@ function start() {
}
log.info(log._("runtime.version",{component:"Node.js ",version:process.version}));
log.info(log._("server.loading"));
redNodes.init(runtime);
return redNodes.load().then(function() {
var i;
@@ -159,6 +184,7 @@ var runtime = module.exports = {
settings: settings,
storage: storage,
events: events,
api: redNodes,
util: require("./util")
nodes: redNodes,
util: require("./util"),
get adminApi() { return adminApi }
}

6
red/runtime/log.js
View File

@@ -50,9 +50,9 @@ var LogHandler = function(settings) {
this.logLevel = settings ? levels[settings.level]||levels.info : levels.info;
this.metricsOn = settings ? settings.metrics||false : false;
this.auditOn = settings ? settings.audit||false : false;
metricsEnabled = metricsEnabled || this.metricsOn;
this.handler = (settings && settings.handler) ? settings.handler(settings) : consoleLogger;
this.on("log",function(msg) {
if (this.shouldReportMessage(msg.level)) {
@@ -134,7 +134,7 @@ var log = module.exports = {
metric: function() {
return metricsEnabled;
},
audit: function(msg,req) {
msg.level = log.AUDIT;
if (req) {

21
red/runtime/nodes/flows/Flow.js
View File

@@ -32,6 +32,7 @@ function Flow(global,flow) {
this.start = function(diff) {
var node;
var newNode;
var id;
catchNodeMap = {};
statusNodeMap = {};
@@ -39,7 +40,10 @@ function Flow(global,flow) {
if (flow.configs.hasOwnProperty(id)) {
node = flow.configs[id];
if (!activeNodes[id]) {
activeNodes[id] = createNode(node.type,node);
newNode = createNode(node.type,node);
if (newNode) {
activeNodes[id] = newNode;
}
}
}
}
@@ -57,7 +61,10 @@ function Flow(global,flow) {
node = flow.nodes[id];
if (!node.subflow) {
if (!activeNodes[id]) {
activeNodes[id] = createNode(node.type,node);
newNode = createNode(node.type,node);
if (newNode) {
activeNodes[id] = newNode;
}
}
} else {
if (!subflowInstanceNodes[id]) {
@@ -65,7 +72,9 @@ function Flow(global,flow) {
var nodes = createSubflow(flow.subflows[node.subflow]||global.subflows[node.subflow],node,flow.subflows,global.subflows,activeNodes);
subflowInstanceNodes[id] = nodes.map(function(n) { return n.id});
for (var i=0;i<nodes.length;i++) {
activeNodes[nodes[i].id] = nodes[i];
if (nodes[i]) {
activeNodes[nodes[i].id] = nodes[i];
}
}
} catch(err) {
console.log(err.stack)
@@ -438,8 +447,10 @@ function createSubflow(sf,sfn,subflows,globalSubflows,activeNodes) {
var m = /^subflow:(.+)$/.exec(type);
if (!m) {
var newNode = createNode(type,node);
activeNodes[node.id] = newNode;
nodes.push(newNode);
if (newNode) {
activeNodes[node.id] = newNode;
nodes.push(newNode);
}
} else {
var subflowId = m[1];
nodes = nodes.concat(createSubflow(subflows[subflowId]||globalSubflows[subflowId],node,subflows,globalSubflows,activeNodes));

4
red/runtime/nodes/flows/index.js
View File

@@ -222,7 +222,7 @@ function start(type,diff) {
log.info(log._("nodes.flows.missing-type-install-2"));
log.info(" "+settings.userDir);
}
return;
return when.resolve();
}
if (diff) {
log.info(log._("nodes.flows.starting-modified-"+type));
@@ -270,6 +270,7 @@ function start(type,diff) {
} else {
log.info(log._("nodes.flows.started-flows"));
}
return when.resolve();
}
function stop(type,diff) {
@@ -387,6 +388,7 @@ module.exports = {
*/
stopFlows: stop,
started: function() { return started },
handleError: handleError,
handleStatus: handleStatus,

75
red/runtime/nodes/registry/loader.js
View File

@@ -22,7 +22,6 @@ var semver = require("semver");
var localfilesystem = require("./localfilesystem");
var registry = require("./registry");
var RED;
var settings;
var runtime;
@@ -30,7 +29,6 @@ function init(_runtime) {
runtime = _runtime;
settings = runtime.settings;
localfilesystem.init(runtime);
RED = require('../../../red');
}
function load(defaultNodesDir,disableNodePathScan) {
@@ -43,6 +41,66 @@ function load(defaultNodesDir,disableNodePathScan) {
return loadNodeFiles(nodeFiles);
}
function copyObjectProperties(src,dst,copyList,blockList) {
if (!src) {
return;
}
if (copyList && !blockList) {
copyList.forEach(function(i) {
if (src.hasOwnProperty(i)) {
var propDescriptor = Object.getOwnPropertyDescriptor(src,i);
Object.defineProperty(dst,i,propDescriptor);
}
});
} else if (!copyList && blockList) {
for (var i in src) {
if (src.hasOwnProperty(i) && blockList.indexOf(i) === -1) {
var propDescriptor = Object.getOwnPropertyDescriptor(src,i);
Object.defineProperty(dst,i,propDescriptor);
}
}
}
}
function createNodeApi(node) {
var red = {
nodes: {},
log: {},
settings: {},
util: runtime.util,
version: runtime.version,
}
copyObjectProperties(runtime.nodes,red.nodes,["createNode","getNode","eachNode","registerType","addCredentials","getCredentials","deleteCredentials" ]);
copyObjectProperties(runtime.log,red.log,null,["init"]);
copyObjectProperties(runtime.settings,red.settings,null,["init","load","reset"]);
if (runtime.adminApi) {
red.comms = runtime.adminApi.comms;
red.library = runtime.adminApi.library;
red.auth = runtime.adminApi.auth;
red.httpAdmin = runtime.adminApi.adminApp;
red.httpNode = runtime.adminApi.nodeApp;
red.server = runtime.adminApi.server;
} else {
red.comms = {
publish: function(){}
};
red.library = {
register: function(){}
};
red.auth = {
needsPermission: function() {}
};
// TODO: stub out httpAdmin/httpNode/server
}
red["_"] = function() {
var args = Array.prototype.slice.call(arguments, 0);
args[0] = node.namespace+":"+args[0];
return runtime.i18n._.apply(null,args);
}
return red;
}
function loadNodeFiles(nodeFiles) {
var promises = [];
for (var module in nodeFiles) {
@@ -225,18 +283,7 @@ function loadNodeSet(node) {
var r = require(node.file);
if (typeof r === "function") {
var red = {};
for (var i in RED) {
if (RED.hasOwnProperty(i) && !/^(init|start|stop)$/.test(i)) {
var propDescriptor = Object.getOwnPropertyDescriptor(RED,i);
Object.defineProperty(red,i,propDescriptor);
}
}
red["_"] = function() {
var args = Array.prototype.slice.call(arguments, 0);
args[0] = node.namespace+":"+args[0];
return runtime.i18n._.apply(null,args);
}
var red = createNodeApi(node);
var promise = r(red);
if (promise != null && typeof promise.then === "function") {
loadPromise = promise.then(function() {

12
red/runtime/nodes/registry/registry.js
View File

@@ -314,6 +314,18 @@ function getModuleInfo(module) {
}
}
function getCaller(){
var orig = Error.prepareStackTrace;
Error.prepareStackTrace = function(_, stack){ return stack; };
var err = new Error;
Error.captureStackTrace(err, arguments.callee);
var stack = err.stack;
Error.prepareStackTrace = orig;
stack.shift();
stack.shift();
return stack[0].getFileName();
}
function registerNodeConstructor(type,constructor) {
if (nodeConstructors[type]) {
throw new Error(type+" already registered");