@node-red/runtime 2.1.2 → 2.2.0-beta.1

package/lib/flows/Flow.js

@@ -439,8 +439,6 @@ class Flow {
                                 }
                             }
                             return [env.name, env];
-                            
-                            return [env.name, env];
                         });
                         group._env = Object.fromEntries(entries);
                     }
@@ -457,24 +455,24 @@ class Flow {
                                 const val
                                       = ((value === "true") ||
                                          (value === true));
-                                return {
+                                return [{
                                     val: val
-                                };
+                                }, null];
                             }
                             if (type === "cred") {
-                                return {
+                                return [{
                                     val: value
-                                };
+                                }, null];
                             }
                             try {
                                 var val = redUtil.evaluateNodeProperty(value, type, node, null, null);
-                                return {
+                                return [{
                                     val: val
-                                };
+                                }, null];
                             }
                             catch (e) {
                                 this.error(e);
-                                return null;
+                                return [null, null];
                             }
                         }
                     }
@@ -488,7 +486,7 @@ class Flow {
                 return this.getGroupEnvSetting(node, parent, name);
             }
         }
-        return null;
+        return [null, name];
     }
 
 
@@ -545,6 +543,9 @@ class Flow {
                     }
                 }
             }
+            else {
+                key = key.substring(8);
+            }
         }
         return this.parent.getSetting(key);
     }

package/lib/flows/Subflow.js

@@ -373,10 +373,11 @@ class Subflow extends Flow {
         const node = this.subflowInstance;
         if (node.g) {
             const group = this.getGroupNode(node.g);
-            const result = this.getGroupEnvSetting(node, group, name);
+            const [result, newName] = this.getGroupEnvSetting(node, group, name);
             if (result) {
                 return result.val;
             }
+            name = newName;
         }
         
 

package/lib/flows/util.js

@@ -83,6 +83,7 @@ function createNode(flow,config) {
                 }
             }
             try {
+                Object.defineProperty(conf,'_module', {value: typeRegistry.getNodeInfo(type), enumerable: false, writable: true })
                 Object.defineProperty(conf,'_flow', {value: flow, enumerable: false, writable: true })
                 newNode = new nodeTypeConstructor(conf);
             } catch (err) {

package/lib/nodes/Node.js

@@ -59,6 +59,9 @@ function Node(n) {
         // which we can tolerate as they are the same object.
         Object.defineProperty(this,'_flow', {value: n._flow, enumerable: false, writable: true })
     }
+    if (n._module) {
+        Object.defineProperty(this,'_module', {value: n._module, enumerable: false, writable: true })
+    }
     this.updateWires(n.wires);
 }
 
@@ -496,7 +499,12 @@ function log_helper(self, level, msg) {
     if (self.name) {
         o.name = self.name;
     }
-    self._flow.log(o);
+    // See https://github.com/node-red/node-red/issues/3327
+    try {
+        self._flow.log(o);
+    } catch(err) {
+        logUnexpectedError(self, err)
+    }
 }
 /**
  * Log an INFO level message
@@ -576,4 +584,59 @@ Node.prototype.status = function(status) {
     this._flow.handleStatus(this,status);
 };
 
+
+function inspectObject(flow) {
+    try {
+        let properties = new Set()
+        let currentObj = flow
+        do {
+            if (!Object.getPrototypeOf(currentObj)) { break }
+            Object.getOwnPropertyNames(currentObj).map(item => properties.add(item))
+        } while ((currentObj = Object.getPrototypeOf(currentObj)))
+        let propList = [...properties.keys()].map(item => `${item}[${(typeof flow[item])[0]}]`)
+        propList.sort();
+        let result = [];
+        let line = "";
+        while (propList.length > 0) {
+            let prop = propList.shift()
+            if (line.length+prop.length > 80) {
+                result.push(line)
+                line = "";
+            } else {
+                line += " "+prop
+            }
+        }
+        if (line.length > 0) {
+            result.push(line);
+        }
+        return result.join("\n  ")
+
+    } catch(err) {
+        return "Failed to capture object properties: "+err.toString()
+    }
+}
+
+function logUnexpectedError(node, error) {
+    let moduleInfo = node._module?`${node._module.module}@${node._module.version}`:"undefined"
+    Log.error(`
+********************************************************************
+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'}
+
+Please report this issue, including the information logged above:
+https://github.com/node-red/node-red/issues/
+********************************************************************
+`)
+}
+
 module.exports = Node;

package/package.json

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