@react-native/dev-middleware 0.77.0-nightly-20241121-550b0c0ed → 0.77.0-nightly-20241122-e4d8c9678

package/dist/inspector-proxy/Device.d.ts

@@ -37,7 +37,10 @@ declare class Device {
   handleDebuggerConnection(
     socket: WS,
     pageId: string,
-    metadata: Readonly<{ userAgent: string | null }>
+    $$PARAM_2$$: Readonly<{
+      debuggerRelativeBaseUrl: URL;
+      userAgent: string | null;
+    }>
   ): void;
   dangerouslyGetSocket(): WS;
 }

package/dist/inspector-proxy/Device.js

@@ -167,6 +167,7 @@ class Device {
       oldDebugger.socket.removeAllListeners();
       this.#deviceSocket.close();
       this.handleDebuggerConnection(oldDebugger.socket, oldDebugger.pageId, {
+        debuggerRelativeBaseUrl: oldDebugger.debuggerRelativeBaseUrl,
         userAgent: oldDebugger.userAgent,
       });
     }
@@ -185,16 +186,19 @@ class Device {
       return [...this.#pages.values()];
     }
   }
-  handleDebuggerConnection(socket, pageId, metadata) {
+  handleDebuggerConnection(
+    socket,
+    pageId,
+    { debuggerRelativeBaseUrl, userAgent }
+  ) {
     const page =
       pageId === REACT_NATIVE_RELOADABLE_PAGE_ID
         ? this.#createSyntheticPage()
         : this.#pages.get(pageId);
     if (!page) {
       debug(
-        `Got new debugger connection for page ${pageId} of ${
-          this.#name
-        }, but no such page exists`
+        `Got new debugger connection via ${debuggerRelativeBaseUrl.href} for ` +
+          `page ${pageId} of ${this.#name}, but no such page exists`
       );
       socket.close();
       return;
@@ -203,17 +207,21 @@ class Device {
     this.#terminateDebuggerConnection();
     this.#deviceEventReporter?.logConnection("debugger", {
       pageId,
-      frontendUserAgent: metadata.userAgent,
+      frontendUserAgent: userAgent,
     });
     const debuggerInfo = {
       socket,
       prependedFilePrefix: false,
       pageId,
-      userAgent: metadata.userAgent,
+      userAgent: userAgent,
       customHandler: null,
+      debuggerRelativeBaseUrl,
     };
     this.#debuggerConnection = debuggerInfo;
-    debug(`Got new debugger connection for page ${pageId} of ${this.#name}`);
+    debug(
+      `Got new debugger connection via ${debuggerRelativeBaseUrl.href} for ` +
+        `page ${pageId} of ${this.#name}`
+    );
     if (this.#debuggerConnection && this.#createCustomMessageHandler) {
       this.#debuggerConnection.customHandler = this.#createCustomMessageHandler(
         {
@@ -262,7 +270,7 @@ class Device {
       const debuggerRequest = JSON.parse(message);
       this.#deviceEventReporter?.logRequest(debuggerRequest, "debugger", {
         pageId: this.#debuggerConnection?.pageId ?? null,
-        frontendUserAgent: metadata.userAgent,
+        frontendUserAgent: userAgent,
         prefersFuseboxFrontend: this.#isPageFuseboxFrontend(
           this.#debuggerConnection?.pageId
         ),
@@ -509,11 +517,14 @@ class Device {
             REWRITE_HOSTS_TO_LOCALHOST.has(this.#deviceRelativeBaseUrl.hostname)
           ) {
             const debuggerRelativeURL = new URL(sourceMapURL.href);
-            debuggerRelativeURL.hostname = "localhost";
+            debuggerRelativeURL.host =
+              debuggerInfo.debuggerRelativeBaseUrl.host;
+            debuggerRelativeURL.protocol =
+              debuggerInfo.debuggerRelativeBaseUrl.protocol;
             serverRelativeUrl.host = this.#serverRelativeBaseUrl.host;
             serverRelativeUrl.protocol = this.#serverRelativeBaseUrl.protocol;
-            debuggerInfo.originalSourceURLAddress =
-              this.#deviceRelativeBaseUrl.hostname;
+            debuggerInfo.originalSourceURLOrigin =
+              this.#deviceRelativeBaseUrl.origin;
             payload.params.sourceMapURL = debuggerRelativeURL.href;
           }
           try {
@@ -529,18 +540,18 @@ class Device {
         }
       }
       if ("url" in params) {
-        const originalParamsUrl = params.url;
-        let serverRelativeUrl = originalParamsUrl;
-        const parsedUrl = this.#tryParseHTTPURL(originalParamsUrl);
+        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.hostname = "localhost";
+          parsedUrl.host = debuggerInfo.debuggerRelativeBaseUrl.host;
+          parsedUrl.protocol = debuggerInfo.debuggerRelativeBaseUrl.protocol;
           payload.params.url = parsedUrl.href;
-          debuggerInfo.originalSourceURLAddress =
-            this.#deviceRelativeBaseUrl.hostname;
+          debuggerInfo.originalSourceURLOrigin =
+            this.#deviceRelativeBaseUrl.origin;
           parsedUrl.host = this.#serverRelativeBaseUrl.host;
           parsedUrl.protocol = this.#serverRelativeBaseUrl.protocol;
           serverRelativeUrl = parsedUrl.href;
@@ -618,37 +629,44 @@ class Device {
     }
   }
   #processDebuggerSetBreakpointByUrl(req, debuggerInfo) {
-    if (debuggerInfo.originalSourceURLAddress != null) {
-      const processedReq = {
-        ...req,
-        params: {
-          ...req.params,
-        },
-      };
-      if (processedReq.params.url != null) {
-        processedReq.params.url = processedReq.params.url.replace(
-          "localhost",
-          debuggerInfo.originalSourceURLAddress
-        );
-        if (
-          processedReq.params.url &&
-          processedReq.params.url.startsWith(FILE_PREFIX) &&
-          debuggerInfo.prependedFilePrefix
-        ) {
-          processedReq.params.url = processedReq.params.url.slice(
-            FILE_PREFIX.length
-          );
-        }
-      }
-      if (processedReq.params.urlRegex != null) {
-        processedReq.params.urlRegex = processedReq.params.urlRegex.replace(
-          /localhost/g,
-          debuggerInfo.originalSourceURLAddress
+    const {
+      debuggerRelativeBaseUrl,
+      originalSourceURLOrigin,
+      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) &&
+        prependedFilePrefix
+      ) {
+        processedReq.params.url = processedReq.params.url.slice(
+          FILE_PREFIX.length
         );
       }
-      return processedReq;
     }
-    return req;
+    if (
+      REWRITE_HOSTS_TO_LOCALHOST.has(this.#deviceRelativeBaseUrl.hostname) &&
+      this.#deviceRelativeBaseUrl.port === debuggerRelativeBaseUrl.port &&
+      debuggerRelativeBaseUrl.hostname === "localhost" &&
+      processedReq.params.urlRegex != null
+    ) {
+      processedReq.params.urlRegex = processedReq.params.urlRegex.replaceAll(
+        "localhost",
+        this.#deviceRelativeBaseUrl.hostname.replaceAll(".", "\\.")
+      );
+    }
+    return processedReq;
   }
   #processDebuggerGetScriptSource(req, socket) {
     const sendSuccessResponse = (scriptSource) => {

package/dist/inspector-proxy/Device.js.flow

@@ -40,7 +40,8 @@ declare export default class Device {
   handleDebuggerConnection(
     socket: WS,
     pageId: string,
-    metadata: $ReadOnly<{
+    $ReadOnly<{
+      debuggerRelativeBaseUrl: URL,
       userAgent: string | null,
     }>
   ): void;

package/dist/inspector-proxy/InspectorProxy.js

@@ -190,6 +190,8 @@ class InspectorProxy {
         const query = _url.default.parse(req.url || "", true).query || {};
         const deviceId = query.device;
         const pageId = query.page;
+        const debuggerRelativeBaseUrl =
+          (0, _getBaseUrlFromRequest.default)(req) ?? this.#serverBaseUrl;
         if (deviceId == null || pageId == null) {
           throw new Error("Incorrect URL - must provide device and page IDs");
         }
@@ -199,6 +201,7 @@ class InspectorProxy {
         }
         this.#startHeartbeat(socket, DEBUGGER_HEARTBEAT_INTERVAL_MS);
         device.handleDebuggerConnection(socket, pageId, {
+          debuggerRelativeBaseUrl,
           userAgent: req.headers["user-agent"] ?? query.userAgent ?? null,
         });
       } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/dev-middleware",
-  "version": "0.77.0-nightly-20241121-550b0c0ed",
+  "version": "0.77.0-nightly-20241122-e4d8c9678",
   "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-20241121-550b0c0ed",
+    "@react-native/debugger-frontend": "0.77.0-nightly-20241122-e4d8c9678",
     "chrome-launcher": "^0.15.2",
     "chromium-edge-launcher": "^0.2.0",
     "connect": "^3.6.5",