@oxyhq/core 1.11.12 → 1.11.14

package/dist/esm/mixins/index.js

@@ -24,6 +24,7 @@ import { OxyServicesUtilityMixin } from './OxyServices.utility.js';
 import { OxyServicesFeaturesMixin } from './OxyServices.features.js';
 import { OxyServicesTopicsMixin } from './OxyServices.topics.js';
 import { OxyServicesManagedAccountsMixin } from './OxyServices.managedAccounts.js';
+import { OxyServicesContactsMixin } from './OxyServices.contacts.js';
 /**
  * Mixin pipeline - applied in order from first to last.
  *
@@ -62,6 +63,7 @@ const MIXIN_PIPELINE = [
     OxyServicesFeaturesMixin,
     OxyServicesTopicsMixin,
     OxyServicesManagedAccountsMixin,
+    OxyServicesContactsMixin,
     // Utility (last, can use all above)
     OxyServicesUtilityMixin,
 ];
@@ -69,12 +71,18 @@ const MIXIN_PIPELINE = [
  * Composes all OxyServices mixins using a pipeline pattern.
  *
  * This is equivalent to the nested calls but more readable and maintainable.
- * Adding a new mixin: just add it to MIXIN_PIPELINE at the appropriate position.
+ * Adding a new mixin: add it to MIXIN_PIPELINE at the appropriate position
+ * AND extend `AllMixinInstances` so its methods are visible to consumers.
  *
- * @returns The fully composed OxyServices class with all mixins applied
+ * The cast through `unknown` carries the runtime augmentation chain into the
+ * static type system. `Array.reduce` cannot track each mixin's generic
+ * refinement, so we assert the final shape exposed by all mixins together.
+ *
+ * @returns The fully composed OxyServices constructor with all mixins applied
  */
 export function composeOxyServices() {
-    return MIXIN_PIPELINE.reduce((Base, mixin) => mixin(Base), OxyServicesBase);
+    const composed = MIXIN_PIPELINE.reduce((Base, mixin) => mixin(Base), OxyServicesBase);
+    return composed;
 }
 // Export the pipeline for testing/debugging
 export { MIXIN_PIPELINE };

package/dist/esm/utils/accountUtils.js

@@ -2,6 +2,72 @@
  * Shared account types and pure helper functions.
  * Used by both @oxyhq/services (React Native) and @oxyhq/auth (Web) account stores.
  */
+import { translate } from '../i18n/index.js';
+/**
+ * Truncate a long public key for display, e.g. `0x12345678…`.
+ * Falls back to the raw key if it's too short to truncate.
+ */
+export const formatPublicKeyHandle = (publicKey) => {
+    const cleaned = publicKey.startsWith('0x') ? publicKey.slice(2) : publicKey;
+    if (cleaned.length <= 8)
+        return `0x${cleaned}`;
+    return `0x${cleaned.slice(0, 8)}…`;
+};
+/**
+ * Resolve a friendly display name for a user.
+ *
+ * Order of preference:
+ *  1. `name.full`, or composed `name.first name.last`
+ *  2. `name` (when stored as a plain string)
+ *  3. `username`
+ *  4. `Account 0x12345678…` (derived from publicKey, when present)
+ *  5. Translated fallback (e.g. "Unnamed")
+ *
+ * The translation key `common.unnamed` is used for the final fallback. If the
+ * caller does not pass a locale, the default English translation is used.
+ */
+export const getAccountDisplayName = (user, locale) => {
+    if (!user)
+        return translate(locale, 'common.unnamed');
+    const { name, username, publicKey } = user;
+    if (name && typeof name === 'object') {
+        if (typeof name.full === 'string' && name.full.trim())
+            return name.full.trim();
+        const first = typeof name.first === 'string' ? name.first.trim() : '';
+        const last = typeof name.last === 'string' ? name.last.trim() : '';
+        const composed = [first, last].filter(Boolean).join(' ').trim();
+        if (composed)
+            return composed;
+    }
+    else if (typeof name === 'string' && name.trim()) {
+        return name.trim();
+    }
+    if (typeof username === 'string' && username.trim())
+        return username.trim();
+    if (typeof publicKey === 'string' && publicKey.length > 0) {
+        return translate(locale, 'common.accountFallback', {
+            handle: formatPublicKeyHandle(publicKey),
+        });
+    }
+    return translate(locale, 'common.unnamed');
+};
+/**
+ * Resolve a `@handle` style identifier for a user.
+ *
+ * Returns the bare username when present (without the `@`), otherwise a
+ * truncated public-key handle (`0x12345678…`), or `undefined` when neither is
+ * available — callers can decide whether to hide the line entirely.
+ */
+export const getAccountFallbackHandle = (user) => {
+    if (!user)
+        return undefined;
+    if (typeof user.username === 'string' && user.username.trim())
+        return user.username.trim();
+    if (typeof user.publicKey === 'string' && user.publicKey.length > 0) {
+        return formatPublicKeyHandle(user.publicKey);
+    }
+    return undefined;
+};
 /**
  * Build an ordered array of QuickAccounts from a map and order list.
  */
