@granular-software/sdk 0.3.2 → 0.3.4

package/dist/index.js

@@ -3966,6 +3966,10 @@ var WSClient = class {
    */
   async connect() {
     this.isExplicitlyDisconnected = false;
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
     let WebSocketClass = this.options.WebSocketCtor || GlobalWebSocket;
     if (!WebSocketClass) {
       try {
@@ -3987,6 +3991,10 @@ var WSClient = class {
         const socket = this.ws;
         if (typeof socket.on === "function") {
           socket.on("open", () => {
+            if (this.reconnectTimer) {
+              clearTimeout(this.reconnectTimer);
+              this.reconnectTimer = null;
+            }
             this.emit("open", {});
             resolve();
           });
@@ -4004,12 +4012,20 @@ var WSClient = class {
               reject(error);
             }
           });
-          socket.on("close", () => {
-            this.emit("close", {});
-            this.handleDisconnect();
+          socket.on("close", (code, reason) => {
+            this.handleDisconnect({
+              code,
+              reason: this.normalizeReason(reason),
+              // ws does not provide wasClean on Node-style close callback
+              wasClean: code === 1e3
+            });
           });
         } else {
           this.ws.onopen = () => {
+            if (this.reconnectTimer) {
+              clearTimeout(this.reconnectTimer);
+              this.reconnectTimer = null;
+            }
             this.emit("open", {});
             resolve();
           };
@@ -4030,9 +4046,12 @@ var WSClient = class {
               reject(error);
             }
           };
-          this.ws.onclose = () => {
-            this.emit("close", {});
-            this.handleDisconnect();
+          this.ws.onclose = (event) => {
+            this.handleDisconnect({
+              code: event.code,
+              reason: event.reason,
+              wasClean: event.wasClean
+            });
           };
         }
       } catch (error) {
@@ -4040,13 +4059,80 @@ var WSClient = class {
       }
     });
   }
-  handleDisconnect() {
+  normalizeReason(reason) {
+    if (reason === null || reason === void 0) return void 0;
+    if (typeof reason === "string") return reason;
+    if (typeof reason === "object" && reason && "toString" in reason) {
+      try {
+        const text = String(reason.toString());
+        return text || void 0;
+      } catch {
+        return void 0;
+      }
+    }
+    return void 0;
+  }
+  rejectPending(error) {
+    this.messageQueue.forEach((pending) => pending.reject(error));
+    this.messageQueue = [];
+  }
+  buildDisconnectError(info) {
+    const details = [
+      info.code !== void 0 ? `code=${info.code}` : void 0,
+      info.reason ? `reason=${info.reason}` : void 0
+    ].filter(Boolean).join(", ");
+    const suffix = details ? ` (${details})` : "";
+    return new Error(`WebSocket disconnected${suffix}`);
+  }
+  handleDisconnect(close = {}) {
+    const reconnectDelayMs = 3e3;
+    const unexpected = !this.isExplicitlyDisconnected;
+    const info = {
+      code: close.code,
+      reason: close.reason,
+      wasClean: close.wasClean,
+      unexpected,
+      timestamp: Date.now(),
+      reconnectScheduled: false
+    };
     this.ws = null;
-    if (!this.isExplicitlyDisconnected) {
+    this.emit("close", info);
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
+    if (unexpected) {
+      const disconnectError = this.buildDisconnectError(info);
+      this.rejectPending(disconnectError);
+      this.emit("disconnect", info);
+      info.reconnectScheduled = true;
+      info.reconnectDelayMs = reconnectDelayMs;
+      if (this.options.onUnexpectedClose) {
+        try {
+          this.options.onUnexpectedClose(info);
+        } catch (callbackError) {
+          console.error("[Granular] onUnexpectedClose callback failed:", callbackError);
+        }
+      }
       this.reconnectTimer = setTimeout(() => {
         console.log("[Granular] Attempting reconnect...");
-        this.connect().catch((e) => console.error("[Granular] Reconnect failed:", e));
-      }, 3e3);
+        this.connect().catch((error) => {
+          console.error("[Granular] Reconnect failed:", error);
+          const reconnectInfo = {
+            error: error instanceof Error ? error.message : String(error),
+            sessionId: this.sessionId,
+            timestamp: Date.now()
+          };
+          this.emit("reconnect_error", reconnectInfo);
+          if (this.options.onReconnectError) {
+            try {
+              this.options.onReconnectError(reconnectInfo);
+            } catch (callbackError) {
+              console.error("[Granular] onReconnectError callback failed:", callbackError);
+            }
+          }
+        });
+      }, reconnectDelayMs);
     }
   }
   handleMessage(message) {
@@ -4266,13 +4352,15 @@ var WSClient = class {
    */
   disconnect() {
     this.isExplicitlyDisconnected = true;
-    if (this.reconnectTimer) clearTimeout(this.reconnectTimer);
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
     if (this.ws) {
-      this.ws.close();
+      this.ws.close(1e3, "Client disconnect");
       this.ws = null;
     }
-    this.messageQueue.forEach((q) => q.reject(new Error("Client explicitly disconnected")));
-    this.messageQueue = [];
+    this.rejectPending(new Error("Client explicitly disconnected"));
     this.rpcHandlers.clear();
     this.emit("disconnect", {});
   }
@@ -4817,7 +4905,7 @@ import { ${allImports} } from "./sandbox-tools";
       this.checkForToolChanges();
     });
     this.client.on("prompt", (prompt) => this.emit("prompt", prompt));
-    this.client.on("disconnect", () => this.emit("disconnect", {}));
+    this.client.on("disconnect", (payload) => this.emit("disconnect", payload || {}));
     this.client.on("job.status", (data) => {
       this.emit("job:status", data);
     });
@@ -5744,6 +5832,8 @@ var Granular = class {
   apiUrl;
   httpUrl;
   WebSocketCtor;
+  onUnexpectedClose;
+  onReconnectError;
   /** Sandbox-level effect registry: sandboxId → (toolName → ToolWithHandler) */
   sandboxEffects = /* @__PURE__ */ new Map();
   /** Active environments tracker: sandboxId → Environment[] */
@@ -5760,6 +5850,8 @@ var Granular = class {
     this.apiKey = auth;
     this.apiUrl = options.apiUrl || "wss://api.granular.dev/v2/ws";
     this.WebSocketCtor = options.WebSocketCtor;
+    this.onUnexpectedClose = options.onUnexpectedClose;
+    this.onReconnectError = options.onReconnectError;
     this.httpUrl = this.apiUrl.replace("wss://", "https://").replace("/ws", "");
   }
   /**
@@ -5844,7 +5936,9 @@ var Granular = class {
       url: this.apiUrl,
       sessionId: envData.environmentId,
       token: this.apiKey,
-      WebSocketCtor: this.WebSocketCtor
+      WebSocketCtor: this.WebSocketCtor,
+      onUnexpectedClose: this.onUnexpectedClose,
+      onReconnectError: this.onReconnectError
     });
     await client.connect();
     const graphqlEndpoint = `${this.httpUrl}/orchestrator/graphql`;