react-native-debug-toolkit 3.2.5 → 3.2.7

package/android/src/main/java/com/reactnativedebugtoolkit/DebugToolkitDevConnectModule.java

@@ -17,6 +17,7 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
@@ -24,7 +25,9 @@ import java.util.Enumeration;
 
 public class DebugToolkitDevConnectModule extends ReactContextBaseJavaModule {
   private static final String MODULE_NAME = "DebugToolkitDevConnect";
+  private static final String BUNDLE_ROOT = "index";
   private static final String DEBUG_SERVER_HOST_KEY = "debug_http_host";
+  private static final String KOTLIN_FUNCTION1_CLASS = "kotlin.jvm.functions.Function1";
   private static final String APPLY_RELOAD_REASON = "DebugToolkit DevConnect Metro host changed";
   private static final String RESET_RELOAD_REASON = "DebugToolkit DevConnect Metro host reset";
 
@@ -69,6 +72,46 @@ public class DebugToolkitDevConnectModule extends ReactContextBaseJavaModule {
     setter.invoke(packagerConnectionSettings, hostPort);
   }
 
+  private boolean setReactHostBundleSource(Object reactHost, String hostPort) throws Exception {
+    if (hostPort.length() == 0) {
+      return false;
+    }
+
+    try {
+      Class<?> function1Class = Class.forName(KOTLIN_FUNCTION1_CLASS);
+      Method setBundleSourceMethod = reactHost.getClass().getMethod(
+          "setBundleSource",
+          String.class,
+          String.class,
+          function1Class
+      );
+      Object queryMapper = Proxy.newProxyInstance(
+          function1Class.getClassLoader(),
+          new Class<?>[] { function1Class },
+          (proxy, method, args) -> {
+            String methodName = method.getName();
+            if ("invoke".equals(methodName)) {
+              return args != null && args.length > 0 ? args[0] : null;
+            }
+            if ("toString".equals(methodName)) {
+              return "DebugToolkitIdentityQueryMapper";
+            }
+            if ("hashCode".equals(methodName)) {
+              return System.identityHashCode(proxy);
+            }
+            if ("equals".equals(methodName)) {
+              return proxy == (args != null && args.length > 0 ? args[0] : null);
+            }
+            return null;
+          }
+      );
+      setBundleSourceMethod.invoke(reactHost, hostPort, BUNDLE_ROOT, queryMapper);
+      return true;
+    } catch (ClassNotFoundException | NoSuchMethodException ignored) {
+      return false;
+    }
+  }
+
   private boolean triggerDevSupportReload(
       @Nullable Object devSupportManager,
       String hostPort
@@ -98,6 +141,10 @@ public class DebugToolkitDevConnectModule extends ReactContextBaseJavaModule {
       return false;
     }
 
+    if (setReactHostBundleSource(reactHost, hostPort)) {
+      return true;
+    }
+
     if (triggerDevSupportReload(callGetter(reactHost, "getDevSupportManager"), hostPort)) {
       return true;
     }

package/ios/DebugToolkitDevConnect.mm

@@ -2,6 +2,7 @@
 #import <React/RCTBundleManager.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTBundleURLProvider.h>
+#import <React/RCTDefines.h>
 #import <React/RCTReloadCommand.h>
 #include <ifaddrs.h>
 #include <arpa/inet.h>
@@ -23,21 +24,9 @@ RCT_EXPORT_MODULE(DebugToolkitDevConnect)
   return NO;
 }
 
-- (void)applyBundleURL:(NSURL *)bundleURL
-                reason:(NSString *)reason
-                result:(id)result
-               resolve:(RCTPromiseResolveBlock)resolve
+- (dispatch_queue_t)methodQueue
 {
-  dispatch_async(dispatch_get_main_queue(), ^{
-    if (bundleURL) {
-      if (self->_bundleManager) {
-        self->_bundleManager.bundleURL = bundleURL;
-      }
-      RCTReloadCommandSetBundleURL(bundleURL);
-    }
-    resolve(result ?: [NSNull null]);
-    RCTTriggerReloadCommandListeners(reason);
-  });
+  return dispatch_get_main_queue();
 }
 
 RCT_EXPORT_METHOD(getMetroHost:(RCTPromiseResolveBlock)resolve
@@ -56,12 +45,46 @@ RCT_EXPORT_METHOD(applyMetroHost:(NSString *)hostPort
     return;
   }
 
-  [RCTBundleURLProvider sharedSettings].jsLocation = hostPort;
-  NSURL *bundleURL = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:DebugToolkitBundleRoot];
-  [self applyBundleURL:bundleURL
-                reason:@"DebugToolkit DevConnect Metro host changed"
-                result:@{ @"hostPort" : hostPort }
-               resolve:resolve];
+  RCTBundleURLProvider *settings = [RCTBundleURLProvider sharedSettings];
+  NSRange separator = [hostPort rangeOfString:@":" options:NSBackwardsSearch];
+  NSString *host = separator.location == NSNotFound ? hostPort : [hostPort substringToIndex:separator.location];
+  NSString *port = separator.location == NSNotFound ? @"" : [hostPort substringFromIndex:separator.location + 1];
+
+  if (host.length == 0 && port.length == 0) {
+    [self resetMetroHost:resolve rejecter:reject];
+    return;
+  }
+
+  NSNumberFormatter *formatter = [NSNumberFormatter new];
+  formatter.numberStyle = NSNumberFormatterDecimalStyle;
+  NSNumber *portNumber = [formatter numberFromString:port];
+  if (portNumber == nil) {
+    portNumber = [NSNumber numberWithInt:RCT_METRO_PORT];
+  }
+
+  NSString *normalizedHostPort = [NSString stringWithFormat:@"%@:%d", host, portNumber.intValue];
+  settings.jsLocation = normalizedHostPort;
+
+  if (DebugToolkitBundleRoot.length == 0) {
+    if (_bundleManager) {
+      [_bundleManager resetBundleURL];
+    }
+  } else {
+    NSURL *bundleURL = [settings jsBundleURLForBundleRoot:DebugToolkitBundleRoot];
+    if (_bundleManager) {
+      _bundleManager.bundleURL = bundleURL;
+    } else {
+      RCTReloadCommandSetBundleURL(bundleURL);
+    }
+  }
+
+  NSMutableDictionary *result = [@{@"hostPort" : normalizedHostPort} mutableCopy];
+  if (_bundleManager && _bundleManager.bundleURL.absoluteString) {
+    result[@"bundleURL"] = _bundleManager.bundleURL.absoluteString;
+  }
+
+  RCTTriggerReloadCommandListeners(@"DevConnect - apply changes");
+  resolve(result);
 }
 
 RCT_EXPORT_METHOD(resetMetroHost:(RCTPromiseResolveBlock)resolve
@@ -69,10 +92,13 @@ RCT_EXPORT_METHOD(resetMetroHost:(RCTPromiseResolveBlock)resolve
 {
   [[RCTBundleURLProvider sharedSettings] resetToDefaults];
   NSURL *bundleURL = [[RCTBundleURLProvider sharedSettings] jsBundleURLForFallbackExtension:nil];
-  [self applyBundleURL:bundleURL
-                reason:@"DebugToolkit DevConnect Metro host reset"
-                result:[NSNull null]
-               resolve:resolve];
+  if (_bundleManager) {
+    _bundleManager.bundleURL = bundleURL;
+  } else {
+    RCTReloadCommandSetBundleURL(bundleURL);
+  }
+  RCTTriggerReloadCommandListeners(@"DevConnect - reset to default");
+  resolve([NSNull null]);
 }
 
 RCT_EXPORT_METHOD(getPreference:(NSString *)key
@@ -108,7 +134,6 @@ RCT_EXPORT_METHOD(getLocalIp:(RCTPromiseResolveBlock)resolve
 {
   struct ifaddrs *interfaces = NULL;
   if (getifaddrs(&interfaces) == 0) {
-    // First pass: prefer Wi-Fi interface (en0)
     struct ifaddrs *iface = interfaces;
     while (iface != NULL) {
       if (iface->ifa_addr->sa_family == AF_INET && !(iface->ifa_flags & IFF_LOOPBACK)) {
@@ -124,7 +149,6 @@ RCT_EXPORT_METHOD(getLocalIp:(RCTPromiseResolveBlock)resolve
       }
       iface = iface->ifa_next;
     }
-    // Second pass: any non-loopback IPv4
     iface = interfaces;
     while (iface != NULL) {
       if (iface->ifa_addr->sa_family == AF_INET && !(iface->ifa_flags & IFF_LOOPBACK)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-debug-toolkit",
-  "version": "3.2.5",
+  "version": "3.2.7",
   "description": "A local-first React Native debug toolkit with Web Console, HTTP API, and MCP support for AI-readable app logs",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",