@node-red/runtime 4.1.0-beta.2 → 4.1.1

package/lib/flows/Flow.js

@@ -268,6 +268,9 @@ class Flow {
                             try {
                                 var subflowDefinition = this.flow.subflows[node.subflow]||this.global.subflows[node.subflow]
                                 // console.log("NEED TO CREATE A SUBFLOW",id,node.subflow);
+                                // Ensure the path property is set on the instance node so NR_SUBFLOW_PATH env is evaluated properly
+                                Object.defineProperty(node,'_path', {value: `${this.path}/${node._alias||node.id}`, enumerable: false, writable: true })
+
                                 this.subflowInstanceNodes[id] = true;
                                 var subflow = Subflow.create(
                                     this,

package/lib/flows/util.js

@@ -229,7 +229,11 @@ async function createNode(flow,config) {
             instanceConfig.env = nodeTypeConstructor.subflow.env.map(nodeProp => {
                 var nodePropType;
                 var nodePropValue = config[nodeProp.name];
-                if (nodeProp.type === "cred") {
+                if (nodeProp.ui?.type === "conf-types" && /^\${[^}]+}$/.test(nodePropValue)) {
+                    const valName = nodePropValue.substring(2, nodePropValue.length - 1);
+                    nodePropValue = flow.getSetting(valName)
+                    nodePropType = "conf-type";
+                } else if (nodeProp.type === "cred") {
                     nodePropType = "cred";
                 } else {
                     switch(typeof config[nodeProp.name]) {

package/lib/nodes/index.js

@@ -172,9 +172,10 @@ function installModule(module,version,url) {
         if (info.pending_version) {
             events.emit("runtime-event",{id:"node/upgraded",retain:false,payload:{module:info.name,version:info.pending_version}});
         } else {
-            if (!info.nodes.length && info.plugins.length) {
+            if (info.plugins.length) {
                 events.emit("runtime-event",{id:"plugin/added",retain:false,payload:info.plugins});
-            } else {
+            }
+            if (info.nodes.length) {
                 events.emit("runtime-event",{id:"node/added",retain:false,payload:info.nodes});
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "4.1.0-beta.2",
+    "version": "4.1.1",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,13 +16,14 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "4.1.0-beta.2",
-        "@node-red/util": "4.1.0-beta.2",
+        "@node-red/registry": "4.1.1",
+        "@node-red/util": "4.1.1",
         "async-mutex": "0.5.0",
         "clone": "2.1.2",
         "cronosjs": "1.7.1",
         "express": "4.21.2",
         "fs-extra": "11.3.0",
+        "got": "12.6.1",
         "json-stringify-safe": "5.0.1",
         "rfdc": "^1.3.1",
         "semver": "7.7.1"