react-native-debug-toolkit 3.3.1 → 3.3.3

package/README.md

@@ -77,7 +77,13 @@ In the app, open Debug Panel -> `DevConnect` -> `Send Once` or `Start Live Sync`
 
 DevConnect auto-detects simulator/emulator and uses local host settings automatically. On real devices, enter your computer IP to connect.
 
-For Remote JS Bundle, run Metro on your computer, enter computer IP and Metro port in `DevConnect`, then tap `Use Metro Bundle`. DevConnect writes React Native's native dev-server host setting and reloads the app. The IP and ports are persisted through AsyncStorage when installed, or through the native module after rebuild.
+For Remote JS Bundle, run Metro on your computer, enter computer IP and Metro port in `DevConnect`, then tap `Use Metro Bundle`. DevConnect persists the host and hot-reloads from Metro.
+
+> **Debug builds only.** Metro host switching works in Debug builds. Release builds load the embedded bundle and the controls are disabled (`release: disabled` badge).
+
+**iOS — no AppDelegate changes required.** On install, DevConnect hooks `RCTBundleURLProvider` so the app **cold-starts from the embedded `main.jsbundle`** and only connects to Metro after you apply a host in the panel (fixes Expo `.expo/.virtual-metro-entry` red screens when Metro is off). Use **Reset** to go back to the embedded bundle.
+
+The IP and ports are persisted through AsyncStorage when installed, or through the native module after rebuild.
 
 QR scan is optional. Install `react-native-camera-kit` or `expo-camera` in the app to enable the scan button. The app must request camera permission before scanning.
 

package/README.zh-CN.md

@@ -77,7 +77,13 @@ App 内打开 Debug Panel -> `DevConnect` -> `Send Once` 或 `Start Live Sync`
 
 DevConnect 自动识别模拟器/真机，模拟器下自动使用本机 Metro/daemon 地址。真机需输入电脑 IP 地址。
 
-Remote JS Bundle：先在电脑启动 Metro，在 `DevConnect` 输入电脑 IP 和 Metro 端口，然后点 `Use Metro Bundle`。DevConnect 会写入 React Native 原生 dev-server host 设置并 reload App。IP 和端口会通过 AsyncStorage 持久化；如果没装 AsyncStorage，则在重建后通过本库原生模块持久化。
+Remote JS Bundle：先在电脑启动 Metro，在 `DevConnect` 输入电脑 IP 和 Metro 端口，然后点 `Use Metro Bundle`。DevConnect 会持久化 host 并从 Metro 热重载。
+
+> **仅 Debug 包可用。** Release 包控件会显示 `release: disabled` 并禁用。
+
+**iOS — 无需改 AppDelegate。** 安装本库后会 hook `RCTBundleURLProvider`：**未配置 IP 时冷启动走内置 `main.jsbundle`**，只有在面板里应用 host 后才连 Metro（可避免 Metro 未开时的 `.expo/.virtual-metro-entry` 红屏）。点 **Reset** 可回到内置 bundle。
+
+IP 和端口会通过 AsyncStorage 持久化；如果没装 AsyncStorage，则在重建后通过本库原生模块持久化。
 
 扫码是可选能力。App 安装 `react-native-camera-kit` 或 `expo-camera` 后，DevConnect 才显示扫码按钮。App 仍需自己配置相机权限文案，并在使用扫码前申请相机权限。
 

package/bin/debug-toolkit.js

