react-native-debug-toolkit 3.2.3 → 3.2.5

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

@@ -7,6 +7,7 @@ import android.preference.PreferenceManager;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.reactnativedebugtoolkit.BuildConfig;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -16,6 +17,10 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 
 import java.lang.reflect.Method;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Enumeration;
 
 public class DebugToolkitDevConnectModule extends ReactContextBaseJavaModule {
   private static final String MODULE_NAME = "DebugToolkitDevConnect";
@@ -47,7 +52,27 @@ public class DebugToolkitDevConnectModule extends ReactContextBaseJavaModule {
     }
   }
 
-  private boolean triggerDevSupportReload(@Nullable Object devSupportManager) throws Exception {
+  private void setDebugServerHost(@Nullable Object devSupportManager, String hostPort) throws Exception {
+    if (devSupportManager == null) {
+      return;
+    }
+
+    Object devSettings = callGetter(devSupportManager, "getDevSettings");
+    Object packagerConnectionSettings = devSettings == null
+        ? null
+        : callGetter(devSettings, "getPackagerConnectionSettings");
+    if (packagerConnectionSettings == null) {
+      return;
+    }
+
+    Method setter = packagerConnectionSettings.getClass().getMethod("setDebugServerHost", String.class);
+    setter.invoke(packagerConnectionSettings, hostPort);
+  }
+
+  private boolean triggerDevSupportReload(
+      @Nullable Object devSupportManager,
+      String hostPort
+  ) throws Exception {
     if (devSupportManager == null) {
       return false;
     }
@@ -57,18 +82,23 @@ public class DebugToolkitDevConnectModule extends ReactContextBaseJavaModule {
       return false;
     }
 
+    setDebugServerHost(devSupportManager, hostPort);
     Method reloadMethod = devSupportManager.getClass().getMethod("handleReloadJS");
     reloadMethod.invoke(devSupportManager);
     return true;
   }
 
-  private boolean reloadFromReactHost(Context applicationContext, String reason) throws Exception {
+  private boolean reloadFromReactHost(
+      Context applicationContext,
+      String reason,
+      String hostPort
+  ) throws Exception {
     Object reactHost = callGetter(applicationContext, "getReactHost");
     if (reactHost == null) {
       return false;
     }
 
-    if (triggerDevSupportReload(callGetter(reactHost, "getDevSupportManager"))) {
+    if (triggerDevSupportReload(callGetter(reactHost, "getDevSupportManager"), hostPort)) {
       return true;
     }
 
@@ -77,7 +107,7 @@ public class DebugToolkitDevConnectModule extends ReactContextBaseJavaModule {
     return true;
   }
 
-  private boolean reloadFromReactNativeHost(Context applicationContext) throws Exception {
+  private boolean reloadFromReactNativeHost(Context applicationContext, String hostPort) throws Exception {
     Object reactNativeHost = callGetter(applicationContext, "getReactNativeHost");
     Object instanceManager = reactNativeHost == null
         ? null
@@ -85,15 +115,20 @@ public class DebugToolkitDevConnectModule extends ReactContextBaseJavaModule {
     Object devSupportManager = instanceManager == null
         ? null
         : callGetter(instanceManager, "getDevSupportManager");
-    return triggerDevSupportReload(devSupportManager);
+    return triggerDevSupportReload(devSupportManager, hostPort);
   }
 
-  private void resolveAfterReload(String reason, @Nullable WritableMap result, Promise promise) {
+  private void resolveAfterReload(
+      String reason,
+      @Nullable WritableMap result,
+      String hostPort,
+      Promise promise
+  ) {
     UiThreadUtil.runOnUiThread(() -> {
       try {
         Context applicationContext = getReactApplicationContext().getApplicationContext();
-        boolean reloaded = reloadFromReactHost(applicationContext, reason)
-            || reloadFromReactNativeHost(applicationContext);
+        boolean reloaded = reloadFromReactHost(applicationContext, reason, hostPort)
+            || reloadFromReactNativeHost(applicationContext, hostPort);
         if (!reloaded) {
           promise.reject("reload_unavailable", "Unable to trigger React Native reload after updating Metro host.");
           return;
@@ -126,7 +161,7 @@ public class DebugToolkitDevConnectModule extends ReactContextBaseJavaModule {
 
     WritableMap result = Arguments.createMap();
     result.putString("hostPort", hostPort);
-    resolveAfterReload(APPLY_RELOAD_REASON, result, promise);
+    resolveAfterReload(APPLY_RELOAD_REASON, result, hostPort, promise);
   }
 
   @ReactMethod
@@ -137,7 +172,7 @@ public class DebugToolkitDevConnectModule extends ReactContextBaseJavaModule {
       return;
     }
 
-    resolveAfterReload(RESET_RELOAD_REASON, null, promise);
+    resolveAfterReload(RESET_RELOAD_REASON, null, "", promise);
   }
 
   @ReactMethod
@@ -151,4 +186,39 @@ public class DebugToolkitDevConnectModule extends ReactContextBaseJavaModule {
     getPreferences().edit().putString(key, value).apply();
     promise.resolve(null);
   }
+
+  @ReactMethod
+  public void isDebugBuild(Promise promise) {
+    promise.resolve("debug".equals(BuildConfig.BUILD_TYPE));
+  }
+
+  @ReactMethod
+  public void getLocalIp(Promise promise) {
+    try {
+      Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
+      String fallback = null;
+      while (interfaces != null && interfaces.hasMoreElements()) {
+        NetworkInterface iface = interfaces.nextElement();
+        if (iface.isLoopback() || !iface.isUp()) continue;
+        String name = iface.getName();
+        Enumeration<InetAddress> addresses = iface.getInetAddresses();
+        while (addresses.hasMoreElements()) {
+          InetAddress addr = addresses.nextElement();
+          if (addr instanceof Inet4Address && !addr.isLoopbackAddress()) {
+            String ip = addr.getHostAddress();
+            if (name != null && (name.startsWith("wlan") || name.startsWith("eth"))) {
+              promise.resolve(ip);
+              return;
+            }
+            if (fallback == null) {
+              fallback = ip;
+            }
+          }
+        }
+      }
+      promise.resolve(fallback);
+    } catch (Exception e) {
+      promise.resolve(null);
+    }
+  }
 }

package/ios/DebugToolkitDevConnect.mm

@@ -1,23 +1,14 @@
 #import <Foundation/Foundation.h>
+#import <React/RCTBundleManager.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTReloadCommand.h>
+#include <ifaddrs.h>
+#include <arpa/inet.h>
+#include <net/if.h>
 
-static NSString *const DebugToolkitRCTJsLocationKey = @"RCT_jsLocation";
 static NSString *const DebugToolkitBundleRoot = @"index";
 
-static void DebugToolkitResolveAfterReload(NSString *reason, id result, RCTPromiseResolveBlock resolve)
-{
-  dispatch_async(dispatch_get_main_queue(), ^{
-    NSURL *bundleURL = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:DebugToolkitBundleRoot];
-    if (bundleURL) {
-      RCTReloadCommandSetBundleURL(bundleURL);
-    }
-    RCTTriggerReloadCommandListeners(reason);
-    resolve(result ?: [NSNull null]);
-  });
-}
-
 @interface DebugToolkitDevConnect : NSObject <RCTBridgeModule>
 @end
 
@@ -25,11 +16,30 @@ static void DebugToolkitResolveAfterReload(NSString *reason, id result, RCTPromi
 
 RCT_EXPORT_MODULE(DebugToolkitDevConnect)
 
+@synthesize bundleManager = _bundleManager;
+
 + (BOOL)requiresMainQueueSetup
 {
   return NO;
 }
 
+- (void)applyBundleURL:(NSURL *)bundleURL
+                reason:(NSString *)reason
+                result:(id)result
+               resolve:(RCTPromiseResolveBlock)resolve
+{
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (bundleURL) {
+      if (self->_bundleManager) {
+        self->_bundleManager.bundleURL = bundleURL;
+      }
+      RCTReloadCommandSetBundleURL(bundleURL);
+    }
+    resolve(result ?: [NSNull null]);
+    RCTTriggerReloadCommandListeners(reason);
+  });
+}
+
 RCT_EXPORT_METHOD(getMetroHost:(RCTPromiseResolveBlock)resolve
                   rejecter:(__unused RCTPromiseRejectBlock)reject)
 {
@@ -47,17 +57,22 @@ RCT_EXPORT_METHOD(applyMetroHost:(NSString *)hostPort
   }
 
   [RCTBundleURLProvider sharedSettings].jsLocation = hostPort;
-  DebugToolkitResolveAfterReload(@"DebugToolkit DevConnect Metro host changed", @{ @"hostPort" : hostPort }, resolve);
+  NSURL *bundleURL = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:DebugToolkitBundleRoot];
+  [self applyBundleURL:bundleURL
+                reason:@"DebugToolkit DevConnect Metro host changed"
+                result:@{ @"hostPort" : hostPort }
+               resolve:resolve];
 }
 
 RCT_EXPORT_METHOD(resetMetroHost:(RCTPromiseResolveBlock)resolve
                   rejecter:(__unused RCTPromiseRejectBlock)reject)
 {
-  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-  [defaults removeObjectForKey:DebugToolkitRCTJsLocationKey];
-  [defaults synchronize];
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTBundleURLProviderUpdatedNotification object:nil];
-  DebugToolkitResolveAfterReload(@"DebugToolkit DevConnect Metro host reset", [NSNull null], resolve);
+  [[RCTBundleURLProvider sharedSettings] resetToDefaults];
+  NSURL *bundleURL = [[RCTBundleURLProvider sharedSettings] jsBundleURLForFallbackExtension:nil];
+  [self applyBundleURL:bundleURL
+                reason:@"DebugToolkit DevConnect Metro host reset"
+                result:[NSNull null]
+               resolve:resolve];
 }
 
 RCT_EXPORT_METHOD(getPreference:(NSString *)key
@@ -78,4 +93,54 @@ RCT_EXPORT_METHOD(setPreference:(NSString *)key
   resolve([NSNull null]);
 }
 
+RCT_EXPORT_METHOD(isDebugBuild:(RCTPromiseResolveBlock)resolve
+                  rejecter:(__unused RCTPromiseRejectBlock)reject)
+{
+#if DEBUG
+  resolve(@YES);
+#else
+  resolve(@NO);
+#endif
+}
+
+RCT_EXPORT_METHOD(getLocalIp:(RCTPromiseResolveBlock)resolve
+                  rejecter:(__unused RCTPromiseRejectBlock)reject)
+{
+  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)) {
+        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;
+    }
+    // Second pass: any non-loopback IPv4
+    iface = interfaces;
+    while (iface != NULL) {
+      if (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;
+    }
+  }
+  freeifaddrs(interfaces);
+  resolve([NSNull null]);
+}
+
 @end

package/lib/commonjs/core/initialize.js

@@ -57,14 +57,26 @@ function resolveDefaultFeatures() {
 /**
  * Initialize the debug toolkit.
  *
+ * Detects debug/release mode via native bridge first, falls back to `__DEV__`.
+ *
  * @example
- * initializeDebugToolkit({
+ * await initializeDebugToolkit({
  *   features: { network: true, console: true },
  *   enabled: true,
  * });
  */
-function initializeDebugToolkit(options) {
-  const enabled = options?.enabled ?? isDebugMode;
+async function initializeDebugToolkit(options) {
+  let enabled;
+  if (options?.enabled !== undefined) {
+    enabled = options.enabled;
+  } else {
+    try {
+      const nativeResult = await (0, _devConnect.nativeIsDebugBuild)();
+      enabled = nativeResult !== null ? nativeResult : isDebugMode;
+    } catch {
+      enabled = isDebugMode;
+    }
+  }
   const resolvedFeatures = options?.features ? resolveFeatureConfigs(options.features) : resolveDefaultFeatures();
   try {
     _DebugToolkit.DebugToolkit.setEnabled(enabled);

package/lib/commonjs/core/initialize.js.map

@@ -1 +1 @@
-{"version":3,"names":["_DebugToolkit","require","_network","_console","_zustand","_navigation","_track","_environment","_clipboard","_devConnect","_DaemonClient","isDebugMode","__DEV__","featureRegistry","network","createNetworkFeature","console","createConsoleLogFeature","zustand","createZustandLogFeature","navigation","createNavigationLogFeature","track","createTrackFeature","environment","createEnvironmentFeature","clipboard","createClipboardFeature","devConnect","createDevConnectFeature","DEFAULT_FEATURES","resolveFeatureConfigs","configs","features","entries","Object","name","config","creator","warn","undefined","push","resolveDefaultFeatures","map","initializeDebugToolkit","options","enabled","resolvedFeatures","DebugToolkit","setEnabled","reset","replaceFeatures","daemonClient","setEndpointDetector","url","addToBlacklist","hasFeatures","showLauncher","hideLauncher","restoreDevConnectSettingsToDaemon","then","restore","catch","error"],"sourceRoot":"../../../src","sources":["core/initialize.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_DebugToolkit","require","_network","_console","_zustand","_navigation","_track","_environment","_clipboard","_devConnect","_DaemonClient","isDebugMode","__DEV__","featureRegistry","network","createNetworkFeature","console","createConsoleLogFeature","zustand","createZustandLogFeature","navigation","createNavigationLogFeature","track","createTrackFeature","environment","createEnvironmentFeature","clipboard","createClipboardFeature","devConnect","createDevConnectFeature","DEFAULT_FEATURES","resolveFeatureConfigs","configs","features","entries","Object","name","config","creator","warn","undefined","push","resolveDefaultFeatures","map","initializeDebugToolkit","options","enabled","nativeResult","nativeIsDebugBuild","resolvedFeatures","DebugToolkit","setEnabled","reset","replaceFeatures","daemonClient","setEndpointDetector","url","addToBlacklist","hasFeatures","showLauncher","hideLauncher","restoreDevConnectSettingsToDaemon","then","restore","catch","error"],"sourceRoot":"../../../src","sources":["core/initialize.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/features/devConnect/DevConnectTab.js

@@ -11,7 +11,6 @@ var _DaemonClient = require("../../utils/DaemonClient");
 var _devConnectUtils = require("./devConnectUtils");
 var _devConnectPreferences = require("./devConnectPreferences");
 var _nativeDevConnect = require("./nativeDevConnect");
-var _DevConnectQrScanner = require("./DevConnectQrScanner");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const CONNECTION_TIMEOUT_MS = 2000;
@@ -34,7 +33,8 @@ function describeMetroFailure(result) {
   return result.error ? `Metro switch failed: ${result.error}` : 'Metro switch failed.';
 }
 function DevConnectTab({
-  snapshot
+  snapshot,
+  feature
 }) {
   const inputRef = (0, _react.useRef)(null);
   const [computerHost, setComputerHost] = (0, _react.useState)(snapshot.computerHost);
@@ -45,15 +45,23 @@ function DevConnectTab({
   const [message, setMessage] = (0, _react.useState)(null);
   const [sending, setSending] = (0, _react.useState)(false);
   const [metroBusy, setMetroBusy] = (0, _react.useState)(false);
-  const [qrVisible, setQrVisible] = (0, _react.useState)(false);
   const isSim = snapshot.isSimulator;
+  const updateFeatureSettings = (0, _react.useCallback)(patch => {
+    feature.updateSettings?.(patch);
+  }, [feature]);
   (0, _react.useEffect)(() => {
     setComputerHost(snapshot.computerHost);
+  }, [snapshot.computerHost]);
+  (0, _react.useEffect)(() => {
     setMetroPort(snapshot.metroPort);
+  }, [snapshot.metroPort]);
+  (0, _react.useEffect)(() => {
     setDaemonPort(snapshot.daemonPort);
+  }, [snapshot.daemonPort]);
+  (0, _react.useEffect)(() => {
     setStreaming(snapshot.streaming);
     setSyncState(snapshot.streaming ? 'running' : 'idle');
-  }, [snapshot.computerHost, snapshot.daemonPort, snapshot.metroPort, snapshot.streaming]);
+  }, [snapshot.streaming]);
   const metroHost = isSim ? getSimulatorMetroHost() : computerHost;
   const metroTarget = (0, _react.useMemo)(() => (0, _devConnectUtils.buildMetroTarget)(metroHost, metroPort), [metroHost, metroPort]);
   const metroUrls = (0, _react.useMemo)(() => (0, _devConnectUtils.buildMetroUrls)(metroHost, metroPort), [metroHost, metroPort]);
@@ -62,33 +70,88 @@ function DevConnectTab({
     const target = (0, _devConnectUtils.parseComputerTarget)(value);
     if (target) {
       setMetroPort(target.metroPort);
-      (0, _devConnectPreferences.saveComputerTarget)(value).catch(() => {});
+      (0, _devConnectPreferences.saveComputerTarget)(value).then(savedTarget => {
+        if (savedTarget) {
+          updateFeatureSettings({
+            computerHost: savedTarget.computerHost,
+            metroPort: savedTarget.metroPort
+          });
+        }
+      }).catch(() => {});
     }
     setSyncState(prev => prev === 'failed' ? 'idle' : prev);
     setMessage(null);
-  }, []);
+  }, [updateFeatureSettings]);
   const handleMetroPortChange = (0, _react.useCallback)(value => {
     setMetroPort(value);
     const normalized = (0, _devConnectUtils.normalizePort)(value);
     if (normalized) {
-      (0, _devConnectPreferences.saveMetroPort)(normalized).catch(() => {});
+      (0, _devConnectPreferences.saveMetroPort)(normalized).then(() => updateFeatureSettings({
+        metroPort: normalized
+      })).catch(() => {});
     }
     setMessage(null);
-  }, []);
+  }, [updateFeatureSettings]);
   const handleDaemonPortChange = (0, _react.useCallback)(value => {
     setDaemonPort(value);
     const normalized = (0, _devConnectUtils.normalizePort)(value);
     if (normalized) {
-      (0, _devConnectPreferences.saveDaemonPort)(normalized).catch(() => {});
+      (0, _devConnectPreferences.saveDaemonPort)(normalized).then(() => updateFeatureSettings({
+        daemonPort: normalized
+      })).catch(() => {});
     }
     setMessage(null);
-  }, []);
-  const handleQrTarget = (0, _react.useCallback)(target => {
-    setComputerHost(target.computerHost);
-    setMetroPort(target.metroPort);
-    (0, _devConnectPreferences.saveComputerTarget)(`${target.computerHost}:${target.metroPort}`).catch(() => {});
-    setMessage('Computer IP updated from QR code.');
-  }, []);
+  }, [updateFeatureSettings]);
+  const persistConnectionSettings = (0, _react.useCallback)(async () => {
+    const normalizedDaemonPort = (0, _devConnectUtils.normalizePort)(daemonPort);
+    if (!normalizedDaemonPort) {
+      setMessage('Enter a valid desktop logs port.');
+      return false;
+    }
+    const patch = {
+      daemonPort: normalizedDaemonPort
+    };
+    const writes = [(0, _devConnectPreferences.saveDaemonPort)(normalizedDaemonPort)];
+    setDaemonPort(normalizedDaemonPort);
+    if (!isSim) {
+      const normalizedHost = (0, _devConnectUtils.normalizeComputerHost)(computerHost);
+      if (!normalizedHost) {
+        setMessage('Enter your computer IP first.');
+        return false;
+      }
+      patch.computerHost = normalizedHost;
+      writes.push((0, _devConnectPreferences.saveComputerHost)(normalizedHost));
+      setComputerHost(normalizedHost);
+    }
+    const normalizedMetroPort = (0, _devConnectUtils.normalizePort)(metroPort);
+    if (normalizedMetroPort) {
+      patch.metroPort = normalizedMetroPort;
+      writes.push((0, _devConnectPreferences.saveMetroPort)(normalizedMetroPort));
+      setMetroPort(normalizedMetroPort);
+    }
+    await Promise.all(writes);
+    updateFeatureSettings(patch);
+    return true;
+  }, [computerHost, daemonPort, isSim, metroPort, updateFeatureSettings]);
+  const persistMetroSettings = (0, _react.useCallback)(async () => {
+    if (!metroTarget) {
+      setMessage('Enter a valid computer IP and Metro port.');
+      return false;
+    }
+    const patch = {
+      metroPort: metroTarget.port
+    };
+    const writes = [(0, _devConnectPreferences.saveMetroPort)(metroTarget.port)];
+    setMetroPort(metroTarget.port);
+    if (!isSim) {
+      patch.computerHost = metroTarget.host;
+      writes.push((0, _devConnectPreferences.saveComputerTarget)(metroTarget.hostPort));
+      setComputerHost(metroTarget.host);
+    }
+    await Promise.all(writes);
+    updateFeatureSettings(patch);
+    return true;
+  }, [isSim, metroTarget, updateFeatureSettings]);
   const validateSettings = (0, _react.useCallback)(() => {
     if (!isSim && !(0, _devConnectUtils.normalizeComputerHost)(computerHost)) {
       setMessage('Enter your computer IP first.');
@@ -130,6 +193,9 @@ function DevConnectTab({
     if (!validateSettings()) {
       return;
     }
+    if (!(await persistConnectionSettings())) {
+      return;
+    }
     const daemonOptions = configureDaemon();
     setMessage('Checking desktop connection...');
     setSyncState('checking');
@@ -165,11 +231,14 @@ function DevConnectTab({
       }
     });
     setStreaming(true);
-  }, [configureDaemon, streaming, validateSettings]);
+  }, [configureDaemon, persistConnectionSettings, streaming, validateSettings]);
   const sendOnce = (0, _react.useCallback)(async () => {
     if (!validateSettings()) {
       return;
     }
+    if (!(await persistConnectionSettings())) {
+      return;
+    }
     const daemonOptions = configureDaemon();
     setSending(true);
     setMessage('Checking desktop connection...');
@@ -196,7 +265,7 @@ function DevConnectTab({
     } finally {
       setSending(false);
     }
-  }, [configureDaemon, validateSettings]);
+  }, [configureDaemon, persistConnectionSettings, validateSettings]);
   const applyRemoteBundle = (0, _react.useCallback)(async () => {
     if (!metroTarget) {
       setMessage('Enter a valid computer IP and Metro port.');
@@ -211,6 +280,9 @@ function DevConnectTab({
     setMetroBusy(true);
     setMessage('Checking Metro...');
     try {
+      if (!(await persistMetroSettings())) {
+        return;
+      }
       const result = await (0, _nativeDevConnect.applyMetroBundle)(metroTarget.host, metroTarget.port);
       if (result.ok) {
         setMessage(`Using Metro at ${result.hostPort}. Reloading...`);
@@ -220,7 +292,7 @@ function DevConnectTab({
     } finally {
       setMetroBusy(false);
     }
-  }, [metroTarget, snapshot.nativeMetroAvailable]);
+  }, [metroTarget, persistMetroSettings, snapshot.nativeMetroAvailable]);
   const resetRemoteBundle = (0, _react.useCallback)(async () => {
     if (!snapshot.nativeMetroAvailable) {
       setMessage(describeMetroFailure({
@@ -243,10 +315,12 @@ function DevConnectTab({
   const canConnect = isSim || Boolean((0, _devConnectUtils.normalizeComputerHost)(computerHost)) && Boolean((0, _devConnectUtils.normalizePort)(daemonPort));
   const canUseMetro = Boolean(metroTarget) && snapshot.nativeMetroAvailable && !metroBusy;
   const busy = sending || syncState === 'checking';
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.KeyboardAvoidingView, {
+  const subnetPrefix = snapshot.subnetPrefix;
+  const ipPlaceholder = subnetPrefix ? `${subnetPrefix}...` : '192.168.1.10';
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.KeyboardAvoidingView, {
     style: styles.container,
     behavior: _reactNative.Platform.OS === 'ios' ? 'padding' : undefined,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.ScrollView, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.ScrollView, {
       keyboardShouldPersistTaps: "handled",
       showsVerticalScrollIndicator: false,
       contentContainerStyle: styles.scrollContent,
@@ -261,14 +335,14 @@ function DevConnectTab({
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
           style: styles.label,
           children: "Computer IP"
-        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
           style: styles.inputRow,
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TextInput, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TextInput, {
             ref: inputRef,
             style: styles.input,
             value: computerHost,
             onChangeText: handleHostChange,
-            placeholder: "192.168.1.10",
+            placeholder: ipPlaceholder,
             placeholderTextColor: _colors.Colors.textLight,
             autoCapitalize: "none",
             autoCorrect: false,
@@ -276,17 +350,19 @@ function DevConnectTab({
             returnKeyType: "done",
             onSubmitEditing: () => inputRef.current?.blur(),
             editable: !streaming
-          }), snapshot.qrAvailable ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
-            style: styles.scanButton,
-            onPress: () => setQrVisible(true),
-            disabled: streaming,
-            activeOpacity: 0.7,
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
-              style: styles.scanButtonText,
-              children: "Scan"
-            })
-          }) : null]
-        })]
+          })
+        }), subnetPrefix && !computerHost ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
+          style: styles.subnetHint,
+          onPress: () => {
+            setComputerHost(subnetPrefix);
+            inputRef.current?.focus();
+          },
+          activeOpacity: 0.6,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.Text, {
+            style: styles.subnetHintText,
+            children: ["Tap to fill: ", subnetPrefix]
+          })
+        }) : null]
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
         style: styles.section,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
@@ -415,11 +491,7 @@ function DevConnectTab({
           children: "Native DevConnect requires pod install / Gradle sync and app rebuild."
         }) : null]
       })]
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_DevConnectQrScanner.DevConnectQrScanner, {
-      visible: qrVisible,
-      onClose: () => setQrVisible(false),
-      onScanTarget: handleQrTarget
-    })]
+    })
   });
 }
 const styles = _reactNative.StyleSheet.create({
@@ -468,8 +540,15 @@ const styles = _reactNative.StyleSheet.create({
   },
   inputRow: {
     flexDirection: 'row',
-    alignItems: 'center',
-    gap: 8
+    alignItems: 'center'
+  },
+  subnetHint: {
+    marginTop: 6
+  },
+  subnetHintText: {
+    fontSize: 12,
+    color: _colors.Colors.primary,
+    fontWeight: '500'
   },
   input: {
     flex: 1,
@@ -483,22 +562,6 @@ const styles = _reactNative.StyleSheet.create({
     color: _colors.Colors.text,
     fontFamily: 'Courier'
   },
-  scanButton: {
-    minWidth: 62,
-    alignItems: 'center',
-    justifyContent: 'center',
-    paddingHorizontal: 12,
-    paddingVertical: 10,
-    borderRadius: 8,
-    backgroundColor: _colors.Colors.surface,
-    borderWidth: 1,
-    borderColor: _colors.Colors.primary
-  },
-  scanButtonText: {
-    color: _colors.Colors.primary,
-    fontSize: 13,
-    fontWeight: '600'
-  },
   portRow: {
     flexDirection: 'row',
     gap: 10