edge-core-js 2.41.1 → 2.41.3

package/ios/EdgeCoreWebView.swift

@@ -1,15 +1,25 @@
-import WebKit
 import Foundation
-import Network
+import WebKit
 
+/// Default URL for the WebView
+let DEFAULT_SOURCE = "\(BUNDLE_BASE_URI)/edge-core-js.bundle/index.html"
+
+/// A WebView that loads edge-core-js content using a custom URL scheme handler.
+///
+/// Uses WKURLSchemeHandler to serve local assets via custom URLs (edgebundle://edge.bundle/...),
+/// which provides a proper non-null origin for same-origin policy compliance
+/// without requiring a local HTTP server.
+///
+/// Includes Cross-Origin-Opener-Policy and Cross-Origin-Embedder-Policy headers
+/// required for SharedArrayBuffer support (needed by mixFetch web workers).
+///
+/// Note: WKURLSchemeHandler only handles requests within this specific WKWebView instance.
+/// It does not register a system-wide URL scheme - other apps cannot access this handler.
 class EdgeCoreWebView: RCTView, WKNavigationDelegate, WKScriptMessageHandler {
   var native = EdgeNative()
   var webView: WKWebView?
-  private var httpServer: BundleHTTPServer?
-  private var serverPort: UInt16 = 0
-  private var serverReady = false
-  
-  // react api--------------------------------------------------------------
+
+  // MARK: - React API
 
   @objc var onMessage: RCTDirectEventBlock?
   @objc var onScriptError: RCTDirectEventBlock?
@@ -32,7 +42,7 @@ class EdgeCoreWebView: RCTView, WKNavigationDelegate, WKScriptMessageHandler {
       completionHandler: { result, error in return })
   }
 
