@ibealec/create-zed-bridge 1.0.2 → 1.0.5

package/templates/@zed-controller/react-bridge/dist/index.js

@@ -1709,26 +1709,39 @@ function TaskStatusToast({
     return new Promise((resolve) => {
       const wsUrl = serverUrl.replace(/^http/, "ws").replace(/\/$/, "");
       const ws = new WebSocket(`${wsUrl}/ws/bridge?token=${encodeURIComponent(token)}`);
+      let resolved = false;
+      const cleanup = () => {
+        if (!resolved) {
+          resolved = true;
+          ws.close();
+          resolve();
+        }
+      };
       ws.onopen = () => {
         ws.send(JSON.stringify({
           type: "kill_session",
           sessionId
         }));
-        setTimeout(() => {
-          ws.close();
-          resolve();
-        }, 100);
+      };
+      ws.onmessage = (event) => {
+        try {
+          const message = JSON.parse(event.data);
+          if (message.type === "session_killed" || message.type === "error") {
+            cleanup();
+          }
+        } catch {
+        }
       };
       ws.onerror = () => {
-        ws.close();
-        resolve();
+        cleanup();
       };
-      setTimeout(() => {
-        if (ws.readyState !== WebSocket.CLOSED) {
-          ws.close();
+      ws.onclose = () => {
+        if (!resolved) {
+          resolved = true;
+          resolve();
         }
-        resolve();
-      }, 2e3);
+      };
+      setTimeout(cleanup, 3e3);
     });
   }, [serverUrl, token]);
   const handleDismiss = useCallback3(async () => {