@tachybase/plugin-adapter-red-node 1.3.25 → 1.5.0

package/dist/node_modules/@node-red/runtime/lib/api/context.js

@@ -96,7 +96,11 @@ var api = module.exports = {
             } else if (scope === 'node') {
                 var node = runtime.nodes.getNode(id);
                 if (node) {
-                    ctx = node.context();
+                    if (/^subflow:/.test(node.type)) {
+                        ctx = runtime.nodes.getContext(node.id);
+                    } else {
+                        ctx = node.context();
+                    }
                 }
             }
             if (ctx) {
@@ -104,13 +108,25 @@ var api = module.exports = {
                     store = store || availableStores.default;
                     ctx.get(key,store,function(err, v) {
                         if (opts.keysOnly) {
+                            const result = {}
                             if (Array.isArray(v)) {
-                                resolve({ [store]: { format: `array[${v.length}]`}})
+                                result.format = `array[${v.length}]`
                             } else if (typeof v === 'object') {
-                                resolve({ [store]: { keys: Object.keys(v), format: 'Object' } })
+                                result.keys = Object.keys(v).map(k => {
+                                    if (Array.isArray(v[k])) {
+                                        return { key: k, format: `array[${v[k].length}]`, length: v[k].length }
+                                    } else if (typeof v[k] === 'object') {
+                                        return { key: k, format: 'object' }
+                                    } else {
+                                        return { key: k }
+                                    }
+                                })
+                                result.format = 'object'
                             } else {
-                                resolve({ [store]: { keys: [] }})
+                                result.keys = []
                             }
+                            resolve({ [store]: result })
+                            return
                         }
                         var encoded = util.encodeObject({msg:v});
                         if (store !== availableStores.default) {
@@ -147,7 +163,7 @@ var api = module.exports = {
                                     }
                                     return
                                 }
-                                result[store] = { keys }
+                                result[store] = { keys: keys.map(key => { return { key }}) }
                                 c--;
                                 if (c === 0) {
                                     if (!errorReported) {
@@ -225,7 +241,11 @@ var api = module.exports = {
             } else if (scope === 'node') {
                 var node = runtime.nodes.getNode(id);
                 if (node) {
-                    ctx = node.context();
+                    if (/^subflow:/.test(node.type)) {
+                        ctx = runtime.nodes.getContext(node.id);
+                    } else {
+                        ctx = node.context();
+                    }
                 }
             }
             if (ctx) {

package/dist/node_modules/@node-red/runtime/lib/api/settings.js

@@ -161,6 +161,8 @@ var api = module.exports = {
                 safeSettings.diagnostics.ui = false; // cannot have UI without endpoint
             }
 
+            safeSettings.telemetryEnabled = runtime.telemetry.isEnabled()
+
             safeSettings.runtimeState = {
                 //unless runtimeState.ui and runtimeState.enabled are explicitly true, they will default to false.
                 enabled: !!runtime.settings.runtimeState && runtime.settings.runtimeState.enabled === true,
@@ -213,7 +215,19 @@ var api = module.exports = {
         }
         var currentSettings = runtime.settings.getUserSettings(username)||{};
         currentSettings = extend(currentSettings, opts.settings);
+
         try {
+            if (currentSettings.hasOwnProperty("telemetryEnabled")) {
+                // This is a global setting that is being set by the user. It should
+                // not be stored per-user as it applies to the whole runtime.
+                const telemetryEnabled = currentSettings.telemetryEnabled;
+                delete currentSettings.telemetryEnabled;
+                if (telemetryEnabled) {
+                    runtime.telemetry.enable()
+                } else {
+                    runtime.telemetry.disable()
+                }
+            }
             return runtime.settings.setUserSettings(username, currentSettings).then(function() {
                 runtime.log.audit({event: "settings.update",username:username}, opts.req);
                 return;

package/dist/node_modules/@node-red/runtime/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,
@@ -675,6 +678,9 @@ class Flow {
                         count: count
                     }
                 };
+                if (logMessage.hasOwnProperty('code')) {
+                    errorMessage.error.code = logMessage.code;
+                }
                 if (logMessage.hasOwnProperty('stack')) {
                     errorMessage.error.stack = logMessage.stack;
                 }
@@ -719,6 +725,14 @@ class Flow {
         });
     }
 
+    getContext(scope) {
+        if (scope === 'flow') {
+            return this.context
+        } else if (scope === 'global') {
+            return context.get('global')
+        }
+    }
+
     dump() {
         console.log("==================")
         console.log(this.TYPE, this.id);

package/dist/node_modules/@node-red/runtime/lib/flows/Group.js

@@ -49,6 +49,14 @@ class Group {
         }
         return this.parent.getSetting(key);
     }
+
+    error(msg) {
+        this.parent.error(msg);
+    }
+
+    getContext(scope) {
+        return this.parent.getContext(scope);
+    }
 }
 
 module.exports = {

package/dist/node_modules/@node-red/runtime/lib/flows/util.js

@@ -100,7 +100,24 @@ async function evaluateEnvProperties(flow, env, credentials) {
             }
         } else if (type ==='jsonata') {
             pendingEvaluations.push(new Promise((resolve, _) => {
-                redUtil.evaluateNodeProperty(value, 'jsonata', {_flow: flow}, null, (err, result) => {
+                redUtil.evaluateNodeProperty(value, 'jsonata',{
+                    // Fake a node object to provide access to _flow and context
+                    _flow: flow,
+                    context: () => {
+                        return {
+                            flow: {
+                                get: (value, store, callback) => {
+                                    return flow.getContext('flow').get(value, store, callback)
+                                }
+                            },
+                            global: {
+                                get: (value, store, callback) => {
+                                    return flow.getContext('global').get(value, store, callback)
+                                }
+                            }
+                        }
+                    }
+                }, null, (err, result) => {
                     if (!err) {
                         if (typeof result  === 'object') {
                             result = { value: result, __clone__: true}
@@ -212,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]) {