@arbidocs/client 0.4.169 → 0.5.0

package/dist/index.cjs

@@ -1227,6 +1227,59 @@ function workspaceKeyRequiredOf(body) {
   return d.code === "workspace_key_required" && typeof d.workspace_ext_id === "string" ? d.workspace_ext_id : null;
 }
 
+// src/workspace-opens.ts
+function createWorkspaceOpens() {
+  let tail = Promise.resolve();
+  let pending = 0;
+  let generation = 0;
+  let active = null;
+  return {
+    run(target, open) {
+      pending++;
+      const result = tail.then(async () => {
+        const workspaceId = target();
+        if (workspaceId === null || workspaceId !== active) {
+          generation++;
+          active = null;
+        }
+        try {
+          const value = await open();
+          active = workspaceId;
+          return value;
+        } catch (error) {
+          generation++;
+          active = null;
+          throw error;
+        }
+      });
+      const done = () => {
+        pending--;
+      };
+      tail = result.then(done, done);
+      return result;
+    },
+    get busy() {
+      return pending > 0;
+    },
+    get generation() {
+      return generation;
+    },
+    get active() {
+      return active;
+    },
+    async idle() {
+      for (let current = tail; ; current = tail) {
+        await current;
+        if (current === tail && pending === 0) return;
+      }
+    },
+    reset() {
+      generation++;
+      active = null;
+    }
+  };
+}
+
 // src/middleware/auto-relogin.ts
 var NO_ACTIVE_WORKSPACE = /no active workspace/i;
 async function keyRequiredWorkspace(response) {
@@ -1505,7 +1558,11 @@ function createAllWorkspacesOpener(deps) {
     } catch {
       return;
     }
-    for (const ws of workspaces ?? []) {
+    const last = deps.lastWorkspace?.() ?? null;
+    const ordered = [...workspaces ?? []].sort(
+      (a, b) => Number(a.external_id === last) - Number(b.external_id === last)
+    );
+    for (const ws of ordered) {
       if (!ws.wrapped_key || !ws.external_id) continue;
       try {
         const workspaceKey = deps.unwrapWorkspaceKey(ws.wrapped_key, session.signingPrivateKey);
@@ -1754,7 +1811,7 @@ function readBaseUrlPerRequest(fetchClient, base) {
 }
 var deploymentDomainOf = ({ deploymentDomain }) => typeof deploymentDomain === "function" ? deploymentDomain() : deploymentDomain;
 function createArbiClient(options) {
-  const { fetch: fetch2, session, persistence, workspaceKeys, auth } = createTransport(options);
+  const { fetch: fetch2, session, persistence, workspaceKeys, workspaceOpens, auth } = createTransport(options);
   const authDeps = {
     fetchClient: fetch2,
     session,
@@ -1767,6 +1824,7 @@ function createArbiClient(options) {
   return {
     fetch: fetch2,
     workspaceKeys,
+    workspaceOpens,
     session,
     auth: {
       register: (params) => register(params, authDeps),
@@ -1892,10 +1950,14 @@ function createTransport(options) {
       if (!response.ok) throw new Error(`Could not unlock the workspace (${response.status})`);
     }
   });
+  const workspaceOpens = createWorkspaceOpens();
   let keysUser = session.getState().signedIn ? session.getState().userExtId : null;
   session.subscribe((state) => {
     const user = state.signedIn ? state.userExtId : null;
-    if (user !== keysUser) workspaceKeys.clear();
+    if (user !== keysUser) {
+      workspaceKeys.clear();
+      workspaceOpens.reset();
+    }
     keysUser = user;
   });
   const workspaceKeyRefreshProvider = {
@@ -1903,7 +1965,7 @@ function createTransport(options) {
       return (await workspaceKeys.wrappedKey(workspaceId).catch(() => null))?.wrappedKey ?? null;
     }
   };
-  const workspaceOpenProvider = {
+  const rawWorkspaceOpenProvider = {
     async openWorkspace(accessToken, workspaceId, encryptedWorkspaceKey) {
       const query = "?include_documents=false&include_conversations=false&include_tags=false";
       try {
@@ -1925,6 +1987,16 @@ function createTransport(options) {
       }
     }
   };
+  const workspaceOpenProvider = {
+    openWorkspace: (accessToken, workspaceId, encryptedWorkspaceKey) => workspaceOpens.busy ? Promise.resolve(true) : workspaceOpens.run(
+      () => workspaceId,
+      () => rawWorkspaceOpenProvider.openWorkspace(
+        accessToken,
+        workspaceId,
+        encryptedWorkspaceKey
+      )
+    )
+  };
   let lastFailure = null;
   const expiredListeners = /* @__PURE__ */ new Set();
   const rawRelogin = createReloginHandler({
@@ -1958,15 +2030,19 @@ function createTransport(options) {
     }
     return null;
   }
-  const reopenWorkspace = createWorkspaceReopener({
+  const reopenSelected = createWorkspaceReopener({
     crypto: cryptoProvider,
     persistence,
     authState,
     getAccessToken: () => session.getState().accessToken,
     workspaceKeyRefreshProvider,
-    workspaceOpenProvider
+    workspaceOpenProvider: rawWorkspaceOpenProvider
+  });
+  let reopening = null;
+  const reopenWorkspace = () => reopening ??= workspaceOpens.run(() => authState.getSelectedWorkspaceId(), reopenSelected).finally(() => {
+    reopening = null;
   });
-  const openAllWorkspaces = createAllWorkspacesOpener({
+  const openEveryWorkspace = createAllWorkspacesOpener({
     crypto: cryptoProvider,
     persistence,
     getAccessToken: () => session.getState().accessToken,
@@ -1976,8 +2052,10 @@ function createTransport(options) {
       const list = await listWorkspaces(accessToken);
       return list && workspaceKeys.remember(list);
     },
-    workspaceOpenProvider
+    workspaceOpenProvider: rawWorkspaceOpenProvider,
+    lastWorkspace: () => authState.getSelectedWorkspaceId()
   });
+  const openAllWorkspaces = () => workspaceOpens.run(() => null, openEveryWorkspace);
   const fetchClient = createFetchClient__default.default({
     baseUrl: base(),
     credentials,
@@ -2006,6 +2084,7 @@ function createTransport(options) {
     session,
     persistence,
     workspaceKeys,
+    workspaceOpens,
     auth: {
       relogin,
       reopenWorkspace,
@@ -2137,6 +2216,7 @@ exports.createRecoveryUrl = createRecoveryUrl;
 exports.createReloginHandler = createReloginHandler;
 exports.createSessionManager = createSessionManager;
 exports.createWorkspaceKeys = createWorkspaceKeys;
+exports.createWorkspaceOpens = createWorkspaceOpens;
 exports.createWorkspaceReopener = createWorkspaceReopener;
 exports.decodeCallKey = decodeCallKey;
 exports.decodeSecureMailKey = decodeSecureMailKey;