-  // view api --------------------------------------------------------------
+  // MARK: - View API
 
   required init?(coder: NSCoder) {
     return nil
@@ -41,34 +51,23 @@ class EdgeCoreWebView: RCTView, WKNavigationDelegate, WKScriptMessageHandler {
   override init(frame: CGRect) {
     super.init(frame: frame)
 
-    // Set up our native bridge:
+    // Set up our native bridge and custom URL scheme handler:
     let configuration = WKWebViewConfiguration()
     configuration.userContentController = WKUserContentController()
     configuration.userContentController.add(self, name: "edgeCore")
 
+    // Register custom URL scheme handler BEFORE creating WKWebView
+    let schemeHandler = EdgeAssetsSchemeHandler()
+    configuration.setURLSchemeHandler(schemeHandler, forURLScheme: EDGE_SCHEME)
+
     // Set up the WKWebView child:
     let webView = WKWebView(frame: bounds, configuration: configuration)
     webView.navigationDelegate = self
     addSubview(webView)
     self.webView = webView
 
-    // Start the HTTP server on an ephemeral port bound to loopback only
-    let server = BundleHTTPServer()
-    self.httpServer = server
-    server.start { [weak self] result in
-      DispatchQueue.main.async {
-        switch result {
-        case .success(let port):
-          self?.serverPort = port
-          self?.serverReady = true
-          // Now that the server is ready with its assigned port, load the page
-          self?.visitPage()
-        case .failure(let error):
-          print("Failed to start HTTP server: \(error)")
-          // Server failed to start - the WebView won't be able to load local content
-        }
-      }
-    }
+    // Scheme handler is ready immediately - no async startup needed
+    visitPage()
   }
 
   override func layoutSubviews() {
@@ -84,13 +83,9 @@ class EdgeCoreWebView: RCTView, WKNavigationDelegate, WKScriptMessageHandler {
       webView.removeFromSuperview()
       self.webView = nil
     }
-    
-    // Stop the HTTP server when view is removed
-    httpServer?.stop()
-    httpServer = nil
   }
 
-  // callbacks -------------------------------------------------------------
+  // MARK: - Navigation Delegate
 
   func webView(
     _: WKWebView,
@@ -106,6 +101,8 @@ class EdgeCoreWebView: RCTView, WKNavigationDelegate, WKScriptMessageHandler {
     visitPage()
   }
 
+  // MARK: - Script Message Handler
+
   func userContentController(
     _: WKUserContentController,
     didReceive scriptMessage: WKScriptMessage
@@ -135,7 +132,7 @@ class EdgeCoreWebView: RCTView, WKNavigationDelegate, WKScriptMessageHandler {
     }
   }
 
-  // utilities -------------------------------------------------------------
+  // MARK: - Utilities
 
   func handleMessage(
     _ name: String, args: NSArray
@@ -150,12 +147,6 @@ class EdgeCoreWebView: RCTView, WKNavigationDelegate, WKScriptMessageHandler {
     }
   }
 
-  /// Returns the base URL for the local bundle HTTP server, or nil if the server isn't ready.
-  func defaultSource() -> String? {
-    guard serverReady else { return nil }
-    return "http://127.0.0.1:\(serverPort)/index.html"
-  }
-
   func stringify(_ raw: Any?) -> String {
     if let value = raw,
       let data = try? JSONSerialization.data(
@@ -172,18 +163,14 @@ class EdgeCoreWebView: RCTView, WKNavigationDelegate, WKScriptMessageHandler {
 
   func visitPage() {
     // If source is set, use it directly (e.g., webpack dev server for debugging)
-    // Otherwise, use the local bundle HTTP server with ephemeral port
+    // Otherwise, use the custom URL scheme handler
     let baseUrl: String
     if let src = source, !src.isEmpty {
       baseUrl = src
     } else {
-      guard let defaultUrl = defaultSource() else {
-        print("EdgeCoreWebView: visitPage called before server is ready")
-        return
-      }
-      baseUrl = defaultUrl
+      baseUrl = DEFAULT_SOURCE
     }
-    
+
     guard let url = URL(string: baseUrl) else {
       print("EdgeCoreWebView: Invalid URL string: \(baseUrl)")
       return

package/lib/io/react-native/react-native-worker.js

@@ -73,35 +73,6 @@ window.addEdgeCorePlugins = addEdgeCorePlugins
 window.nativeBridge = nativeBridge
 window.reactBridge = reactBridge
 
-/**
- * Convert a file:// URI to a domain-relative path served by our local bundle server.
- * This is needed because cross-origin isolation (COOP/COEP) blocks file:// loads.
- * Using domain-relative paths ensures plugins load from the same origin as the page
- * (localhost:3693 in production, localhost:8080 in debug mode).
- */
-function convertPluginUri(uri) {
-  // If already an HTTP URI, use as-is (e.g., custom bundles from metro bundler)
-  if (uri.startsWith('http://') || uri.startsWith('https://')) {
-    return uri
-  }
-
-  // Convert file:// URIs to domain-relative paths
-  // Extract the bundle path (e.g., "edge-currency-accountbased.bundle/edge-currency-accountbased.js")
-  const bundleMatch = uri.match(/([^/]+\.bundle\/[^/]+\.js)$/)
-  if (bundleMatch != null) {
-    return `/plugin/${bundleMatch[1]}`
-  }
-
-  // Fallback: try to extract just the filename
-  const fileMatch = uri.match(/([^/]+\.js)$/)
-  if (fileMatch != null) {
-    return `/plugin/${fileMatch[1]}`
-  }
-
-  // If we can't parse it, return as-is (will likely fail, but provides debugging info)
-  return uri
-}
-
 function loadPlugins(pluginUris) {
   const { head } = window.document
   if (head == null || pluginUris.length === 0) {
@@ -120,7 +91,7 @@ function loadPlugins(pluginUris) {
     script.addEventListener('load', handleLoad)
     script.charset = 'utf-8'
     script.defer = true
-    script.src = convertPluginUri(uri)
+    script.src = uri
     head.appendChild(script)
   }
 }
@@ -208,10 +179,11 @@ async function makeIo(logBackend) {
         // Ensure mixFetch is initialized before use
         await initMixFetch(log)
         // Use queued fetch to handle mixFetch's one-request-per-host limitation
-        return await queueMixFetch(uri, {
+        const response = await queueMixFetch(uri, {
           ...opts,
           mode: 'unsafe-ignore-cors' 
         })
+        return response
       }
       if (corsBypass === 'always') {
         return await nativeFetch(uri, opts)

package/lib/libs.d.js

@@ -28,6 +28,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

package/lib/react-native.js

@@ -1,6 +1,7 @@
 const _jsxFileName = "src/react-native.tsx";import { asObject, asString } from 'cleaners'
 import { makeReactNativeDisklet } from 'disklet'
 import * as React from 'react'
+import { NativeModules } from 'react-native'
 import { base64 } from 'rfc4648'
 import { bridgifyObject } from 'yaob'
 
@@ -22,6 +23,15 @@ import { timeout } from './util/promise'
 export { makeFakeIo } from './core/fake/fake-io'
 export * from './types/types'
 
+const { EdgeCoreModule } = NativeModules
+
+/**
+ * Constants exported from native:
+ * - bundleBaseUri: iOS "edgebundle://edge.bundle", Android "https://edge.bundle"
+ * - rootBaseUri: iOS "file:///path/to/Edge.app/", Android "file:///android_asset/"
+ */
+const { bundleBaseUri, rootBaseUri } = EdgeCoreModule.getConstants()
+
 function defaultOnError(error) {
   console.error(error)
 }
@@ -69,7 +79,7 @@ export function MakeEdgeContext(props) {
         const context = await root.makeEdgeContext(
           bridgifyNativeIo(nativeIo),
           bridgifyLogBackend({ crashReporter, onLog }),
-          pluginUris,
+          pluginUris.map(normalizePluginUri),
           {
             airbitzSupport,
             apiKey,
@@ -91,7 +101,7 @@ export function MakeEdgeContext(props) {
           }
         )
         await onLoad(context)
-      }, __self: this, __source: {fileName: _jsxFileName, lineNumber: 64}}
+      }, __self: this, __source: {fileName: _jsxFileName, lineNumber: 74}}
     )
   )
 }
@@ -121,11 +131,11 @@ export function MakeFakeEdgeWorld(props) {
         const fakeWorld = await root.makeFakeEdgeWorld(
           bridgifyNativeIo(nativeIo),
           bridgifyLogBackend({ crashReporter, onLog }),
-          pluginUris,
+          pluginUris.map(normalizePluginUri),
           props.users
         )
         await onLoad(fakeWorld)
-      }, __self: this, __source: {fileName: _jsxFileName, lineNumber: 116}}
+      }, __self: this, __source: {fileName: _jsxFileName, lineNumber: 126}}
     )
   )
 }
@@ -217,3 +227,30 @@ export async function fetchLoginMessages(
     })
   })
 }
