@oxyhq/core 12.7.0 → 12.9.0

package/dist/esm/index.js

@@ -62,7 +62,8 @@ export { mergeSessions, normalizeAndSortSessions, sessionsArraysEqual, } from '.
 // ---------------------------------------------------------------------------
 // Crypto / identity
 // ---------------------------------------------------------------------------
-export { KeyManager, IdentityAlreadyExistsError, IdentityPersistError, } from './crypto/keyManager.js';
+export { KeyManager, IdentityAlreadyExistsError, IdentityPersistError, IdentityUnavailableError, } from './crypto/keyManager.js';
+export { readIdentityMarker, updateIdentityMarker, } from './crypto/identityMarker.js';
 export { SignatureService } from './crypto/signatureService.js';
 export { RecoveryPhraseService } from './crypto/recoveryPhrase.js';
 // Low-level crypto primitives (b3 Phase 0 — encrypted backup + device transfer)

package/dist/esm/mixins/OxyServices.auth.js

@@ -293,12 +293,16 @@ export function OxyServicesAuthMixin(Base) {
          * The client must sign this challenge with their private key
          *
          * @param publicKey - The user's public key
+         * @param requestOptions - Optional per-call transport overrides (`retry`,
+         *   `timeout`). Interactive callers omit it (defaults keep retries); the
+         *   cold-boot `shared-key-signin` step passes `{ retry: false }` so a slow
+         *   network cannot multiply boot latency via the inner retry loop.
          */
-        async requestChallenge(publicKey) {
+        async requestChallenge(publicKey, requestOptions) {
             try {
                 return await this.makeRequest('POST', '/auth/challenge', {
                     publicKey,
-                }, { cache: false });
+                }, { cache: false, ...requestOptions });
             }
             catch (error) {
                 throw this.handleError(error);
@@ -313,8 +317,12 @@ export function OxyServicesAuthMixin(Base) {
          * @param timestamp - Timestamp when the signature was created
          * @param deviceName - Optional device name
          * @param deviceFingerprint - Optional device fingerprint
+         * @param requestOptions - Optional per-call transport overrides (`retry`,
+         *   `timeout`). Interactive callers omit it (defaults keep retries); the
+         *   cold-boot `shared-key-signin` step passes `{ retry: false }` so a slow
+         *   network cannot multiply boot latency via the inner retry loop.
          */
-        async verifyChallenge(publicKey, challenge, signature, timestamp, deviceName, deviceFingerprint) {
+        async verifyChallenge(publicKey, challenge, signature, timestamp, deviceName, deviceFingerprint, requestOptions) {
             try {
                 const res = await this.makeRequest('POST', '/auth/verify', {
                     publicKey,
@@ -323,7 +331,7 @@ export function OxyServicesAuthMixin(Base) {
                     timestamp,
                     deviceName,
                     deviceFingerprint,
-                }, { cache: false });
+                }, { cache: false, ...requestOptions });
                 // Plant the freshly-minted tokens, mirroring `claimSessionByToken`.
                 // `/auth/verify` returns the first access token (and refresh token) in
                 // its body, so installing it here means callers get an authenticated
@@ -461,6 +469,13 @@ export function OxyServicesAuthMixin(Base) {
          *
          * The cold-boot wiring that CALLS this lives in `OxyContext`
          * (`@oxyhq/services`); this method just performs the exchange.
+         *
+         * @param opts.requestOptions - Optional per-call transport overrides
+         *   (`retry`, `timeout`) forwarded to BOTH the `requestChallenge` and
+         *   `verifyChallenge` round-trips. Interactive flows omit it (defaults keep
+         *   retries); the cold-boot `shared-key-signin` step passes `{ retry: false }`
+         *   so this network step cannot multiply boot latency via the inner retry
+         *   loop. The token-refresh scheduler / 401 lane still retry later.
          */
         async signInWithSharedIdentity(opts = {}) {
             try {
@@ -474,10 +489,10 @@ export function OxyServicesAuthMixin(Base) {
                 if (!sharedPublicKey) {
                     return null;
                 }
-                const { challenge } = await this.requestChallenge(sharedPublicKey);
+                const { challenge } = await this.requestChallenge(sharedPublicKey, opts.requestOptions);
                 const signed = await SignatureService.signChallengeWithSharedKey(challenge);
                 // `signed.challenge` carries the SIGNATURE (mirrors `signChallenge`).
-                return await this.verifyChallenge(signed.publicKey, challenge, signed.challenge, signed.timestamp, opts.deviceName, opts.deviceFingerprint);
+                return await this.verifyChallenge(signed.publicKey, challenge, signed.challenge, signed.timestamp, opts.deviceName, opts.deviceFingerprint, opts.requestOptions);
             }
             catch (error) {
                 throw this.handleError(error);

package/dist/esm/mixins/OxyServices.deviceBoot.js

@@ -29,11 +29,19 @@ export function OxyServicesDeviceBootMixin(Base) {
          * `no_active_session`) to decide whether to drop the secret and fall back or
          * resolve signed-out.
          *
+         * `retry: false`: the mint is a single logical attempt. The proactive
+         * token-refresh scheduler and the reactive 401 lane already own backoff and
+         * re-arm, so `HttpService`'s inner retry loop here would only multiply the
+         * mint's latency on a slow/black-hole network (3 retries × 5s timeout ≈ 20s
+         * per lane) with no correctness benefit — it is the dominant term in the cold
+         * boot's worst-case time-to-route. A transient failure surfaces once and the
+         * scheduler/401 path retries it later.
+         *
          * @throws if the response does not match {@link deviceTokenMintResponseSchema}.
          */
         async mintFromDeviceSecret(deviceId, deviceSecret) {
             try {
-                const res = await this.makeRequest('POST', '/session/device/token', { deviceId, deviceSecret }, { cache: false, skipAuth: true });
+                const res = await this.makeRequest('POST', '/session/device/token', { deviceId, deviceSecret }, { cache: false, skipAuth: true, retry: false });
                 const parsed = safeParseContract(deviceTokenMintResponseSchema, res);
                 if (!parsed) {
                     throw new Error('session/device/token returned an unexpected response shape');

package/dist/esm/mixins/OxyServices.utility.js

@@ -8,6 +8,7 @@ import { jwtDecode } from 'jwt-decode';
 import { loadNodeCrypto } from '@oxyhq/protocol';
 import { buildUrl } from '../utils/apiUtils.js';
 import { logger } from '../logger/index.js';
+import { OXY_SERVICE_ENVIRONMENTS } from '../utils/oxyServiceEnvironment.js';
 /**
  * Expected JWT audience for tokens issued by the Oxy auth service.
  */
@@ -39,6 +40,10 @@ class ServiceTokenClaimError extends Error {
         this.name = 'ServiceTokenClaimError';
     }
 }
+function isOxyServiceEnvironment(value) {
+    return (typeof value === 'string' &&
+        OXY_SERVICE_ENVIRONMENTS.includes(value));
+}
 export function OxyServicesUtilityMixin(Base) {
     return class extends Base {
         // TypeScript's mixin pattern requires `(...args: any[])` here — the
@@ -335,7 +340,11 @@ export function OxyServicesUtilityMixin(Base) {
                         // Validate required service token fields
                         const appId = decoded.appId;
                         const credentialId = decoded.credentialId;
-                        if (!appId || typeof credentialId !== 'string' || credentialId.length === 0) {
+                        const environment = decoded.environment;
+                        if (!appId ||
+                            typeof credentialId !== 'string' ||
+                            credentialId.length === 0 ||
+                            !isOxyServiceEnvironment(environment)) {
                             if (optional) {
                                 req.userId = null;
                                 req.user = null;
@@ -388,6 +397,7 @@ export function OxyServicesUtilityMixin(Base) {
                             appName: decoded.appName || 'unknown',
                             credentialId,
                             scopes: Array.isArray(decoded.scopes) ? decoded.scopes : [],
+                            environment,
                         };
                         if (debug) {
                             logger.debug(`[oxy.auth] Service token OK app=${decoded.appName} delegateUser=${oxyUserId || '(none)'}`, {

package/dist/esm/server/auth.js

@@ -1,3 +1,5 @@
+import { OXY_SERVICE_ENVIRONMENTS } from '../utils/oxyServiceEnvironment.js';
+export { OXY_SERVICE_ENVIRONMENTS };
 function normalizeId(value) {
     const normalized = value?.trim();
     return normalized && normalized.length > 0 ? normalized : null;

package/dist/esm/server/index.js

@@ -14,7 +14,7 @@
  * app.use(createOxyRateLimit(oxy, { store: redisStore }));
  * ```
  */
-export { createOptionalOxyAuth, createOxyAuthMiddleware, getOxyUserId, getRequiredOxyUserId, isOxyAuthenticated, requireOxyAuth, } from './auth.js';
+export { createOptionalOxyAuth, createOxyAuthMiddleware, getOxyUserId, getRequiredOxyUserId, isOxyAuthenticated, requireOxyAuth, OXY_SERVICE_ENVIRONMENTS, } from './auth.js';
 export { createOxyRateLimit } from './rateLimit.js';
 // SSRF-safe upstream fetch + URL validation (Node-only).
 export { assertSafePublicUrl, isBlockedIp, safeFetch, SsrfRejection, UpstreamError, ALLOWED_PORTS, ALLOWED_PROTOCOLS, BLOCKED_HOSTNAMES, DEFAULT_USER_AGENT, MAX_REDIRECTS, MAX_URL_LENGTH, UPSTREAM_HEADERS_TIMEOUT_MS, } from './safeFetch.js';

package/dist/esm/utils/oxyServiceEnvironment.js

@@ -0,0 +1,16 @@
+/**
+ * Environment segregation for Oxy service-token JWTs (test/live isolation).
+ * Mirrors `ApplicationCredentialEnvironment` on the API's `ApplicationCredential`
+ * model (`packages/api/src/models/ApplicationCredential.ts`) as an INDEPENDENT
+ * literal union — `@oxyhq/core` has zero dependency on `@oxyhq/api`, so this is
+ * kept in sync by hand, not by import.
+ *
+ * Defined here (not in `server/auth.ts` or `mixins/OxyServices.utility.ts`
+ * directly) because BOTH of those files need it and neither may import from
+ * the other: `server/` types import `express` (Node-only, a peer dependency
+ * `mixins/` deliberately avoids so it stays safe to bundle into RN/browser
+ * consumers — see the "Local request/response/socket typing" comment in
+ * `OxyServices.utility.ts`). This file has zero imports, so both sides can
+ * depend on it without crossing that boundary.
+ */
+export const OXY_SERVICE_ENVIRONMENTS = ['development', 'staging', 'production'];