@oxy.so/core 1.18.1 → 3.0.0

package/dist/esm/HttpService.js

@@ -12,16 +12,16 @@
  * - Error handling
  * - Request queuing
  */
-import { TTLCache, registerCacheForCleanup } from './utils/cache.js';
+import { TTLCache, registerCacheForCleanup, unregisterCacheFromCleanup } from './utils/cache.js';
 import { RequestDeduplicator, RequestQueue, SimpleLogger } from './utils/requestUtils.js';
 import { retryAsync } from './utils/asyncUtils.js';
 import { createCancelledError, ErrorCodes, handleHttpError, parseHttpErrorBody } from './utils/errorUtils.js';
-import { jwtDecode } from 'jwt-decode';
-import { isReactNative } from '@oxy.so/protocol';
+import { decodeTokenClaims } from './utils/tokenClaims.js';
+import { isReactNative } from '@oxy.so/protocol/random';
 import { computeIdentityTag, fnv1a32 } from './utils/cacheKey.js';
 import { redactUrlQuery } from './utils/redactUrl.js';
 import { OxyAuthenticationError } from './OxyServices.errors.js';
-import { getBrowserEdgeRegionHeader } from './utils/edgeRegion.js';
+import { peekBrowserEdgeRegionHeader } from './utils/edgeRegion.js';
 import { getBrowserActivityIdHeader } from './utils/activityId.js';
 /**
  * Default per-request timeout (ms) when neither the call site nor
@@ -29,6 +29,26 @@ import { getBrowserActivityIdHeader } from './utils/activityId.js';
  * endpoint surfaces as an `AbortError` quickly rather than blocking the
  * request queue.
  */
