@oxyhq/core 12.5.4 → 12.7.0

package/dist/esm/HttpService.js

@@ -20,6 +20,7 @@ import { jwtDecode } from 'jwt-decode';
 import { isNative, getPlatformOS } from './utils/platform.js';
 import { isReactNative } from '@oxyhq/protocol';
 import { computeIdentityTag, fnv1a32 } from './utils/cacheKey.js';
+import { redactUrlQuery } from './utils/redactUrl.js';
 /**
  * Check if we're running in a native app environment (React Native, not web)
  * This is used to determine CSRF handling mode
@@ -260,7 +261,9 @@ export class HttpService {
             const cached = this.cache.get(cacheKey);
             if (cached !== null) {
                 this.requestMetrics.cacheHits++;
-                this.logger.debug('Cache hit:', url);
+                // Redact the query string: an asset stream URL passed here carries a
+                // scoped `mt=` media token that must never reach a log sink.
+                this.logger.debug('Cache hit:', redactUrlQuery(url));
                 return cached;
             }
             this.requestMetrics.cacheMisses++;

package/dist/esm/OxyServices.errors.js

@@ -9,6 +9,46 @@ export class OxyAuthenticationError extends Error {
         this.status = status;
     }
 }
+/**
+ * Thrown when an asset's authorized download URL cannot be resolved.
+ *
+ * `getFileDownloadUrlAsync` asks the API for a URL that is valid for the
+ * CALLER and the asset's actual visibility. When that resolution fails there is
+ * no honest fallback: the public CDN origin only serves `public` assets, so
+ * handing back `https://cloud.oxy.so/<id>` for an unresolved asset produces a
+ * hard 404 at render time and hides the real failure from the caller. This
+ * error surfaces the failure instead.
+ *
+ * The message and fields deliberately carry only the asset id, the requested
+ * variant and the HTTP status — never the resolved URL, which embeds a scoped
+ * media token.
+ *
+ * ## `status` lets a caller decide whether a CDN fallback is safe
+ *
+ * Core itself never falls back to the public CDN builder, because it has no
+ * knowledge of the asset's visibility and that URL is a guaranteed 404 for a
+ * private asset. A CALLER that knows an asset is public MAY choose to fall back
+ * to `getFileDownloadUrl(id, variant)` — but only for a TRANSIENT failure, not
+ * a definitive denial:
+ *   - `status` 401/403/404 → definitive: the asset is private/denied/missing.
+ *     Never CDN-fall-back — it will 404.
+ *   - `status` undefined (network error) or 5xx → transient: resolution itself
+ *     failed. If the caller independently knows the asset is public, a CDN
+ *     fallback is defensible best-effort.
+ */
+export class AssetUrlResolutionError extends Error {
+    constructor(fileId, variant, status, cause) {
+        const variantSuffix = variant ? ` (variant "${variant}")` : '';
+        const statusSuffix = typeof status === 'number' ? ` — status ${status}` : '';
+        super(`Could not resolve a download URL for asset "${fileId}"${variantSuffix}${statusSuffix}`);
+        this.code = 'ASSET_URL_UNRESOLVED';
+        this.name = 'AssetUrlResolutionError';
+        this.fileId = fileId;
+        this.variant = variant;
+        this.status = status;
+        this.cause = cause;
+    }
+}
 export class OxyAuthenticationTimeoutError extends OxyAuthenticationError {
     constructor(operationName, timeoutMs) {
         super(`Authentication timeout (${timeoutMs}ms): ${operationName} requires user authentication. Please ensure the user is logged in before calling this method.`, 'AUTH_TIMEOUT', 408);

package/dist/esm/OxyServices.js

@@ -1,4 +1,4 @@
-import { OxyAuthenticationError, OxyAuthenticationTimeoutError } from './OxyServices.errors.js';
+import { AssetUrlResolutionError, OxyAuthenticationError, OxyAuthenticationTimeoutError } from './OxyServices.errors.js';
 // Import mixin composition helper
 import { composeOxyServices } from './mixins/index.js';
 /**
@@ -50,7 +50,7 @@ export class OxyServices extends OxyServicesComposed {
     }
 }
 // Re-export error classes for convenience
-export { OxyAuthenticationError, OxyAuthenticationTimeoutError };
+export { AssetUrlResolutionError, OxyAuthenticationError, OxyAuthenticationTimeoutError };
 /**
  * Default Oxy Cloud URL — used when no `cloudURL` is provided to OxyServices.
  */

package/dist/esm/crypto/keyManager.js

@@ -9,6 +9,7 @@ const { ec: EC } = _cjs_elliptic;
 import { isWeb, isIOS, isAndroid } from '../utils/platform.js';
 import { isReactNative, isNodeJS, loadExpoCrypto, loadNodeCrypto, loadSecureStore, loadSharedIdentityBridge } from '@oxyhq/protocol';
 import { isDev, logger } from '../logger/index.js';
+import { hkdfSha256 } from './kdf.js';
 /**
  * Thrown when an identity-mutating operation (createIdentity / importKeyPair)
  * is invoked while a valid identity already exists on the device.
@@ -41,6 +42,25 @@ export class IdentityPersistError extends Error {
     }
 }
 const ec = new EC('secp256k1');
+/**
+ * HKDF salt that domain-separates every identity-scoped seed produced by
+ * {@link KeyManager.deriveScopedSeed}. Versioned so a future scheme change is a
+ * new, non-colliding tag. The per-app domain (e.g. Oxy Pay's FairCoin wallet)
+ * is carried by the caller's `info` string, not this salt.
+ */
+const SCOPED_SEED_KDF_SALT = 'oxy-identity-scoped-seed-v1';
+/** UTF-8 encode an ASCII label to bytes (HKDF salt/info). */
+function utf8ToBytes(label) {
+    return new TextEncoder().encode(label);
+}
+/** Decode a hex string to bytes. Inverse of {@link uint8ArrayToHex}. */
+function hexToBytes(hex) {
+    const out = new Uint8Array(hex.length / 2);
+    for (let i = 0; i < out.length; i++) {
+        out[i] = Number.parseInt(hex.slice(i * 2, i * 2 + 2), 16);
+    }
+    return out;
+}
 const STORAGE_KEYS = {
     PRIVATE_KEY: 'oxy_identity_private_key',
     PUBLIC_KEY: 'oxy_identity_public_key',
@@ -1385,6 +1405,36 @@ export class KeyManager {
             return false;
         }
     }
+    /**
+     * Derive a 32-byte, domain-separated seed from the on-device Oxy identity
+     * private key via HKDF-SHA256, WITHOUT ever exposing the raw private key.
+     *
+     * The domain separation is carried by `info` (e.g. `"oxypay/faircoin/v1"`),
+     * so distinct apps/purposes get independent seeds from the same identity.
+     * The output is HKDF keying material, never the private key itself — a
+     * consumer (e.g. Oxy Pay's FairCoin HD wallet) can feed it straight into
+     * `HDKey.fromMasterSeed` and never touches the identity key.
+     *
+     * Key source (native only): prefers the shared ecosystem identity written to
+     * `group.so.oxy.shared` (what a Relying Party like Oxy Pay reads), then falls
+     * back to this device's primary identity (Commons/Accounts). Both reproduce
+     * from the user's Oxy recovery phrase, so the derived seed is recoverable.
+     *
+     * @param info Context/domain-binding label (distinct labels → independent seeds).
+     * @returns 32 bytes of derived keying material, or `null` on web / when no
+     *          identity key is available on this device.
+     */
+    static async deriveScopedSeed(info) {
+        if (isWebPlatform()) {
+            return null;
+        }
+        const privateKey = (await KeyManager.getSharedPrivateKey()) ?? (await KeyManager.getPrivateKey());
+        if (!privateKey) {
+            return null;
+        }
+        const ikm = hexToBytes(KeyManager.canonicalPrivateKey(privateKey));
+        return hkdfSha256(ikm, utf8ToBytes(SCOPED_SEED_KDF_SALT), utf8ToBytes(info), 32);
+    }
     /**
      * Get a shortened version of the public key for display
      * Format: first 8 chars...last 8 chars

package/dist/esm/i18n/locales/en-US.json

@@ -1449,6 +1449,13 @@
             "emptyTitle": "No photos yet",
             "emptySubtitle": "Upload from your device to get started"
         },
+        "details": {
+            "title": "File Details",
+            "download": "Download",
+            "type": "Type",
+            "uploaded": "Uploaded",
+            "description": "Description"
+        },
         "a11y": {
             "viewAll": "Show all files",
             "viewPhotos": "Show photos only",

package/dist/esm/i18n/locales/es-ES.json

@@ -1449,6 +1449,13 @@
             "emptyTitle": "Aún no hay fotos",
             "emptySubtitle": "Sube desde tu dispositivo para empezar"
         },
+        "details": {
+            "title": "Detalles del archivo",
+            "download": "Descargar",
+            "type": "Tipo",
+            "uploaded": "Subido",
+            "description": "Descripción"
+        },
         "a11y": {
             "viewAll": "Mostrar todos los archivos",
             "viewPhotos": "Mostrar solo fotos",

package/dist/esm/i18n/locales/locales/en-US.json

@@ -1449,6 +1449,13 @@
       "emptyTitle": "No photos yet",
       "emptySubtitle": "Upload from your device to get started"
     },
+    "details": {
+      "title": "File Details",
+      "download": "Download",
+      "type": "Type",
+      "uploaded": "Uploaded",
+      "description": "Description"
+    },
     "a11y": {
       "viewAll": "Show all files",
       "viewPhotos": "Show photos only",

package/dist/esm/i18n/locales/locales/es-ES.json

@@ -1449,6 +1449,13 @@
       "emptyTitle": "Aún no hay fotos",
       "emptySubtitle": "Sube desde tu dispositivo para empezar"
     },
+    "details": {
+      "title": "Detalles del archivo",
+      "download": "Descargar",
+      "type": "Tipo",
+      "uploaded": "Subido",
+      "description": "Descripción"
+    },
     "a11y": {
       "viewAll": "Mostrar todos los archivos",
       "viewPhotos": "Mostrar solo fotos",

package/dist/esm/index.js

@@ -21,7 +21,7 @@ import './crypto/polyfill.js';
 // ---------------------------------------------------------------------------
 // API client
 // ---------------------------------------------------------------------------
-export { OxyServices, OxyAuthenticationError, OxyAuthenticationTimeoutError } from './OxyServices.js';
+export { OxyServices, AssetUrlResolutionError, OxyAuthenticationError, OxyAuthenticationTimeoutError } from './OxyServices.js';
 export { OXY_CLOUD_URL, oxyClient } from './OxyServices.js';
 // ---------------------------------------------------------------------------
 // Authentication

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

@@ -1,5 +1,6 @@
 import { isReactNative } from '@oxyhq/protocol';
 import { logger } from '../logger/index.js';
+import { AssetUrlResolutionError } from '../OxyServices.errors.js';
 import { extractErrorStatus } from '../utils/errorUtils.js';
 /**
  * Maximum number of ids sent per `POST /assets/service/by-ids` request. Matches
@@ -21,6 +22,37 @@ const SERVICE_ASSET_METADATA_BY_SHA_CHUNK_SIZE = 100;
  * never 400s an otherwise-valid chunk on the server.
  */
 const SHA256_HEX_PATTERN = /^[a-f0-9]{64}$/;
+/**
+ * Conservative lower bound (10 min) the SDK assumes for the lifetime of the
+ * scoped media token (`mt`) the API embeds in the stream URL it returns for a
+ * private asset. The SDK never mints or inspects that token; this constant
+ * exists only so the SDK's own URL cache can be sized safely BELOW the token's
+ * real lifetime.
+ *
+ * The API currently mints tokens for 900s (`MEDIA_TOKEN_TTL_SECONDS` in
+ * `packages/api/src/utils/mediaToken.ts`). Core deliberately assumes a shorter
+ * 10-min floor rather than copying 15: core and the API are separate packages,
+ * so core cannot observe a server-side TTL change at runtime. Under-assuming the
+ * lifetime only ever shortens the cache (more refetches, never a dead URL), so
+ * it stays correct even if the server lowers its TTL toward this floor. The
+ * {@link ASSET_URL_CACHE_LIFETIME_FRACTION} discount is applied on top.
+ */
+const ASSET_MEDIA_TOKEN_TTL_MS = 10 * 60 * 1000;
+/**
+ * Fraction of a resolved URL's remaining lifetime the SDK is willing to keep it
+ * cached for. A resolved URL stops working the moment its media token expires,
+ * so caching it for its full nominal lifetime guarantees a window in which the
+ * cache hands out an already-dead URL (clock skew, time spent in the render
+ * pipeline, an image request queued behind others). Half the lifetime leaves a
+ * margin at least as large as the entry's own age.
+ */
+const ASSET_URL_CACHE_LIFETIME_FRACTION = 0.5;
+/**
+ * Fallback URL lifetime, in seconds, assumed when the caller does not request
+ * an explicit `expiresIn`. Mirrors the API's default signed-URL expiry; the
+ * effective value is still clamped by {@link ASSET_MEDIA_TOKEN_TTL_MS}.
+ */
+const DEFAULT_ASSET_URL_EXPIRES_IN_SECONDS = 3600;
 export function OxyServicesAssetsMixin(Base) {
     return class extends Base {
         constructor(...args) {
@@ -38,14 +70,33 @@ export function OxyServicesAssetsMixin(Base) {
             }
         }
         /**
-         * Build a synchronous, `<img src>`-ready file URL from an Oxy asset id.
+         * Build a synchronous, `<img src>`-ready URL for a **PUBLIC** Oxy asset.
+         *
+         * ## Contract — read before calling
          *
-         * This method must never embed the caller's general access token in the
-         * returned URL. The URL is commonly rendered into DOM attributes, browser
-         * network panels, caches, and logs. Public asset URLs use the clean CDN
-         * origin; callers that need authorized/private access should use
-         * {@link getFileDownloadUrlAsync}, which asks the API for a scoped download
-         * URL instead of exposing the in-memory bearer token in a query string.
+         * This is a pure string builder. It performs no network call and therefore
+         * has **no knowledge of the asset's visibility**. It always produces the
+         * public form: `${cloudURL}/<id>[?variant=…]`, which the CDN serves from
+         * the public media origin only.
+         *
+         * Consequently:
+         *  - Call it ONLY when the asset is known to be `public` — e.g. avatars and
+         *    profile banners, which {@link uploadAvatar} / {@link uploadProfileBanner}
+         *    upload with `visibility: 'public'`.
+         *  - For an asset that may be `private` or `unlisted` — anything uploaded
+         *    through the generic {@link assetUpload} path, whose server-side default
+         *    is private — this URL resolves to a hard **404**. Use
+         *    {@link getFileDownloadUrlAsync}, which asks the API for a URL scoped to
+         *    the current caller.
+         *  - It must never guess visibility, and must never embed the caller's
+         *    bearer token: the returned string is rendered into DOM attributes,
+         *    browser network panels, HTTP caches, and logs.
+         *
+         * Passing `expiresIn` switches to the API-origin stream form
+         * (`${baseURL}/assets/<id>/stream?…`) WITHOUT any credential. That form
+         * still only serves what an unauthenticated request may see — it is not a
+         * synchronous private-asset path, and none exists: authorization for a
+         * private asset requires the round-trip in {@link getFileDownloadUrlAsync}.
          */
         getFileDownloadUrl(fileId, variant, expiresIn) {
             // Never embed the in-memory bearer token: this URL is rendered into DOM
@@ -66,16 +117,40 @@ export function OxyServicesAssetsMixin(Base) {
             return `${base}/assets/${encodeURIComponent(fileId)}/stream${qs ? `?${qs}` : ''}`;
         }
         /**
-         * Get file download URL asynchronously (returns signed URL directly from CDN)
+         * Resolve an asset id to a URL that is valid for the CURRENT caller,
+         * whatever the asset's visibility.
+         *
+         * Asks the API (`GET /assets/:id/url`) rather than guessing: a `public`
+         * asset resolves to the CDN form, while a `private`/`unlisted` asset the
+         * caller may read resolves to an API-origin stream URL carrying a scoped,
+         * short-lived media token. The returned URL is passed through **unchanged**
+         * — the SDK never rewrites, re-signs, or strips it.
+         *
+         * ## Failure behaviour — no CDN fallback
+         *
+         * Throws {@link AssetUrlResolutionError} when the API returns no URL or the
+         * request fails (including 401/403/404). It deliberately does NOT fall back
+         * to {@link getFileDownloadUrl}: that builder only produces the public CDN
+         * form, so falling back would hand the caller a URL that renders as a hard
+         * 404 for every private asset and would silently swallow the real failure.
+         * A caller that knows an asset is public should call the synchronous
+         * builder directly instead of relying on a fallback here.
+         *
+         * The resolved URL is cached per identity for well under the media token's
+         * lifetime — see {@link getAssetUrlCacheTTL}.
          */
         async getFileDownloadUrlAsync(fileId, variant, expiresIn) {
+            let url;
             try {
-                const url = await this.fetchAssetDownloadUrl(fileId, variant, this.getAssetUrlCacheTTL(expiresIn), expiresIn);
-                return url || this.getFileDownloadUrl(fileId, variant, expiresIn);
+                url = await this.fetchAssetDownloadUrl(fileId, variant, this.getAssetUrlCacheTTL(expiresIn), expiresIn);
             }
             catch (error) {
-                return this.getFileDownloadUrl(fileId, variant, expiresIn);
+                throw new AssetUrlResolutionError(fileId, variant, extractErrorStatus(error), error);
+            }
+            if (!url) {
+                throw new AssetUrlResolutionError(fileId, variant, undefined);
             }
+            return url;
         }
         /**
          * List user files
@@ -139,13 +214,36 @@ export function OxyServicesAssetsMixin(Base) {
             }
         }
         /**
-         * Get batch access to multiple files
+         * Resolve access + a caller-scoped URL for many assets — each with its OWN
+         * requested variant — in ONE round trip via `POST /assets/batch-access`.
+         *
+         * `requests` is a per-file `{ fileId, variant? }` list (a `variant` of
+         * `undefined` asks for the original). `options.expiresIn` sets the requested
+         * media-token / signed-URL lifetime (seconds); `options.context` is the
+         * server-side access-check context. Entries with a blank `fileId` are
+         * dropped and exact `(fileId, variant)` duplicates are collapsed before the
+         * request; an empty effective list performs no network call.
+         *
+         * The server caps the batch at 100 entries — callers that page beyond that
+         * must chunk. Returns the raw per-file envelope (see
+         * {@link BatchFileAccessResponse}); most callers want {@link getFileDownloadUrls},
+         * which flattens it to just the usable URLs.
          */
-        async getBatchFileAccess(fileIds, context) {
+        async getBatchFileAccess(requests, options) {
+            const files = dedupeFileAccessRequests(requests);
+            if (files.length === 0) {
+                return { results: {} };
+            }
+            const body = {
+                files,
+            };
+            if (typeof options?.expiresIn === 'number')
+                body.expiresIn = options.expiresIn;
+            if (typeof options?.context === 'string')
+                body.context = options.context;
             try {
-                return await this.makeRequest('POST', '/assets/batch-access', {
-                    fileIds,
-                    context
+                return await this.makeRequest('POST', '/assets/batch-access', body, {
+                    cache: false,
                 });
             }
             catch (error) {
@@ -153,13 +251,27 @@ export function OxyServicesAssetsMixin(Base) {
             }
         }
         /**
-         * Get download URLs for multiple files efficiently
+         * Resolve many assets — each with its OWN variant — to caller-scoped,
+         * `<img src>`-ready URLs in one round trip. The batch counterpart of
+         * {@link getFileDownloadUrlAsync}, built to resolve a whole grid page at once.
+         *
+         * `requests` is a per-file `{ fileId, variant? }` list (e.g. `poster` for a
+         * video, `thumb` for an image); the per-file variant RULE lives in the
+         * caller — core just forwards what it is given. `options.expiresIn` /
+         * `options.context` are passed through to the endpoint.
+         *
+         * Each returned URL is the API's own scoped form, passed through unchanged:
+         * the public CDN URL for a public asset, or an API-origin
+         * `/assets/:id/stream?…&mt=<media token>` URL for a private asset the caller
+         * may read. Ids the caller cannot access (or that do not exist) are simply
+         * OMITTED from the returned map — there is NO public-CDN fallback, so a grid
+         * never renders a known-404 URL. Callers detect a miss by the absent key
+         * (the map never contains an empty-string value). Keyed by `fileId`.
          */
-        async getFileDownloadUrls(fileIds, context) {
-            const response = await this.getBatchFileAccess(fileIds, context);
+        async getFileDownloadUrls(requests, options) {
+            const response = await this.getBatchFileAccess(requests, options);
             const urls = {};
-            const results = response.results || {};
-            for (const [id, result] of Object.entries(results)) {
+            for (const [id, result] of Object.entries(response.results ?? {})) {
                 if (result.allowed && result.url) {
                     urls[id] = result.url;
                 }
@@ -458,7 +570,7 @@ export function OxyServicesAssetsMixin(Base) {
                     params.expiresIn = expiresIn;
                 return await this.makeRequest('GET', `/assets/${fileId}/url`, params, {
                     cache: true,
-                    cacheTTL: 10 * 60 * 1000,
+                    cacheTTL: this.getAssetUrlCacheTTL(expiresIn),
                 });
             }
             catch (error) {
@@ -546,9 +658,21 @@ export function OxyServicesAssetsMixin(Base) {
                 throw this.handleError(error);
             }
         }
+        /**
+         * How long a resolved asset URL may stay in the SDK's GET cache, in ms.
+         *
+         * A resolved private-asset URL dies the instant its scoped media token
+         * expires (~{@link ASSET_MEDIA_TOKEN_TTL_MS}). Caching it for its full
+         * nominal lifetime would leave a window where the cache serves an
+         * already-dead URL (clock skew, render-pipeline latency, an image request
+         * queued behind others). So the TTL is (a) never longer than the token's
+         * lifetime and (b) discounted to {@link ASSET_URL_CACHE_LIFETIME_FRACTION}
+         * of that bound — comfortably below the token TTL by construction.
+         */
         getAssetUrlCacheTTL(expiresIn) {
-            const desiredTtlMs = (expiresIn ?? 3600) * 1000;
-            return Math.min(desiredTtlMs, 10 * 60 * 1000);
+            const requestedLifetimeMs = (expiresIn ?? DEFAULT_ASSET_URL_EXPIRES_IN_SECONDS) * 1000;
+            const boundedLifetimeMs = Math.min(requestedLifetimeMs, ASSET_MEDIA_TOKEN_TTL_MS);
+            return Math.floor(boundedLifetimeMs * ASSET_URL_CACHE_LIFETIME_FRACTION);
         }
         async fetchAssetDownloadUrl(fileId, variant, cacheTTL, expiresIn) {
             const params = {};
@@ -558,7 +682,10 @@ export function OxyServicesAssetsMixin(Base) {
                 params.expiresIn = expiresIn;
             const urlRes = await this.makeRequest('GET', `/assets/${encodeURIComponent(fileId)}/url`, Object.keys(params).length ? params : undefined, {
                 cache: true,
-                cacheTTL: cacheTTL ?? 10 * 60 * 1000,
+                // Cap the cached URL well below the media token's lifetime. The
+                // response body is a scoped, expiring URL; over-caching it serves a
+                // dead URL after the token expires (see getAssetUrlCacheTTL).
+                cacheTTL: cacheTTL ?? this.getAssetUrlCacheTTL(expiresIn),
             });
             return urlRes?.url || null;
         }
@@ -573,6 +700,29 @@ export function OxyServicesAssetsMixin(Base) {
         }
     };
 }
+/**
+ * Normalize the per-file batch-access request list: drop entries with a blank
+ * `fileId` and collapse exact `(fileId, variant)` duplicates (first occurrence
+ * wins, preserving order). Two entries for the SAME `fileId` with DIFFERENT
+ * variants are intentionally kept — but note the response is keyed by `fileId`,
+ * so a caller that needs two variants of one file must issue separate calls.
+ */
+function dedupeFileAccessRequests(requests) {
+    const seen = new Set();
+    const out = [];
+    for (const req of requests) {
+        if (typeof req?.fileId !== 'string' || req.fileId.trim().length === 0) {
+            continue;
+        }
+        const key = `${req.fileId}\u0000${req.variant ?? ''}`;
+        if (seen.has(key)) {
+            continue;
+        }
+        seen.add(key);
+        out.push(req.variant === undefined ? { fileId: req.fileId } : { fileId: req.fileId, variant: req.variant });
+    }
+    return out;
+}
 /**
  * Only send ambient credentials (cookies) when the asset URL is same-origin with
  * the configured API base. Caller-supplied cross-origin asset URLs must not leak