@bian-womp/spark-graph 0.2.86 → 0.2.88

package/lib/cjs/src/runtime/GraphRuntime.d.ts

@@ -58,6 +58,12 @@ export declare class GraphRuntime {
     resume(): void;
     invalidateDownstream(nodeId: string): void;
     scheduleInputsChanged(nodeId: string): void;
+    /**
+     * Cancel all active runs for a node and emit cancellation events
+     * @param node - The node to cancel runs for
+     * @param reason - The cancellation reason ("snapshot" | "node-deleted")
+     */
+    private cancelNodeActiveRuns;
     cancelNodeRuns(nodeIds: string[]): void;
     hydrate(payload: {
         inputs?: Record<string, Record<string, unknown>>;

package/lib/cjs/src/runtime/GraphRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GraphRuntime.d.ts","sourceRoot":"","sources":["../../../../src/runtime/GraphRuntime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GraphRuntime.d.ts","sourceRoot":"","sources":["../../../../src/runtime/GraphRuntime.ts"],"names":[],"mappings":"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"}

package/lib/esm/index.js

@@ -758,6 +758,7 @@ class GraphRuntime {
                     this.emit("stats", {
                         kind: "node-progress",
                         nodeId,
+                        typeId: node.typeId,
                         runId,
                         progress: node.stats.progress,
                     });
@@ -774,15 +775,16 @@ class GraphRuntime {
                     await node.runtime.onInputsChanged?.(capturedInputs, ctx);
                 }
                 catch (err) {
-                    // Suppress errors caused by expected cancellations (switch, snapshot)
+                    // Suppress errors caused by expected cancellations
                     if (controller.signal.aborted) {
                         const reason = controller.signal.reason;
-                        if (reason === "switch" || reason === "snapshot") {
-                            return; // ignore switched/snapshot-cancelled runs
+                        if (reason === "switch" ||
+                            reason === "snapshot" ||
+                            reason === "node-deleted") {
+                            return; // Cancellation events are emitted separately, skip error handling
                         }
                     }
                     hadError = true;
-                    // Record last error for node
                     node.stats.lastError = err;
                     const retry = policy.retry;
                     if (retry && attempt < (retry.attempts ?? 0)) {
@@ -793,6 +795,10 @@ class GraphRuntime {
                     this.emit("error", { kind: "node-run", nodeId, runId, err });
                 }
                 finally {
+                    // Skip cleanup if node was deleted (cleanup already handled)
+                    if (!this.nodes.has(nodeId)) {
+                        return;
+                    }
                     if (timeoutId)
                         clearTimeout(timeoutId);
                     node.activeControllers.delete(controller);
@@ -803,15 +809,21 @@ class GraphRuntime {
                         node.stats.lastStartAt && node.stats.lastEndAt
                             ? node.stats.lastEndAt - node.stats.lastStartAt
                             : undefined;
-                    // Clear lastError upon successful completion
                     if (!hadError)
                         node.stats.lastError = undefined;
-                    this.emit("stats", {
-                        kind: "node-done",
-                        nodeId,
-                        runId,
-                        durationMs: node.stats.lastDurationMs,
-                    });
+                    // Only emit node-done if not cancelled (cancellation events emitted separately)
+                    const isCancelled = controller.signal.aborted &&
+                        (controller.signal.reason === "snapshot" ||
+                            controller.signal.reason === "node-deleted");
+                    if (!isCancelled) {
+                        this.emit("stats", {
+                            kind: "node-done",
+                            nodeId,
+                            typeId: node.typeId,
+                            runId,
+                            durationMs: node.stats.lastDurationMs,
+                        });
+                    }
                     ctx.log("debug", "node-done", {
                         durationMs: node.stats.lastDurationMs,
                         hadError,
@@ -821,7 +833,12 @@ class GraphRuntime {
                 }
             };
             // fire node-start event
-            this.emit("stats", { kind: "node-start", nodeId, runId });
+            this.emit("stats", {
+                kind: "node-start",
+                nodeId,
+                typeId: node.typeId,
+                runId,
+            });
             ctx.log("debug", "node-start");
             exec(0);
         };
@@ -1017,6 +1034,7 @@ class GraphRuntime {
                 this.emit("stats", {
                     kind: "edge-start",
                     edgeId: e.id,
+                    typeId: e.typeId,
                     source: { nodeId: e.source.nodeId, handle: e.source.handle },
                     target: { nodeId: e.target.nodeId, handle: e.target.handle },
                 });
@@ -1037,6 +1055,7 @@ class GraphRuntime {
                     this.emit("stats", {
                         kind: "edge-done",
                         edgeId: e.id,
+                        typeId: e.typeId,
                         source: { nodeId: e.source.nodeId, handle: e.source.handle },
                         target: { nodeId: e.target.nodeId, handle: e.target.handle },
                         durationMs: e.stats.lastDurationMs,
@@ -1350,12 +1369,50 @@ class GraphRuntime {
     scheduleInputsChanged(nodeId) {
         this.scheduleInputsChangedInternal(nodeId);
     }
+    /**
+     * Cancel all active runs for a node and emit cancellation events
+     * @param node - The node to cancel runs for
+     * @param reason - The cancellation reason ("snapshot" | "node-deleted")
+     */
+    cancelNodeActiveRuns(node, reason) {
+        for (const controller of Array.from(node.activeControllers)) {
+            const runId = node.controllerRunIds.get(controller);
+            if (runId) {
+                // Track cancelled runIds for snapshot operations
+                if (reason === "snapshot") {
+                    if (!node.snapshotCancelledRunIds) {
+                        node.snapshotCancelledRunIds = new Set();
+                    }
+                    node.snapshotCancelledRunIds.add(runId);
+                }
+                // Emit cancellation event
+                this.emit("stats", {
+                    kind: "node-done",
+                    nodeId: node.nodeId,
+                    typeId: node.typeId,
+                    runId,
+                    cancelled: true,
+                });
+            }
+            try {
+                controller.abort(reason);
+            }
+            catch {
+                // ignore abort errors
+            }
+        }
+        node.activeControllers.clear();
+        node.controllerRunIds.clear();
+        node.stats.active = 0;
+        node.queue = [];
+    }
     cancelNodeRuns(nodeIds) {
         if (nodeIds.length === 0)
             return;
         const toCancel = new Set(nodeIds);
         const visited = new Set();
         const queue = [...nodeIds];
+        // Collect all downstream nodes to cancel
         for (let i = 0; i < queue.length; i++) {
             const nodeId = queue[i];
             if (visited.has(nodeId))
@@ -1371,29 +1428,12 @@ class GraphRuntime {
                 }
             }
         }
+        // Cancel runs for all affected nodes
         for (const nodeId of toCancel) {
             const node = this.nodes.get(nodeId);
             if (!node)
                 continue;
-            if (!node.snapshotCancelledRunIds) {
-                node.snapshotCancelledRunIds = new Set();
-            }
-            for (const controller of Array.from(node.activeControllers)) {
-                const rid = node.controllerRunIds.get(controller);
-                if (rid) {
-                    node.snapshotCancelledRunIds.add(rid);
-                }
-                try {
-                    controller.abort("snapshot");
-                }
-                catch {
-                    // ignore
-                }
-            }
-            node.activeControllers.clear();
-            node.controllerRunIds.clear();
-            node.stats.active = 0;
-            node.queue = [];
+            this.cancelNodeActiveRuns(node, "snapshot");
             node.runSeq += 1;
             const now = Date.now();
             node.latestRunId = `${nodeId}:${node.runSeq}:${now}:snapshot`;
@@ -1456,6 +1496,9 @@ class GraphRuntime {
         for (const nodeId of Array.from(currentIds)) {
             if (!desiredIds.has(nodeId)) {
                 const node = this.nodes.get(nodeId);
+                // Cancel all active runs and emit cancellation events
+                this.cancelNodeActiveRuns(node, "node-deleted");
+                // Cleanup node resources
                 node.runtime.onDeactivated?.();
                 node.runtime.dispose?.();
                 node.lifecycle?.dispose?.({
@@ -1463,7 +1506,6 @@ class GraphRuntime {
                     setState: (next) => Object.assign(node.state, next),
                 });
                 this.nodes.delete(nodeId);
-                // Clear any array buckets for this node
                 this.arrayInputBuckets.delete(nodeId);
             }
         }