@bian-womp/spark-remote 0.2.50 → 0.2.52

package/lib/cjs/index.cjs

@@ -23,22 +23,23 @@ class SeqGenerator {
 
 const OPEN = 1;
 class WebSocketTransport {
-    constructor(url) {
+    constructor(url, options) {
         this.listeners = new Set();
         this.seq = new SeqGenerator();
+        this.isAlive = false;
+        this.PING_INTERVAL_MS = 30000;
+        this.PONG_TIMEOUT_MS = 10000;
         this.baseUrl = url;
+        this.onConnectionLost = options?.onConnectionLost;
     }
     async connect(options) {
         if (this.ws && this.ws.readyState === OPEN)
             return;
-        // Build URL with connection params
-        // Handle both ws:///wss:// URLs and http:///https:// URLs (convert to ws)
         let url;
         if (this.baseUrl.startsWith("ws://") || this.baseUrl.startsWith("wss://")) {
             url = new URL(this.baseUrl);
         }
         else {
-            // Convert http/https to ws/wss
             const wsBaseUrl = this.baseUrl.replace(/^http/, "ws");
             url = new URL(wsBaseUrl);
         }
@@ -56,7 +57,10 @@ class WebSocketTransport {
         await new Promise((resolve, reject) => {
             if (!this.ws)
                 return reject(new Error("ws init failed"));
-            this.ws.onopen = () => resolve();
+            this.ws.onopen = () => {
+                this.startHeartbeat();
+                resolve();
+            };
             this.ws.onerror = (e) => reject(e);
             this.ws.onmessage = (ev) => {
                 try {
@@ -66,10 +70,72 @@ class WebSocketTransport {
                 }
                 catch { }
             };
+            this.ws.onclose = () => {
+                this.stopHeartbeat();
+            };
         });
     }
+    startHeartbeat() {
+        this.stopHeartbeat();
+        this.isAlive = true;
+        if (typeof window !== "undefined" || !this.ws)
+            return;
+        this.pongHandler = () => {
+            this.isAlive = true;
+            if (this.pongTimeout) {
+                clearTimeout(this.pongTimeout);
+                this.pongTimeout = undefined;
+            }
+        };
+        this.ws.on("pong", this.pongHandler);
+        this.pingInterval = setInterval(() => {
+            if (!this.ws || this.ws.readyState !== OPEN) {
+                this.stopHeartbeat();
+                return;
+            }
+            if (!this.isAlive) {
+                this.onConnectionLost?.();
+                this.stopHeartbeat();
+                this.ws.terminate();
+                return;
+            }
+            this.isAlive = false;
+            try {
+                this.ws.ping();
+            }
+            catch (err) {
+                console.warn("[WebSocketTransport] Failed to send ping:", err);
+                this.onConnectionLost?.();
+                this.stopHeartbeat();
+                return;
+            }
+            this.pongTimeout = setTimeout(() => {
+                if (!this.isAlive) {
+                    this.onConnectionLost?.();
+                    this.stopHeartbeat();
+                    if (this.ws) {
+                        this.ws.terminate();
+                    }
+                }
+            }, this.PONG_TIMEOUT_MS);
+        }, this.PING_INTERVAL_MS);
+    }
+    stopHeartbeat() {
+        if (this.pingInterval) {
+            clearInterval(this.pingInterval);
+            this.pingInterval = undefined;
+        }
+        if (this.pongTimeout) {
+            clearTimeout(this.pongTimeout);
+            this.pongTimeout = undefined;
+        }
+        if (this.ws && this.pongHandler) {
+            this.ws.off("pong", this.pongHandler);
+            this.pongHandler = undefined;
+        }
+        this.isAlive = false;
+    }
     async request(msg) {
-        // For now, just send and wait for the next message with matching seq (simple demo)
         const seq = this.seq.next();
         const env = { ...msg, seq };
         const p = new Promise((resolve) => {
@@ -93,6 +159,7 @@ class WebSocketTransport {
         return () => this.listeners.delete(cb);
     }
     async close() {
+        this.stopHeartbeat();
         if (!this.ws)
             return;
         const ws = this.ws;
@@ -347,6 +414,7 @@ async function createRuntimeAdapter(createRegistry, send, extensions) {
         },
         snapshotFull: () => {
             const snap = originalApi.snapshot();
+            const extData = originalApi.getExtData();
             const env = graphRuntime?.getEnvironment?.() ?? {};
             const def = graphRuntime?.getGraphDef();
             return {
@@ -354,6 +422,7 @@ async function createRuntimeAdapter(createRegistry, send, extensions) {
                 environment: env,
                 inputs: snap.inputs,
                 outputs: snap.outputs,
+                ui: extData?.ui || undefined,
             };
         },
         applySnapshotFull: async (payload) => {
@@ -418,15 +487,6 @@ async function createRuntimeAdapter(createRegistry, send, extensions) {
             }
             graphRuntime.setEnvironment(env);
         },
-        setInput: (nodeId, handle, value) => {
-            // If engine exists, use it; otherwise fall back to direct runtime access
-            if (engine) {
-                engine.setInput(nodeId, handle, value);
-            }
-            else {
-                graphRuntime?.setInput(nodeId, handle, value);
-            }
-        },
         setInputs: (nodeId, inputs) => {
             if (engine) {
                 engine.setInputs(nodeId, inputs);
@@ -526,7 +586,6 @@ async function createRuntimeAdapter(createRegistry, send, extensions) {
         describeRegistry: wrapMethod("describeRegistry", originalApi.describeRegistry),
         update: wrapMethod("update", originalApi.update),
         setEnvironment: wrapMethod("setEnvironment", originalApi.setEnvironment),
-        setInput: wrapMethod("setInput", originalApi.setInput),
         setInputs: wrapMethod("setInputs", originalApi.setInputs),
         triggerExternal: wrapMethod("triggerExternal", originalApi.triggerExternal),
         step: wrapMethod("step", originalApi.step),
@@ -576,11 +635,6 @@ class RemoteEngine {
             },
         });
     }
-    setInput(nodeId, handle, value) {
-        this.transport.send({
-            message: { type: "SetInput", payload: { nodeId, handle, value } },
-        });
-    }
     // Batch inputs for a single network round-trip
     setInputs(nodeId, inputs) {
         this.transport.send({
@@ -739,7 +793,13 @@ class RuntimeApiClient {
             if (!WebSocketTransport) {
                 throw new Error("WebSocketTransport not available");
             }
-            return new WebSocketTransport(this.config.url);
+            return new WebSocketTransport(this.config.url, {
+                onConnectionLost: () => {
+                    this.dispose().catch((err) => {
+                        console.warn("[RuntimeApiClient] Error disposing on connection loss:", err);
+                    });
+                },
+            });
         }
         else if (kind === "remote-unix") {
             // Dynamic import to avoid bundling in browser builds
@@ -985,6 +1045,12 @@ class RuntimeApiClient {
             message: { type: "Flush" },
         });
     }
+    async setExtData(data) {
+        const transport = await this.ensureConnected();
+        await transport.request({
+            message: { type: "SetExtData", payload: data },
+        });
+    }
     /**
      * Dispose the client and close the transport connection.
      * Idempotent: safe to call multiple times.
@@ -1096,16 +1162,6 @@ class RuntimeApiServer {
                 ack();
                 break;
             }
-            case "SetInput": {
-                this.logCommand("SetInput", env, {
-                    nodeId: msg.payload.nodeId,
-                    handle: msg.payload.handle,
-                    value: summarize(msg.payload.value),
-                });
-                this.runtimeApi.setInput(msg.payload.nodeId, msg.payload.handle, msg.payload.value);
-                ack();
-                break;
-            }
             case "SetInputs": {
                 this.logCommand("SetInputs", env, {
                     nodeId: msg.payload.nodeId,
@@ -1218,15 +1274,14 @@ class RuntimeApiServer {
                 ack();
                 break;
             }
-            case "Dispose": {
-                this.logCommand("Dispose", env);
-                this.runtimeApi.dispose();
+            case "SetExtData": {
+                this.runtimeApi.setExtData(msg.payload);
                 ack();
                 break;
             }
-            case "Pause":
-            case "Resume": {
-                this.logCommand(`${msg.type} (not-impl)`, env);
+            case "Dispose": {
+                this.logCommand("Dispose", env);
+                this.runtimeApi.dispose();
                 ack();
                 break;
             }