@inteli.city/node-red-contrib-exec-collection 2.0.0 → 2.0.2

package/exec.queue.html

@@ -319,9 +319,11 @@ valgrind bash $file
                 $("#node-input-cmdTemplate").prop("checked",false);
             }
 
+            var initFormat = this.format || "javascript";
+            if (initFormat === "nunjucks") initFormat = "twig";
             this.editor = RED.editor.createEditor({
                 id: 'node-input-template-editor',
-                mode: 'ace/mode/html',
+                mode: 'ace/mode/' + initFormat,
                 value: $("#node-input-template").val()
             });
 
@@ -335,7 +337,9 @@ valgrind bash $file
             this.editor.focus();
 
             $("#node-input-format").on("change", function() {
-                var mod = "ace/mode/"+$("#node-input-format").val();
+                var format = $("#node-input-format").val();
+                if (format === "nunjucks") format = "twig";
+                var mod = "ace/mode/" + format;
                 that.editor.getSession().setMode({
                     path: mod,
                     v: Date.now()

package/exec.queue.js

@@ -32,7 +32,59 @@ const Queue     = require('queue');
 const nunjucks   = require('nunjucks');
 const yaml       = require('js-yaml');
 const convertXML = require('xml-js');
-const { buildContext } = require('./utils/context');
+
+// ── LOCAL TEMPLATE CONTEXT ────────────────────────────────────────────────────
+// Raw context: objects are NOT pre-stringified. Instead, each value is wrapped
+// in a Proxy that serialises itself only when Nunjucks coerces it to a string
+// (i.e. at output time). This means:
+//   {{ payload }}     → JSON.stringify(payload)    (calls toString / toPrimitive)
+//   {{ payload.a }}   → the value of a (string/number as-is, object → JSON)
+//   {{ payload.a.b }} → the value of b
+// No "[object Object]" is ever produced.
+
+const _SKIP_KEYS = ['req', 'res', '_req', '_res'];
+
+function _safeStringify(obj) {
+    const seen = new WeakSet();
+    try {
+        return JSON.stringify(obj, (key, value) => {
+            if (typeof value === 'object' && value !== null) {
+                if (seen.has(value)) return '[Circular]';
+                seen.add(value);
+            }
+            return value;
+        });
+    } catch (e) {
+        return '[Unserializable]';
+    }
+}
+
+function _wrapValue(value) {
+    if (typeof value !== 'object' || value === null) return value;
+    return new Proxy(value, {
+        get(target, prop) {
+            // String coercion paths used by Nunjucks when outputting a variable
+            if (prop === Symbol.toPrimitive) return () => _safeStringify(target);
+            if (prop === 'toString')         return () => _safeStringify(target);
+            const result = Reflect.get(target, prop);
+            // Recursively wrap nested objects so their toString also serialises
+            if (typeof result === 'object' && result !== null) return _wrapValue(result);
+            return result;
+        }
+    });
+}
+
+function buildRawContext(msg, node) {
+    const ctx = {};
+    for (const k of Object.keys(msg || {})) {
+        if (_SKIP_KEYS.includes(k)) continue;
+        ctx[k] = _wrapValue(msg[k]);
+    }
+    ctx.flow   = { get: (key) => node.context().flow.get(key) };
+    ctx.global = { get: (key) => node.context().global.get(key) };
+    ctx.env    = process.env;
+    return ctx;
+}
 
 // ── SECTION 1: TEMPLATE RESOLUTION ───────────────────────────────────────────
 
@@ -354,7 +406,7 @@ function updateStatus(node) {
 // 4. Build shellcode and execute via exec or spawn.
 // 5. Clean up all temp files created during this execution (finally).
 async function processMessage({ msg, node, send, done, RED, template }) {
-    const context = buildContext(msg, node);
+    const context = buildRawContext(msg, node);
 
     // Per-execution temp file list — isolated from other concurrent executions.
     const executionTempFiles = [];

package/node.queue.js

@@ -6,7 +6,57 @@ const nunjucks  = require('nunjucks');
 const { spawn } = require('child_process');
 const yaml       = require('js-yaml');
 const convertXML = require('xml-js');
-const { buildContext } = require('./utils/context');
+
+// ── LOCAL TEMPLATE CONTEXT ────────────────────────────────────────────────────
+// Raw context: objects are NOT pre-stringified. Instead, each value is wrapped
+// in a Proxy that serialises itself only when Nunjucks coerces it to a string
+// (i.e. at output time). This means:
+//   {{ payload }}     → JSON.stringify(payload)    (calls toString / toPrimitive)
+//   {{ payload.a }}   → the value of a (string/number as-is, object → JSON)
+//   {{ payload.a.b }} → the value of b
+// No "[object Object]" is ever produced.
+
+const _SKIP_KEYS = ['req', 'res', '_req', '_res'];
+
+function _safeStringify(obj) {
+    const seen = new WeakSet();
+    try {
+        return JSON.stringify(obj, (key, value) => {
+            if (typeof value === 'object' && value !== null) {
+                if (seen.has(value)) return '[Circular]';
+                seen.add(value);
+            }
+            return value;
+        });
+    } catch (e) {
+        return '[Unserializable]';
+    }
+}
+
+function _wrapValue(value) {
+    if (typeof value !== 'object' || value === null) return value;
+    return new Proxy(value, {
+        get(target, prop) {
+            if (prop === Symbol.toPrimitive) return () => _safeStringify(target);
+            if (prop === 'toString')         return () => _safeStringify(target);
+            const result = Reflect.get(target, prop);
+            if (typeof result === 'object' && result !== null) return _wrapValue(result);
+            return result;
+        }
+    });
+}
+
+function buildRawContext(msg, node) {
+    const ctx = {};
+    for (const k of Object.keys(msg || {})) {
+        if (_SKIP_KEYS.includes(k)) continue;
+        ctx[k] = _wrapValue(msg[k]);
+    }
+    ctx.flow   = { get: (key) => node.context().flow.get(key) };
+    ctx.global = { get: (key) => node.context().global.get(key) };
+    ctx.env    = process.env;
+    return ctx;
+}
 
 // ── BOOTSTRAP ─────────────────────────────────────────────────────────────────
 // Injected into each Node.js worker via node -e.
@@ -454,7 +504,7 @@ module.exports = function(RED) {
             }
 
             const template = selectTemplate(msg, node);
-            const context  = buildContext(msg, node);
+            const context  = buildRawContext(msg, node);
 
             let rendered;
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name" : "@inteli.city/node-red-contrib-exec-collection",
-	"version": "2.0.0",
+	"version": "2.0.2",
 	"dependencies": {
 		"fs": "*",
         "tmp-promise": "*",

package/python.queue.js

@@ -6,7 +6,57 @@ const nunjucks  = require('nunjucks');
 const { spawn } = require('child_process');
 const yaml       = require('js-yaml');
 const convertXML = require('xml-js');
-const { buildContext } = require('./utils/context');
+
+// ── LOCAL TEMPLATE CONTEXT ────────────────────────────────────────────────────
+// Raw context: objects are NOT pre-stringified. Instead, each value is wrapped
+// in a Proxy that serialises itself only when Nunjucks coerces it to a string
+// (i.e. at output time). This means:
+//   {{ payload }}     → JSON.stringify(payload)    (calls toString / toPrimitive)
+//   {{ payload.a }}   → the value of a (string/number as-is, object → JSON)
+//   {{ payload.a.b }} → the value of b
+// No "[object Object]" is ever produced.
+
+const _SKIP_KEYS = ['req', 'res', '_req', '_res'];
+
+function _safeStringify(obj) {
+    const seen = new WeakSet();
+    try {
+        return JSON.stringify(obj, (key, value) => {
+            if (typeof value === 'object' && value !== null) {
+                if (seen.has(value)) return '[Circular]';
+                seen.add(value);
+            }
+            return value;
+        });
+    } catch (e) {
+        return '[Unserializable]';
+    }
+}
+
+function _wrapValue(value) {
+    if (typeof value !== 'object' || value === null) return value;
+    return new Proxy(value, {
+        get(target, prop) {
+            if (prop === Symbol.toPrimitive) return () => _safeStringify(target);
+            if (prop === 'toString')         return () => _safeStringify(target);
+            const result = Reflect.get(target, prop);
+            if (typeof result === 'object' && result !== null) return _wrapValue(result);
+            return result;
+        }
+    });
+}
+
+function buildRawContext(msg, node) {
+    const ctx = {};
+    for (const k of Object.keys(msg || {})) {
+        if (_SKIP_KEYS.includes(k)) continue;
+        ctx[k] = _wrapValue(msg[k]);
+    }
+    ctx.flow   = { get: (key) => node.context().flow.get(key) };
+    ctx.global = { get: (key) => node.context().global.get(key) };
+    ctx.env    = process.env;
+    return ctx;
+}
 
 // ── BOOTSTRAP ─────────────────────────────────────────────────────────────────
 // Injected into each Python worker via -c.
@@ -446,7 +496,7 @@ module.exports = function(RED) {
             }
 
             const template = selectTemplate(msg, node);
-            const context  = buildContext(msg, node);
+            const context  = buildRawContext(msg, node);
 
             let rendered;
             try {