@node-red/runtime 3.0.2 → 3.1.0-beta.1

package/lib/api/settings.js

@@ -89,10 +89,16 @@ var api = module.exports = {
 
         if (!runtime.settings.disableEditor) {
             safeSettings.context = runtime.nodes.listContextStores();
-            if (runtime.settings.editorTheme && runtime.settings.editorTheme.codeEditor) {
-                safeSettings.codeEditor = runtime.settings.editorTheme.codeEditor || {};
-                safeSettings.codeEditor.lib = safeSettings.codeEditor.lib || "monaco";
-                safeSettings.codeEditor.options = safeSettings.codeEditor.options || {};
+            if (runtime.settings.editorTheme) {
+                if (runtime.settings.editorTheme.codeEditor) {
+                    safeSettings.codeEditor = runtime.settings.editorTheme.codeEditor || {};
+                    safeSettings.codeEditor.lib = safeSettings.codeEditor.lib || "monaco";
+                    safeSettings.codeEditor.options = safeSettings.codeEditor.options || {};
+                }
+                if (runtime.settings.editorTheme.markdownEditor) {
+                    safeSettings.markdownEditor = runtime.settings.editorTheme.markdownEditor || {};
+                    safeSettings.markdownEditor.mermaid = safeSettings.markdownEditor.mermaid || { enabled: true };
+                }
             }
             safeSettings.libraries = runtime.library.getLibraries();
             if (util.isArray(runtime.settings.paletteCategories)) {

package/lib/flows/index.js

@@ -641,6 +641,7 @@ function getFlow(id) {
                 if (node.type === 'link out') {
                     delete node.wires;
                 }
+                delete node.credentials;
                 return node;
             })
         }
@@ -648,7 +649,10 @@ function getFlow(id) {
     if (flow.configs) {
         var configIds = Object.keys(flow.configs);
         result.configs = configIds.map(function(configId) {
-            return clone(flow.configs[configId]);
+            const node = clone(flow.configs[configId]);
+            delete node.credentials;
+            return node
+
         })
         if (result.configs.length === 0) {
             delete result.configs;
@@ -660,12 +664,16 @@ function getFlow(id) {
             var subflow = clone(flow.subflows[subflowId]);
             var nodeIds = Object.keys(subflow.nodes);
             subflow.nodes = nodeIds.map(function(id) {
-                return subflow.nodes[id];
+                const node = clone(subflow.nodes[id])
+                delete node.credentials
+                return node
             });
             if (subflow.configs) {
                 var configIds = Object.keys(subflow.configs);
                 subflow.configs = configIds.map(function(id) {
-                    return subflow.configs[id];
+                    const node = clone(subflow.configs[id])
+                    delete node.credentials
+                    return node
                 })
             }
             delete subflow.instances;
@@ -777,6 +785,16 @@ const flowAPI = {
 }
 
 
+function getGlobalConfig() {
+    let gconf = null;
+    eachNode((n) => {
+        if (n.type === "global-config") {
+            gconf = n;
+        }
+    });
+    return gconf;
+}
+
 module.exports = {
     init: init,
 
@@ -790,6 +808,9 @@ module.exports = {
     get:getNode,
     eachNode: eachNode,
 
+
+    getGlobalConfig: getGlobalConfig,
+    
     /**
      * Gets the current flow configuration
      */

package/lib/flows/util.js

@@ -18,7 +18,9 @@ var redUtil = require("@node-red/util").util;
 var Log = require("@node-red/util").log;
 var subflowInstanceRE = /^subflow:(.+)$/;
 var typeRegistry = require("@node-red/registry");
+const credentials = require("../nodes/credentials");
 
+let _runtime = null;
 
 var envVarExcludes = {};
 
@@ -265,15 +267,55 @@ function parseConfig(config) {
    return flow;
 }
 
+function getGlobalEnv(name) {
+    const nodes = _runtime.nodes;
+    if (!nodes) {
+        return null;
+    }
+    const gconf = nodes.getGlobalConfig();
+    const env = gconf ? gconf.env : null;
+
+    if (env) {
+        const cred = (gconf ? credentials.get(gconf.id) : null) || {
+            map: {}
+        };
+        const map = cred.map;
+
+        for (let i = 0; i < env.length; i++) {
+            const item = env[i];
+            if (item.name === name) {
+                if (item.type === "cred") {
+                    return {
+                        name: name,
+                        value: map[name],
+                        type: "cred"
+                    };
+                }
+                return item;
+            }
+        }
+    }
+    return null;
+}
+
 module.exports = {
     init: function(runtime) {
+        _runtime = runtime;
         envVarExcludes = {};
         if (runtime.settings.hasOwnProperty('envVarExcludes') && Array.isArray(runtime.settings.envVarExcludes)) {
             runtime.settings.envVarExcludes.forEach(v => envVarExcludes[v] = true);
         }
     },
     getEnvVar: function(k) {
-        return !envVarExcludes[k]?process.env[k]:undefined
+        if (!envVarExcludes[k]) {
+            const item = getGlobalEnv(k);
+            if (item) {
+                const val = redUtil.evaluateNodeProperty(item.value, item.type, null, null, null);
+                return val;
+            }
+            return process.env[k];
+        }
+        return undefined;
     },
     diffNodes: diffNodes,
     mapEnvVarProperties: mapEnvVarProperties,

package/lib/index.js

@@ -161,6 +161,8 @@ function start() {
                     for (i=0;i<nodeErrors.length;i+=1) {
                         if (nodeErrors[i].err.code === "type_already_registered") {
                             log.warn("["+nodeErrors[i].id+"] "+log._("server.type-already-registered",{type:nodeErrors[i].err.details.type,module: nodeErrors[i].err.details.moduleA}));
+                        } else if (nodeErrors[i].err.code === "set_has_no_types") {
+                            log.warn("["+nodeErrors[i].id+"] "+log._("server.set-has-no-types", nodeErrors[i].err.details));
                         } else {
                             log.warn("["+nodeErrors[i].id+"] "+nodeErrors[i].err);
                         }

package/lib/nodes/Node.js

@@ -373,6 +373,11 @@ Node.prototype.send = function(msg) {
     if (msg === null || typeof msg === "undefined") {
         return;
     } else if (!util.isArray(msg)) {
+        // A single message has been passed in
+        if (typeof msg !== 'object') {
+            this.error(Log._("nodes.flow.non-message-returned", { type: typeof msg }));
+            return
+        }
         if (this._wire) {
             // A single message and a single wire on output 0
             // TODO: pre-load flows.get calls - cannot do in constructor
@@ -425,27 +430,31 @@ Node.prototype.send = function(msg) {
                     for (k = 0; k < msgs.length; k++) {
                         var m = msgs[k];
                         if (m !== null && m !== undefined) {
-                            if (!m._msgid) {
-                                hasMissingIds = true;
-                            }
-                            /* istanbul ignore else */
-                            if (!sentMessageId) {
-                                sentMessageId = m._msgid;
+                            if (typeof m !== 'object') {
+                                this.error(Log._("nodes.flow.non-message-returned", { type: typeof m }));
+                            } else {
+                                if (!m._msgid) {
+                                    hasMissingIds = true;
+                                }
+                                /* istanbul ignore else */
+                                if (!sentMessageId) {
+                                    sentMessageId = m._msgid;
+                                }
+                                sendEvents.push({
+                                    msg: m,
+                                    source: {
+                                        id: this.id,
+                                        node: this,
+                                        port: i
+                                    },
+                                    destination: {
+                                        id: wires[j],
+                                        node: undefined
+                                    },
+                                    cloneMessage: msgSent
+                                });
+                                msgSent = true;
                             }
-                            sendEvents.push({
-                                msg: m,
-                                source: {
-                                    id: this.id,
-                                    node: this,
-                                    port: i
-                                },
-                                destination: {
-                                    id: wires[j],
-                                    node: undefined
-                                },
-                                cloneMessage: msgSent
-                            });
-                            msgSent = true;
                         }
                     }
                 }

package/lib/nodes/credentials.js

@@ -383,6 +383,11 @@ var api = module.exports = {
                         }
                     }
                 }
+            } else if (nodeType === "global-config") {
+                if (JSON.stringify(savedCredentials.map) !== JSON.stringify(newCreds.map)) {
+                    savedCredentials.map = newCreds.map;
+                    dirty = true;
+                }
             } else {
                 var dashedType = nodeType.replace(/\s+/g, '-');
                 var definition = credentialsDef[dashedType];

package/lib/nodes/index.js

@@ -205,6 +205,7 @@ module.exports = {
     getNode: flows.get,
     eachNode: flows.eachNode,
     getContext: context.get,
+    getGlobalConfig: flows.getGlobalConfig,
 
     clearContext: context.clear,
 

package/lib/storage/localfilesystem/projects/defaultFileSet.js

@@ -18,7 +18,7 @@ var i18n = require("@node-red/util").i18n;
 
 module.exports = {
     "package.json": function(project) {
-        var package = {
+        var packageDetails = {
             "name": project.name,
             "description": project.summary||i18n._("storage.localfilesystem.projects.summary"),
             "version": "0.0.1",
@@ -30,11 +30,11 @@ module.exports = {
         };
         if (project.files) {
             if (project.files.flow) {
-                package['node-red'].settings.flowFile = project.files.flow;
-                package['node-red'].settings.credentialsFile = project.files.credentials;
+                packageDetails['node-red'].settings.flowFile = project.files.flow;
+                packageDetails['node-red'].settings.credentialsFile = project.files.credentials;
             }
         }
-        return JSON.stringify(package,"",4);
+        return JSON.stringify(packageDetails,"",4);
     },
     "README.md": function(project) {
         var content = project.name+"\n"+("=".repeat(project.name.length))+"\n\n";

package/lib/storage/localfilesystem/projects/git/index.js

@@ -71,6 +71,8 @@ function runGitCommand(args,cwd,env,emit) {
             err.code = "git_missing_user";
         } else if (/name consists only of disallowed characters/i.test(stderr)) {
             err.code = "git_missing_user";
+        } else if (/nothing (add )?to commit/i.test(stdout)) {
+            return stdout;
         }
         throw err;
     })
@@ -106,7 +108,7 @@ function runGitCommandWithSSHCommand(args,cwd,auth,emit) {
         commandEnv.GIT_SSH = path.join(__dirname,"node-red-ssh.sh");
         commandEnv.NODE_RED_KEY_FILE=auth.key_path;
         // GIT_SSH_COMMAND - added in git 2.3.0
-        commandEnv.GIT_SSH_COMMAND = "ssh -i " + auth.key_path + " -F /dev/null";
+        commandEnv.GIT_SSH_COMMAND = "ssh -i \"" + auth.key_path + "\" -F /dev/null";
         // console.log('commandEnv:', commandEnv);
         return runGitCommand(args,cwd,commandEnv,emit).then( result => {
             rs.close();
@@ -419,7 +421,10 @@ module.exports = {
         });
     },
     initRepo: function(cwd) {
-        return runGitCommand(["init"],cwd);
+        var args = ["init", "--initial-branch", "main"];
+        return runGitCommand(args, cwd).catch(function () {
+            return runGitCommand(["init"], cwd);
+        });
     },
     setUpstream: function(cwd,remoteBranch) {
         var args = ["branch","--set-upstream-to",remoteBranch];

package/locales/en-US/runtime.json

@@ -20,6 +20,7 @@
         "errors-help": "Run with -v for details",
         "missing-modules": "Missing node modules:",
         "node-version-mismatch": "Node module cannot be loaded on this version. Requires: __version__ ",
+        "set-has-no-types": "Set does not have any types. name: '__name__', module: '__module__', file: '__file__'",
         "type-already-registered": "'__type__' already registered by module __module__",
         "removing-modules": "Removing modules from config",
         "added-types": "Added node types:",
@@ -134,7 +135,8 @@
         "flow": {
             "unknown-type": "Unknown type: __type__",
             "missing-types": "missing types",
-            "error-loop": "Message exceeded maximum number of catches"
+            "error-loop": "Message exceeded maximum number of catches",
+            "non-message-returned": "Node tried to send a message of type __type__"
         },
         "index": {
             "unrecognised-id": "Unrecognised id: __id__",

package/locales/ja/runtime.json

@@ -20,6 +20,7 @@
         "errors-help": "詳細は -v を指定して実行してください",
         "missing-modules": "不足しているノードモジュール:",
         "node-version-mismatch": "ノードモジュールはこのバージョンではロードできません。必要なバージョン: __version__ ",
+        "set-has-no-types": "セットに型がありません。 名前: '__name__', モジュール: '__module__', ファイル: '__file__'",
         "type-already-registered": "'__type__' はモジュール __module__ で登録済みです",
         "removing-modules": "設定からモジュールを削除します",
         "added-types": "追加したノード:",
@@ -134,7 +135,8 @@
         "flow": {
             "unknown-type": "不明なノード: __type__",
             "missing-types": "欠落したノード",
-            "error-loop": "メッセージの例外補足回数が最大値を超えました"
+            "error-loop": "メッセージの例外補足回数が最大値を超えました",
+            "non-message-returned": "ノードが __type__ 型のメッセージの送信を試みました"
         },
         "index": {
             "unrecognised-id": "不明なID: __id__",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "3.0.2",
+    "version": "3.1.0-beta.1",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,11 +16,11 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "3.0.2",
-        "@node-red/util": "3.0.2",
-        "async-mutex": "0.3.2",
+        "@node-red/registry": "3.1.0-beta.1",
+        "@node-red/util": "3.1.0-beta.1",
+        "async-mutex": "0.4.0",
         "clone": "2.1.2",
-        "express": "4.18.1",
+        "express": "4.18.2",
         "fs-extra": "10.1.0",
         "json-stringify-safe": "5.0.1"
     }