react-native-debug-toolkit 3.3.4 → 3.3.8

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

@@ -1,70 +1,34 @@
 "use strict";
 
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { KeyboardAvoidingView, Platform, ScrollView, StyleSheet, Text, TextInput, TouchableOpacity, View } from 'react-native';
 import { Colors } from '../../ui/theme/colors';
 import { buildDeviceDaemonEndpoint, daemonClient, getDefaultDaemonEndpoint, normalizeDaemonSettings } from '../../utils/DaemonClient';
-import { DEFAULT_DAEMON_PORT, DEFAULT_METRO_PORT, buildDaemonDeviceHost, buildMetroTarget, buildMetroUrls, normalizeComputerHost, normalizePort, parseComputerTarget } from './devConnectUtils';
-import { saveComputerHost, saveComputerTarget, saveDaemonPort, saveMetroPort } from './devConnectPreferences';
-import { applyMetroBundle, getNativeDiagnostics, resetMetroBundle } from './nativeDevConnect';
+import { DEFAULT_DAEMON_PORT, buildDaemonDeviceHost, normalizeComputerHost, normalizePort, parseComputerTarget } from './devConnectUtils';
+import { saveComputerHost, saveComputerTarget, saveDaemonPort } from './devConnectPreferences';
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 const CONNECTION_TIMEOUT_MS = 2000;
-function getSimulatorMetroHost() {
+function getSimulatorHost() {
   return Platform.OS === 'android' ? '10.0.2.2' : 'localhost';
 }
-function describeMetroFailure(result) {
-  if (result.reason === 'native_unavailable') {
-    return 'Native DevConnect not installed. Rebuild app after installing native module.';
-  }
-  if (result.reason === 'metro_unreachable') {
-    return result.error ? `Metro not reachable: ${result.error}` : 'Metro not reachable. Start Metro on that port.';
-  }
-  if (result.reason === 'fetch_unavailable') {
-    return 'Cannot check Metro because fetch is unavailable.';
-  }
-  if (result.reason === 'invalid_target') {
-    return 'Enter a valid computer IP and Metro port.';
-  }
-  return result.error ? `Metro switch failed: ${result.error}` : 'Metro switch failed.';
-}
 export function DevConnectTab({
   snapshot,
   feature
 }) {
   const inputRef = useRef(null);
   const [computerHost, setComputerHost] = useState(snapshot.computerHost);
-  const [metroPort, setMetroPort] = useState(snapshot.metroPort);
   const [daemonPort, setDaemonPort] = useState(snapshot.daemonPort);
   const [streaming, setStreaming] = useState(snapshot.streaming);
   const [syncState, setSyncState] = useState(snapshot.streaming ? 'running' : 'idle');
   const [message, setMessage] = useState(null);
   const [sending, setSending] = useState(false);
-  const [metroBusy, setMetroBusy] = useState(false);
-  const [diagData, setDiagData] = useState(null);
-  const [diagOpen, setDiagOpen] = useState(false);
   const isSim = snapshot.isSimulator;
   const updateFeatureSettings = useCallback(patch => {
     feature.updateSettings?.(patch);
   }, [feature]);
-  useEffect(() => {
-    getNativeDiagnostics().then(result => {
-      if (result) {
-        setDiagData(result);
-        console.info(`[DevConnect] debugBuild=${result.isDebugBuild} appDelegate=${result.appDelegateClass} persistedHost=${result.persistedMetroHost ?? 'none'}`);
-      }
-    }).catch(() => {});
-  }, []);
-  const refreshDiag = useCallback(() => {
-    getNativeDiagnostics().then(result => {
-      if (result) setDiagData(result);
-    }).catch(() => {});
-  }, []);
   useEffect(() => {
     setComputerHost(snapshot.computerHost);
   }, [snapshot.computerHost]);
-  useEffect(() => {
-    setMetroPort(snapshot.metroPort);
-  }, [snapshot.metroPort]);
   useEffect(() => {
     setDaemonPort(snapshot.daemonPort);
   }, [snapshot.daemonPort]);
@@ -72,19 +36,14 @@ export function DevConnectTab({
     setStreaming(snapshot.streaming);
     setSyncState(snapshot.streaming ? 'running' : 'idle');
   }, [snapshot.streaming]);
-  const metroHost = isSim ? getSimulatorMetroHost() : computerHost;
-  const metroTarget = useMemo(() => buildMetroTarget(metroHost, metroPort), [metroHost, metroPort]);
-  const metroUrls = useMemo(() => buildMetroUrls(metroHost, metroPort), [metroHost, metroPort]);
   const handleHostChange = useCallback(value => {
     setComputerHost(value);
     const target = parseComputerTarget(value);
     if (target) {
-      setMetroPort(target.metroPort);
       saveComputerTarget(value).then(savedTarget => {
         if (savedTarget) {
           updateFeatureSettings({
-            computerHost: savedTarget.computerHost,
-            metroPort: savedTarget.metroPort
+            computerHost: savedTarget.computerHost
           });
         }
       }).catch(() => {});
@@ -92,16 +51,6 @@ export function DevConnectTab({
     setSyncState(prev => prev === 'failed' ? 'idle' : prev);
     setMessage(null);
   }, [updateFeatureSettings]);
-  const handleMetroPortChange = useCallback(value => {
-    setMetroPort(value);
-    const normalized = normalizePort(value);
-    if (normalized) {
-      saveMetroPort(normalized).then(() => updateFeatureSettings({
-        metroPort: normalized
-      })).catch(() => {});
-    }
-    setMessage(null);
-  }, [updateFeatureSettings]);
   const handleDaemonPortChange = useCallback(value => {
     setDaemonPort(value);
     const normalized = normalizePort(value);
@@ -133,35 +82,10 @@ export function DevConnectTab({
       writes.push(saveComputerHost(normalizedHost));
       setComputerHost(normalizedHost);
     }
-    const normalizedMetroPort = normalizePort(metroPort);
-    if (normalizedMetroPort) {
-      patch.metroPort = normalizedMetroPort;
-      writes.push(saveMetroPort(normalizedMetroPort));
-      setMetroPort(normalizedMetroPort);
-    }
-    await Promise.all(writes);
-    updateFeatureSettings(patch);
-    return true;
-  }, [computerHost, daemonPort, isSim, metroPort, updateFeatureSettings]);
-  const persistMetroSettings = useCallback(async () => {
-    if (!metroTarget) {
-      setMessage('Enter a valid computer IP and Metro port.');
-      return false;
-    }
-    const patch = {
-      metroPort: metroTarget.port
-    };
-    const writes = [saveMetroPort(metroTarget.port)];
-    setMetroPort(metroTarget.port);
-    if (!isSim) {
-      patch.computerHost = metroTarget.host;
-      writes.push(saveComputerTarget(metroTarget.hostPort));
-      setComputerHost(metroTarget.host);
-    }
     await Promise.all(writes);
     updateFeatureSettings(patch);
     return true;
-  }, [isSim, metroTarget, updateFeatureSettings]);
+  }, [computerHost, daemonPort, isSim, updateFeatureSettings]);
   const validateSettings = useCallback(() => {
     if (!isSim && !normalizeComputerHost(computerHost)) {
       setMessage('Enter your computer IP first.');
@@ -276,58 +200,7 @@ export function DevConnectTab({
       setSending(false);
     }
   }, [configureDaemon, persistConnectionSettings, validateSettings]);
-  const applyRemoteBundle = useCallback(async () => {
-    if (!metroTarget) {
-      setMessage('Enter a valid computer IP and Metro port.');
-      return;
-    }
-    if (!snapshot.nativeMetroAvailable) {
-      setMessage(describeMetroFailure({
-        reason: 'native_unavailable'
-      }));
-      return;
-    }
-    setMetroBusy(true);
-    setMessage('Checking Metro...');
-    try {
-      if (!(await persistMetroSettings())) {
-        return;
-      }
-      const result = await applyMetroBundle(metroTarget.host, metroTarget.port);
-      if (result.ok) {
-        setMessage(`Using Metro at ${result.hostPort}. Reloading...`);
-      } else {
-        setMessage(describeMetroFailure(result));
-      }
-    } finally {
-      setMetroBusy(false);
-    }
-  }, [metroTarget, persistMetroSettings, snapshot.nativeMetroAvailable]);
-  const resetRemoteBundle = useCallback(async () => {
-    if (!snapshot.nativeMetroAvailable) {
-      setMessage(describeMetroFailure({
-        reason: 'native_unavailable'
-      }));
-      return;
-    }
-    setMetroBusy(true);
-    try {
-      const result = await resetMetroBundle();
-      if (result.ok) {
-        setMessage('Metro host reset. Reloading...');
-      } else {
-        setMessage(describeMetroFailure(result));
-      }
-    } finally {
-      setMetroBusy(false);
-    }
-  }, [snapshot.nativeMetroAvailable]);
-
-  // Metro host switching only works in Debug builds. diagData is iOS-populated; when we know
-  // it's a Release build, disable the controls (Android reports null → stays enabled).
-  const metroReleaseBlocked = diagData ? !diagData.isDebugBuild : false;
   const canConnect = isSim || Boolean(normalizeComputerHost(computerHost)) && Boolean(normalizePort(daemonPort));
-  const canUseMetro = Boolean(metroTarget) && snapshot.nativeMetroAvailable && !metroBusy && !metroReleaseBlocked;
   const busy = sending || syncState === 'checking';
   const subnetPrefix = snapshot.subnetPrefix;
   const ipPlaceholder = subnetPrefix ? `${subnetPrefix}...` : '192.168.1.10';
@@ -342,7 +215,7 @@ export function DevConnectTab({
         style: styles.badge,
         children: /*#__PURE__*/_jsxs(Text, {
           style: styles.badgeText,
-          children: ["Simulator/emulator - using ", getSimulatorMetroHost()]
+          children: ["Simulator/emulator - using ", getSimulatorHost()]
         })
       }) : /*#__PURE__*/_jsxs(View, {
         style: styles.section,
@@ -381,42 +254,20 @@ export function DevConnectTab({
         style: styles.section,
         children: [/*#__PURE__*/_jsx(Text, {
           style: styles.label,
-          children: "Ports"
-        }), /*#__PURE__*/_jsxs(View, {
-          style: styles.portRow,
-          children: [/*#__PURE__*/_jsxs(View, {
-            style: styles.portField,
-            children: [/*#__PURE__*/_jsx(Text, {
-              style: styles.portLabel,
-              children: "Metro"
-            }), /*#__PURE__*/_jsx(TextInput, {
-              style: styles.portInput,
-              value: metroPort,
-              onChangeText: handleMetroPortChange,
-              placeholder: DEFAULT_METRO_PORT,
-              placeholderTextColor: Colors.textLight,
-              autoCapitalize: "none",
-              autoCorrect: false,
-              keyboardType: "number-pad",
-              returnKeyType: "done"
-            })]
-          }), /*#__PURE__*/_jsxs(View, {
-            style: styles.portField,
-            children: [/*#__PURE__*/_jsx(Text, {
-              style: styles.portLabel,
-              children: "Logs"
-            }), /*#__PURE__*/_jsx(TextInput, {
-              style: styles.portInput,
-              value: daemonPort,
-              onChangeText: handleDaemonPortChange,
-              placeholder: DEFAULT_DAEMON_PORT,
-              placeholderTextColor: Colors.textLight,
-              autoCapitalize: "none",
-              autoCorrect: false,
-              keyboardType: "number-pad",
-              returnKeyType: "done"
-            })]
-          })]
+          children: "Desktop Logs Port"
+        }), /*#__PURE__*/_jsx(View, {
+          style: styles.inputRow,
+          children: /*#__PURE__*/_jsx(TextInput, {
+            style: styles.input,
+            value: daemonPort,
+            onChangeText: handleDaemonPortChange,
+            placeholder: DEFAULT_DAEMON_PORT,
+            placeholderTextColor: Colors.textLight,
+            autoCapitalize: "none",
+            autoCorrect: false,
+            keyboardType: "number-pad",
+            returnKeyType: "done"
+          })
         })]
       }), /*#__PURE__*/_jsxs(View, {
         style: styles.actions,
@@ -442,153 +293,6 @@ export function DevConnectTab({
       }), message ? /*#__PURE__*/_jsx(Text, {
         style: styles.message,
         children: message
-      }) : null, /*#__PURE__*/_jsxs(View, {
-        style: styles.section,
-        children: [/*#__PURE__*/_jsxs(View, {
-          style: styles.sectionTitleRow,
-          children: [/*#__PURE__*/_jsx(Text, {
-            style: styles.sectionTitle,
-            children: "Remote JS Bundle"
-          }), diagData ? /*#__PURE__*/_jsxs(View, {
-            style: styles.swizzleBadge,
-            children: [/*#__PURE__*/_jsx(View, {
-              style: [styles.swizzleDot, diagData.isDebugBuild ? styles.dotGreen : styles.dotRed]
-            }), /*#__PURE__*/_jsx(Text, {
-              style: styles.swizzleBadgeText,
-              children: diagData.isDebugBuild ? 'debug build' : 'release: disabled'
-            })]
-          }) : null]
-        }), /*#__PURE__*/_jsx(Text, {
-          style: styles.sectionDesc,
-          children: "Starts from the embedded bundle. After you apply a computer IP, hot-reloads from that Metro. Debug builds only \u2014 use Reset to go back to the embedded bundle."
-        }), !metroUrls ? /*#__PURE__*/_jsx(View, {
-          style: styles.stepCard,
-          children: /*#__PURE__*/_jsx(Text, {
-            style: styles.stepHint,
-            children: "Enter your computer IP and Metro port to get started."
-          })
-        }) : /*#__PURE__*/_jsxs(View, {
-          style: styles.stepCard,
-          children: [/*#__PURE__*/_jsxs(View, {
-            style: styles.urlRow,
-            children: [/*#__PURE__*/_jsx(Text, {
-              style: styles.urlLabel,
-              children: "HTTP"
-            }), /*#__PURE__*/_jsx(Text, {
-              style: styles.urlText,
-              numberOfLines: 1,
-              children: metroUrls.httpUrl
-            })]
-          }), /*#__PURE__*/_jsxs(View, {
-            style: styles.urlRow,
-            children: [/*#__PURE__*/_jsx(Text, {
-              style: styles.urlLabel,
-              children: "Expo"
-            }), /*#__PURE__*/_jsx(Text, {
-              style: styles.urlText,
-              numberOfLines: 1,
-              children: metroUrls.expUrl
-            })]
-          })]
-        }), /*#__PURE__*/_jsxs(View, {
-          style: styles.actions,
-          children: [/*#__PURE__*/_jsx(TouchableOpacity, {
-            style: [styles.primaryButton, !canUseMetro && styles.buttonDisabled],
-            onPress: applyRemoteBundle,
-            disabled: !canUseMetro,
-            activeOpacity: 0.75,
-            children: /*#__PURE__*/_jsx(Text, {
-              style: styles.primaryButtonText,
-              children: metroBusy ? 'Checking...' : 'Use Metro Bundle'
-            })
-          }), /*#__PURE__*/_jsx(TouchableOpacity, {
-            style: [styles.secondaryButton, (!snapshot.nativeMetroAvailable || metroBusy) && styles.buttonDisabled],
-            onPress: resetRemoteBundle,
-            disabled: !snapshot.nativeMetroAvailable || metroBusy,
-            activeOpacity: 0.75,
-            children: /*#__PURE__*/_jsx(Text, {
-              style: styles.secondaryButtonText,
-              children: "Reset"
-            })
-          })]
-        }), !snapshot.nativeMetroAvailable ? /*#__PURE__*/_jsx(Text, {
-          style: styles.hint,
-          children: "Native DevConnect requires pod install / Gradle sync and app rebuild."
-        }) : null, metroReleaseBlocked ? /*#__PURE__*/_jsx(Text, {
-          style: styles.diagWarning,
-          children: "\u26A0 This is a Release build. Metro host switching is disabled \u2014 RN loads the embedded bundle and strips the packager machinery in Release. Run a Debug build to switch hosts."
-        }) : null]
-      }), snapshot.nativeMetroAvailable && diagData ? /*#__PURE__*/_jsxs(View, {
-        style: styles.section,
-        children: [/*#__PURE__*/_jsxs(TouchableOpacity, {
-          style: styles.diagHeader,
-          onPress: () => {
-            setDiagOpen(v => !v);
-            refreshDiag();
-          },
-          activeOpacity: 0.7,
-          children: [/*#__PURE__*/_jsx(Text, {
-            style: styles.sectionTitle,
-            children: "iOS Bundle Status"
-          }), /*#__PURE__*/_jsx(Text, {
-            style: styles.diagChevron,
-            children: diagOpen ? '▲' : '▼'
-          })]
-        }), diagOpen ? /*#__PURE__*/_jsxs(View, {
-          style: styles.diagCard,
-          children: [/*#__PURE__*/_jsxs(View, {
-            style: styles.diagRow,
-            children: [/*#__PURE__*/_jsx(Text, {
-              style: styles.diagKey,
-              children: "AppDelegate"
-            }), /*#__PURE__*/_jsx(Text, {
-              style: styles.diagVal,
-              children: diagData.appDelegateClass
-            })]
-          }), /*#__PURE__*/_jsxs(View, {
-            style: styles.diagRow,
-            children: [/*#__PURE__*/_jsx(Text, {
-              style: styles.diagKey,
-              children: "packagerHost"
-            }), /*#__PURE__*/_jsx(Text, {
-              style: styles.diagVal,
-              children: diagData.persistedMetroHost ?? '—'
-            })]
-          }), /*#__PURE__*/_jsxs(View, {
-            style: styles.diagRow,
-            children: [/*#__PURE__*/_jsx(Text, {
-              style: styles.diagKey,
-              children: "embedded"
-            }), /*#__PURE__*/_jsx(Text, {
-              style: [styles.diagVal, diagData.hasEmbeddedBundle ? styles.diagGood : styles.diagWarn],
-              children: diagData.hasEmbeddedBundle ? 'main.jsbundle' : 'missing'
-            })]
-          }), /*#__PURE__*/_jsxs(View, {
-            style: styles.diagRow,
-            children: [/*#__PURE__*/_jsx(Text, {
-              style: styles.diagKey,
-              children: "build"
-            }), /*#__PURE__*/_jsx(Text, {
-              style: [styles.diagVal, diagData.isDebugBuild ? styles.diagGood : styles.diagWarn],
-              children: diagData.isDebugBuild ? 'Debug' : 'Release'
-            })]
-          }), /*#__PURE__*/_jsxs(View, {
-            style: styles.diagRow,
-            children: [/*#__PURE__*/_jsx(Text, {
-              style: styles.diagKey,
-              children: "embedded-first"
-            }), /*#__PURE__*/_jsx(Text, {
-              style: [styles.diagVal, diagData.embeddedFirstHookInstalled ? styles.diagGood : styles.diagWarn],
-              children: diagData.embeddedFirstHookInstalled ? 'active' : 'inactive'
-            })]
-          }), !diagData.embeddedFirstHookInstalled ? /*#__PURE__*/_jsxs(Text, {
-            style: styles.diagWarning,
-            children: ["\u26A0 Embedded-first hook not active (bundleRoot=", diagData.bundleRootHookInstalled ? 'Y' : 'N', "). Rebuild after pod install. Without it, Debug may still try Metro on launch."]
-          }) : diagData.hasEmbeddedBundle === false ? /*#__PURE__*/_jsx(Text, {
-            style: styles.diagWarning,
-            children: "\u26A0 main.jsbundle is missing from the app package. Build with an embedded bundle (e.g. export/bundle) or cold start cannot use offline JS."
-          }) : null]
-        }) : null]
       }) : null]
     })
   });
@@ -619,18 +323,6 @@ const styles = StyleSheet.create({
   section: {
     marginBottom: 14
   },
-  sectionTitle: {
-    fontSize: 14,
-    fontWeight: '600',
-    color: Colors.text,
-    marginBottom: 4
-  },
-  sectionDesc: {
-    fontSize: 12,
-    color: Colors.textSecondary,
-    marginBottom: 10,
-    lineHeight: 17
-  },
   label: {
     fontSize: 13,
     fontWeight: '500',
@@ -661,29 +353,6 @@ const styles = StyleSheet.create({
     color: Colors.text,
     fontFamily: 'Courier'
   },
-  portRow: {
-    flexDirection: 'row',
-    gap: 10
-  },
-  portField: {
-    flex: 1
-  },
-  portLabel: {
-    fontSize: 11,
-    color: Colors.textSecondary,
-    marginBottom: 4
-  },
-  portInput: {
-    backgroundColor: Colors.surface,
-    borderWidth: 1,
-    borderColor: Colors.border,
-    borderRadius: 8,
-    paddingHorizontal: 12,
-    paddingVertical: 9,
-    fontSize: 13,
-    color: Colors.text,
-    fontFamily: 'Courier'
-  },
   actions: {
     flexDirection: 'row',
     gap: 10,
@@ -726,127 +395,6 @@ const styles = StyleSheet.create({
     lineHeight: 17,
     color: Colors.textSecondary,
     marginBottom: 12
-  },
-  hint: {
-    fontSize: 12,
-    color: Colors.textLight,
-    lineHeight: 17
-  },
-  stepCard: {
-    backgroundColor: Colors.surface,
-    borderWidth: 1,
-    borderColor: Colors.border,
-    borderRadius: 10,
-    padding: 12,
-    marginBottom: 8
-  },
-  stepHint: {
-    fontSize: 12,
-    color: Colors.textSecondary,
-    lineHeight: 17
-  },
-  urlLabel: {
-    minWidth: 40,
-    fontSize: 10,
-    fontWeight: '600',
-    color: Colors.primary,
-    backgroundColor: `${Colors.primary}15`,
-    paddingHorizontal: 6,
-    paddingVertical: 2,
-    borderRadius: 4,
-    marginRight: 8,
-    textAlign: 'center'
-  },
-  urlRow: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    borderBottomWidth: StyleSheet.hairlineWidth,
-    borderBottomColor: Colors.border,
-    paddingVertical: 7
-  },
-  urlText: {
-    flex: 1,
-    fontSize: 13,
-    fontFamily: 'Courier',
-    color: Colors.text
-  },
-  sectionTitleRow: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-    marginBottom: 4
-  },
-  swizzleBadge: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    gap: 4,
-    paddingHorizontal: 7,
-    paddingVertical: 3,
-    borderRadius: 10,
-    backgroundColor: Colors.surface,
-    borderWidth: 1,
-    borderColor: Colors.border
-  },
-  swizzleDot: {
-    width: 6,
-    height: 6,
-    borderRadius: 3
-  },
-  dotGreen: {
-    backgroundColor: '#34C759'
-  },
-  dotRed: {
-    backgroundColor: '#FF3B30'
-  },
-  swizzleBadgeText: {
-    fontSize: 11,
-    color: Colors.textSecondary,
-    fontFamily: 'Courier'
-  },
-  diagHeader: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-    marginBottom: 6
-  },
-  diagChevron: {
-    fontSize: 12,
-    color: Colors.textSecondary
-  },
-  diagCard: {
-    backgroundColor: Colors.surface,
-    borderWidth: 1,
-    borderColor: Colors.border,
-    borderRadius: 10,
-    padding: 10
-  },
-  diagRow: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    paddingVertical: 4
-  },
-  diagKey: {
-    fontSize: 12,
-    color: Colors.textSecondary,
-    fontFamily: 'Courier'
-  },
-  diagVal: {
-    fontSize: 12,
-    color: Colors.text,
-    fontFamily: 'Courier',
-    fontWeight: '600'
-  },
-  diagGood: {
-    color: '#34C759'
-  },
-  diagWarn: {
-    color: '#FF9500'
-  },
-  diagWarning: {
-    marginTop: 10,
-    fontSize: 11,
-    color: '#FF9500',
-    lineHeight: 16
   }
 });
 //# sourceMappingURL=DevConnectTab.js.map