@react-native/dev-middleware 0.77.0-nightly-20241122-e4d8c9678 → 0.77.0-nightly-20241124-d4d1eb9bb

package/dist/inspector-proxy/Device.js

@@ -39,11 +39,6 @@ function _interopRequireDefault(e) {
 }
 const debug = require("debug")("Metro:InspectorProxy");
 const PAGES_POLLING_INTERVAL = 1000;
-const REWRITE_HOSTS_TO_LOCALHOST = new Set([
-  "127.0.0.1",
-  "10.0.2.2",
-  "10.0.3.2",
-]);
 const FILE_PREFIX = "file://";
 const REACT_NATIVE_RELOADABLE_PAGE_ID = "-1";
 class Device {
@@ -500,6 +495,39 @@ class Device {
       });
     }
   }
+  #debuggerRelativeToDeviceRelativeUrl(
+    debuggerRelativeUrl,
+    { debuggerRelativeBaseUrl }
+  ) {
+    const deviceRelativeUrl = new URL(debuggerRelativeUrl.href);
+    if (debuggerRelativeUrl.origin === debuggerRelativeBaseUrl.origin) {
+      deviceRelativeUrl.hostname = this.#deviceRelativeBaseUrl.hostname;
+      deviceRelativeUrl.port = this.#deviceRelativeBaseUrl.port;
+      deviceRelativeUrl.protocol = this.#deviceRelativeBaseUrl.protocol;
+    }
+    return deviceRelativeUrl;
+  }
+  #deviceRelativeUrlToDebuggerRelativeUrl(
+    deviceRelativeUrl,
+    { debuggerRelativeBaseUrl }
+  ) {
+    const debuggerRelativeUrl = new URL(deviceRelativeUrl.href);
+    if (deviceRelativeUrl.origin === this.#deviceRelativeBaseUrl.origin) {
+      debuggerRelativeUrl.hostname = debuggerRelativeBaseUrl.hostname;
+      debuggerRelativeUrl.port = debuggerRelativeBaseUrl.port;
+      debuggerRelativeUrl.protocol = debuggerRelativeUrl.protocol;
+    }
+    return debuggerRelativeUrl;
+  }
+  #deviceRelativeUrlToServerRelativeUrl(deviceRelativeUrl) {
+    const debuggerRelativeUrl = new URL(deviceRelativeUrl.href);
+    if (deviceRelativeUrl.origin === this.#deviceRelativeBaseUrl.origin) {
+      debuggerRelativeUrl.hostname = this.#serverRelativeBaseUrl.hostname;
+      debuggerRelativeUrl.port = this.#serverRelativeBaseUrl.port;
+      debuggerRelativeUrl.protocol = this.#serverRelativeBaseUrl.protocol;
+    }
+    return debuggerRelativeUrl;
+  }
   async #processMessageFromDeviceLegacy(payload, debuggerInfo, pageId) {
     const page = pageId != null ? this.#pages.get(pageId) : null;
     if (
@@ -511,24 +539,15 @@ class Device {
       if ("sourceMapURL" in params) {
         const sourceMapURL = this.#tryParseHTTPURL(params.sourceMapURL);
         if (sourceMapURL) {
-          const serverRelativeUrl = new URL(sourceMapURL.href);
-          if (
-            sourceMapURL.origin === this.#deviceRelativeBaseUrl.origin &&
-            REWRITE_HOSTS_TO_LOCALHOST.has(this.#deviceRelativeBaseUrl.hostname)
-          ) {
-            const debuggerRelativeURL = new URL(sourceMapURL.href);
-            debuggerRelativeURL.host =
-              debuggerInfo.debuggerRelativeBaseUrl.host;
-            debuggerRelativeURL.protocol =
-              debuggerInfo.debuggerRelativeBaseUrl.protocol;
-            serverRelativeUrl.host = this.#serverRelativeBaseUrl.host;
-            serverRelativeUrl.protocol = this.#serverRelativeBaseUrl.protocol;
-            debuggerInfo.originalSourceURLOrigin =
-              this.#deviceRelativeBaseUrl.origin;
-            payload.params.sourceMapURL = debuggerRelativeURL.href;
-          }
+          payload.params.sourceMapURL =
+            this.#deviceRelativeUrlToDebuggerRelativeUrl(
+              sourceMapURL,
+              debuggerInfo
+            ).href;
           try {
-            const sourceMap = await this.#fetchText(serverRelativeUrl);
+            const sourceMap = await this.#fetchText(
+              this.#deviceRelativeUrlToServerRelativeUrl(sourceMapURL)
+            );
             payload.params.sourceMapURL =
               "data:application/json;charset=utf-8;base64," +
               Buffer.from(sourceMap).toString("base64");
@@ -542,19 +561,13 @@ class Device {
       if ("url" in params) {
         let serverRelativeUrl = params.url;
         const parsedUrl = this.#tryParseHTTPURL(params.url);
-        if (
-          parsedUrl &&
-          parsedUrl.origin === this.#deviceRelativeBaseUrl.origin &&
-          REWRITE_HOSTS_TO_LOCALHOST.has(this.#deviceRelativeBaseUrl.hostname)
-        ) {
-          parsedUrl.host = debuggerInfo.debuggerRelativeBaseUrl.host;
-          parsedUrl.protocol = debuggerInfo.debuggerRelativeBaseUrl.protocol;
-          payload.params.url = parsedUrl.href;
-          debuggerInfo.originalSourceURLOrigin =
-            this.#deviceRelativeBaseUrl.origin;
-          parsedUrl.host = this.#serverRelativeBaseUrl.host;
-          parsedUrl.protocol = this.#serverRelativeBaseUrl.protocol;
-          serverRelativeUrl = parsedUrl.href;
+        if (parsedUrl) {
+          payload.params.url = this.#deviceRelativeUrlToDebuggerRelativeUrl(
+            parsedUrl,
+            debuggerInfo
+          ).href;
+          serverRelativeUrl =
+            this.#deviceRelativeUrlToServerRelativeUrl(parsedUrl).href;
         }
         if (payload.params.url.match(/^[0-9a-z]+$/)) {
           payload.params.url = FILE_PREFIX + payload.params.url;
@@ -629,35 +642,32 @@ class Device {
     }
   }
   #processDebuggerSetBreakpointByUrl(req, debuggerInfo) {
-    const {
-      debuggerRelativeBaseUrl,
-      originalSourceURLOrigin,
-      prependedFilePrefix,
-    } = debuggerInfo;
+    const { debuggerRelativeBaseUrl, prependedFilePrefix } = debuggerInfo;
     const processedReq = {
       ...req,
       params: {
         ...req.params,
       },
     };
-    if (originalSourceURLOrigin != null && processedReq.params.url != null) {
-      processedReq.params.url = processedReq.params.url.replace(
-        debuggerRelativeBaseUrl.origin,
-        originalSourceURLOrigin
-      );
-      if (
-        processedReq.params.url &&
-        processedReq.params.url.startsWith(FILE_PREFIX) &&
+    if (processedReq.params.url != null) {
+      const originalUrlParam = processedReq.params.url;
+      const httpUrl = this.#tryParseHTTPURL(originalUrlParam);
+      if (httpUrl) {
+        processedReq.params.url = this.#debuggerRelativeToDeviceRelativeUrl(
+          httpUrl,
+          debuggerInfo
+        ).href;
+      } else if (
+        originalUrlParam.startsWith(FILE_PREFIX) &&
         prependedFilePrefix
       ) {
-        processedReq.params.url = processedReq.params.url.slice(
-          FILE_PREFIX.length
-        );
+        processedReq.params.url = originalUrlParam.slice(FILE_PREFIX.length);
       }
     }
     if (
-      REWRITE_HOSTS_TO_LOCALHOST.has(this.#deviceRelativeBaseUrl.hostname) &&
-      this.#deviceRelativeBaseUrl.port === debuggerRelativeBaseUrl.port &&
+      new Set(["10.0.2.2", "10.0.3.2"]).has(
+        this.#deviceRelativeBaseUrl.hostname
+      ) &&
       debuggerRelativeBaseUrl.hostname === "localhost" &&
       processedReq.params.urlRegex != null
     ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/dev-middleware",
-  "version": "0.77.0-nightly-20241122-e4d8c9678",
+  "version": "0.77.0-nightly-20241124-d4d1eb9bb",
   "description": "Dev server middleware for React Native",
   "keywords": [
     "react-native",
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "@isaacs/ttlcache": "^1.4.1",
-    "@react-native/debugger-frontend": "0.77.0-nightly-20241122-e4d8c9678",
+    "@react-native/debugger-frontend": "0.77.0-nightly-20241124-d4d1eb9bb",
     "chrome-launcher": "^0.15.2",
     "chromium-edge-launcher": "^0.2.0",
     "connect": "^3.6.5",