@arbidocs/sdk 0.3.7 → 0.3.9

package/dist/index.cjs

@@ -388,14 +388,6 @@ function createWorkspaceKeyMiddleware(config) {
 function createAutoReloginMiddleware(config) {
   return {
     async onResponse({ response, request }) {
-      if (needsWorkspaceKey(request.url, config.urlConfig)) {
-        const hasWorkspaceKey = request.headers.has("Workspace-Key");
-        console.debug(
-          `[${request.method}] ${response.status}`,
-          request.url,
-          `Workspace-Key: ${hasWorkspaceKey ? "\u2713" : "\u2717"}`
-        );
-      }
       if (response.status === 400) {
         const isSafeMethod = ["GET", "HEAD", "DELETE"].includes(request.method);
         if (isSafeMethod) {
@@ -404,12 +396,6 @@ function createAutoReloginMiddleware(config) {
           if (newToken) {
             const newRequest = request.clone();
             newRequest.headers.set("Authorization", `Bearer ${newToken}`);
-            if (needsWorkspaceKey(request.url, config.urlConfig)) {
-              const workspaceHeader = config.workspaceKeyProvider.getWorkspaceKeyHeader();
-              if (workspaceHeader) {
-                newRequest.headers.set("Workspace-Key", workspaceHeader);
-              }
-            }
             console.info("[API] Retrying request after re-login");
             return fetch(newRequest);
           }
@@ -424,12 +410,6 @@ function createAutoReloginMiddleware(config) {
             try {
               const newRequest = request.clone();
               newRequest.headers.set("Authorization", `Bearer ${newToken}`);
-              if (needsWorkspaceKey(request.url, config.urlConfig)) {
-                const workspaceHeader = config.workspaceKeyProvider.getWorkspaceKeyHeader();
-                if (workspaceHeader) {
-                  newRequest.headers.set("Workspace-Key", workspaceHeader);
-                }
-              }
               console.info("[API] Retrying request after re-login:", request.method, request.url);
               return fetch(newRequest);
             } catch (cloneError) {
@@ -541,14 +521,25 @@ function createReloginHandler(deps) {
                 wrappedKey,
                 encryptionKeyPair.secretKey
               );
-              const workspaceKeyHeader = await deps.crypto.createWorkspaceKeyHeader(
+              const encryptedWorkspaceKey = await deps.crypto.createWorkspaceKeyHeader(
                 workspaceKey,
                 loginResult.sessionKey
               );
-              deps.authState.setCachedWorkspaceHeader(selectedWorkspaceId, workspaceKeyHeader);
+              deps.authState.setCachedWorkspaceHeader(selectedWorkspaceId, encryptedWorkspaceKey);
+              if (deps.workspaceOpenProvider) {
+                const workspaceJwt = await deps.workspaceOpenProvider.openWorkspace(
+                  loginResult.accessToken,
+                  selectedWorkspaceId,
+                  encryptedWorkspaceKey
+                );
+                if (workspaceJwt) {
+                  deps.authState.setAccessToken(workspaceJwt);
+                  console.info("[API] Workspace-scoped JWT obtained after re-login");
+                }
+              }
             }
           } catch (error) {
-            console.error("[API] Failed to regenerate workspace header:", error);
+            console.error("[API] Failed to re-open workspace after re-login:", error);
           }
         }
         console.info("[API] Re-login successful");
@@ -849,7 +840,7 @@ async function register(params, deps) {
     params.password,
     deps.deploymentDomain
   );
-  const response = await deps.fetchClient.POST("/api/user/register", {
+  const response = await deps.fetchClient.POST("/v1/user/register", {
     body: credentials.request
   });
   if (response.error) {
@@ -883,7 +874,7 @@ async function loginWithKey(params, deps) {
   return performLogin(credentials.request, credentials.signingPrivateKey, deps);
 }
 async function performLogin(request, signingPrivateKey, deps) {
-  const response = await deps.fetchClient.POST("/api/user/login", {
+  const response = await deps.fetchClient.POST("/v1/user/login", {
     body: request
   });
   if (response.error || !response.data) {
@@ -922,7 +913,7 @@ async function changePassword(params, deps) {
     params.newPassword,
     deps.deploymentDomain
   );
-  const response = await deps.fetchClient.POST("/api/user/change_password", {
+  const response = await deps.fetchClient.POST("/v1/user/change_password", {
     body: {
       ...credentials.request,
       rewrapped_workspace_keys: params.rewrappedWorkspaceKeys ?? {}
@@ -938,14 +929,20 @@ async function changePassword(params, deps) {
 }
 
 // src/client.ts
+var API_PREFIX = "/v1";
 var DEFAULT_WORKSPACE_KEY_URL_CONFIG = {
-  excludePatterns: ["/api/user/", "/api/health/", "/api/configs/", "/api/workspace/create"],
+  excludePatterns: [
+    `${API_PREFIX}/user/`,
+    `${API_PREFIX}/health/`,
+    `${API_PREFIX}/configs/`,
+    `${API_PREFIX}/workspace/create`
+  ],
   includePatterns: [
-    "/api/workspace/wrk-",
-    "/api/document/",
-    "/api/conversation/",
-    "/api/assistant/",
-    "/api/tag/"
+    `${API_PREFIX}/workspace/wrk-`,
+    `${API_PREFIX}/document/`,
+    `${API_PREFIX}/conversation/`,
+    `${API_PREFIX}/assistant/`,
+    `${API_PREFIX}/tag/`
   ]
 };
 var RETRYABLE_CODES = /* @__PURE__ */ new Set([
@@ -968,7 +965,8 @@ function createRetryFetch() {
     let lastError;
     for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
       try {
-        return await globalThis.fetch(input, init);
+        const fetchInput = input instanceof Request ? input.clone() : input;
+        return await globalThis.fetch(fetchInput, init);
       } catch (err) {
         lastError = err;
         if (attempt < MAX_RETRIES && isRetryableError(err)) {
@@ -986,7 +984,7 @@ function createArbiClient(options) {
     baseUrl,
     deploymentDomain,
     workspaceKeyUrlConfig = DEFAULT_WORKSPACE_KEY_URL_CONFIG,
-    reloginExcludePatterns = ["/api/user/login"],
+    reloginExcludePatterns = [`${API_PREFIX}/user/login`],
     credentials = "include",
     ssoTokenProvider = null,
     onReloginSuccess
@@ -1011,7 +1009,7 @@ function createArbiClient(options) {
         credentials,
         fetch: retryFetch
       });
-      const response = await rawFetch.POST("/api/user/login", {
+      const response = await rawFetch.POST("/v1/user/login", {
         body: {
           email: payload.email,
           signature: payload.signature,
@@ -1033,7 +1031,7 @@ function createArbiClient(options) {
   };
   const workspaceKeyRefreshProvider = {
     async getWrappedKey(accessToken, workspaceId) {
-      const workspacesResponse = await retryFetch(`${baseUrl}/api/user/workspaces`, {
+      const workspacesResponse = await retryFetch(`${baseUrl}${API_PREFIX}/user/workspaces`, {
         method: "GET",
         headers: {
           Authorization: `Bearer ${accessToken}`,
@@ -1073,8 +1071,6 @@ function createArbiClient(options) {
   fetchClient.use(
     createAutoReloginMiddleware({
       reloginHandler,
-      workspaceKeyProvider,
-      urlConfig: workspaceKeyUrlConfig,
       reloginExcludePatterns
     })
   );
@@ -1124,7 +1120,7 @@ function createArbiClient(options) {
 function buildWebSocketUrl(baseUrl) {
   const wsScheme = baseUrl.startsWith("https") ? "wss" : "ws";
   const hostAndPath = baseUrl.replace(/^https?:\/\//, "").replace(/\/+$/, "");
-  return `${wsScheme}://${hostAndPath}/api/notifications/ws`;
+  return `${wsScheme}://${hostAndPath}${API_PREFIX}/notifications/ws`;
 }
 function createAuthMessage(accessToken) {
   const msg = { type: "auth", token: accessToken };
@@ -1145,6 +1141,7 @@ function isMessageType(msg, type) {
   return msg.type === type;
 }
 
+exports.API_PREFIX = API_PREFIX;
 exports.base64Decode = base64Decode;
 exports.base64Encode = base64Encode;
 exports.base64ToBytes = base64ToBytes;