Merge pull request #729 from EdgeApp/jon/nym-mixfetch-v2

Upgrade NYM mix-fetch to v2

Author: j0ntz

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- changed: Upgrade `@nymproject/mix-fetch` to v2, which routes NYM mixnet traffic through the new smolmix-wasm tunnel (`@nymproject/mix-tunnel`). The v2 wasm + worker are inlined into the bundle, so the build no longer copies sibling `.wasm`/`web-worker-*.js` assets.
+
 ## 2.46.1 (2026-06-29)
 
 - changed: Upgrade yaob to v0.4.0 to share a single bridge instance with currency plugins (mismatched yaob copies give the bridge separate object-id counters that cross-wire bridged nativeIo objects).

package-lock.json

@@ -78,7 +78,7 @@
     "*.{js,jsx,ts,tsx}": "eslint"
   },
   "dependencies": {
-    "@nymproject/mix-fetch": "^1.4.4",
+    "@nymproject/mix-fetch": "^2.0.0",
     "aes-js": "^3.1.0",
     "base-x": "^4.0.1",
     "biggystring": "^4.2.3",

package.json

@@ -3,7 +3,7 @@ import { makeLocalStorageDisklet } from 'disklet'
 import { LogBackend, makeLog } from '../../core/log/log'
 import { EdgeFetchOptions, EdgeFetchResponse, EdgeIo } from '../../types/types'
 import { scrypt } from '../../util/crypto/scrypt'
-import { initMixFetch, mixFetchOptions } from '../../util/nym'
+import { initMixFetch } from '../../util/nym'
 import { fetchCorsProxy } from './fetch-cors-proxy'
 
 // Only try CORS proxy/bridge techniques up to 5 times
@@ -50,14 +50,7 @@ export function makeBrowserIo(logBackend: LogBackend): EdgeIo {
 
       if (privacy === 'nym') {
         const nymFetch = await initMixFetch(log)
-        return await nymFetch(
-          uri,
-          {
-            ...opts,
-            mode: 'unsafe-ignore-cors' as RequestMode
-          },
-          mixFetchOptions
-        )
+        return await nymFetch(uri, opts)
       }
       if (corsBypass === 'always') {
         return await fetchCorsProxy(uri, opts)

src/io/browser/browser-io.ts

@@ -17,7 +17,7 @@ import {
   EdgeFetchResponse,
   EdgeIo
 } from '../../types/types'
-import { initMixFetch, mixFetchOptions } from '../../util/nym'
+import { initMixFetch } from '../../util/nym'
 import { hideProperties } from '../hidden-properties'
 import { makeNativeBridge } from './native-bridge'
 import { WorkerApi, YAOB_THROTTLE_MS } from './react-native-types'
@@ -177,15 +177,7 @@ async function makeIo(logBackend: LogBackend): Promise<EdgeIo> {
 
       if (privacy === 'nym') {
         const nymFetch = await initMixFetch(log)
-        const response = await nymFetch(
-          uri,
-          {
-            ...opts,
-            mode: 'unsafe-ignore-cors' as RequestMode
-          },
-          mixFetchOptions
-        )
-        return response
+        return await nymFetch(uri, opts)
       }
       if (corsBypass === 'always') {
         return await nativeFetch(uri, opts)

src/io/react-native/react-native-worker.ts

@@ -1,56 +1,53 @@
 import {
   createMixFetch,
-  disconnectMixFetch,
-  IMixFetch,
-  IMixFetchFn,
-  SetupMixFetchOps
+  disconnectMixTunnel,
+  SetupMixTunnelOpts
 } from '@nymproject/mix-fetch'
 
 import { EdgeLog } from '../types/types'
 
+/** The fetch-bound function `createMixFetch` resolves to. */
+type MixFetchFn = (url: string, init?: RequestInit) => Promise<Response>
+
 /**
- * Configuration options for the NYM mixFetch client.
+ * Configuration options for the NYM mixFetch tunnel.
  */
-export const mixFetchOptions: SetupMixFetchOps = {
+export const mixFetchOptions: SetupMixTunnelOpts = {
   clientId: 'edge-core-js-2026-03-10',
-  preferredGateway: '5rXcNe2a44vXisK3uqLHCzpzvEwcnsijDMU7hg4fcYk8', // with WSS
-  preferredNetworkRequester:
-    '5x6q9UfVHs5AohKMUqeivj7a556kVVy7QwoKige8xHxh.6CFoB3kJaDbYz6oafPJxNxNjzahpT2NtgtytcSyN9EvF@5rXcNe2a44vXisK3uqLHCzpzvEwcnsijDMU7hg4fcYk8',
   forceTls: true, // force WSS
-  mixFetchOverride: {
-    requestTimeoutMs: 300000
-  }
+  // Mixnet round trips are slow, so give the tunnel handshake plenty of time.
+  // v1 tuned a 5 min `requestTimeoutMs`; v2 exposes no per-request timeout, but
+  // the tunnel setup is where mixnet latency bites, so restore that 5 min
+  // budget here to avoid premature failures during the handshake.
+  connectTimeoutMs: 300000
 }
 
 // MixFetch initialization state
-let mixFetchInitPromise: Promise<IMixFetch> | null = null
+let mixFetchInitPromise: Promise<MixFetchFn> | null = null
 
 /**
  * Initialize the NYM mixFetch client. Must be called before using mixFetch.
  * Safe to call multiple times - subsequent calls return the same promise.
  */
-export async function initMixFetch(log: EdgeLog): Promise<IMixFetchFn> {
+export async function initMixFetch(log: EdgeLog): Promise<MixFetchFn> {
   if (mixFetchInitPromise == null) {
     log('Initializing mixFetch...')
     mixFetchInitPromise = createMixFetch(mixFetchOptions)
-      .then(mixFetchModule => {
+      .then(mixFetch => {
         log('mixFetch initialized successfully')
-        return mixFetchModule
+        return mixFetch
       })
       .catch(async error => {
-        // Clean up stale global state left by the failed init so the
-        // next createMixFetch call starts fresh instead of reusing a
+        // Tear down any partially-established tunnel left by the failed init
+        // so the next createMixFetch call starts fresh instead of reusing a
         // broken singleton.
         try {
-          await disconnectMixFetch()
+          await disconnectMixTunnel()
         } catch {}
-        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-        delete (window as any).__mixFetchGlobal
         mixFetchInitPromise = null
         log.error('mixFetch initialization failed:', error)
         throw error
       })
   }
-  const mixFetchModule = await mixFetchInitPromise
-  return mixFetchModule.mixFetch
+  return await mixFetchInitPromise
 }

src/util/nym.ts

@@ -50,9 +50,6 @@ module.exports = {
     static: bundlePath
   },
   entry: './src/io/react-native/react-native-worker.ts',
-  experiments: {
-    asyncWebAssembly: true
-  },
   mode: debug ? 'development' : 'production',
   module: {
     rules: [
@@ -75,10 +72,6 @@ module.exports = {
           loader: 'babel-loader',
           options: { presets: ['@babel/preset-env'] }
         }
-      },
-      {
-        test: /\.wasm$/,
-        type: 'webassembly/async'
       }
     ]
   },
@@ -92,29 +85,12 @@ module.exports = {
   plugins: [
     new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }),
     new webpack.ProvidePlugin({ process: ['process'] }),
-    // Copy static files and mix-fetch WASM/worker files
     new CopyPlugin({
       patterns: [
         // HTML entry point
         {
           from: path.resolve(__dirname, 'src/index.html'),
           to: 'index.html'
-        },
-        // mix-fetch WASM files for NYM mixnet support
-        {
-          from: path.resolve(
-            __dirname,
-            'node_modules/@nymproject/mix-fetch/*.wasm'
-          ),
-          to: '[name][ext]'
-        },
-        // mix-fetch web worker files
-        {
-          from: path.resolve(
-            __dirname,
-            'node_modules/@nymproject/mix-fetch/web-worker-*.js'
-          ),
-          to: '[name][ext]'
         }
       ]
     })