@bian-womp/spark-workbench 0.2.43 → 0.2.44

package/lib/cjs/index.cjs

@@ -736,11 +736,7 @@ class RemoteGraphRunner extends AbstractGraphRunner {
     /**
      * Setup event subscriptions for the client.
      */
-    setupClientSubscriptions(client, backend) {
-        // Subscribe to custom events (for additional listeners if needed)
-        if (backend.onCustomEvent) {
-            this.customEventUnsubscribe = client.subscribeCustomEvents(backend.onCustomEvent);
-        }
+    setupClientSubscriptions(client) {
         // Subscribe to transport status changes
         // Convert RuntimeApiClient.TransportStatus to IGraphRunner.TransportStatus
         this.transportStatusUnsubscribe = client.onTransportStatus((status) => {
@@ -772,7 +768,7 @@ class RemoteGraphRunner extends AbstractGraphRunner {
                 onCustomEvent: backend.onCustomEvent,
             });
             // Setup event subscriptions
-            this.setupClientSubscriptions(client, backend);
+            this.setupClientSubscriptions(client);
             // Connect the client (this will create and connect transport)
             await client.connect();
             this.client = client;
@@ -1126,11 +1122,8 @@ class RemoteGraphRunner extends AbstractGraphRunner {
         super.dispose();
         // Clear client promise if any
         this.clientPromise = undefined;
-        // Unsubscribe from custom events and transport status
-        if (this.customEventUnsubscribe) {
-            this.customEventUnsubscribe();
-            this.customEventUnsubscribe = undefined;
-        }
+        // Unsubscribe from transport status
+        // Note: Custom events are cleaned up automatically when client is disposed
         if (this.transportStatusUnsubscribe) {
             this.transportStatusUnsubscribe();
             this.transportStatusUnsubscribe = undefined;
@@ -2057,35 +2050,23 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
             ];
             return next.length > 200 ? next.slice(0, 200) : next;
         });
-        // Helper to refresh resolved handles from remote and merge into workbench
-        const refreshResolvedHandles = async () => {
-            try {
-                const snap = await runner.snapshotFull();
-                const remoteDef = snap?.def;
-                if (remoteDef && Array.isArray(remoteDef.nodes)) {
-                    // Mutate current def in-place to avoid emitting graphChanged and causing update loop
-                    const cur = wb.export();
-                    const byId = new Map((remoteDef.nodes || []).map((n) => [
-                        n.nodeId,
-                        n,
-                    ]));
-                    let changed = false;
-                    for (const n of cur.nodes) {
-                        const rn = byId.get(n.nodeId);
-                        if (rn && rn.resolvedHandles) {
-                            const before = JSON.stringify(n.resolvedHandles || {});
-                            const after = JSON.stringify(rn.resolvedHandles || {});
-                            if (before !== after) {
-                                n.resolvedHandles = rn.resolvedHandles;
-                                changed = true;
-                            }
-                        }
+        // Helper to apply resolved handles from event payload to workbench
+        const applyResolvedHandles = (resolvedHandles) => {
+            const cur = wb.export();
+            let changed = false;
+            for (const n of cur.nodes) {
+                const updated = resolvedHandles[n.nodeId];
+                if (updated) {
+                    const before = JSON.stringify(n.resolvedHandles || {});
+                    const after = JSON.stringify(updated);
+                    if (before !== after) {
+                        n.resolvedHandles = updated;
+                        changed = true;
                     }
-                    if (changed)
-                        wb.refreshValidation();
                 }
             }
-            catch { }
+            if (changed)
+                wb.refreshValidation();
         };
         const offRunnerValue = runner.on("value", (e) => {
             if (e?.io === "input") {
@@ -2167,9 +2148,9 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
             return add("runner", "error")(e);
         });
         const offRunnerInvalidate = runner.on("invalidate", (e) => {
-            // After build/update, pull resolved handles and merge in-place (no graphChanged)
-            if (e?.reason === "graph-updated" || e?.reason === "graph-built") {
-                refreshResolvedHandles();
+            // If resolvedHandles are included in the event, use them directly (more efficient)
+            if (e?.resolvedHandles && Object.keys(e.resolvedHandles).length > 0) {
+                applyResolvedHandles(e.resolvedHandles);
             }
             return add("runner", "invalidate")(e);
         });