@node-red/runtime 2.2.0 → 2.2.3

package/lib/flows/Flow.js

@@ -582,7 +582,7 @@ class Flow {
             reportingNode = node;
         }
         if (!muteStatusEvent) {
-            if (statusMessage.hasOwnProperty("text") && typeof(statusMessage.text !== "string")) {
+            if (statusMessage.hasOwnProperty("text") && typeof statusMessage.text !== "string") {
                 try {
                     statusMessage.text = statusMessage.text.toString();
                 }

package/lib/flows/Subflow.js

@@ -390,7 +390,6 @@ class Subflow extends Flow {
             }
             name = newName;
         }
-        
 
         var parent = this.parent;
         if (parent) {

package/lib/flows/util.js

@@ -77,15 +77,16 @@ function createNode(flow,config) {
         if (typeof nodeTypeConstructor === "function") {
             var conf = clone(config);
             delete conf.credentials;
-            for (var p in conf) {
-                if (conf.hasOwnProperty(p)) {
-                    mapEnvVarProperties(conf,p,flow,conf);
-                }
-            }
             try {
                 Object.defineProperty(conf,'_module', {value: typeRegistry.getNodeInfo(type), enumerable: false, writable: true })
                 Object.defineProperty(conf,'_flow', {value: flow, enumerable: false, writable: true })
                 Object.defineProperty(conf,'_path', {value: `${flow.path}/${config._alias||config.id}`, enumerable: false, writable: true })
+
+                for (var p in conf) {
+                    if (conf.hasOwnProperty(p)) {
+                        mapEnvVarProperties(conf,p,flow,conf);
+                    }
+                }
                 newNode = new nodeTypeConstructor(conf);
             } catch (err) {
                 Log.log({

package/lib/nodes/Node.js

@@ -503,10 +503,25 @@ function log_helper(self, level, msg) {
         o.name = self.name;
     }
     // See https://github.com/node-red/node-red/issues/3327
+    // See https://github.com/node-red/node-red/issues/3389
+
+    let srcError;
+    if (msg instanceof Error) {
+        srcError = msg;//use existing err object for actual stack
+    } else {
+        srcError = new Error(msg);//generate a new error for generate a stack
+    }
     try {
-        self._flow.log(o);
+        if(self instanceof Node && self._flow) {
+            self._flow.log(o);
+        } else {
+            //if self._flow is not present, this is not a node-red Node
+            //Set info to "Node object is not a node-red Node" to point out the `Node type` problem in log
+            logUnexpectedError(self, srcError, "Node object is not a node-red Node")
+        }
     } catch(err) {
-        logUnexpectedError(self, err)
+        //build an unexpected error report indicating using the original error (for better stack trace)
+        logUnexpectedError(self, srcError, `An error occured attempting to make a log entry: ${err}`)
     }
 }
 /**
@@ -531,7 +546,7 @@ Node.prototype.error = function(logMessage,msg) {
         logMessage = logMessage || "";
     }
     var handled = false;
-    if (msg && typeof msg === 'object') {
+    if (this._flow && msg && typeof msg === 'object') {
         handled = this._flow.handleError(this,logMessage,msg);
     }
     if (!handled) {
@@ -619,27 +634,34 @@ function inspectObject(flow) {
     }
 }
 
-function logUnexpectedError(node, error) {
-    let moduleInfo = node._module?`${node._module.module}@${node._module.version}`:"undefined"
-    Log.error(`
+function logUnexpectedError(node, error, info) {
+    const header = `
 ********************************************************************
 Unexpected Node Error
-${error.stack}
-Node:
- Type: ${node.type}
- Module: ${moduleInfo}
- ID: ${node._alias||node.id}
- Properties:
-  ${inspectObject(node)}
-Flow: ${node._flow?node._flow.path:'undefined'}
- Type: ${node._flow?node._flow.TYPE:'undefined'}
- Properties:
-  ${node._flow?inspectObject(node._flow):'undefined'}
+********************************************************************`;
 
+    const footer = `
 Please report this issue, including the information logged above:
 https://github.com/node-red/node-red/issues/
-********************************************************************
-`)
+********************************************************************`;
+
+    let detail = [`Info:\n ${info || 'No additional info'}`];
+
+    //Include Error info?
+    if(error && error.stack){
+        detail.push(`Stack:\n ${error.stack}`)
+    }
+    //Include Node info?
+    if(node && (node._module || node.type)){
+        const moduleInfo = node._module?`${node._module.module}@${node._module.version}`:"undefined";
+        const id = node._alias||node.id||"undefined";
+        detail.push(`Node:\n Type: ${node.type}\n Module: ${moduleInfo}\n ID: ${id}\n Properties:\n  ${inspectObject(node)}`)
+    }
+    //Include Flow info?
+    if(node && node._flow){
+        detail.push(`Flow: ${node._flow.path}\n Type: ${node._flow.TYPE}\n Properties:\n  ${inspectObject(node._flow)}`)
+    }
+    Log.error(`${header}\n${detail.join("\n")}\n${footer}`);
 }
 
 module.exports = Node;

package/lib/nodes/credentials.js

@@ -239,7 +239,15 @@ var api = module.exports = {
                     throw error;
                 }
             } else {
-                credentialCache = credentials;
+                if (encryptionEnabled) {
+                    // Our config expects the credentials to be encrypted but the encrypted object is not found
+                    log.warn(log._("nodes.credentials.encryptedNotFound"))
+                    credentialCache = credentials;
+                } else {
+                    // credentialSecret is set to False
+                    log.warn(log._("nodes.credentials.unencrypted"))
+                    credentialCache = credentials;
+                }
             }
             if (clearInvalidFlag) {
                 // TODO: this delves too deep into Project structure
@@ -365,11 +373,13 @@ var api = module.exports = {
 
                     }
                 }
-                for (cred in savedCredentials) {
-                    if (savedCredentials.hasOwnProperty(cred)) {
-                        if (!newCreds.hasOwnProperty(cred)) {
-                            delete savedCredentials[cred];
-                            dirty = true;
+                if (/^subflow(:|$)/.test(nodeType)) {
+                    for (cred in savedCredentials) {
+                        if (savedCredentials.hasOwnProperty(cred)) {
+                            if (!newCreds.hasOwnProperty(cred)) {
+                                delete savedCredentials[cred];
+                                dirty = true;
+                            }
                         }
                     }
                 }

package/locales/en-US/runtime.json

@@ -104,7 +104,9 @@
             "error":"Error loading credentials: __message__",
             "error-saving":"Error saving credentials: __message__",
             "not-registered": "Credential type '__type__' is not registered",
-            "system-key-warning": "\n\n---------------------------------------------------------------------\nYour flow credentials file is encrypted using a system-generated key.\n\nIf the system-generated key is lost for any reason, your credentials\nfile will not be recoverable, you will have to delete it and re-enter\nyour credentials.\n\nYou should set your own key using the 'credentialSecret' option in\nyour settings file. Node-RED will then re-encrypt your credentials\nfile using your chosen key the next time you deploy a change.\n---------------------------------------------------------------------\n"
+            "system-key-warning": "\n\n---------------------------------------------------------------------\nYour flow credentials file is encrypted using a system-generated key.\n\nIf the system-generated key is lost for any reason, your credentials\nfile will not be recoverable, you will have to delete it and re-enter\nyour credentials.\n\nYou should set your own key using the 'credentialSecret' option in\nyour settings file. Node-RED will then re-encrypt your credentials\nfile using your chosen key the next time you deploy a change.\n---------------------------------------------------------------------\n",
+            "unencrypted" : "Using unencrypted credentials",
+            "encryptedNotFound" : "Encrypted credentials not found"
         },
         "flows": {
             "safe-mode": "Flows stopped in safe mode. Deploy to start.",

package/locales/ja/runtime.json

@@ -100,7 +100,9 @@
             "error": "クレデンシャルの読み込みエラー: __message__",
             "error-saving": "クレデンシャルの保存エラー: __message__",
             "not-registered": "クレデンシャル '__type__' は登録されていません",
-            "system-key-warning": "\n\n---------------------------------------------------------------------\nフローのクレデンシャルファイルはシステム生成キーで暗号化されています。\n\nシステム生成キーを何らかの理由で失った場合、クレデンシャルファイルを\n復元することはできません。その場合、ファイルを削除してクレデンシャルを\n再入力しなければなりません。\n\n設定ファイル内で 'credentialSecret' オプションを使って独自キーを設定\nします。変更を次にデプロイする際、Node-REDは選択したキーを用いてクレ\nデンシャルを再暗号化します。 \n\n---------------------------------------------------------------------\n"
+            "system-key-warning": "\n\n---------------------------------------------------------------------\nフローのクレデンシャルファイルはシステム生成キーで暗号化されています。\n\nシステム生成キーを何らかの理由で失った場合、クレデンシャルファイルを\n復元することはできません。その場合、ファイルを削除してクレデンシャルを\n再入力しなければなりません。\n\n設定ファイル内で 'credentialSecret' オプションを使って独自キーを設定\nします。変更を次にデプロイする際、Node-REDは選択したキーを用いてクレ\nデンシャルを再暗号化します。 \n\n---------------------------------------------------------------------\n",
+            "unencrypted": "暗号化されていないクレデンシャルを使用",
+            "encryptedNotFound": "暗号化されたクレデンシャルが存在しません"
         },
         "flows": {
             "safe-mode": "セーフモードでフローを停止しました。開始するためにはデプロイしてください",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "2.2.0",
+    "version": "2.2.3",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "2.2.0",
-        "@node-red/util": "2.2.0",
+        "@node-red/registry": "2.2.3",
+        "@node-red/util": "2.2.3",
         "async-mutex": "0.3.2",
         "clone": "2.1.2",
         "express": "4.17.2",