+/**
+ * Strip leading or trailing `/`s without a regex: `/\/+$/` backtracks
+ * polynomially on a long run of slashes (CodeQL js/polynomial-redos), and this
+ * runs on every request.
+ */
+function trimSlashes(value, side) {
+    let start = 0;
+    let end = value.length;
+    if (side === 'start')
+        while (start < end && value.charCodeAt(start) === 47)
+            start++;
+    else
+        while (end > start && value.charCodeAt(end - 1) === 47)
+            end--;
+    return value.slice(start, end);
+}
+/** Methods whose calls concurrent callers may share (read-only). */
+const SAFE_METHODS = new Set(['GET']);
+/** Methods safe to re-send after a transient failure (RFC 9110 §9.2.2). */
+const IDEMPOTENT_METHODS = new Set(['GET', 'PUT', 'DELETE']);
 const DEFAULT_REQUEST_TIMEOUT_MS = 5000;
 /**
  * Cooldown (ms) applied after a failed access-token refresh before another
@@ -94,18 +114,13 @@ const TOKEN_REFRESH_LEAD_SECONDS = 60;
  * lead window. `false` for an expired, opaque or no-`exp` token.
  */
 function isInsideRefreshLeadWindow(token) {
-    try {
-        const decoded = jwtDecode(token);
-        if (typeof decoded.exp !== 'number') {
-            return false;
-        }
-        const now = Math.floor(Date.now() / 1000);
-        // `<=`: the proactive scheduler fires at exactly `exp - lead`.
-        return decoded.exp > now && decoded.exp - now <= TOKEN_REFRESH_LEAD_SECONDS;
-    }
-    catch {
+    const decoded = decodeTokenClaims(token);
+    if (typeof decoded?.exp !== 'number') {
         return false;
     }
+    const now = Math.floor(Date.now() / 1000);
+    // `<=`: the proactive scheduler fires at exactly `exp - lead`.
+    return decoded.exp > now && decoded.exp - now <= TOKEN_REFRESH_LEAD_SECONDS;
 }
 /**
  * Soft ceiling on the number of live entries in the identity-scoped GET
@@ -376,7 +391,15 @@ export class HttpService {
      * Main request method - handles everything in one place
      */
     async request(config) {
-        const { method, url, data, params, timeout = this.config.requestTimeout || DEFAULT_REQUEST_TIMEOUT_MS, signal, cache: cacheRequested = method === 'GET', cacheTTL, deduplicate = true, retry = this.config.enableRetry !== false, maxRetries = this.config.maxRetries || 3, } = config;
+        const { method, url, data, params, timeout = this.config.requestTimeout || DEFAULT_REQUEST_TIMEOUT_MS, signal, cache: cacheRequested = method === 'GET', cacheTTL, 
+        // Only reads are shared by default. A write's body can be opaque
+        // (`FormData`, `URLSearchParams` key as empty objects), so two different
+        // uploads used to collapse into one call and the second caller got the
+        // first file's result.
+        deduplicate = SAFE_METHODS.has(method), 
+        // Only idempotent methods are re-sent by default: re-sending a POST after a
+        // 5xx or a dropped connection can apply it twice.
+        retry = this.config.enableRetry !== false && IDEMPOTENT_METHODS.has(method), maxRetries = this.config.maxRetries || 3, } = config;
         // A per-instance disabled cache (`enableCache:false` / `cacheTTL<=0`)
         // overrides any per-request `cache:true`: nothing is read from nor written
         // to the response cache. Request deduplication below is unaffected.
@@ -406,7 +429,9 @@ export class HttpService {
         // 401 retry re-enters request() with a fresh config, so it re-resolves
         // this here with the refreshed token.
         const authHeader = config.skipAuth ? null : await this.getAuthHeader();
-        const edgeRegionHeader = await getBrowserEdgeRegionHeader();
+        // Never awaited: the PoP is a hint, and waiting on its trace fetch put up
+        // to a second in front of requests.
+        const edgeRegionHeader = peekBrowserEdgeRegionHeader();
         const activityIdHeader = getBrowserActivityIdHeader();
         // A request the caller has ALREADY abandoned takes no queue slot and makes
         // no network call. Checked here, before enqueue, because a slot is the
@@ -415,40 +440,30 @@ export class HttpService {
         if (signal?.aborted) {
             throw createCancelledError('Request cancelled before it was sent');
         }
-        // ONE abort domain for the whole call, linked to the caller's signal ONCE.
-        //
-        // The bug this replaces: the controller used to be built INSIDE `requestFn`
-        // — the function `retryAsync` re-invokes — and the caller's signal was
-        // linked to each new controller with a bare `addEventListener`. An `abort`
-        // event fires once, so on attempt 2 the caller's already-fired signal could
-        // not abort the freshly built controller, and the request the caller had
-        // cancelled went out for real. Hoisting the linkage means a cancellation
-        // arrives once and is then true for every attempt, including ones not yet
-        // started.
-        const callController = new AbortController();
-        const disposeCallerLink = signal ? linkAbort(signal, callController) : undefined;
-        /**
-         * Which of our own timers fired, so a timeout can be told apart from a
-         * cancellation. Both reach us from `fetch` as an indistinguishable
-         * `AbortError`, and collapsing them (as this used to) is what let the retry
-         * predicate treat an abandoned request as a transient failure.
-         */
-        let timedOut = false;
-        // Request function
-        const requestFn = async () => {
+        // One network attempt, inside the call's abort domain `domain`: the caller's
+        // own signal, or — when deduplicated — the shared work's, which aborts only
+        // once every caller waiting on it has cancelled.
+        const attempt = async (domain) => {
             const startTime = Date.now();
             // Re-checked per attempt so no retry can issue a network call after the
             // caller gave up — belt to `retryAsync`'s braces, and the one that holds
             // if a custom `shouldRetry` ever says yes to a cancellation.
-            if (callController.signal.aborted) {
+            if (domain.aborted) {
                 throw createCancelledError('Request cancelled');
             }
+            /**
+             * Whether OUR timer fired, so a timeout can be told apart from a
+             * cancellation. Both reach us from `fetch` as an indistinguishable
+             * `AbortError`, and collapsing them is what let the retry predicate treat
+             * an abandoned request as a transient failure.
+             */
+            let timedOut = false;
             // This attempt's controller carries its own timeout and inherits the
             // call-wide abort domain. Declared OUTSIDE the `try` so the `finally`
             // that releases them can see them — the timer and the listener are
             // exactly what leaked when they lived inside it.
             const controller = new AbortController();
-            const disposeCallLink = linkAbort(callController.signal, controller);
+            const disposeCallLink = linkAbort(domain, controller);
             const timeoutId = timeout
                 ? setTimeout(() => {
                     timedOut = true;
@@ -474,19 +489,19 @@ export class HttpService {
                 }
                 // Add authorization header if available
                 if (authHeader) {
-                    headers['Authorization'] = authHeader;
+                    headers.Authorization = authHeader;
                 }
                 // Merge custom headers if provided
                 if (config.headers) {
-                    Object.entries(config.headers).forEach(([key, value]) => {
+                    for (const [key, value] of Object.entries(config.headers)) {
                         // For FormData, explicitly remove Content-Type if user tries to set it
                         // The browser/fetch API will set it automatically with the boundary
                         if (isFormData && key.toLowerCase() === 'content-type') {
                             this.logger.debug('Ignoring Content-Type header for FormData - will be set automatically');
-                            return;
+                            continue;
                         }
                         headers[key] = value;
-                    });
+                    }
                 }
                 // This is Cloudflare's coarse serving PoP (for example `mad`), never an
                 // IP or coordinate. Set it after caller headers so request code cannot
@@ -534,7 +549,12 @@ export class HttpService {
                             // deduplicated retry would resolve to the still-pending original
                             // and await itself (deadlock). Opting the retry out of dedupe makes
                             // it a fresh request.
-                            return this.request({ ...config, _isAuthRetry: true, retry: false, deduplicate: false });
+                            //
+                            // `bypassQueue: true` is REQUIRED too: this attempt still holds its
+                            // queue slot, so a queued retry waits for a slot while holding one.
+                            // With every slot held by a 401 (a revoked session under load) no
+                            // retry could ever start and the whole client stalled.
+                            return this.request({ ...config, _isAuthRetry: true, retry: false, deduplicate: false, bypassQueue: true });
                         }
                         // Refresh failed or no token — clear tokens
                         this.tokenStore.clearTokens();
@@ -579,7 +599,7 @@ export class HttpService {
                 if (config.responseType === 'blob') {
                     responseData = await response.blob();
                 }
-                else if (contentType && contentType.includes('application/json')) {
+                else if (contentType?.includes('application/json')) {
                     // Use response.json() directly for better performance
                     try {
                         responseData = await response.json();
@@ -662,47 +682,55 @@ export class HttpService {
                 disposeCallLink();
             }
         };
-        // Wrap with retry if enabled.
+        // Composition: dedupe(retry(queue(attempt))). A queue slot is network
+        // occupancy only — each attempt takes one and releases it — so neither the
+        // retry backoff sleep nor a deduplicated caller waiting on shared work holds
+        // a slot while doing nothing.
         //
-        // `retryOnTimeout` defaults to false in `retryAsync`, which is what makes
-        // the pathological total unreachable: a timeout now costs ONE attempt
-        // instead of four-plus-backoff (~28s at the 5s default), and a cancellation
-        // costs none. `deadline` bounds whatever retries do happen by wall clock
-        // rather than by attempts x timeout + backoff.
-        const requestWithRetry = retry
-            ? () => retryAsync(requestFn, {
+        // `retryOnTimeout` defaults to false in `retryAsync`: a timeout costs ONE
+        // attempt, a cancellation none. `deadline` bounds whatever retries do happen
+        // by wall clock rather than by attempts x timeout + backoff.
+        const runAttempt = (domain) => 
+        // Control-plane calls the auth lane depends on (`bypassQueue`, e.g. the
+        // device-secret mint) run DIRECTLY — a queued mint could never acquire a
+        // slot when every slot is parked awaiting it.
+        config.bypassQueue ? attempt(domain) : this.requestQueue.enqueue(() => attempt(domain), domain);
+        const execute = (domain) => retry
+            ? retryAsync(() => runAttempt(domain), {
                 maxRetries,
                 baseDelay: this.config.retryDelay || 1000,
                 retryOnTimeout: config.retryOnTimeout ?? false,
                 deadline: config.deadline !== undefined ? Date.now() + config.deadline : undefined,
             })
-            : requestFn;
-        // Wrap with deduplication if enabled (use optimized key generation)
-        const dedupeKey = deduplicate ? this.generateCacheKey(method, url, data || params) : null;
-        const finalRequest = dedupeKey
-            ? () => this.deduplicator.deduplicate(dedupeKey, requestWithRetry, callController.signal)
-            : requestWithRetry;
-        try {
-            // Execute the request. Control-plane calls the auth lane depends on
-            // (`bypassQueue`, e.g. the device-secret mint) run DIRECTLY — a queued mint
-            // could never acquire a slot when every slot is parked awaiting it.
-            const result = config.bypassQueue
-                ? await finalRequest()
-                : await this.requestQueue.enqueue(finalRequest, callController.signal);
-            // Cache the result if caching is enabled
-            if (cache && cacheKey && result) {
-                this.cache.set(cacheKey, result, cacheTTL);
-                this.warnIfCacheOversized();
+            : runAttempt(domain);
+        let result;
+        if (deduplicate) {
+            // The cache key IS the dedupe key (same method, url, payload, identity);
+            // computed once per call.
+            const dedupeKey = cacheKey ?? this.generateCacheKey(method, url, data || params);
+            result = await this.deduplicator.deduplicate(dedupeKey, execute, signal);
+        }
+        else {
+            // The call's own abort domain, linked to the caller's signal ONCE, so a
+            // cancellation arrives once and is then true for every attempt, including
+            // ones not yet started. Released however the call ends: a caller signal
+            // that outlives the request (a React Query signal) would otherwise accrue
+            // one listener per request.
+            const callController = new AbortController();
+            const disposeCallerLink = signal ? linkAbort(signal, callController) : undefined;
+            try {
+                result = await execute(callController.signal);
+            }
+            finally {
+                disposeCallerLink?.();
             }
-            return result;
         }
-        finally {
-            // The call-wide link to the CALLER's signal, released once the call is
-            // over however it ended. Without this a caller signal that outlives the
-            // request — the normal case for a React Query query signal — accrues one
-            // listener per request for its whole lifetime.
-            disposeCallerLink?.();
+        // Cache the result if caching is enabled
+        if (cache && cacheKey && result) {
+            this.cache.set(cacheKey, result, cacheTTL);
+            this.warnIfCacheOversized();
         }
+        return result;
     }
     /**
      * Soft cache-size guard. Emits a single throttled telemetry warning when the
@@ -889,16 +917,16 @@ export class HttpService {
     buildURL(url, params) {
         const base = /^https?:\/\//i.test(url)
             ? url
-            : `${this.baseURL.replace(/\/+$/, '')}/${url.replace(/^\/+/, '')}`;
+            : `${trimSlashes(this.baseURL, 'end')}/${trimSlashes(url, 'start')}`;
         if (!params || Object.keys(params).length === 0) {
             return base;
         }
         const searchParams = new URLSearchParams();
-        Object.entries(params).forEach(([key, value]) => {
+        for (const [key, value] of Object.entries(params)) {
             if (value !== undefined && value !== null) {
                 searchParams.append(key, String(value));
             }
-        });
+        }
         const queryString = searchParams.toString();
         return queryString ? `${base}${base.includes('?') ? '&' : '?'}${queryString}` : base;
     }
@@ -922,7 +950,9 @@ export class HttpService {
             return this.getAnonymousAuthHeader();
         }
         try {
-            const decoded = jwtDecode(accessToken);
+            const decoded = decodeTokenClaims(accessToken);
+            if (!decoded)
+                throw new Error('opaque token');
             const currentTime = Math.floor(Date.now() / 1000);
             // If the token expires within the refresh lead window, refresh it.
             if (decoded.exp && decoded.exp - currentTime < TOKEN_REFRESH_LEAD_SECONDS) {
@@ -1068,26 +1098,22 @@ export class HttpService {
         if (!token) {
             return false;
         }
-        try {
-            const decoded = jwtDecode(token);
-            return typeof decoded.exp === 'number' && decoded.exp <= Math.floor(Date.now() / 1000);
-        }
-        catch {
-            return false;
-        }
+        const exp = decodeTokenClaims(token)?.exp;
+        return typeof exp === 'number' && exp <= Math.floor(Date.now() / 1000);
     }
     /**
-     * PROCESS-WIDE single-flight for the rotating device-secret mint
+     * PROCESS-WIDE single-flight for the device-secret mint
      * (`POST /session/device/token`).
      *
-     * The server rotates the presented `deviceSecret` on every successful mint, so
-     * two concurrent mints would double-rotate and the durable store could end up
-     * holding a superseded secret → a later cold-boot mint 401s → the user is
-     * signed out. Every mint lane (the re-mint handler behind `refreshAccessToken`,
-     * the device-first cold boot, the socket token transport, the tab-focus
-     * reconcile) funnels its `refreshDeviceSecretArm` call through here, so
-     * concurrent callers await the SAME in-flight mint and all receive its result —
-     * exactly one server rotation.
+     * The server does not rotate the presented `deviceSecret` (it echoes it back
+     * as `nextDeviceSecret`; each holder of a shared DeviceSession has its own
+     * stable credential), so this is no longer what keeps the store's secret
+     * valid. It still collapses concurrent callers onto one request and one
+     * persisted write. Every mint lane (the re-mint handler behind
+     * `refreshAccessToken`, the device-first cold boot, the socket token
+     * transport, the tab-focus reconcile) funnels its `refreshDeviceSecretArm`
+     * call through here, so concurrent callers await the SAME in-flight mint and
+     * all receive its result.
      *
      * Distinct from {@link tokenRefreshPromise} (which dedups the FULL re-mint
      * handler incl. the native shared-key arm + the failure cooldown): this inner
@@ -1184,7 +1210,9 @@ export class HttpService {
         // Authentication is owned by this SDK instance. A caller cannot replace
         // the bearer with a different session or leak one across linked apps.
         headers.set('Authorization', authHeader);
-        const edgeRegionHeader = await getBrowserEdgeRegionHeader();
+        // Never awaited: the PoP is a hint, and waiting on its trace fetch put up
+        // to a second in front of requests.
+        const edgeRegionHeader = peekBrowserEdgeRegionHeader();
         for (const [name, value] of Object.entries(edgeRegionHeader))
             headers.set(name, value);
         const activityIdHeader = getBrowserActivityIdHeader();
@@ -1360,13 +1388,7 @@ export class HttpService {
      * identity-scoped variant `<key> id=*`.
      */
     clearCacheEntry(key) {
-        this.cache.delete(key);
-        const identityVariantPrefix = `${key}${HttpService.CACHE_IDENTITY_DELIM}`;
-        for (const existing of this.cache.keys()) {
-            if (existing.startsWith(identityVariantPrefix)) {
-                this.cache.delete(existing);
-            }
-        }
+        this.invalidateCache({ keys: [key] });
     }
     /**
      * Delete every cache entry whose key starts with `prefix`.
@@ -1377,14 +1399,40 @@ export class HttpService {
      * deleted entries (for observability in tests).
      */
     clearCacheByPrefix(prefix) {
-        let removed = 0;
-        for (const key of this.cache.keys()) {
-            if (key.startsWith(prefix)) {
-                this.cache.delete(key);
-                removed++;
+        return this.invalidateCache({ prefixes: [prefix] });
+    }
+    /**
+     * Invalidate a set of LOGICAL keys (each with every identity-scoped variant,
+     * see `clearCacheEntry`) and key prefixes in ONE pass over the cache. A
+     * mutation touching many resources (a bulk follow) costs one scan, not one
+     * per resource.
+     * @returns Number of entries deleted
+     */
+    invalidateCache({ keys = [], prefixes = [] }) {
+        if (keys.length === 0 && prefixes.length === 0)
+            return 0;
+        const exact = new Set(keys);
+        const delim = HttpService.CACHE_IDENTITY_DELIM;
+        return this.cache.deleteWhere((stored) => {
+            const cut = stored.lastIndexOf(delim);
+            if (exact.has(cut === -1 ? stored : stored.slice(0, cut)))
+                return true;
+            for (const prefix of prefixes) {
+                if (stored.startsWith(prefix))
+                    return true;
             }
-        }
-        return removed;
+            return false;
+        });
+    }
+    /**
+     * Release this client: its response cache leaves the global cleanup sweep and
+     * is emptied, pending shared calls are forgotten, and the session ends.
+     */
+    dispose() {
+        unregisterCacheFromCleanup(this.cache);
+        this.cache.clear();
+        this.deduplicator.clear();
+        this.endSession();
     }
     getCacheStats() {
         const cacheStats = this.cache.getStats();

package/dist/esm/OxyServices.errors.js

@@ -1,3 +1,4 @@
+import { handleHttpError } from './utils/errorUtils.js';
 /**
  * Custom error types for better error handling
  */
@@ -112,3 +113,47 @@ export class OxyAuthenticationTimeoutError extends OxyAuthenticationError {
         this.name = 'OxyAuthenticationTimeoutError';
     }
 }
+/**
+ * The one error every `OxyServices` call rejects with.
+ *
+ * `status` is the HTTP status (0 when no response arrived: a network failure,
+ * a timeout or a cancellation), `code` the API's machine code when it sent one
+ * (else a transport code such as `TIMEOUT`, `NETWORK_ERROR`, `CANCELLED`), and
+ * `details` the API's structured detail. The original error is `cause`.
+ */
+export class OxyApiError extends Error {
+    constructor(message, init) {
+        super(message);
+        this.name = 'OxyApiError';
+        this.status = init.status;
+        this.code = init.code;
+        this.details = init.details;
+        this.response = init.response;
+        this.cancelled = init.cancelled ?? false;
+        this.timeout = init.timeout ?? false;
+        if (init.cause !== undefined) {
+            this.cause = init.cause;
+        }
+    }
+}
+/**
+ * Normalise anything a request rejected with into an `OxyApiError`. An error
+ * that already is one (or a typed SDK error such as `OxyAuthenticationError`)
+ * passes through unchanged.
+ */
+export function toOxyApiError(error) {
+    if (error instanceof OxyApiError || error instanceof OxyAuthenticationError) {
+        return error;
+    }
+    const api = handleHttpError(error);
+    const source = (error && typeof error === 'object' ? error : {});
+    return new OxyApiError(api.message?.trim() || 'An unexpected error occurred', {
+        status: api.status,
+        code: api.code,
+        details: api.details,
+        response: source.response,
+        cancelled: source.cancelled === true,
+        timeout: source.timeout === true,
+        cause: error,
+    });
+}