@oxy.so/protocol 1.0.1 → 1.1.1

package/src/platform/crypto.native.ts

@@ -24,7 +24,7 @@
  * Those three RN modules are declared OPTIONAL peer dependencies in
  * `package.json`. A static `import` contradicts that: an optional peer that is
  * omitted does not degrade, it fails to RESOLVE, and Metro aborts the whole
- * bundle. Because `@oxy.so/core`'s `crypto/polyfill` imports `@oxy.so/protocol`
+ * bundle. Because `@oxy.so/core` imports `@oxy.so/protocol`
  * from its root entry, this file is in the eager graph of EVERY React Native
  * app on `@oxy.so/core` — so a single undeclared optional peer broke the native
  * bundle of every app that did not happen to install it, with a resolution
@@ -54,6 +54,8 @@
 
 import { requireOptionalNativeModule } from 'expo-modules-core';
 import type { ExpoCryptoLike, ExpoSecureStoreLike, SharedIdentityBridge } from './expoTypes';
+import { missingOptionalPeerError } from './optionalPeer';
+import { requireExpoCrypto } from './random.native';
 
 // Re-export the interfaces so consumers can import them from the same
 // entry-point they use for the loaders (mirrors the default variant).
@@ -77,14 +79,6 @@ type AsyncStorageLike = {
   removeItem: (key: string) => Promise<void>;
 };
 