@@ -23,7 +89,7 @@ export const buildAccountsArray = (accounts, order) => {
  * @param getFileDownloadUrl - Function to generate avatar download URL from file ID
  */
 export const createQuickAccount = (sessionId, userData, existingAccount, getFileDownloadUrl) => {
-    const displayName = userData.name?.full || userData.name?.first || userData.username || 'Account';
+    const displayName = getAccountDisplayName(userData);
     const userId = userData.id || (typeof userData._id === 'string' ? userData._id : userData._id?.toString());
     // Preserve existing avatarUrl if avatar hasn't changed (prevents image reload)
     let avatarUrl;

package/dist/esm/utils/deviceManager.js

@@ -1,3 +1,4 @@
+import { loadAsyncStorage } from './platformCrypto.js';
 /**
  * Client-side device management utility
  * Handles persistent device identification across app sessions
@@ -15,9 +16,10 @@ export class DeviceManager {
     static async getStorage() {
         if (this.isReactNative()) {
             try {
-                // Variable indirection prevents bundlers (Vite, webpack) from statically resolving this
-                const moduleName = '@react-native-async-storage/async-storage';
-                const asyncStorageModule = await import(/* @vite-ignore */ moduleName);
+                // `loadAsyncStorage` is per-platform: the RN variant statically imports
+                // @react-native-async-storage/async-storage, the default variant throws
+                // (never called outside RN because of the `isReactNative()` gate above).
+                const asyncStorageModule = await loadAsyncStorage();
                 const storage = asyncStorageModule.default;
                 return {
                     getItem: storage.getItem.bind(storage),

package/dist/esm/utils/languageUtils.js

@@ -156,3 +156,24 @@ export function normalizeLanguageCode(lang) {
     };
     return map[lang] || lang;
 }
+/**
+ * RTL language detection.
+ *
+ * Returns `true` when the given BCP-47 tag or bare language code is one
+ * of the right-to-left scripts we ship UI for. Apps use this to drive
+ * `I18nManager.allowRTL(true)` / `forceRTL(...)` on React Native and the
+ * `<html dir="rtl">` attribute on web.
+ *
+ * Includes Arabic (`ar`), Hebrew (`he` / legacy `iw`), Persian (`fa`),
+ * Urdu (`ur`) plus their common region variants. Unknown tags are
+ * treated as LTR.
+ */
+const RTL_LANGUAGE_BASES = new Set(['ar', 'he', 'iw', 'fa', 'ur']);
+export function isRTLLocale(locale) {
+    if (!locale)
+        return false;
+    const base = locale.toLowerCase().split('-')[0];
+    if (!base)
+        return false;
+    return RTL_LANGUAGE_BASES.has(base);
+}

package/dist/esm/utils/platformCrypto.js

@@ -0,0 +1,125 @@
+/**
+ * Platform Crypto / Storage — Default Variant (Node.js, Browser, generic bundlers)
+ *
+ * Provides lazy access to platform-specific crypto and storage modules.
+ *
+ * # Variants
+ *
+ * This module ships in two physical variants on disk, selected per consumer
+ * by the bundler / runtime:
+ *
+ * - `platformCrypto.js`           — this file. Used by Node.js, Vite, webpack,
+ *                                   Rollup, esbuild, and anything that does
+ *                                   not match Metro's `*.native.js`
+ *                                   source-extension preference.
+ * - `platformCrypto.native.js`    — sibling file. Picked up automatically by
+ *                                   Metro's resolver (which prefers
+ *                                   `*.<platform>.js` and `*.native.js` over
+ *                                   plain `*.js` when `preferNativePlatform`
+ *                                   is true — Expo sets this for all non-web
+ *                                   builds).
+ *
+ * The `package.json#exports` map also declares a `"react-native"` condition
+ * pointing at the same `dist/esm/index.js` entry — that entry transitively
+ * imports `./platformCrypto`, and Metro's per-file source-extension lookup
+ * substitutes the `.native.js` sibling automatically inside `dist/`. This
+ * means consumers never have to add resolver shims; Metro Just Works.
+ *
+ * Both variants expose the EXACT same public API; importers don't need to know
+ * which one they got. The variant difference is purely about which underlying
+ * native modules each one references:
+ *
+ *   ┌──────────────────┬───────────────────────┬───────────────────────────────┐
+ *   │ Function         │ Default variant       │ React Native variant          │
+ *   ├──────────────────┼───────────────────────┼───────────────────────────────┤
+ *   │ loadNodeCrypto   │ `await import('crypto')` (Node built-in)              │
+ *   │                  │                       │ throws — Node crypto is not   │
+ *   │                  │                       │ available on Hermes/RN        │
+ *   ├──────────────────┼───────────────────────┼───────────────────────────────┤
+ *   │ loadExpoCrypto   │ throws — expo-crypto  │ static `import 'expo-crypto'` │
+ *   │                  │ is not part of a      │                               │
+ *   │                  │ Node/Vite bundle      │                               │
+ *   ├──────────────────┼───────────────────────┼───────────────────────────────┤
+ *   │ loadSecureStore  │ throws (web/Node have │ static `import 'expo-secure-` │
+ *   │                  │ their own storage)    │ store'                        │
+ *   ├──────────────────┼───────────────────────┼───────────────────────────────┤
+ *   │ loadAsyncStorage │ throws (web/Node have │ static `import '@react-       │
+ *   │                  │ their own storage)    │ native-async-storage/...'     │
+ *   ├──────────────────┼───────────────────────┼───────────────────────────────┤
+ *   │ getRandomBytesRN │ throws (RN-only)      │ direct call into expo-crypto  │
+ *   └──────────────────┴───────────────────────┴───────────────────────────────┘
+ *
+ * Crucially, the default variant references ONLY Node's `'crypto'`. It never
+ * mentions `expo-*` or `@react-native-async-storage/*` — so Vite, webpack,
+ * esbuild, Rollup, and Node itself can bundle / require it without ever
+ * attempting to resolve those RN-only packages.
+ *
+ * The React Native variant references ONLY the RN packages. It never
+ * mentions `'crypto'` — so Metro and Hermes have nothing to choke on.
+ *
+ * # Why not a single file with dynamic import?
+ *
+ * A previous iteration used a "bundler-opaque" `new Function('s', 'return
+ * import(s)')` trick so a single file could service every platform. It
+ * bundled cleanly on Metro but Hermes refused to PARSE the resulting
+ * `import()` expression inside a Function-constructor body
+ * (`SyntaxError: Invalid expression encountered` at the `(` of `import(`).
+ * The platform-extension split is the only approach that lets each runtime
+ * see a file containing only specifiers it can understand — no tricks, no
+ * runtime parsing risks.
+ */
+import { isReactNative } from './platform.js';
+// ---------------------------------------------------------------------------
+// Node `crypto` — Node built-in
+//
+// `await import('crypto')` here is a real, static-from-tsc's-perspective
+// dynamic import. Node ESM, Vite, webpack, and esbuild all resolve it fine.
+// Metro never sees this file because the `.react-native.js` sibling shadows
+// it, so Metro never tries to resolve `'crypto'`.
+// ---------------------------------------------------------------------------
+let cachedNodeCrypto = null;
+export async function loadNodeCrypto() {
+    if (cachedNodeCrypto) {
+        return cachedNodeCrypto;
+    }
+    cachedNodeCrypto = await import('node:crypto');
+    return cachedNodeCrypto;
+}
+// ---------------------------------------------------------------------------
+// RN-only modules — never called from this variant.
+//
+// These throw a clear error if anything ever reaches them outside RN. In
+// practice every caller gates with `isReactNative()` before calling, so
+// these are belt-and-braces.
+// ---------------------------------------------------------------------------
+function notReactNativeError(module) {
+    return new Error(`[oxy.platformCrypto] Tried to load '${module}' outside React Native. This module is only available in a React Native runtime; bundling routed this consumer to the default (Node/web) variant. This indicates a missing platform gate (\`isReactNative()\`) in the calling code.`);
+}
+export async function loadExpoCrypto() {
+    if (isReactNative()) {
+        // Should be unreachable: when running on RN, Metro / the `react-native`
+        // exports condition serves the sibling variant. If we got here, the
+        // package-exports map is misconfigured for this host. Throw with a
+        // helpful diagnostic rather than fall back to a broken dynamic import.
+        throw new Error('[oxy.platformCrypto] React Native runtime resolved the default ' +
+            '(non-RN) variant of @oxyhq/core/utils/platformCrypto. Check the ' +
+            "consumer's bundler resolution — Metro should pick the sibling " +
+            '.react-native.js file via package exports.');
+    }
+    throw notReactNativeError('expo-crypto');
+}
+export async function loadSecureStore() {
+    throw notReactNativeError('expo-secure-store');
+}
+export async function loadAsyncStorage() {
+    throw notReactNativeError('@react-native-async-storage/async-storage');
+}
+/**
+ * Synchronous random-bytes via `expo-crypto.getRandomBytes`. Only available
+ * in the React Native variant. The default variant throws because Node and
+ * browsers have their own native CSPRNGs (`crypto.randomBytes` and
+ * `crypto.getRandomValues` respectively) — callers should use those.
+ */
+export function getRandomBytesRN(_byteCount) {
+    throw notReactNativeError('expo-crypto.getRandomBytes (sync)');
+}

package/dist/esm/utils/platformCrypto.native.js

@@ -0,0 +1,80 @@
+/**
+ * Platform Crypto / Storage — React Native Variant
+ *
+ * Companion to `./platformCrypto.ts`. See the doc-comment at the top of that
+ * file for the full design.
+ *
+ * Metro auto-selects this file in any non-web build (`preferNativePlatform`
+ * is `true` for iOS / Android, so `*.native.js` shadows `*.js` during
+ * source-extension resolution inside `node_modules/@oxyhq/core/dist/`). On
+ * iOS / Android `<base>.ios.js` / `<base>.android.js` would shadow this file
+ * if they existed, but they don't — `.native.js` is the shared RN variant.
+ *
+ *   - The default variant references Node's `'crypto'` and would crash Metro
+ *     if bundled into an RN app.
+ *   - This variant references the RN-only modules (`expo-crypto`,
+ *     `expo-secure-store`, `@react-native-async-storage/async-storage`)
+ *     as static imports, so Metro and Hermes both resolve and parse them
+ *     cleanly.
+ *
+ * Both variants expose the same surface; importers don't care which one
+ * they got.
+ *
+ * # Why static imports?
+ *
+ * Every RN consumer of `@oxyhq/core` already lists or transitively pulls
+ * in `expo-crypto`, `expo-secure-store`, and
+ * `@react-native-async-storage/async-storage` (they're stable Expo modules
+ * present in `services`, `accounts`, `inbox`, and `test-app`). A static
+ * import is what Metro wants to see anyway, and Hermes parses it like any
+ * other ES module — no `Function`-constructor parser exotic-mode involved.
+ *
+ * This is also clearer to debug: Metro fails up-front with a normal
+ * unresolved-module error if a consumer is missing a peer dep, instead of
+ * a confusing runtime throw the first time a code path that needs the
+ * module is exercised.
+ */
+import * as ExpoCrypto from 'expo-crypto';
+import * as SecureStore from 'expo-secure-store';
+import AsyncStorage from '@react-native-async-storage/async-storage';
+// ---------------------------------------------------------------------------
+// Node `crypto` — never available in RN.
+// ---------------------------------------------------------------------------
+export async function loadNodeCrypto() {
+    // Unreachable in practice: every caller gates with `isNodeJS()` before
+    // invoking this. If it somehow does fire, throw immediately with a clear
+    // diagnostic rather than letting Metro / Hermes attempt to find a
+    // non-existent module at runtime.
+    throw new Error("[oxy.platformCrypto] Node's built-in 'crypto' module is not available " +
+        'in a React Native runtime. Use the RN-specific helpers ' +
+        '(loadExpoCrypto, getRandomBytesRN) or the Web Crypto API (`globalThis.crypto`).');
+}
+// ---------------------------------------------------------------------------
+// expo-crypto — RN cryptographic primitives.
+// ---------------------------------------------------------------------------
+export async function loadExpoCrypto() {
+    return ExpoCrypto;
+}
+// ---------------------------------------------------------------------------
+// expo-secure-store — RN keychain / keystore.
+// ---------------------------------------------------------------------------
+export async function loadSecureStore() {
+    return SecureStore;
+}
+export async function loadAsyncStorage() {
+    // Mirror the shape callers historically used (`module.default.<method>`)
+    // so the call sites don't have to know whether the underlying module
+    // ships ESM or CJS-with-default.
+    const storage = AsyncStorage;
+    return {
+        default: storage,
+    };
+}
+/**
+ * Synchronous random-bytes via `expo-crypto.getRandomBytes`. Available
+ * synchronously because `expo-crypto` is statically imported by this file
+ * — no async initialization race.
+ */
+export function getRandomBytesRN(byteCount) {
+    return ExpoCrypto.getRandomBytes(byteCount);
+}