@wspc/cli 0.1.8 → 0.1.10

package/dist/cli.js

@@ -1520,9 +1520,9 @@ function createConsistencyFetch(opts) {
 }
 
 // src/version.ts
-var VERSION = "0.1.8";
+var VERSION = "0.1.10";
 var SPEC_SHA = "bec760cd";
-var SPEC_FETCHED_AT = "2026-07-01T09:21:28.049Z";
+var SPEC_FETCHED_AT = "2026-07-07T06:24:39.560Z";
 var API_BASE = "https://api.wspc.ai";
 
 // src/index.ts
@@ -1564,8 +1564,33 @@ function createAuthInterceptor(mode) {
   }
   let accessToken = mode.accessToken;
   let refreshToken = mode.refreshToken;
+  let expiresAt = mode.expiresAt;
+  const { baseUrl, clientId, onTokenRefresh } = mode;
   const fetchImpl = mode.fetchImpl ?? fetch;
   const now = mode.now ?? Date.now;
+  const SKEW_MS = 3e4;
+  async function refresh() {
+    const refreshRes = await fetchImpl(`${baseUrl}/auth/oauth/token`, {
+      method: "POST",
+      headers: {
+        "content-type": "application/x-www-form-urlencoded",
+        "user-agent": USER_AGENT
+      },
+      body: new URLSearchParams({
+        grant_type: "refresh_token",
+        refresh_token: refreshToken,
+        client_id: clientId
+      })
+    });
+    if (!refreshRes.ok) {
+      throw new WspcAuthExpiredError(await expiredMessage(refreshRes));
+    }
+    const tokens = await refreshRes.json();
+    accessToken = tokens.access_token;
+    refreshToken = tokens.refresh_token;
+    expiresAt = now() + tokens.expires_in * 1e3;
+    await onTokenRefresh({ accessToken, refreshToken, expiresAt });
+  }
   return {
     async onRequest(req) {
       req.headers.set("authorization", `Bearer ${accessToken}`);
@@ -1573,31 +1598,12 @@ function createAuthInterceptor(mode) {
       return req;
     },
     async execute(req) {
+      if (expiresAt !== void 0 && now() >= expiresAt - SKEW_MS) {
+        await refresh();
+      }
       const first = await fetchImpl(await this.onRequest(req.clone()));
       if (first.status !== 401) return first;
-      const refreshRes = await fetchImpl(`${mode.baseUrl}/auth/oauth/token`, {
-        method: "POST",
-        headers: {
-          "content-type": "application/x-www-form-urlencoded",
-          "user-agent": USER_AGENT
-        },
-        body: new URLSearchParams({
-          grant_type: "refresh_token",
-          refresh_token: refreshToken,
-          client_id: mode.clientId
-        })
-      });
-      if (!refreshRes.ok) {
-        throw new WspcAuthExpiredError(await expiredMessage(refreshRes));
-      }
-      const tokens = await refreshRes.json();
-      accessToken = tokens.access_token;
-      refreshToken = tokens.refresh_token;
-      await mode.onTokenRefresh({
-        accessToken,
-        refreshToken,
-        expiresAt: now() + tokens.expires_in * 1e3
-      });
+      await refresh();
       return fetchImpl(await this.onRequest(req.clone()));
     }
   };
@@ -1654,6 +1660,7 @@ function buildInterceptor(store, resolved, fetchImpl) {
   return createAuthInterceptor({
     accessToken: creds.access_token,
     refreshToken: creds.refresh_token,
+    expiresAt: creds.access_token_expires_at,
     baseUrl: apiBase,
     clientId,
     fetchImpl,
@@ -6331,6 +6338,15 @@ function createDriveRealtimeSource(args) {
     if (stopped || authFailed) return;
     clearReconnectTimer();
     const id = ++connectionId;
+    const headers = args.headers;
+    if (typeof headers !== "function") {
+      openSocket(id, headers);
+      return;
+    }
+    void headers().then((resolved) => openSocket(id, resolved)).catch((error) => closeConnection(id, error));
+  }
+  function openSocket(id, headers) {
+    if (id !== connectionId || stopped || authFailed) return;
     const url = buildDriveRealtimeUrl(args.baseUrl, args.libraryId, currentRealtime);
     activeSocket = connect(url, {
       open() {
@@ -6345,7 +6361,7 @@ function createDriveRealtimeSource(args) {
       close(error) {
         closeConnection(id, error ?? "close");
       }
-    }, args.headers === void 0 ? void 0 : { headers: args.headers });
+    }, headers === void 0 ? void 0 : { headers });
   }
   function closeConnection(id, error) {
     if (id !== connectionId || stopped || authFailed) return;
@@ -6540,6 +6556,9 @@ function isInvalidCursorReason(reason) {
   return /\bcursor[_ -]?(invalid|expired|gone|missing|not[_ -]?found)\b|\binvalid[_ -]?cursor\b/i.test(reason);
 }
 function isRealtimeAuthError(error) {
+  if (typeof error === "object" && error !== null && error.code === "WSPC_AUTH_EXPIRED") {
+    return true;
+  }
   return /\b(401|403|auth|authorization|unauthorized|forbidden)\b/i.test(String(error));
 }
 function nativeWebSocketConnector(url, handlers, init) {
@@ -6683,16 +6702,17 @@ async function runDriveWatch(root, options = {}) {
     realtimeSource = options.once ? void 0 : options.realtimeSource;
     if (!options.once && realtimeSource === void 0) {
       state = await ensureDriveRealtimeState(root);
-      const { baseUrl, headers } = await loadRealtimeAuthHeaders({
-        verifyPath: `/drive/libraries/${encodeURIComponent(state.library_id)}`
-      });
+      const verifyPath = `/drive/libraries/${encodeURIComponent(state.library_id)}`;
+      const { baseUrl } = await loadRealtimeAuthHeaders({ verifyPath });
       const realtime = state.realtime;
       if (realtime === void 0) {
         throw new Error("drive realtime state is required");
       }
       realtimeSource = createDriveRealtimeSource({
         baseUrl,
-        headers,
+        // Tokens expire while watching; resolve fresh headers on every
+        // (re)connect so an idle drop cannot loop on a stale snapshot.
+        headers: async () => (await loadRealtimeAuthHeaders({ verifyPath })).headers,
         libraryId: state.library_id,
         realtime,
         writeRealtimeState: (next) => writeDriveRealtimeState(root, next)