+
+/**
+ * Convert a legacy plugin URI to an absolute URL that can be loaded by the WebView.
+ *
+ * Handles `file://` URIs by replacing the rootBaseUri prefix with bundleBaseUri:
+ * - `file:///android_asset/folder/file.js` → `{bundleBaseUri}/folder/file.js`
+ * - `file:///path/to/Edge.app/name.bundle/file.js` → `{bundleBaseUri}/name.bundle/file.js`
+ * - `edge-core/plugin-bundle.js` → `{bundleBaseUri}/edge-core/plugin-bundle.js`
+ *
+ * Full URLs are returned unchanged (http, https, edgebundle).
+ */
+function normalizePluginUri(uri) {
+  // Handle file:// URIs that start with our root base URI
+  if (uri.startsWith(rootBaseUri)) {
+    const relativePath = uri.slice(rootBaseUri.length)
+    return `${bundleBaseUri}/${relativePath}`
+  }
+
+  // Handle relative paths (no schema) like "edge-core/plugin-bundle.js"
+  if (!uri.includes('://') && uri.match(/^[^/]+\/[^/]+\.(js)$/) != null) {
+    // Relative paths are return as absolute paths
+    return `${bundleBaseUri}/${uri}`
+  }
+
+  // Full URLs and anything else pass through unchanged
+  return uri
+}

package/lib/util/nym.js

