@arbidocs/sdk 0.3.75 → 0.3.77

package/dist/index.cjs

@@ -4408,6 +4408,12 @@ function formatStreamSummary(result, elapsedTime) {
 var consumeSSEStream = streamSSE;
 var AUTH_TIMEOUT_MS = 1e4;
 var MAX_BACKOFF_MS = 3e4;
+var WebSocketAuthError = class extends Error {
+  constructor(reason) {
+    super(`WebSocket auth failed: ${reason}`);
+    this.name = "WebSocketAuthError";
+  }
+};
 function connectWebSocket(options) {
   const { baseUrl, accessToken, onMessage, onClose } = options;
   const url = client.buildWebSocketUrl(baseUrl);
@@ -4435,7 +4441,7 @@ function connectWebSocket(options) {
             resolve2({ close: () => ws.close() });
           } else {
             ws.close();
-            reject(new Error(`WebSocket auth failed: ${msg.reason || "unknown"}`));
+            reject(new WebSocketAuthError(msg.reason || "unknown"));
           }
         }
         return;
@@ -4458,52 +4464,66 @@ async function connectWithReconnect(options) {
   const {
     maxRetries = 10,
     initialDelayMs = 1e3,
+    getAccessToken,
+    refreshAuth,
     onReconnecting,
     onReconnected,
     onReconnectFailed,
     onClose,
-    ...connectOpts
+    onMessage,
+    baseUrl,
+    accessToken
   } = options;
+  const resolveToken = getAccessToken ?? (() => accessToken);
   let closed = false;
-  let reconnectTimer = null;
+  let cancelDelay = null;
   let currentConnection = null;
+  const connectOnce = async () => {
+    const token = await resolveToken();
+    if (!token) throw new WebSocketAuthError("no access token available");
+    return connectWebSocket({
+      baseUrl,
+      accessToken: token,
+      onMessage,
+      onClose: (code, reason) => {
+        currentConnection = null;
+        onClose?.(code, reason);
+        if (!closed) void scheduleReconnect();
+      }
+    });
+  };
   const scheduleReconnect = async () => {
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
       if (closed) return;
       const delay = Math.min(initialDelayMs * Math.pow(2, attempt - 1), MAX_BACKOFF_MS);
       onReconnecting?.(attempt, maxRetries);
       await new Promise((resolve2) => {
-        reconnectTimer = setTimeout(resolve2, delay);
+        const timer = setTimeout(resolve2, delay);
+        cancelDelay = () => {
+          clearTimeout(timer);
+          resolve2();
+        };
       });
+      cancelDelay = null;
       if (closed) return;
       try {
-        currentConnection = await connectWebSocket({
-          ...connectOpts,
-          onClose: (code, reason) => {
-            currentConnection = null;
-            onClose?.(code, reason);
-            if (!closed) scheduleReconnect();
-          }
-        });
+        currentConnection = await connectOnce();
         onReconnected?.();
         return;
-      } catch {
+      } catch (err) {
+        if (err instanceof WebSocketAuthError && refreshAuth) {
+          await refreshAuth().catch(() => {
+          });
+        }
       }
     }
     if (!closed) onReconnectFailed?.();
   };
-  currentConnection = await connectWebSocket({
-    ...connectOpts,
-    onClose: (code, reason) => {
-      currentConnection = null;
-      onClose?.(code, reason);
-      if (!closed) scheduleReconnect();
-    }
-  });
+  currentConnection = await connectOnce();
   return {
     close: () => {
       closed = true;
-      if (reconnectTimer) clearTimeout(reconnectTimer);
+      cancelDelay?.();
       currentConnection?.close();
       currentConnection = null;
     }
@@ -7123,10 +7143,14 @@ var OpenClawOrchestrator = class {
 
 // src/listen/dm-listener.ts
 async function startDmListener(options) {
-  const { arbi, accessToken, baseUrl, crypto, orchestrator, parentExtId, onLog, onError } = options;
+  const { arbi, baseUrl, crypto, orchestrator, parentExtId, onLog, onError } = options;
   const log = onLog ?? (() => {
   });
   const logError = onError ?? ((msg) => console.error(msg));
+  const initialToken = arbi.session.getState().accessToken;
+  if (!initialToken) {
+    throw new Error("No access token \u2014 run `arbi login` first.");
+  }
   const handleNotification = async (msg) => {
     if (msg.type !== "user_message") return;
     const senderExtId = msg.sender?.external_id;
@@ -7196,7 +7220,10 @@ async function startDmListener(options) {
   }
   const ws = await connectWithReconnect({
     baseUrl,
-    accessToken,
+    accessToken: initialToken,
+    getAccessToken: () => arbi.session.getState().accessToken,
+    refreshAuth: () => arbi.auth.relogin(),
+    maxRetries: Infinity,
     onMessage: (msg) => {
       if ("sender" in msg && "recipient" in msg) {
         const notification = msg;
@@ -7208,14 +7235,12 @@ async function startDmListener(options) {
       }
     },
     onReconnecting: (attempt, max) => {
-      log(`WebSocket reconnecting (${attempt}/${max})...`);
+      const limit = Number.isFinite(max) ? `/${max}` : "";
+      log(`WebSocket reconnecting (attempt ${attempt}${limit})...`);
     },
     onReconnected: () => {
       log("WebSocket reconnected");
     },
-    onReconnectFailed: () => {
-      logError("WebSocket reconnection failed \u2014 listener stopped");
-    },
     onClose: (_code, reason) => {
       log(`WebSocket closed: ${reason || "no reason"}`);
     }
@@ -7236,6 +7261,7 @@ exports.ClaudeOrchestrator = ClaudeOrchestrator;
 exports.DOC_TERMINAL_STATUSES = DOC_TERMINAL_STATUSES;
 exports.FileConfigStore = FileConfigStore;
 exports.OpenClawOrchestrator = OpenClawOrchestrator;
+exports.WebSocketAuthError = WebSocketAuthError;
 exports.agentconfig = agentconfig_exports;
 exports.agents = agents_exports;
 exports.assistant = assistant_exports;