-let expoCryptoModule: ExpoCryptoLike | null = null;
-let expoCryptoError: unknown;
-try {
-  expoCryptoModule = require('expo-crypto') as ExpoCryptoLike;
-} catch (error) {
-  expoCryptoError = error;
-}
-
 let secureStoreModule: ExpoSecureStoreLike | null = null;
 let secureStoreError: unknown;
 try {
@@ -107,23 +101,6 @@ try {
   asyncStorageError = error;
 }
 
-/**
- * Actionable error for a missing optional peer. Carries the underlying Metro
- * resolution message so the failure is never silent — the `catch` above only
- * defers the report to the point where the capability is actually needed.
- */
-function missingOptionalPeerError(packageName: string, capability: string, cause: unknown): Error {
-  const sentences = [
-    `[oxy.protocol.crypto] '${packageName}' is not installed, so ${capability} is unavailable in this app.`,
-    'It is an optional peer dependency of @oxy.so/protocol that the React Native runtime needs —',
-    `install it with \`npx expo install ${packageName}\`.`,
-  ];
-  if (cause instanceof Error) {
-    sentences.push(`Underlying error: ${cause.message}`);
-  }
-  return new Error(sentences.join(' '));
-}
-
 // ---------------------------------------------------------------------------
 // Node `crypto` — never available in RN.
 // ---------------------------------------------------------------------------
@@ -149,10 +126,7 @@ export async function loadNodeCrypto(): Promise<typeof import('crypto')> {
 // ---------------------------------------------------------------------------
 
 export async function loadExpoCrypto(): Promise<ExpoCryptoLike> {
-  if (!expoCryptoModule) {
-    throw missingOptionalPeerError('expo-crypto', 'React Native cryptography', expoCryptoError);
-  }
-  return expoCryptoModule;
+  return requireExpoCrypto('React Native cryptography');
 }
 
 // ---------------------------------------------------------------------------
@@ -188,24 +162,12 @@ export async function loadAsyncStorage(): Promise<{ default: AsyncStorageLike }>
   return { default: asyncStorageModule };
 }
 
-/**
- * Synchronous random-bytes via `expo-crypto.getRandomBytes`.
- *
- * Synchronous by contract: `@oxy.so/core`'s crypto polyfill uses this to back
- * `globalThis.crypto.getRandomValues`, which cannot await. That is why
- * `expo-crypto` is resolved with a synchronous `require` at module scope rather
- * than a dynamic `import()`.
- */
-export function getRandomBytesRN(byteCount: number): Uint8Array {
-  if (!expoCryptoModule) {
-    throw missingOptionalPeerError(
-      'expo-crypto',
-      'the React Native CSPRNG (crypto.getRandomValues)',
-      expoCryptoError,
-    );
-  }
-  return expoCryptoModule.getRandomBytes(byteCount);
-}
+// Synchronous random bytes (and the single `expo-crypto` resolution) live in
+// the dependency-free `./random.native` module, so `@oxy.so/core`'s crypto
+// polyfill can load them through `@oxy.so/protocol/random` without evaluating
+// any crypto library first. The explicit `.native` specifier keeps tsc and
+// Metro pointed at the same file.
+export { getRandomBytesRN } from './random.native';
 
 // ---------------------------------------------------------------------------
 // Shared identity bridge — `@oxy.so/expo-oxy-identity` (native-only, OPTIONAL).

package/src/platform/crypto.ts

@@ -148,15 +148,10 @@ export async function loadAsyncStorage(): Promise<{
   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: number): Uint8Array {
-  throw notReactNativeError('expo-crypto.getRandomBytes (sync)');
-}
+// Synchronous random bytes live in the dependency-free `./random` module so
+// `@oxy.so/core`'s crypto polyfill can load them through the
+// `@oxy.so/protocol/random` entry without evaluating any crypto library first.
+export { getRandomBytesRN } from './random';
 
 // ---------------------------------------------------------------------------
 // Shared identity bridge — `@oxy.so/expo-oxy-identity` (native-only).

package/src/platform/optionalPeer.ts

@@ -0,0 +1,23 @@
+/**
+ * Actionable error for a missing optional React Native peer.
+ *
+ * Shared by the React Native platform variants (`crypto.native.ts`,
+ * `random.native.ts`). It carries the underlying Metro resolution message so
+ * the failure is never silent: the variants' `try { require(...) } catch` only
+ * defers the report to the point where the capability is actually used.
+ */
+export function missingOptionalPeerError(
+  packageName: string,
+  capability: string,
+  cause: unknown,
+): Error {
+  const sentences = [
+    `[oxy.protocol.crypto] '${packageName}' is not installed, so ${capability} is unavailable in this app.`,
+    'It is an optional peer dependency of @oxy.so/protocol that the React Native runtime needs —',
+    `install it with \`npx expo install ${packageName}\`.`,
+  ];
+  if (cause instanceof Error) {
+    sentences.push(`Underlying error: ${cause.message}`);
+  }
+  return new Error(sentences.join(' '));
+}

package/src/platform/random.native.ts

@@ -0,0 +1,56 @@
+/**
+ * Synchronous CSPRNG source — React Native variant.
+ *
+ * Companion to `./random.ts`; Metro substitutes this file on iOS / Android
+ * (see `./crypto.ts` for how the `.native` split works).
+ *
+ * This module is deliberately tiny and imports NOTHING but `expo-crypto`: it
+ * backs `@oxy.so/core`'s `globalThis.crypto.getRandomValues` polyfill, which
+ * must be fully installed before any module that captures `globalThis.crypto`
+ * at evaluation time (`@noble/hashes` 1.x's `crypto.js` does exactly that) is
+ * evaluated. Reaching a crypto library from here would let that library
+ * capture the missing global first and throw
+ * `crypto.getRandomValues must be defined` for the lifetime of the app.
+ *
+ * `expo-crypto` is an OPTIONAL peer, so it is resolved with a string-literal
+ * `require` inside a `try` (Metro's optional-dependency form; see
+ * `./crypto.native.ts`), and the load stays synchronous because
+ * `getRandomValues` cannot await.
+ */
+
+import type { ExpoCryptoLike } from './expoTypes';
+import { missingOptionalPeerError } from './optionalPeer';
+
+declare const require: (moduleName: string) => unknown;
+
+let expoCryptoModule: ExpoCryptoLike | null = null;
+let expoCryptoError: unknown;
+try {
+  expoCryptoModule = require('expo-crypto') as ExpoCryptoLike;
+} catch (error) {
+  expoCryptoError = error;
+}
+
+/**
+ * The resolved `expo-crypto` module, or an actionable error naming the missing
+ * peer and the capability that needed it. Shared with `./crypto.native.ts` so
+ * the optional peer is resolved in exactly one place.
+ */
+export function requireExpoCrypto(capability: string): ExpoCryptoLike {
+  if (!expoCryptoModule) {
+    throw missingOptionalPeerError('expo-crypto', capability, expoCryptoError);
+  }
+  return expoCryptoModule;
+}
+
+/**
+ * Synchronous random bytes via `expo-crypto.getRandomBytes`.
+ *
+ * Synchronous by contract: `@oxy.so/core`'s crypto polyfill uses this to back
+ * `globalThis.crypto.getRandomValues`, which cannot await.
+ */
+export function getRandomBytesRN(byteCount: number): Uint8Array {
+  return requireExpoCrypto('the React Native CSPRNG (crypto.getRandomValues)').getRandomBytes(
+    byteCount,
+  );
+}

package/src/platform/random.ts

@@ -0,0 +1,18 @@
+/**
+ * Synchronous CSPRNG source — default variant (Node.js, browsers, bundlers).
+ *
+ * Companion to `./random.native.ts`, which Metro substitutes on iOS / Android.
+ * Node and browsers own a native CSPRNG (`node:crypto`, `globalThis.crypto`),
+ * so `getRandomBytesRN` only exists here to keep both variants' surfaces
+ * identical, and throws if anything reaches it outside React Native.
+ *
+ * Like its sibling, this module imports nothing: it is part of the
+ * `@oxy.so/protocol/random` entry that `@oxy.so/core`'s crypto polyfill loads
+ * BEFORE any crypto library is evaluated.
+ */
+
+export function getRandomBytesRN(_byteCount: number): Uint8Array {
+  throw new Error(
+    "[oxy.protocol.crypto] Tried to load 'expo-crypto.getRandomBytes (sync)' 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.",
+  );
+}

package/src/random.ts

@@ -0,0 +1,20 @@
+/**
+ * `@oxy.so/protocol/random` — the platform randomness source, and nothing else.
+ *
+ * `@oxy.so/core`'s crypto polyfill installs `globalThis.crypto.getRandomValues`
+ * on hosts that lack it (React Native / Hermes). `@noble/hashes` 1.x captures
+ * `globalThis.crypto` ONCE, when its `crypto.js` is evaluated, so the polyfill
+ * has to be installed before any `@noble/*` module is evaluated. ES imports are
+ * evaluated before the importing module's body, so whatever the polyfill
+ * imports is evaluated first: importing the ROOT entry (which reaches
+ * `@noble/curves` through the envelope signer) let noble capture `undefined`
+ * and broke identity creation on Android.
+ *
+ * This entry therefore reaches no crypto library, no `@oxy.so/*` package and no
+ * third-party module other than the optional `expo-crypto` peer (RN variant
+ * only). `src/__tests__/randomEntry.test.ts` walks its module graph to keep it
+ * that way.
+ */
+
+export { isNodeJS, isReactNative } from './platform/platform';
+export { getRandomBytesRN } from './platform/random';