@bonsae/nrg-runtime 0.36.0 → 0.37.0

package/index.cjs

@@ -292,7 +292,7 @@ function initValidator(RED) {
 var import_node_path = __toESM(require("node:path"), 1);
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_module = require("node:module");
-var CLIENT_ASSET = true ? "nrg.0682c337.js" : "nrg.js";
+var CLIENT_ASSET = true ? "nrg.8ad0ea04.js" : "nrg.js";
 function serveFile(filePath) {
   return (_req, res, next) => {
     if (!import_node_fs.default.existsSync(filePath)) return next();
@@ -792,6 +792,15 @@ function setupContext(context, store) {
 var import_node_async_hooks = require("node:async_hooks");
 var RETURN_PROPERTY_PATTERN = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
 var INPUT_KEY = "input";
+var SOURCE_KEY = "source";
+var RESERVED_RETURN_PROPERTIES = /* @__PURE__ */ new Set([
+  SOURCE_KEY,
+  INPUT_KEY,
+  "error",
+  "complete",
+  "status",
+  "_msgid"
+]);
 var IONode = class _IONode extends Node {
   static align;
   /**
@@ -846,11 +855,18 @@ var IONode = class _IONode extends Node {
     const outputReturnProperties = this.config.outputReturnProperties;
     if (outputReturnProperties) {
       for (const [port, key] of Object.entries(outputReturnProperties)) {
-        if (typeof key === "string" && key.trim() && !RETURN_PROPERTY_PATTERN.test(key.trim())) {
+        const trimmed = typeof key === "string" ? key.trim() : "";
+        if (!trimmed) continue;
+        if (!RETURN_PROPERTY_PATTERN.test(trimmed)) {
           throw new NrgError(
             `Invalid return property "${key}" for output port ${port} in ${this.constructor.type} \u2014 it must be a valid JavaScript identifier (letters, digits, _, $; not starting with a digit)`
           );
         }
+        if (RESERVED_RETURN_PROPERTIES.has(trimmed)) {
+          throw new NrgError(
+            `Reserved return property "${trimmed}" for output port ${port} in ${this.constructor.type} \u2014 the framework owns this key on the outgoing message (source/input provenance and the built-in ports). Choose another name.`
+          );
+        }
       }
     }
   }
@@ -874,11 +890,8 @@ var IONode = class _IONode extends Node {
           const result = await this.#input(msg, store);
           if (this.config.completePort) {
             this.#sendToPort("complete", {
-              ...msg,
-              ...result !== void 0 ? { output: result } : {},
-              complete: {
-                source: this.#nodeSource()
-              },
+              ...result !== void 0 ? { complete: result } : {},
+              [SOURCE_KEY]: this.#nodeSource(),
               [INPUT_KEY]: msg
             });
           }
@@ -886,31 +899,29 @@ var IONode = class _IONode extends Node {
           this.node.log("Input processed");
         } catch (error) {
           const errorMsg = error instanceof Error ? error.message : "Unknown error during input handling";
-          if (this.config.errorPort && !store.errorEmitted) {
-            const errorData = error && typeof error === "object" ? { ...error } : {};
-            this.#sendToPort("error", {
-              ...msg,
-              error: {
-                ...errorData,
-                name: error?.name ?? "Error",
-                message: errorMsg,
-                source: this.#nodeSource()
-              },
-              [INPUT_KEY]: msg
-            });
-          }
-          if (error instanceof Error) {
-            this.node.error(
-              "Error while processing input: " + error.message,
-              msg
-            );
-            done(error);
+          const err = error instanceof Error ? error : new Error(errorMsg);
+          if (!(error instanceof NrgError) && this.config.errorPort) {
+            if (!store.errorEmitted) {
+              const errorData = error && typeof error === "object" ? { ...error } : {};
+              for (const k of Object.keys(errorData)) {
+                if (errorData[k] === void 0) delete errorData[k];
+              }
+              const stack = error instanceof Error ? error.stack : void 0;
+              this.#sendToPort("error", {
+                error: {
+                  ...errorData,
+                  name: error?.name ?? "Error",
+                  message: errorMsg,
+                  ...stack ? { stack } : {}
+                },
+                [SOURCE_KEY]: this.#nodeSource(),
+                [INPUT_KEY]: msg
+              });
+              this.node.error(errorMsg);
+            }
+            done();
           } else {
-            this.node.error(
-              "Unknown error occurred during input handling",
-              msg
-            );
-            done(new Error(errorMsg));
+            done(err);
           }
         }
       }
@@ -1046,13 +1057,27 @@ var IONode = class _IONode extends Node {
   #wrapOutgoing(value, mode, port) {
     const key = this.#returnPropertyKey(port);
     const input = _IONode.#invocation.getStore()?.inputMsg ?? {};
-    if (mode === "reset") {
-      return { [key]: value };
-    }
-    if (mode === "trace") {
-      return { ...input, [key]: value, [INPUT_KEY]: input };
-    }
-    return { ...input, [key]: value };
+    const source = this.#outputSource(port);
+    const frame = (msg) => Object.keys(msg).length ? { [key]: value, [SOURCE_KEY]: source, [INPUT_KEY]: msg } : { [key]: value, [SOURCE_KEY]: source };
+    if (mode === "reset") return { [key]: value, [SOURCE_KEY]: source };
+    if (mode === "trace") return frame(input);
+    const lastOnly = { ...input };
+    delete lastOnly[INPUT_KEY];
+    return frame(lastOnly);
+  }
+  /**
+   * Provenance stamped on every data-port output under `msg.source`: the
+   * producing node plus the port the message was sent on (with the named-port
+   * name when the node declares a `Port<T>` record). Message metadata, like
+   * `_msgid` — never part of the typed result.
+   */
+  #outputSource(port) {
+    const portName = this.#namedPortKeys()?.[port];
+    return {
+      ...this.#nodeSource(),
+      port,
+      ...portName ? { portName } : {}
+    };
   }
   // --- Built-in port management ---
   // Private, override-proof accessors the framework reads for port routing. A
@@ -1165,21 +1190,22 @@ var IONode = class _IONode extends Node {
     });
   }
   error(message, msg) {
-    super.error(message, msg);
     if (msg && this.config.errorPort) {
       this.#sendToPort("error", {
-        ...msg,
         error: {
-          // `name` keeps the error-port payload Catch-node compatible and
-          // consistent with the auto-emit from a thrown error.
+          // `name` keeps the error-port payload consistent with the auto-emit
+          // from a thrown error.
           name: "Error",
-          message,
-          source: this.#nodeSource()
+          message
         },
+        [SOURCE_KEY]: this.#nodeSource(),
         [INPUT_KEY]: msg
       });
+      super.error(message);
       const store = _IONode.#invocation.getStore();
       if (store) store.errorEmitted = true;
+    } else {
+      super.error(message, msg);
     }
   }
   updateWires(wires) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bonsae/nrg-runtime",
-  "version": "0.36.0",
+  "version": "0.37.0",
   "description": "The runtime for Node-RED nodes built with @bonsae/nrg — node base classes, schemas, AJV validator, and the editor client. Carries no build tooling.",
   "author": "Allan Oricil <allanoricil@duck.com>",
   "license": "MIT",