@@ -11,14 +11,7 @@
  * Configuration options for the NYM mixFetch client.
  */
 export const mixFetchOptions = {
-  preferredGateway: '5rXcNe2a44vXisK3uqLHCzpzvEwcnsijDMU7hg4fcYk8', // with WSS
-  preferredNetworkRequester:
-    '5x6q9UfVHs5AohKMUqeivj7a556kVVy7QwoKige8xHxh.6CFoB3kJaDbYz6oafPJxNxNjzahpT2NtgtytcSyN9EvF@5rXcNe2a44vXisK3uqLHCzpzvEwcnsijDMU7hg4fcYk8',
-  mixFetchOverride: {
-    requestTimeoutMs: 60000
-  },
-  forceTls: true, // force WSS
-  extra: {}
+  forceTls: true // force WSS
 }
 
 // MixFetch initialization state

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-core-js",
-  "version": "2.41.1",
+  "version": "2.41.3",
   "description": "Edge account & wallet management library",
   "keywords": [
     "bitcoin",

package/android/src/main/java/app/edge/reactnative/core/BundleHTTPServer.java

@@ -1,318 +0,0 @@
-package app.edge.reactnative.core;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.util.Log;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * A simple HTTP server that serves files from the Android assets folder.
- * Includes Cross-Origin-Opener-Policy and Cross-Origin-Embedder-Policy headers
- * required for SharedArrayBuffer support (needed by mixFetch web workers).
- * 
- * Security: Binds to loopback interface only (127.0.0.1) on an ephemeral port
- * to prevent access from other devices on the network.
- */
-class BundleHTTPServer {
-    private static final String TAG = "BundleHTTPServer";
-
-    private final Context mContext;
-    private ServerSocket mServerSocket;
-    private ExecutorService mExecutor;
-    private final AtomicBoolean mRunning = new AtomicBoolean(false);
-    private int mAssignedPort = 0;
-
-    /**
-     * Callback interface for server start events.
-     */
-    public interface OnServerStartedListener {
-        void onServerStarted(int port);
-        void onServerError(Exception error);
-    }
-
-    public BundleHTTPServer(Context context) {
-        mContext = context;
-    }
-
-    /**
-     * Returns the assigned port after the server has started.
-     * Returns 0 if the server hasn't started yet.
-     */
-    public int getAssignedPort() {
-        return mAssignedPort;
-    }
-
-    /**
-     * Starts the HTTP server on an ephemeral port bound to loopback only (127.0.0.1).
-     * This prevents other devices on the network from connecting to the server.
-     * 
-     * @param listener Callback to receive the assigned port or error
-     */
-    public void start(OnServerStartedListener listener) {
-        if (mRunning.get()) {
-            if (listener != null && mAssignedPort > 0) {
-                listener.onServerStarted(mAssignedPort);
-            }
-            return;
-        }
-
-        mExecutor = Executors.newCachedThreadPool();
-        mRunning.set(true);
-
-        new Thread(() -> {
-            try {
-                // Bind to loopback only (127.0.0.1) on port 0 (ephemeral)
-                // This prevents access from other devices on the network
-                InetAddress loopback = InetAddress.getByName("127.0.0.1");
-                mServerSocket = new ServerSocket(0, 50, loopback);
-                
-                // Get the assigned ephemeral port
-                mAssignedPort = mServerSocket.getLocalPort();
-                Log.d(TAG, "BundleHttpServer ready on 127.0.0.1:" + mAssignedPort);
-                
-                // Notify listener of the assigned port
-                if (listener != null) {
-                    listener.onServerStarted(mAssignedPort);
-                }
-
-                while (mRunning.get()) {
-                    try {
-                        Socket clientSocket = mServerSocket.accept();
-                        mExecutor.execute(() -> handleConnection(clientSocket));
-                    } catch (IOException e) {
-                        if (mRunning.get()) {
-                            Log.e(TAG, "Error accepting connection: " + e.getMessage());
-                        }
-                    }
-                }
-            } catch (IOException e) {
-                Log.e(TAG, "Failed to start HTTP server: " + e.getMessage());
-                mRunning.set(false);
-                if (listener != null) {
-                    listener.onServerError(e);
-                }
-            }
-        }).start();
-    }
-
-    public void stop() {
-        mRunning.set(false);
-
-        if (mServerSocket != null) {
-            try {
-                mServerSocket.close();
-            } catch (IOException e) {
-                Log.e(TAG, "Error closing server socket: " + e.getMessage());
-            }
-            mServerSocket = null;
-        }
-
-        if (mExecutor != null) {
-            mExecutor.shutdown();
-            mExecutor = null;
-        }
-
-        Log.d(TAG, "BundleHttpServer stopped");
-    }
-
-    private void handleConnection(Socket clientSocket) {
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
-            OutputStream output = clientSocket.getOutputStream();
-
-            // Read the request line
-            String requestLine = reader.readLine();
-            if (requestLine == null || requestLine.isEmpty()) {
-                clientSocket.close();
-                return;
-            }
-
-            // Parse method and path
-            String[] parts = requestLine.split(" ");
-            if (parts.length < 2) {
-                sendResponse(output, 400, "Bad Request", "text/plain", "Bad Request".getBytes());
-                clientSocket.close();
-                return;
-            }
-
-            String method = parts[0];
-            String path = parts[1];
-
-            // Read and discard headers
-            String line;
-            while ((line = reader.readLine()) != null && !line.isEmpty()) {
-                // Just consume headers
-            }
-
-            // Only support GET
-            if (!method.equals("GET")) {
-                sendResponse(output, 405, "Method Not Allowed", "text/plain", "Method Not Allowed".getBytes());
-                clientSocket.close();
-                return;
-            }
-
-            // Remove query parameters
-            int queryIndex = path.indexOf('?');
-            if (queryIndex > 0) {
-                path = path.substring(0, queryIndex);
-            }
-
-            // Require explicit file name - no auto-matching for root path
-            if (path.equals("/")) {
-                sendResponse(output, 404, "Not Found", "text/plain", "Not Found".getBytes());
-                clientSocket.close();
-                return;
-            }
-
-            // Handle plugin bundle requests (e.g., /plugin/edge-currency-accountbased.bundle/edge-currency-accountbased.js)
-            if (path.startsWith("/plugin/")) {
-                String pluginPath = path.substring("/plugin/".length());
-                servePluginFile(output, pluginPath);
-                clientSocket.close();
-                return;
-            }
-
-            // Remove leading slash and prepend assets path
-            String assetPath = "edge-core-js" + path;
-
-            // Try to read the asset (using try-with-resources to ensure stream is closed)
-            try {
-                AssetManager assetManager = mContext.getAssets();
-                try (InputStream inputStream = assetManager.open(assetPath)) {
-                    byte[] data = readAllBytes(inputStream);
-                    String mimeType = getMimeType(path);
-                    sendResponse(output, 200, "OK", mimeType, data);
-                }
-            } catch (IOException e) {
-                Log.d(TAG, "File not found: " + assetPath);
-                sendResponse(output, 404, "Not Found", "text/plain", "Not Found".getBytes());
-            }
-
-            clientSocket.close();
-        } catch (IOException e) {
-            Log.e(TAG, "Error handling connection: " + e.getMessage());
-            try {
-                clientSocket.close();
-            } catch (IOException ignored) {
-            }
-        }
-    }
-
-    private void servePluginFile(OutputStream output, String pluginPath) throws IOException {
-        AssetManager assetManager = mContext.getAssets();
-        byte[] data = null;
-        
-        // Plugin path format: "edge-currency-accountbased.bundle/edge-currency-accountbased.js"
-        // or just: "plugin-bundle.js"
-        // Try multiple asset path patterns
-        String[] pathsToTry;
-        
-        if (pluginPath.contains(".bundle/")) {
-            // Extract bundle name and file name
-            String[] parts = pluginPath.split("\\.bundle/");
-            if (parts.length >= 2) {
-                String bundleName = parts[0];
-                String fileName = parts[1];
-                pathsToTry = new String[] {
-                    pluginPath,                                    // As-is
-                    bundleName + "/" + fileName,                   // Without .bundle
-                    bundleName + ".bundle/" + fileName,            // With .bundle as folder
-                    fileName,                                      // Just the filename
-                    "edge-core/" + pluginPath,                     // In edge-core assets folder
-                    "edge-core-js/" + pluginPath                   // In edge-core-js assets folder
-                };
-            } else {
-                pathsToTry = new String[] { pluginPath, "edge-core/" + pluginPath, "edge-core-js/" + pluginPath };
-            }
-        } else {
-            // Just a filename like "plugin-bundle.js"
-            // Try to find it in various asset locations
-            String fileName = pluginPath;
-            int dotIndex = fileName.lastIndexOf('.');
-            if (dotIndex > 0) {
-                String baseName = fileName.substring(0, dotIndex);
-                pathsToTry = new String[] {
-                    "edge-core/" + pluginPath,                     // e.g., edge-core/plugin-bundle.js (app's plugin bundle)
-                    "edge-core-js/" + pluginPath,                  // e.g., edge-core-js/plugin-bundle.js
-                    baseName + ".bundle/" + fileName,              // e.g., plugin-bundle.bundle/plugin-bundle.js
-                    baseName + "/" + fileName,                     // e.g., plugin-bundle/plugin-bundle.js
-                    pluginPath                                     // Just the filename
-                };
-            } else {
-                pathsToTry = new String[] { "edge-core/" + pluginPath, "edge-core-js/" + pluginPath, pluginPath };
-            }
-        }
-        
-        for (String assetPath : pathsToTry) {
-            try (InputStream inputStream = assetManager.open(assetPath)) {
-                data = readAllBytes(inputStream);
-                Log.d(TAG, "Found plugin at: " + assetPath);
-                break;
-            } catch (IOException e) {
-                // Try next path
-                Log.d(TAG, "Plugin not found at: " + assetPath);
-            }
-        }
-        
-        if (data != null) {
-            String mimeType = getMimeType(pluginPath);
-            sendResponse(output, 200, "OK", mimeType, data);
-        } else {
-            Log.e(TAG, "Plugin file not found: " + pluginPath);
-            sendResponse(output, 404, "Not Found", "text/plain", ("Not Found: " + pluginPath).getBytes());
-        }
-    }
-
-    private void sendResponse(OutputStream output, int code, String status, String contentType, byte[] body)
-            throws IOException {
-        StringBuilder headers = new StringBuilder();
-        headers.append("HTTP/1.1 ").append(code).append(" ").append(status).append("\r\n");
-        headers.append("Content-Type: ").append(contentType).append("\r\n");
-        headers.append("Content-Length: ").append(body.length).append("\r\n");
-        headers.append("Connection: close\r\n");
-        headers.append("Server: EdgeCoreBundleServer/1.0\r\n");
-        // Cross-origin isolation headers required for SharedArrayBuffer (needed by mixFetch web workers)
-        headers.append("Cross-Origin-Opener-Policy: same-origin\r\n");
-        headers.append("Cross-Origin-Embedder-Policy: require-corp\r\n");
-        headers.append("\r\n");
-
-        output.write(headers.toString().getBytes("UTF-8"));
-        output.write(body);
-        output.flush();
-    }
-
-    private byte[] readAllBytes(InputStream inputStream) throws IOException {
-        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        byte[] chunk = new byte[4096];
-        int bytesRead;
-        while ((bytesRead = inputStream.read(chunk)) != -1) {
-            buffer.write(chunk, 0, bytesRead);
-        }
-        return buffer.toByteArray();
-    }
-
-    // We only serve HTML, JS, and WASM files
-    private String getMimeType(String path) {
-        String lowerPath = path.toLowerCase();
-        if (lowerPath.endsWith(".html") || lowerPath.endsWith(".htm")) {
-            return "text/html";
-        } else if (lowerPath.endsWith(".js")) {
-            return "application/javascript";
-        } else if (lowerPath.endsWith(".wasm")) {
-            return "application/wasm";
-        }
-        return "application/octet-stream";
-    }
-}