Merge branch 'dev' into 3843-alternative-impl

packages/node_modules/@node-red/runtime/lib/flows/Flow.js

@@ -889,6 +889,16 @@ function handlePreRoute(flow, sendEvent, reportError) {
     })
 }
 
+function deliverMessageToDestination(sendEvent) {
+    if (sendEvent?.destination?.node) {
+        try {
+            sendEvent.destination.node.receive(sendEvent.msg);
+        } catch(err) {
+            Log.error(`Error delivering message to node:${sendEvent.destination.node._path} [${sendEvent.destination.node.type}]`)
+            Log.error(err.stack)
+        }
+    }
+}
 function handlePreDeliver(flow,sendEvent, reportError) {
     // preDeliver - the local router has identified the node it is going to send to. At this point, the message has been cloned if needed.
     hooks.trigger("preDeliver",sendEvent,(err) => {
@@ -898,15 +908,10 @@ function handlePreDeliver(flow,sendEvent, reportError) {
         } else if (err !== false) {
             if (asyncMessageDelivery) {
                 setImmediate(function() {
-                    if (sendEvent.destination.node) {
-                        sendEvent.destination.node.receive(sendEvent.msg);
-                    }
+                    deliverMessageToDestination(sendEvent)
                 })
             } else {
-                if (sendEvent.destination.node) {
-                    sendEvent.destination.node.receive(sendEvent.msg);
-
-                }
+                deliverMessageToDestination(sendEvent)
             }
             // postDeliver - the message has been dispatched to be delivered asynchronously (unless the sync delivery flag is set, in which case it would be continue as synchronous delivery)
             hooks.trigger("postDeliver", sendEvent, function(err) {

packages/node_modules/@node-red/runtime/lib/flows/Subflow.js

@@ -474,7 +474,7 @@ class Subflow extends Flow {
  */
 function createNodeInSubflow(subflowInstanceId, def) {
     let node = clone(def);
-    let nid = redUtil.generateId();
+    let nid = `${subflowInstanceId}-${node.id}` //redUtil.generateId();
     // console.log("Create Node In subflow",node._alias, "--->",nid, "(",node.type,")")
     // node_map[node.id] = node;
     node._alias = node.id;

packages/node_modules/@node-red/runtime/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
      */

packages/node_modules/@node-red/runtime/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 = {};
 
@@ -134,10 +136,12 @@ function createNode(flow,config) {
                 subflowInstanceConfig,
                 instanceConfig
             );
+            // Register this subflow as an instance node of the parent flow.
+            // This allows nodes inside the subflow to get ahold of each other
+            // such as a node accessing its config node
+            flow.subflowInstanceNodes[config.id] = subflow
             subflow.start();
             return subflow.node;
-
-            Log.error(Log._("nodes.flow.unknown-type", {type:type}));
         }
     } catch(err) {
         Log.error(err);
@@ -197,7 +201,9 @@ function parseConfig(config) {
                if (subflowDetails) {
                    var subflowType = subflowDetails[1]
                    n.subflow = subflowType;
-                   flow.subflows[subflowType].instances.push(n)
+                   if (flow.subflows[subflowType]) {
+                       flow.subflows[subflowType].instances.push(n)
+                   }
                }
                if (container) {
                    container.nodes[n.id] = n;
@@ -263,15 +269,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,