@arbidocs/client 0.5.25 → 0.5.27

package/dist/index.cjs

@@ -1116,6 +1116,67 @@ function createBearerAuthMiddleware(config) {
   };
 }
 
+// src/session-gate.ts
+function abortError() {
+  return new DOMException("The session ended.", "AbortError");
+}
+function isAbortError(error) {
+  for (let e = error, depth = 0; e && typeof e === "object" && depth < 5; depth++) {
+    if (e.name === "AbortError") return true;
+    e = e.cause;
+  }
+  return false;
+}
+function eitherSignal(a, b) {
+  if (!b) return a;
+  if (typeof AbortSignal.any === "function") return AbortSignal.any([a, b]);
+  const controller = new AbortController();
+  const abort = (signal) => () => controller.abort(signal.reason);
+  if (a.aborted || b.aborted) controller.abort((a.aborted ? a : b).reason);
+  else {
+    a.addEventListener("abort", abort(a), { once: true });
+    b.addEventListener("abort", abort(b), { once: true });
+  }
+  return controller.signal;
+}
+function createSessionGate() {
+  let controller = new AbortController();
+  let closed = false;
+  return {
+    get signal() {
+      return controller.signal;
+    },
+    get closed() {
+      return closed;
+    },
+    close() {
+      closed = true;
+    },
+    abort() {
+      controller.abort(abortError());
+    },
+    reopen() {
+      if (controller.signal.aborted) controller = new AbortController();
+      closed = false;
+    }
+  };
+}
+function gatedFetch(gate, fetch2) {
+  return (input, init) => {
+    if (gate.closed) return Promise.reject(abortError());
+    const own = init?.signal ?? (input instanceof Request ? input.signal : void 0);
+    return fetch2(input, { ...init, signal: eitherSignal(gate.signal, own) });
+  };
+}
+function createSessionGateMiddleware(gate) {
+  return {
+    onRequest({ request }) {
+      const signal = gate.closed ? AbortSignal.abort(abortError()) : gate.signal;
+      return new Request(request, { signal: eitherSignal(signal, request.signal) });
+    }
+  };
+}
+
 // src/workspace-keys.ts
 function createWorkspaceKeys(deps) {
   const wrapped = /* @__PURE__ */ new Map();
@@ -1912,6 +1973,8 @@ function createTransport(options) {
   const baseUrlOption = options.baseUrl;
   const base = typeof baseUrlOption === "function" ? baseUrlOption : () => baseUrlOption;
   const retryFetch = createRetryFetch();
+  const gate = createSessionGate();
+  const sessionFetch = gatedFetch(gate, retryFetch);
   const session = options.session ?? createSessionManager();
   if (userEmail) session.setUser(userEmail);
   const tokenProvider = createTokenProvider(session);
@@ -1929,7 +1992,7 @@ function createTransport(options) {
       const rawFetch = createFetchClient__default.default({
         baseUrl: base(),
         credentials,
-        fetch: retryFetch
+        fetch: sessionFetch
       });
       let response;
       try {
@@ -1942,7 +2005,7 @@ function createTransport(options) {
           }
         });
       } catch (error) {
-        console.warn("[API] Login call unreachable:", error);
+        if (!isAbortError(error)) console.warn("[API] Login call unreachable:", error);
         return "unreachable";
       }
       if (response.error || !response.data) {
@@ -1959,7 +2022,7 @@ function createTransport(options) {
     }
   };
   async function listWorkspaces(accessToken) {
-    const response = await retryFetch(`${base()}${API_PREFIX}/user/workspaces`, {
+    const response = await sessionFetch(`${base()}${API_PREFIX}/user/workspaces`, {
       method: "GET",
       headers: {
         Authorization: `Bearer ${accessToken}`,
@@ -1977,7 +2040,7 @@ function createTransport(options) {
     getServerSessionKey: () => session.getState().serverSessionKey,
     listWorkspaces,
     async primeKey(accessToken, workspaceId, sealedKey) {
-      const response = await retryFetch(
+      const response = await sessionFetch(
         `${base()}${API_PREFIX}/workspace/${workspaceId}/prime-key`,
         {
           method: "POST",
@@ -2008,7 +2071,7 @@ function createTransport(options) {
     async openWorkspace(accessToken, workspaceId, encryptedWorkspaceKey) {
       const query = "?include_documents=false&include_conversations=false&include_tags=false";
       try {
-        const response = await retryFetch(
+        const response = await sessionFetch(
           `${base()}${API_PREFIX}/workspace/${workspaceId}/open${query}`,
           {
             method: "POST",
@@ -2038,6 +2101,7 @@ function createTransport(options) {
   };
   let lastFailure = null;
   const expiredListeners = /* @__PURE__ */ new Set();
+  const signingOutListeners = /* @__PURE__ */ new Set();
   const rawRelogin = createReloginHandler({
     crypto: cryptoProvider,
     persistence,
@@ -2057,6 +2121,7 @@ function createTransport(options) {
     }
   });
   async function relogin() {
+    if (gate.closed) return null;
     const tokenBefore = session.getState().accessToken;
     const token = await rawRelogin();
     if (token) return token;
@@ -2078,7 +2143,7 @@ function createTransport(options) {
     workspaceOpenProvider: rawWorkspaceOpenProvider
   });
   let reopening = null;
-  const reopenWorkspace = () => reopening ??= workspaceOpens.run(() => authState.getSelectedWorkspaceId(), reopenSelected).finally(() => {
+  const reopenWorkspace = () => gate.closed ? Promise.resolve(false) : reopening ??= workspaceOpens.run(() => authState.getSelectedWorkspaceId(), reopenSelected).finally(() => {
     reopening = null;
   });
   const openEveryWorkspace = createAllWorkspacesOpener({
@@ -2101,6 +2166,7 @@ function createTransport(options) {
     fetch: retryFetch
   });
   if (typeof baseUrlOption === "function") readBaseUrlPerRequest(fetchClient, base);
+  fetchClient.use(createSessionGateMiddleware(gate));
   fetchClient.use(createBearerAuthMiddleware({ tokenProvider }));
   for (const m of middleware) fetchClient.use(m);
   fetchClient.use(
@@ -2128,18 +2194,39 @@ function createTransport(options) {
       relogin,
       reopenWorkspace,
       openAllWorkspaces,
+      onSigningOut(listener) {
+        signingOutListeners.add(listener);
+        return () => {
+          signingOutListeners.delete(listener);
+        };
+      },
+      isSigningOut: () => gate.closed,
+      sessionSignal: () => gate.signal,
       async logout({ everywhere = false } = {}) {
-        if (session.getState().accessToken) {
+        gate.close();
+        for (const listener of [...signingOutListeners]) {
           try {
-            await fetchClient.POST("/v1/user/logout", {
-              params: { query: { all_sessions: everywhere } }
-            });
+            listener();
           } catch (error) {
-            console.warn("[API] Server logout failed:", error);
+            console.warn("[API] A sign-out listener failed:", error);
           }
         }
-        session.clear();
-        if (everywhere) await clearAllData();
+        gate.abort();
+        try {
+          const accessToken = session.getState().accessToken;
+          if (accessToken) {
+            const query = `?all_sessions=${everywhere}`;
+            await retryFetch(`${base()}${API_PREFIX}/user/logout${query}`, {
+              method: "POST",
+              headers: { Authorization: `Bearer ${accessToken}` },
+              credentials
+            }).catch((error) => console.warn("[API] Server logout failed:", error));
+          }
+          session.clear();
+          if (everywhere) await clearAllData();
+        } finally {
+          gate.reopen();
+        }
       },
       async unlock({ email, password }) {
         const saved = await persistence.getSession();
@@ -2294,6 +2381,7 @@ exports.hasSession = hasSession;
 exports.identityFromLoginResponse = identityFromLoginResponse;
 exports.initSodium = initSodium;
 exports.initializeDatabase = initializeDatabase;
+exports.isAbortError = isAbortError;
 exports.isEncryptedRecoveryKey = isEncryptedRecoveryKey;
 exports.isMessageType = isMessageType;
 exports.openCallKeyOf = openCallKeyOf;