@node-red/runtime 4.1.0 → 4.1.2

package/lib/api/plugins.js

@@ -22,6 +22,31 @@ var api = module.exports = {
         return runtime.plugins.getPlugin(opts.id);
     },
 
+    /**
+    * Gets the info of an individual plugin set
+    * @param {Object} opts
+    * @param {User} opts.user - the user calling the api
+    * @param {String} opts.id - the id of the plugin set to return
+    * @param {Object} opts.req - the request to log (optional)
+    * @return {Promise<PluginInfo>} - the plugin information
+    * @memberof @node-red/runtime_plugins
+    */
+    getPluginInfo: async function(opts) {
+        const id = opts.id;
+        const result = runtime.plugins.getPluginInfo(id);
+        if (result) {
+            runtime.log.audit({ event: "plugins.info.get", id: id }, opts.req);
+            delete result.loaded;
+            return result;
+        } else {
+            runtime.log.audit({ event: "plugins.info.get", id: id, error: "not_found" }, opts.req);
+            var err = new Error("Plugin not found");
+            err.code = "not_found";
+            err.status = 404;
+            throw err;
+        }
+    },
+
     /**
     * Gets all plugin definitions of a given type
     * @param {Object} opts
@@ -67,12 +92,12 @@ var api = module.exports = {
     },
 
     /**
-    * Gets the editor content for one registered plugin
+    * Gets an individual plugin's html content
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {User} opts.user - the user calling the api
     * @param {Object} opts.req - the request to log (optional)
-    * @return {Promise<NodeInfo>} - the plugin information
+    * @return {Promise<string>} - the plugin html content
     * @memberof @node-red/runtime_plugins
     */
     getPluginConfig: async function(opts) {
@@ -81,7 +106,7 @@ var api = module.exports = {
             return;
         }
         runtime.log.audit({event: "plugins.configs.get"}, opts.req);
-        return runtime.plugins.getPluginConfig(opts.module, opts.lang);
+        return runtime.plugins.getPluginConfig(opts.id, opts.lang);
     },
 
     /**

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/lib/plugins.js

@@ -4,6 +4,7 @@ module.exports = {
     init: function() {},
     registerPlugin: registry.registerPlugin,
     getPlugin: registry.getPlugin,
+    getPluginInfo: registry.getPluginInfo,
     getPluginsByType: registry.getPluginsByType,
     getPluginList: registry.getPluginList,
     getPluginConfigs: registry.getPluginConfigs,

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

@@ -92,7 +92,7 @@ function init(_settings, _runtime) {
 
     if (projectsEnabled) {
         return sshTools.init(settings,runtime).then(function() {
-            gitTools.init(_settings).then(function(gitConfig) {
+            return gitTools.init(_settings).then(function(gitConfig) {
                 if (!gitConfig || /^1\./.test(gitConfig.version)) {
                     if (!gitConfig) {
                         projectLogMessages.push(log._("storage.localfilesystem.projects.git-not-found"))

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "4.1.0",
+    "version": "4.1.2",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,12 +16,12 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "4.1.0",
-        "@node-red/util": "4.1.0",
+        "@node-red/registry": "4.1.2",
+        "@node-red/util": "4.1.2",
         "async-mutex": "0.5.0",
         "clone": "2.1.2",
         "cronosjs": "1.7.1",
-        "express": "4.21.2",
+        "express": "4.22.1",
         "fs-extra": "11.3.0",
         "got": "12.6.1",
         "json-stringify-safe": "5.0.1",