@h-ai/api-client 1.0.0-beta.2 → 1.0.0-beta.21

package/dist/index.js

@@ -8,6 +8,7 @@ import { z } from 'zod';
 // src/api-client-main.ts
 var logger = core.logger.child({ module: "api-client", scope: "auth" });
 var HTTPONLY_COOKIE_SENTINEL = "__httponly_cookie__";
+var cookieTokenStorages = /* @__PURE__ */ new WeakSet();
 function createMemoryTokenStorage() {
   let accessToken = null;
   let refreshToken = null;
@@ -32,7 +33,7 @@ function createMemoryTokenStorage() {
 }
 function createHttpOnlyCookieTokenStorage() {
   let memoryAccessToken = null;
-  return {
+  const storage = {
     async getAccessToken() {
       return memoryAccessToken;
     },
@@ -51,6 +52,8 @@ function createHttpOnlyCookieTokenStorage() {
       memoryAccessToken = null;
     }
   };
+  cookieTokenStorages.add(storage);
+  return storage;
 }
 var RefreshTokenPayloadSchema = z.object({
   accessToken: z.string().min(1),
@@ -63,6 +66,7 @@ function createTokenManager(storage, refreshEndpointUrl, fetchFn, onRefreshFaile
   let refreshPromise = null;
   let refreshController = null;
   let generation = 0;
+  let disposed = false;
   let sessionInvalid = false;
   let storageMutation = Promise.resolve();
   function mutateStorage(operation) {
@@ -91,6 +95,8 @@ function createTokenManager(storage, refreshEndpointUrl, fetchFn, onRefreshFaile
     });
   }
   async function refresh() {
+    if (disposed)
+      return null;
     if (refreshPromise)
       return refreshPromise;
     const controller = new AbortController();
@@ -153,7 +159,14 @@ function createTokenManager(storage, refreshEndpointUrl, fetchFn, onRefreshFaile
         return null;
       }
       if (!useHttpOnlyCookie && !parsed.data.refreshToken) {
-        logger.warn("Token refresh returned invalid data", { issues: [{ path: ["refreshToken"], message: "Required" }] });
+        logger.warn("Token refresh returned invalid data", {
+          issues: [
+            {
+              path: ["refreshToken"],
+              message: "Required"
+            }
+          ]
+        });
         await failRefresh(refreshGeneration);
         return null;
       }
@@ -194,6 +207,13 @@ function createTokenManager(storage, refreshEndpointUrl, fetchFn, onRefreshFaile
   }
   return {
     storage,
+    usesCookieCredentials: cookieTokenStorages.has(storage),
+    async dispose() {
+      disposed = true;
+      invalidateRefresh()?.abort();
+      callbacks.length = 0;
+      await storageMutation;
+    },
     get generation() {
       return generation;
     },
@@ -321,7 +341,9 @@ function createIamAuthActions(client) {
         if (event.persisted || sent)
           return;
         sent = true;
-        void client.iam.auth.closeSession({}, { context: { keepalive: true, autoRefresh: false } }).then((result) => {
+        void client.iam.auth.closeSession({}, {
+          context: { keepalive: true, autoRefresh: false }
+        }).then((result) => {
           if (!result.success)
             core.logger.warn("Page exit session revocation failed", { errorCode: result.error.code });
         }).catch(() => core.logger.warn("Page exit session request did not complete"));
@@ -341,7 +363,22 @@ function createIamAuthActions(client) {
     publicConfig: () => client.iam.auth.publicConfig(),
     createCaptcha: (input) => client.iam.auth.createCaptcha(input),
     login: async (input) => {
-      const result = input.method === "ldap" ? await client.iam.auth.loginWithLdap({ username: input.identifier, password: input.password, captcha: input.captcha, expectedUserId: input.expectedUserId }) : input.method === "email" || input.method === "sms" ? await client.iam.auth.loginWithOtp({ identifier: input.identifier, code: input.code ?? "", captcha: input.captcha, expectedUserId: input.expectedUserId }) : await client.iam.auth.login({ identifier: input.identifier, password: input.password, captcha: input.captcha, expectedUserId: input.expectedUserId });
+      const result = input.method === "ldap" ? await client.iam.auth.loginWithLdap({
+        username: input.identifier,
+        password: input.password,
+        captcha: input.captcha,
+        expectedUserId: input.expectedUserId
+      }) : input.method === "email" || input.method === "sms" ? await client.iam.auth.loginWithOtp({
+        identifier: input.identifier,
+        code: input.code ?? "",
+        captcha: input.captcha,
+        expectedUserId: input.expectedUserId
+      }) : await client.iam.auth.login({
+        identifier: input.identifier,
+        password: input.password,
+        captcha: input.captcha,
+        expectedUserId: input.expectedUserId
+      });
       return save(result);
     },
     register: async (input) => save(await client.iam.auth.register(input)),
@@ -408,12 +445,13 @@ function createApiClient(contract) {
       });
     }
   };
+  let closePromise = null;
   let initPromise = null;
   const lifecycle = {
     async init(config) {
       if (initPromise)
         return initPromise;
-      if (state.rawClient) {
+      if (state.rawClient || closePromise) {
         return err(
           HaiApiClientError.CONFIG_ERROR,
           apiClientM("apiClient_alreadyInitialized")
@@ -438,7 +476,11 @@ function createApiClient(contract) {
           state.transport = void 0;
           return err(
             HaiApiClientError.CONFIG_ERROR,
-            apiClientM("apiClient_configError", { params: { error: String(error) } }),
+            apiClientM("apiClient_configError", {
+              params: {
+                error: String(error)
+              }
+            }),
             error
           );
         }
@@ -450,13 +492,22 @@ function createApiClient(contract) {
       }
     },
     async close() {
+      if (closePromise)
+        return closePromise;
       clearIamPageExitBindings(auth);
       state.observers.clear();
+      const manager = state.tokenManager;
       state.transport?.destroy();
       state.config = null;
       state.rawClient = null;
       state.tokenManager = void 0;
       state.transport = void 0;
+      closePromise = manager?.dispose() ?? Promise.resolve();
+      try {
+        await closePromise;
+      } finally {
+        closePromise = null;
+      }
     },
     get config() {
       return state.config ? core.sanitize.sanitizeSensitiveFields(state.config) : null;
@@ -512,10 +563,20 @@ function createProcedureProxy(state, path) {
   });
 }
 async function callObservedProcedure(rawClient, path, args, observers) {
-  const record = { requestId: core.context.get().requestId ?? core.id.uuid(), procedure: path.join("."), timestamp: Date.now(), duration: 0, success: false, attempts: 0 };
+  const record = {
+    requestId: core.context.get().requestId ?? core.id.uuid(),
+    procedure: path.join("."),
+    timestamp: Date.now(),
+    duration: 0,
+    success: false,
+    attempts: 0
+  };
   const provided = args[1] && typeof args[1] === "object" ? args[1] : {};
   const providedContext = provided.context && typeof provided.context === "object" ? provided.context : {};
-  const options = { ...provided, context: { ...providedContext, [REQUEST_OBSERVATION]: record } };
+  const options = {
+    ...provided,
+    context: { ...providedContext, [REQUEST_OBSERVATION]: record }
+  };
   let result = await callProcedure(rawClient, path, [args[0], options]);
   record.duration = Math.max(0, Date.now() - record.timestamp);
   record.success = !(result && typeof result === "object" && "success" in result && result.success === false);
@@ -528,7 +589,16 @@ async function callObservedProcedure(rawClient, path, args, observers) {
       const safe = core.error.toPublic({ ...error, publicExt: error.ext }, receivedId);
       if (error.cause && typeof error.cause === "object" && !Array.isArray(error.cause)) {
         const metadata = {};
-        for (const key of ["orpcCode", "status", "transportCode", "direction", "stage", "limitBytes", "actualBytes"]) {
+        for (const key of [
+          "orpcCode",
+          "status",
+          "transportCode",
+          "serverTime",
+          "direction",
+          "stage",
+          "limitBytes",
+          "actualBytes"
+        ]) {
           const value = Reflect.get(error.cause, key);
           if (typeof value === "number" || typeof value === "string")
             metadata[key] = core.sanitize.sanitizeSensitiveValue(value, key);
@@ -536,7 +606,13 @@ async function callObservedProcedure(rawClient, path, args, observers) {
         if (Object.keys(metadata).length)
           safe.cause = metadata;
       }
-      core.logger.error("API request failed", { traceId: safe.traceId, requestId: record.requestId, procedure: record.procedure, status: record.status, error: result.error });
+      core.logger.error("API request failed", {
+        traceId: safe.traceId,
+        requestId: record.requestId,
+        procedure: record.procedure,
+        status: record.status,
+        error: result.error
+      });
       result = { ...result, error: safe };
     }
   }
@@ -627,7 +703,8 @@ function buildRawClient(contract, config, tokenManager, transport) {
         const value = await confirm();
         return typeof value === "string" || value === void 0 ? value : null;
       } : void 0;
-      const response = await fetchWithRefresh(request, requestInit, config, options.context.autoRefresh === false ? void 0 : tokenManager, transport, record, reauthorize);
+      const authenticatedRequest = tokenManager?.usesCookieCredentials ? new Request(request, { credentials: "include" }) : request;
+      const response = await fetchWithRefresh(authenticatedRequest, requestInit, config, options.context.autoRefresh === false ? void 0 : tokenManager, transport, record, reauthorize);
       if (record) {
         record.status = response.status;
         const traceId = response.headers.get("x-trace-id") ?? response.headers.get("x-request-id");
@@ -663,6 +740,7 @@ async function fetchWithRefresh(request, init, config, tokenManager, transport,
   if (observation)
     observation.attempts++;
   const response = await fetchWithTimeout(request, init, config, transport);
+  request.signal.throwIfAborted();
   if (!retryRequest)
     return response;
   async function retryAuthorized(accessToken2) {
@@ -692,9 +770,10 @@ async function fetchWithRefresh(request, init, config, tokenManager, transport,
   const baseUrl = config.baseUrl.replace(TRAILING_SLASHES_REGEX, "");
   const refreshPath = config.auth?.refreshPath ?? DEFAULT_REFRESH_PATH;
   const excludedPaths = [...AUTH_ENTRY_PATHS, refreshPath];
-  if (excludedPaths.some((path) => new URL(`${baseUrl}${path.startsWith("/") ? path : `/${path}`}`).pathname === new URL(request.url).pathname))
+  if (excludedPaths.some((path) => new URL(`${baseUrl}${path.startsWith("/") ? path : `/${path}`}`).pathname === new URL(request.url).pathname)) {
     return response;
-  const failure = response.status === 401 || response.headers.get("content-type")?.includes("application/json") ? await response.clone().json().catch(() => void 0) : void 0;
+  }
+  const failure = response.headers.get("content-type")?.includes("application/json") ? await response.clone().json().catch(() => void 0) : void 0;
   const code = failure && typeof failure === "object" && "success" in failure && failure.success === false && "error" in failure && failure.error && typeof failure.error === "object" && "code" in failure.error ? failure.error.code : void 0;
   if (code === "hai:iam:027" && reauthorize)
     return retryAuthorized();
@@ -707,6 +786,7 @@ async function fetchWithRefresh(request, init, config, tokenManager, transport,
   }
   if (tokenManager.generation !== identityGeneration)
     return response;
+  request.signal.throwIfAborted();
   const tokens = await tokenManager.refresh();
   if (tokenManager.generation !== identityGeneration)
     return response;
@@ -742,26 +822,39 @@ async function fetchWithTimeout(request, init, config, transport) {
   const controller = new AbortController();
   const timeoutId = setTimeout(() => controller.abort(), timeout);
   const userSignal = request.signal;
-  if (userSignal) {
-    if (userSignal.aborted) {
-      controller.abort();
-    } else {
-      userSignal.addEventListener("abort", () => controller.abort(), { once: true });
-    }
-  }
+  const abort = () => controller.abort(userSignal.reason);
+  if (userSignal.aborted)
+    abort();
+  else
+    userSignal.addEventListener("abort", abort, { once: true });
   try {
-    return await fetchFn(new Request(request, { signal: controller.signal }), init);
+    const response = await fetchFn(new Request(request, { signal: controller.signal }), init);
+    const contentType = response.headers.get("content-type")?.split(";", 1)[0]?.trim().toLowerCase() ?? "";
+    const json = contentType.endsWith("/json") || contentType.endsWith("+json");
+    const body = response.body === null ? null : json || !response.ok ? await response.arrayBuffer() : response.body.pipeThrough(new TransformStream(), { signal: userSignal });
+    return new Response(body, {
+      status: response.status,
+      statusText: response.statusText,
+      headers: response.headers
+    });
   } finally {
     clearTimeout(timeoutId);
+    userSignal.removeEventListener("abort", abort);
   }
 }
 function mapClientError(error) {
   const time = error instanceof TransportTimeError ? error : error instanceof Error && error.cause instanceof TransportTimeError ? error.cause : void 0;
   if (time)
-    return err(HaiApiClientError.VALIDATION_FAILED, time.message, { transportCode: time.code });
+    return err(HaiApiClientError.VALIDATION_FAILED, time.message, { transportCode: time.code, serverTime: time.serverTime });
   const capacity = error instanceof TransportBodyTooLargeError ? error : error instanceof Error && error.cause instanceof TransportBodyTooLargeError ? error.cause : void 0;
-  if (capacity)
-    return err(HaiApiClientError.PAYLOAD_TOO_LARGE, capacity.message, { direction: capacity.direction, stage: capacity.stage, limitBytes: capacity.limitBytes, actualBytes: capacity.actualBytes });
+  if (capacity) {
+    return err(HaiApiClientError.PAYLOAD_TOO_LARGE, capacity.message, {
+      direction: capacity.direction,
+      stage: capacity.stage,
+      limitBytes: capacity.limitBytes,
+      actualBytes: capacity.actualBytes
+    });
+  }
   if (error instanceof ORPCError) {
     const body = error.data && typeof error.data === "object" && "body" in error.data ? error.data.body : void 0;
     if (body && typeof body === "object" && "success" in body && body.success === false && "error" in body) {