@@ -27,10 +27,19 @@ function hasHelpFlag(args) {
 function printHelp() {
   process.stderr.write(
     'Usage: debug-toolkit [--host 0.0.0.0] [--port 3799] [--token dev-token] [--store ~/.react-native-debug-toolkit/daemon-devices.json] [--daemon-only]\n'
+  + '       debug-toolkit embed [--platform ios|android] [--undo] [--yes]\n'
   + '\n'
   + 'Starts the debug toolkit: daemon (HTTP + Web Console) and MCP stdio server.\n'
   + '\n'
-  + 'Options:\n'
+  + 'Commands:\n'
+  + '  embed           Embed JS bundle in debug builds (run in host app root)\n'
+  + '\n'
+  + 'Embed options:\n'
+  + '  --platform <p>  Target platform: ios or android (default: both)\n'
+  + '  --undo          Remove embed injections\n'
+  + '  --yes           Skip confirmations (CI/EAS)\n'
+  + '\n'
+  + 'Daemon options:\n'
   + '  --host <addr>   Host to bind (default: 0.0.0.0)\n'
     + '  --port <port>   Port to bind (default: 3799)\n'
   + '  --token <str>   Auth token for daemon endpoints\n'
@@ -57,6 +66,12 @@ async function main() {
     return;
   }
 
+  // Route embed subcommand
+  if (args[0] === 'embed') {
+    const { main: embedMain } = require('../scripts/embed');
+    return embedMain(args.slice(1));
+  }
+
   const host = readOption(args, '--host', process.env.DEBUG_TOOLKIT_DAEMON_HOST || DEFAULT_HOST);
   const port = Number(readOption(args, '--port', process.env.DEBUG_TOOLKIT_DAEMON_PORT || DEFAULT_PORT));
   const token = readOption(args, '--token', process.env.DEBUG_TOOLKIT_DAEMON_TOKEN || '');

package/ios/DebugToolkitDevConnect.h

@@ -0,0 +1,17 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Returns a Metro bundle URL when the user has applied a host via DevConnect; otherwise nil.
+
+ Zero-config: installing this pod hooks RCTBundleURLProvider so cold start uses the embedded
+ main.jsbundle until DevConnect applies a host. You do not need to change AppDelegate.
+
+ Optional override for custom bundleURL() implementations:
+
+     if let metro = DebugToolkitMetroBundleURL() { return metro }
+ */
+FOUNDATION_EXPORT NSURL * _Nullable DebugToolkitMetroBundleURL(void);
+
+NS_ASSUME_NONNULL_END

package/ios/DebugToolkitDevConnect.mm

@@ -1,49 +1,220 @@
+#import "DebugToolkitDevConnect.h"
+
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <React/RCTBridge.h>
 #import <React/RCTBundleManager.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTBundleURLProvider.h>
-#import <React/RCTDefines.h>
 #import <React/RCTReloadCommand.h>
 #import <objc/runtime.h>
 #include <ifaddrs.h>
 #include <arpa/inet.h>
 #include <net/if.h>
 
-static NSString *const DebugToolkitBundleRoot = @"index";
-static NSString *const kDevConnectMetroHost = @"_devconnect_metro_host";
+// Debug-only Metro host switching — zero host-app native changes required.
+//
+// RN/Expo Debug templates call jsBundleURLForBundleRoot:fallbackURLProvider:, which consults
+// -packagerServerHostPort (guessPackagerHost on simulator when Metro is running). We hook:
+//   1. jsBundleURLForBundleRoot:fallbackURLProvider: — no DevConnect host → main.jsbundle first.
+//   2. packagerServerHostPort — no DevConnect host → nil (block auto-discovered localhost:8081).
+//
+// Optional: host apps may call DebugToolkitMetroBundleURL() from bundleURL() for explicit control.
+
+static NSString *const kBundleRoot = @"index";
+// Expo prebuild templates pass this to jsBundleURLForBundleRoot: in Debug (see expo/expo#21643).
+static NSString *const kExpoVirtualMetroEntry = @".expo/.virtual-metro-entry";
+static NSString *const kMetroHostKey = @"_devconnect_metro_host";
+
+static BOOL gPackagerHookInstalled = NO;
+static BOOL gBundleRootHookInstalled = NO;
 
-#pragma mark - AppDelegate Swizzling
+static NSURL *(*gOrigJsBundleURLForBundleRootWithFallback)(id, SEL, NSString *, NSURL * _Nonnull (^)(void));
 
-static IMP original_sourceURLForBridge = NULL;
+static BOOL DevConnectEmbeddedFirstHooksActive(void)
+{
+  return gBundleRootHookInstalled;
+}
 
-static NSURL *devconnect_sourceURLForBridge(id self, SEL _cmd, RCTBridge *bridge)
+static NSURL *DebugToolkitEmbeddedBundleURL(void)
 {
-  NSString *metroHost = [[NSUserDefaults standardUserDefaults] stringForKey:kDevConnectMetroHost];
-  if (metroHost.length > 0) {
-    NSString *urlStr = [NSString stringWithFormat:
-        @"http://%@/%@.bundle?platform=ios&dev=true&minify=false&lazy=true", metroHost, DebugToolkitBundleRoot];
-    NSURL *url = [NSURL URLWithString:urlStr];
-    NSLog(@"[DevConnect] swizzle: returning Metro URL %@ (host=%@)", url, metroHost);
-    return url;
+  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+}
+
+static NSString *DevConnectPersistedMetroHost(void)
+{
+  return [[NSUserDefaults standardUserDefaults] stringForKey:kMetroHostKey];
+}
+
+static void DevConnectSetPersistedMetroHost(NSString *_Nullable hostPort)
+{
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+  if (hostPort.length > 0) {
+    [defaults setObject:hostPort forKey:kMetroHostKey];
+  } else {
+    [defaults removeObjectForKey:kMetroHostKey];
   }
-  if (original_sourceURLForBridge) {
-    return ((NSURL *(*)(id, SEL, RCTBridge *))original_sourceURLForBridge)(self, _cmd, bridge);
+  [defaults synchronize];
+}
+
+static void DebugToolkitPrepareBundleSourceIfNeeded(void)
+{
+  // Touch sharedSettings so RCTBundleURLProvider is linked before hook install retries.
+  RCTBundleURLProvider *settings = [RCTBundleURLProvider sharedSettings];
+  if (DevConnectPersistedMetroHost().length > 0) {
+    return;
   }
-  return nil;
+  [settings resetToDefaults];
+}
+
+static BOOL DevConnectIsExpoProject(void)
+{
+  static dispatch_once_t onceToken;
+  static BOOL isExpo = NO;
+  dispatch_once(&onceToken, ^{
+    // Heuristic: matches common Expo prebuild / dev-client binaries.
+    isExpo = NSClassFromString(@"EXAppDelegateWrapper") != nil
+          || [[NSBundle mainBundle] objectForInfoDictionaryKey:@"EXUpdatesURL"] != nil
+          || [[NSBundle mainBundle] objectForInfoDictionaryKey:@"EXPO_RUNTIME_VERSION"] != nil;
+  });
+  return isExpo;
 }
 
-static void swizzleSourceURLForBridge(Class targetClass)
+/// Bundle root Metro expects when DevConnect steers the packager (index for plain RN, virtual entry for Expo).
+static NSString *DevConnectMetroBundleRoot(void)
 {
-  if (!targetClass) return;
-  SEL selector = @selector(sourceURLForBridge:);
-  Method method = class_getInstanceMethod(targetClass, selector);
-  if (!method) return;
-  if (original_sourceURLForBridge) return; // Already swizzled
-  original_sourceURLForBridge = method_setImplementation(method, (IMP)devconnect_sourceURLForBridge);
-  NSLog(@"[DevConnect] swizzled sourceURLForBridge: on %@", NSStringFromClass(targetClass));
+  return DevConnectIsExpoProject() ? kExpoVirtualMetroEntry : kBundleRoot;
+}
+
+static NSURL *DevConnectMetroURLForPersistedHost(void)
+{
+  NSString *host = DevConnectPersistedMetroHost();
+  if (host.length == 0) {
+    return nil;
+  }
+  RCTBundleURLProvider *settings = [RCTBundleURLProvider sharedSettings];
+  settings.jsLocation = host;
+  return [settings jsBundleURLForBundleRoot:DevConnectMetroBundleRoot()];
+}
+
+/// When no DevConnect host: block guessPackagerHost (simulator often has Metro on :8081).
+static NSString *replacement_packagerServerHostPort(id self, SEL _cmd)
+{
+  NSString *host = DevConnectPersistedMetroHost();
+  if (host.length == 0) {
+    return nil;
+  }
+  [(RCTBundleURLProvider *)self setJsLocation:host];
+  return host;
 }
 
+/// Primary hook: return embedded main.jsbundle before RN/Expo tries Metro / virtual-metro-entry.
+static NSURL *replacement_jsBundleURLForBundleRoot_fallback(
+    id self, SEL _cmd, NSString *bundleRoot, NSURL * _Nonnull (^fallbackURLProvider)(void))
+{
+  if (DevConnectPersistedMetroHost().length == 0) {
+    NSURL *embedded = DebugToolkitEmbeddedBundleURL();
+    if (embedded) {
+      NSLog(@"[DevConnect] cold start → embedded bundle (root=%@)", bundleRoot);
+      return embedded;
+    }
+    NSLog(@"[DevConnect] no embedded main.jsbundle — falling back to Metro (root=%@)", bundleRoot);
+  }
+
+  if (gOrigJsBundleURLForBundleRootWithFallback) {
+    return gOrigJsBundleURLForBundleRootWithFallback(self, _cmd, bundleRoot, fallbackURLProvider);
+  }
+  return fallbackURLProvider ? fallbackURLProvider() : nil;
+}
+
+static void DebugToolkitInstallPackagerHook(Class cls)
+{
+  if (gPackagerHookInstalled) {
+    return;
+  }
+  Method method = class_getInstanceMethod(cls, @selector(packagerServerHostPort));
+  if (!method) {
+    NSLog(@"[DevConnect] packagerServerHostPort not found");
+    return;
+  }
+  IMP replacement = (IMP)replacement_packagerServerHostPort;
+  if (method_getImplementation(method) == replacement) {
+    gPackagerHookInstalled = YES;
+    return;
+  }
+  method_setImplementation(method, replacement);
+  gPackagerHookInstalled = YES;
+}
+
+static void DebugToolkitInstallBundleRootHook(Class cls)
+{
+  if (gBundleRootHookInstalled) {
+    return;
+  }
+  SEL selector = @selector(jsBundleURLForBundleRoot:fallbackURLProvider:);
+  Method method = class_getInstanceMethod(cls, selector);
+  if (!method) {
+    NSLog(@"[DevConnect] jsBundleURLForBundleRoot:fallbackURLProvider: not found");
+    return;
+  }
+  IMP replacement = (IMP)replacement_jsBundleURLForBundleRoot_fallback;
+  gOrigJsBundleURLForBundleRootWithFallback =
+      (NSURL * (*)(id, SEL, NSString *, NSURL * _Nonnull (^)(void)))method_getImplementation(method);
+  if ((IMP)gOrigJsBundleURLForBundleRootWithFallback == replacement) {
+    gBundleRootHookInstalled = YES;
+    return;
+  }
+  method_setImplementation(method, replacement);
+  gBundleRootHookInstalled = YES;
+}
+
+static void DebugToolkitInstallAllHooks(void)
+{
+  if (gBundleRootHookInstalled && gPackagerHookInstalled) {
+    return;
+  }
+
+  Class cls = NSClassFromString(@"RCTBundleURLProvider");
+  if (!cls) {
+    NSLog(@"[DevConnect] RCTBundleURLProvider not loaded — hooks will retry");
+    return;
+  }
+
+  DebugToolkitInstallBundleRootHook(cls);
+  DebugToolkitInstallPackagerHook(cls);
+
+  static BOOL didLogOutcome = NO;
+  if (!didLogOutcome && (gBundleRootHookInstalled || gPackagerHookInstalled)) {
+    didLogOutcome = YES;
+    if (DevConnectEmbeddedFirstHooksActive()) {
+      NSLog(@"[DevConnect] embedded-first hooks active (bundleRoot=%@ packager=%@)",
+            gBundleRootHookInstalled ? @"Y" : @"N",
+            gPackagerHookInstalled ? @"Y" : @"N");
+    } else {
+      NSLog(@"[DevConnect] embedded-first hooks FAILED — rebuild / check React linkage");
+    }
+  }
+}
+
+NSURL *DebugToolkitMetroBundleURL(void)
+{
+  return DevConnectMetroURLForPersistedHost();
+}
+
+// RCT_EXPORT_MODULE defines +load for module registration — use a separate class for hooks.
+@interface DebugToolkitDevConnectBootstrap : NSObject
+@end
+
+@implementation DebugToolkitDevConnectBootstrap
+
++ (void)load
+{
+  DebugToolkitPrepareBundleSourceIfNeeded();
+  DebugToolkitInstallAllHooks();
+}
+
+@end
+
 #pragma mark - Module
 
 @interface DebugToolkitDevConnect : NSObject <RCTBridgeModule>
@@ -56,61 +227,64 @@ RCT_EXPORT_MODULE(DebugToolkitDevConnect)
 @synthesize bridge = _bridge;
 @synthesize bundleManager = _bundleManager;
 
-__attribute__((constructor))
-static void devconnect_swizzle_init(void)
-{
-  // Runs after all +load methods, before main() — same timing as +load but no conflict with RCT_EXPORT_MODULE
-  swizzleSourceURLForBridge(NSClassFromString(@"AppDelegate"));
-}
-
 - (instancetype)init
 {
   if ((self = [super init])) {
-    // Fallback — use actual delegate class at runtime (covers custom class names / Swift)
-    if (!original_sourceURLForBridge) {
-      Class delegateClass = object_getClass([UIApplication sharedApplication].delegate);
-      swizzleSourceURLForBridge(delegateClass);
-    }
+    DebugToolkitInstallAllHooks();
   }
   return self;
 }
 
-+ (BOOL)requiresMainQueueSetup
-{
-  return NO;
-}
++ (BOOL)requiresMainQueueSetup { return NO; }
+- (dispatch_queue_t)methodQueue { return dispatch_get_main_queue(); }
 
-- (dispatch_queue_t)methodQueue
+#pragma mark - Bundle Manager Resolution
+
+- (RCTBundleManager *)resolveBundleManager
 {
-  return dispatch_get_main_queue();
+  if (_bundleManager) return _bundleManager;
+  if (_bridge) return [_bridge moduleForClass:[RCTBundleManager class]];
+  return nil;
 }
 
-#pragma mark - Bundle Manager Resolution
+#pragma mark - Host Parsing
 
-- (RCTBundleManager *)resolveBundleManager
+- (NSString *)normalizeHostPort:(NSString *)hostPort
 {
-  if (_bundleManager) {
-    return _bundleManager;
-  }
-  if (_bridge) {
-    return [_bridge moduleForClass:[RCTBundleManager class]];
+  NSRange sep = [hostPort rangeOfString:@":" options:NSBackwardsSearch];
+  NSString *host = sep.location == NSNotFound ? hostPort : [hostPort substringToIndex:sep.location];
+  NSString *portStr = sep.location == NSNotFound ? @"" : [hostPort substringFromIndex:sep.location + 1];
+
+  NSNumberFormatter *formatter = [NSNumberFormatter new];
+  formatter.numberStyle = NSNumberFormatterDecimalStyle;
+  NSNumber *parsed = [formatter numberFromString:portStr];
+  int port;
+  if (parsed && parsed.intValue > 0 && parsed.intValue <= 65535) {
+    port = parsed.intValue;
+  } else {
+#ifdef RCT_METRO_PORT
+    port = RCT_METRO_PORT;
+#else
+    port = 8081;
+#endif
   }
-  return nil;
+  return [NSString stringWithFormat:@"%@:%d", host, port];
 }
 
-#pragma mark - Exported Methods
+#pragma mark - Reload helper
 
-RCT_EXPORT_METHOD(getMetroHost:(RCTPromiseResolveBlock)resolve
-                  rejecter:(__unused RCTPromiseRejectBlock)reject)
+- (void)reloadWithBundleURL:(NSURL *)bundleURL reason:(NSString *)reason
 {
-  @try {
-    NSString *host = [RCTBundleURLProvider sharedSettings].jsLocation;
-    resolve(host ?: [NSNull null]);
-  } @catch (NSException *exception) {
-    reject(@"native_error", exception.reason, nil);
+  if (bundleURL) {
+    RCTBundleManager *bm = [self resolveBundleManager];
+    if (bm) bm.bundleURL = bundleURL;
+    RCTReloadCommandSetBundleURL(bundleURL);
   }
+  RCTTriggerReloadCommandListeners(reason);
 }
 
+#pragma mark - Exported Methods
+
 RCT_EXPORT_METHOD(applyMetroHost:(NSString *)hostPort
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
@@ -120,71 +294,24 @@ RCT_EXPORT_METHOD(applyMetroHost:(NSString *)hostPort
       reject(@"invalid_host", @"Metro host cannot be empty.", nil);
       return;
     }
+    NSString *normalized = [self normalizeHostPort:hostPort];
 
-    RCTBundleURLProvider *settings = [RCTBundleURLProvider sharedSettings];
-
-    // Parse host and port
-    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) {
-#ifdef RCT_METRO_PORT
-      portNumber = [NSNumber numberWithInt:RCT_METRO_PORT];
-#else
-      portNumber = [NSNumber numberWithInt:8081];
-#endif
-    }
-
-    NSString *normalizedHostPort = [NSString stringWithFormat:@"%@:%d", host, portNumber.intValue];
-
-    // Persist for AppDelegate swizzle (Release mode + restart)
-    [[NSUserDefaults standardUserDefaults] setObject:normalizedHostPort forKey:kDevConnectMetroHost];
-    [[NSUserDefaults standardUserDefaults] synchronize];
-
-    // Also set jsLocation (Debug mode + hot reload)
-    settings.jsLocation = normalizedHostPort;
-
-    // Try hot reload via bundleManager (works in Debug)
-    NSURL *bundleURL = nil;
-    if (DebugToolkitBundleRoot.length > 0) {
-      bundleURL = [settings jsBundleURLForBundleRoot:DebugToolkitBundleRoot];
-    }
-    RCTBundleManager *bm = [self resolveBundleManager];
-    if (bm) {
-      bm.bundleURL = bundleURL;
-    }
-#ifdef RCTReloadCommandSetBundleURL
-    else if (bundleURL) {
-      RCTReloadCommandSetBundleURL(bundleURL);
-    }
-#endif
-
-    NSLog(@"[DevConnect] applyMetroHost: %@ | bm=%@ | bridge=%@ | url=%@",
-          normalizedHostPort, bm ? @"YES" : @"nil", _bridge ? @"YES" : @"nil", bundleURL);
+    DevConnectSetPersistedMetroHost(normalized);
 
-    RCTTriggerReloadCommandListeners(@"Dev menu - apply changes");
-
-    NSMutableDictionary *result = [@{@"hostPort" : normalizedHostPort} mutableCopy];
-    if (bm && bm.bundleURL.absoluteString) {
-      result[@"bundleURL"] = bm.bundleURL.absoluteString;
-    }
-    resolve(result);
-  } @catch (NSException *exception) {
-    NSLog(@"[DevConnect] applyMetroHost EXCEPTION: %@", exception.reason);
-    reject(@"native_error", exception.reason, nil);
+    RCTBundleURLProvider *settings = [RCTBundleURLProvider sharedSettings];
+    settings.jsLocation = normalized;
+    NSURL *bundleURL = [settings jsBundleURLForBundleRoot:DevConnectMetroBundleRoot()];
+
+    [self reloadWithBundleURL:bundleURL reason:@"Dev menu - apply changes"];
+
+    NSLog(@"[DevConnect] applyMetroHost host=%@ url=%@", normalized, bundleURL);
+    resolve(@{
+      @"hostPort": normalized,
+      @"bundleURL": bundleURL.absoluteString ?: [NSNull null],
+    });
+  } @catch (NSException *e) {
+    NSLog(@"[DevConnect] applyMetroHost EXCEPTION: %@", e.reason);
+    reject(@"native_error", e.reason ?: @"unknown", nil);
   }
 }
 
@@ -192,29 +319,57 @@ RCT_EXPORT_METHOD(resetMetroHost:(RCTPromiseResolveBlock)resolve
                   rejecter:(__unused RCTPromiseRejectBlock)reject)
 {
   @try {
-    // Clear stored Metro host
-    [[NSUserDefaults standardUserDefaults] removeObjectForKey:kDevConnectMetroHost];
-    [[NSUserDefaults standardUserDefaults] synchronize];
+    DevConnectSetPersistedMetroHost(nil);
 
-    // Reset RN settings
     RCTBundleURLProvider *settings = [RCTBundleURLProvider sharedSettings];
     [settings resetToDefaults];
-    NSURL *bundleURL = [settings jsBundleURLForFallbackExtension:nil];
 
-    RCTBundleManager *bm = [self resolveBundleManager];
-    if (bm) {
-      bm.bundleURL = bundleURL;
+    NSURL *embedded = DebugToolkitEmbeddedBundleURL();
+    if (!embedded) {
+      embedded = [settings jsBundleURLForFallbackExtension:nil];
     }
 
-    NSLog(@"[DevConnect] resetMetroHost | bm=%@ | url=%@", bm ? @"YES" : @"nil", bundleURL);
-    RCTTriggerReloadCommandListeners(@"Dev menu - reset to default");
+    [self reloadWithBundleURL:embedded reason:@"Dev menu - reset to default"];
+
+    NSLog(@"[DevConnect] resetMetroHost url=%@", embedded);
     resolve([NSNull null]);
-  } @catch (NSException *exception) {
-    NSLog(@"[DevConnect] resetMetroHost EXCEPTION: %@", exception.reason);
-    reject(@"native_error", exception.reason, nil);
+  } @catch (NSException *e) {
+    NSLog(@"[DevConnect] resetMetroHost EXCEPTION: %@", e.reason);
+    reject(@"native_error", e.reason ?: @"unknown", nil);
   }
 }
 
+RCT_EXPORT_METHOD(getMetroHost:(RCTPromiseResolveBlock)resolve
+                  rejecter:(__unused RCTPromiseRejectBlock)reject)
+{
+  NSString *host = DevConnectPersistedMetroHost();
+  resolve(host.length > 0 ? host : [NSNull null]);
+}
+
+RCT_EXPORT_METHOD(getDiagnostics:(RCTPromiseResolveBlock)resolve
+                  rejecter:(__unused RCTPromiseRejectBlock)reject)
+{
+  Class realDelegate = object_getClass([UIApplication sharedApplication].delegate);
+  NSString *delegateName = realDelegate ? NSStringFromClass(realDelegate) : @"unknown";
+  NSString *persisted = DevConnectPersistedMetroHost();
+
+#if DEBUG
+  BOOL isDebug = YES;
+#else
+  BOOL isDebug = NO;
+#endif
+
+  resolve(@{
+    @"persistedMetroHost": persisted.length > 0 ? persisted : [NSNull null],
+    @"appDelegateClass": delegateName,
+    @"isDebugBuild": @(isDebug),
+    @"hasEmbeddedBundle": @(DebugToolkitEmbeddedBundleURL() != nil),
+    @"embeddedFirstHookInstalled": @(DevConnectEmbeddedFirstHooksActive()),
+    @"packagerHookInstalled": @(gPackagerHookInstalled),
+    @"bundleRootHookInstalled": @(gBundleRootHookInstalled),
+  });
+}
+
 RCT_EXPORT_METHOD(getPreference:(NSString *)key
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(__unused RCTPromiseRejectBlock)reject)
@@ -222,8 +377,8 @@ RCT_EXPORT_METHOD(getPreference:(NSString *)key
   @try {
     NSString *value = [[NSUserDefaults standardUserDefaults] stringForKey:key];
     resolve(value ?: [NSNull null]);
-  } @catch (NSException *exception) {
-    reject(@"native_error", exception.reason, nil);
+  } @catch (NSException *e) {
+    reject(@"native_error", e.reason ?: @"unknown", nil);
   }
 }
 
@@ -236,8 +391,8 @@ RCT_EXPORT_METHOD(setPreference:(NSString *)key
     [[NSUserDefaults standardUserDefaults] setObject:value forKey:key];
     [[NSUserDefaults standardUserDefaults] synchronize];
     resolve([NSNull null]);
-  } @catch (NSException *exception) {
-    reject(@"native_error", exception.reason, nil);
+  } @catch (NSException *e) {
+    reject(@"native_error", e.reason ?: @"unknown", nil);
   }
 }
 
@@ -256,40 +411,27 @@ RCT_EXPORT_METHOD(getLocalIp:(RCTPromiseResolveBlock)resolve
 {
   @try {
     struct ifaddrs *interfaces = NULL;
-    if (getifaddrs(&interfaces) == 0) {
-      struct ifaddrs *iface = interfaces;
-      while (iface != NULL) {
-        if (iface->ifa_addr != NULL && iface->ifa_addr->sa_family == AF_INET && !(iface->ifa_flags & IFF_LOOPBACK)) {
-          if (strcmp(iface->ifa_name, "en0") == 0) {
-            char addrStr[INET_ADDRSTRLEN];
-            struct sockaddr_in *sin = (struct sockaddr_in *)iface->ifa_addr;
-            inet_ntop(AF_INET, &sin->sin_addr, addrStr, sizeof(addrStr));
-            NSString *ip = [NSString stringWithUTF8String:addrStr];
-            freeifaddrs(interfaces);
-            resolve(ip);
-            return;
-          }
-        }
-        iface = iface->ifa_next;
-      }
-      iface = interfaces;
-      while (iface != NULL) {
-        if (iface->ifa_addr != NULL && iface->ifa_addr->sa_family == AF_INET && !(iface->ifa_flags & IFF_LOOPBACK)) {
-          char addrStr[INET_ADDRSTRLEN];
-          struct sockaddr_in *sin = (struct sockaddr_in *)iface->ifa_addr;
-          inet_ntop(AF_INET, &sin->sin_addr, addrStr, sizeof(addrStr));
-          NSString *ip = [NSString stringWithUTF8String:addrStr];
-          freeifaddrs(interfaces);
-          resolve(ip);
-          return;
-        }
-        iface = iface->ifa_next;
-      }
+    if (getifaddrs(&interfaces) != 0) {
+      resolve([NSNull null]);
+      return;
+    }
+
+    NSString *preferred = nil;
+    NSString *fallback = nil;
+    for (struct ifaddrs *iface = interfaces; iface != NULL; iface = iface->ifa_next) {
+      if (!iface->ifa_addr || iface->ifa_addr->sa_family != AF_INET) continue;
+      if (iface->ifa_flags & IFF_LOOPBACK) continue;
+      char addrStr[INET_ADDRSTRLEN];
+      struct sockaddr_in *sin = (struct sockaddr_in *)iface->ifa_addr;
+      inet_ntop(AF_INET, &sin->sin_addr, addrStr, sizeof(addrStr));
+      NSString *ip = [NSString stringWithUTF8String:addrStr];
+      if (strcmp(iface->ifa_name, "en0") == 0) { preferred = ip; break; }
+      if (!fallback) fallback = ip;
     }
     freeifaddrs(interfaces);
-    resolve([NSNull null]);
-  } @catch (NSException *exception) {
-    reject(@"native_error", exception.reason, nil);
+    resolve(preferred ?: fallback ?: [NSNull null]);
+  } @catch (NSException *e) {
+    reject(@"native_error", e.reason ?: @"unknown", nil);
   }
 }