@bian-womp/spark-graph 0.2.45 → 0.2.47

package/lib/cjs/index.cjs

@@ -639,6 +639,30 @@ class GraphRuntime {
             },
         };
     }
+    createExecutionContext(nodeId, node, inputs, runId, abortSignal, options) {
+        const emitHandler = options?.emitHandler ??
+            ((handle, value) => this.propagate(nodeId, handle, value));
+        const reportProgress = options?.reportProgress ??
+            ((p) => {
+                node.stats.progress = Math.max(0, Math.min(1, Number(p) || 0));
+            });
+        return {
+            state: node.state,
+            setState: (next) => Object.assign(node.state, next),
+            emit: emitHandler,
+            invalidateDownstream: () => this.invalidateDownstream(nodeId),
+            scheduleInputsChanged: () => {
+                if (this.allInboundHaveValue(nodeId)) {
+                    this.scheduleInputsChanged(nodeId);
+                }
+            },
+            getInput: (handle) => inputs[handle],
+            environment: this.environment,
+            runId,
+            abortSignal,
+            reportProgress,
+        };
+    }
     scheduleInputsChanged(nodeId) {
         const node = this.nodes.get(nodeId);
         if (!node)
@@ -681,21 +705,13 @@ class GraphRuntime {
             if (policy.timeoutMs && policy.timeoutMs > 0) {
                 timeoutId = setTimeout(() => controller.abort("timeout"), policy.timeoutMs);
             }
-            const ctx = {
-                state: node.state,
-                setState: (next) => Object.assign(node.state, next),
-                emit: (handle, value) => {
+            const ctx = this.createExecutionContext(nodeId, node, capturedInputs, runId, controller.signal, {
+                emitHandler: (handle, value) => {
                     const m = policy.asyncConcurrency ?? "switch";
                     if (m !== "merge" && runId !== node.latestRunId)
                         return;
                     this.propagate(nodeId, handle, value);
                 },
-                invalidateDownstream: () => this.invalidateDownstream(nodeId),
-                getInput: (handle) => capturedInputs[handle],
-                environment: this.environment,
-                runId: runId,
-                abortSignal: controller.signal,
-                createAbortController: () => new AbortController(),
                 reportProgress: (p) => {
                     node.stats.progress = Math.max(0, Math.min(1, Number(p) || 0));
                     this.emit("stats", {
@@ -705,10 +721,11 @@ class GraphRuntime {
                         progress: node.stats.progress,
                     });
                 },
-            };
+            });
             const exec = async (attempt) => {
                 let hadError = false;
                 try {
+                    node.lifecycle?.prepare?.(node.params ?? {}, ctx);
                     await node.runtime.onInputsChanged?.(capturedInputs, ctx);
                 }
                 catch (err) {
@@ -1150,27 +1167,11 @@ class GraphRuntime {
     launch(invalidate = false) {
         // call onActivated for nodes that implement it
         for (const node of this.nodes.values()) {
-            const ctrl = new AbortController();
             const effectiveInputs = this.getEffectiveInputs(node.nodeId);
-            const ctx = {
-                state: node.state,
-                setState: (next) => Object.assign(node.state, next),
-                emit: (handle, value) => this.propagate(node.nodeId, handle, value),
-                invalidateDownstream: () => this.invalidateDownstream(node.nodeId),
-                getInput: (handle) => effectiveInputs[handle],
-                environment: this.environment,
-                runId: `${node.nodeId}:activation`,
-                abortSignal: ctrl.signal,
-                createAbortController: () => new AbortController(),
-                reportProgress: (p) => {
-                    node.stats.progress = Math.max(0, Math.min(1, Number(p) || 0));
-                },
-            };
-            node.lifecycle?.init?.(node.params ?? {}, {
-                state: node.state,
-                setState: (next) => Object.assign(node.state, next),
-            });
-            node.runtime.onActivated?.(ctx);
+            const ctrl = new AbortController();
+            const ctx = this.createExecutionContext(node.nodeId, node, effectiveInputs, `${node.nodeId}:init`, ctrl.signal);
+            node.lifecycle?.prepare?.(node.params ?? {}, ctx);
+            node.runtime.onActivated?.();
         }
         if (invalidate) {
             // After activation, schedule nodes that have all inbound inputs present
@@ -1184,22 +1185,6 @@ class GraphRuntime {
         const node = this.nodes.get(nodeId);
         if (!node)
             return;
-        const ctrl = new AbortController();
-        const effectiveInputs = this.getEffectiveInputs(nodeId);
-        const ctx = {
-            state: node.state,
-            setState: (next) => Object.assign(node.state, next),
-            emit: (handle, value) => this.propagate(nodeId, handle, value),
-            invalidateDownstream: () => this.invalidateDownstream(nodeId),
-            getInput: (handle) => effectiveInputs[handle],
-            environment: this.environment,
-            runId: `${nodeId}:external`,
-            abortSignal: ctrl.signal,
-            createAbortController: () => new AbortController(),
-            reportProgress: (p) => {
-                node.stats.progress = Math.max(0, Math.min(1, Number(p) || 0));
-            },
-        };
         // Built-in support: invalidate event reruns or re-emits without per-node wiring
         if (event &&
             typeof event === "object" &&
@@ -1210,7 +1195,7 @@ class GraphRuntime {
                 this.invalidateDownstream(nodeId);
         }
         else {
-            node.runtime.onExternalEvent?.(event, ctx);
+            node.runtime.onExternalEvent?.(event, node.state);
         }
     }
     dispose() {
@@ -1428,24 +1413,11 @@ class GraphRuntime {
                 };
                 this.nodes.set(n.nodeId, rn);
                 // Activate new node
-                const ctrl = new AbortController();
                 const effectiveInputs = this.getEffectiveInputs(rn.nodeId);
-                const ctx = {
-                    state: rn.state,
-                    setState: (next) => Object.assign(rn.state, next),
-                    emit: (handle, value) => this.propagate(rn.nodeId, handle, value),
-                    invalidateDownstream: () => this.invalidateDownstream(rn.nodeId),
-                    getInput: (handle) => effectiveInputs[handle],
-                    environment: this.environment,
-                    runId: `${rn.nodeId}:activation`,
-                    abortSignal: ctrl.signal,
-                    createAbortController: () => new AbortController(),
-                };
-                rn.lifecycle?.init?.(rn.params ?? {}, {
-                    state: rn.state,
-                    setState: (next) => Object.assign(rn.state, next),
-                });
-                rn.runtime.onActivated?.(ctx);
+                const ctrl = new AbortController();
+                const ctx = this.createExecutionContext(rn.nodeId, rn, effectiveInputs, `${rn.nodeId}:init`, ctrl.signal);
+                rn.lifecycle?.prepare?.(rn.params ?? {}, ctx);
+                rn.runtime.onActivated?.();
             }
             else {
                 // update params/policy and initialInputs
@@ -2088,13 +2060,13 @@ const ComputeCategory = {
                     ctx.emit(h, v);
             }
         },
-        onExternalEvent(event, ctx) {
+        onExternalEvent(event, state) {
             try {
                 const e = event;
-                // Preferred: call a function on ctx.state keyed by e.action
+                // Preferred: call a function on state keyed by e.action
                 const action = e?.action;
-                if (action && typeof ctx.state?.[action] === "function") {
-                    const fn = ctx.state[action];
+                if (action && typeof state?.[action] === "function") {
+                    const fn = state[action];
                     // Normalize args: prefer explicit args array, else wrap single value;
                     let args = [];
                     if (Array.isArray(e?.args))