remove support for relative urls when parsing bundle options from url

Summary:
Changelog: [Internal] Remove support for relative urls when parsing bundle options from url. This seems to have not been used.

Working on `parseBundleOptionsFromBundleRequestUrl`, I noticed we handle a use-case that is not clear why would we support.

It complicates the logic of that very complicated function without a sufficiently good reason, besides being a left-over from an older HMR logic.

While we introduce some semi-breaking-changes to how urls are handled, it's a good opportunity to make the function stricter in terms of what it expects to receive as an input.

Reviewed By: robhogan

Differential Revision: D79809398

fbshipit-source-id: 3b73e189ef163d1a965a71883c83e826b8418f0f

Author: vzaidman

packages/metro/src/HmrServer.js

@@ -49,10 +49,6 @@ type ClientGroup = {
   +graphOptions: GraphOptions,
 };
 
-// This is a bit weird but this is the recommended way of getting around "URL" demanding to have a valid protocol
-// for when handling relative URLs: https://nodejs.org/docs/latest-v24.x/api/url.html#urlresolvefrom-to
-const RESOLVE_BASE_URL = 'resolve://';
-
 function send(sendFns: Array<(string) => void>, message: HmrMessage): void {
   const strMessage = JSON.stringify(message);
   sendFns.forEach((sendFn: string => void) => sendFn(strMessage));
@@ -157,7 +153,7 @@ export default class HmrServer<TClient: Client> {
     if (clientGroup != null) {
       clientGroup.clients.add(client);
     } else {
-      const clientUrl = new URL(requestUrl, RESOLVE_BASE_URL);
+      const clientUrl = new URL(requestUrl);
 
       // Prepare the clientUrl to be used as sourceUrl in HMR updates.
       clientUrl.protocol = 'http';

packages/metro/src/Server.js

@@ -622,7 +622,7 @@ export default class Server {
     const pathname = urlObj.pathname || '';
 
     // using this Metro particular convention for decoding URL paths into file paths
-    const decodedPathname = pathname
+    const filePathname = pathname
       .split('/')
       .map(segment => decodeURIComponent(segment))
       .join('/');
@@ -639,7 +639,7 @@ export default class Server {
       });
 
       if (this._serverOptions && this._serverOptions.onBundleBuilt) {
-        this._serverOptions.onBundleBuilt(decodedPathname);
+        this._serverOptions.onBundleBuilt(filePathname);
       }
     } else if (pathname.endsWith('.map')) {
       // Chrome dev tools may need to access the source maps.
@@ -671,8 +671,8 @@ export default class Server {
       let handled = false;
       for (const [pathnamePrefix, normalizedRootDir] of this
         ._sourceRequestRoutingMap) {
-        if (decodedPathname.startsWith(pathnamePrefix)) {
-          const relativeFilePathname = decodedPathname.substr(
+        if (filePathname.startsWith(pathnamePrefix)) {
+          const relativeFilePathname = filePathname.substr(
             pathnamePrefix.length,
           );
           await this._processSourceRequest(

packages/metro/src/__tests__/HmrServer-test.js

@@ -227,31 +227,12 @@ describe('HmrServer', () => {
   });
 
   test('should retrieve for relative urls without host and protocol', async () => {
-    await connect('/hot?bundleEntry=EntryPoint.js&platform=ios', undefined, {
-      baseUrl: '',
-    });
-
-    expect(getRevisionByGraphIdMock).toBeCalledWith(
-      getGraphId(
-        '/root/EntryPoint.js',
-        {
-          customTransformOptions: {},
-          dev: true,
-          hot: true,
-          minify: false,
-          platform: 'ios',
-          type: 'module',
-          unstable_transformProfile: 'default',
-        },
-        {
-          shallow: false,
-          lazy: false,
-          unstable_allowRequireContext: false,
-          resolverOptions: {
-            dev: true,
-          },
-        },
-      ),
+    expect(
+      connect('/hot?bundleEntry=EntryPoint.js&platform=ios', undefined, {
+        baseUrl: '',
+      }),
+    ).rejects.toThrowError(
+      'Expecting the request url to have a valid protocol, e.g. "http://", "https://", or "//"',
     );
   });
 

packages/metro/src/lib/__tests__/parseBundleOptionsFromBundleRequestUrl-test.js

@@ -39,8 +39,16 @@ describe('parseBundleOptionsFromBundleRequestUrl', () => {
     ).toMatchObject({platform: 'test'});
   });
 
+  test('relative urls fail to be parsed', () => {
+    expect(() =>
+      parseBundleOptionsFromBundleRequestUrl('my/bundle.bundle', new Set([])),
+    ).toThrowError(
+      'Expecting the request url to have a valid protocol, e.g. "http://", "https://", or "//"',
+    );
+  });
+
   test.each(['absolute', 'relative'])(
-    '%s urls- infers the source url and source map url from the pathname',
+    '%s protocol urls- infers the source url and source map url from the pathname',
     type => {
       const protocol = type === 'absolute' ? 'http:' : '';
       expect(
@@ -75,14 +83,6 @@ describe('parseBundleOptionsFromBundleRequestUrl', () => {
     });
   });
 
-  test('retrieves stuff from HMR urls', () => {
-    expect(
-      parseBundleOptionsFromBundleRequestUrl('my/bundle.bundle', new Set([])),
-    ).toMatchObject({
-      entryFile: './my/bundle',
-    });
-  });
-
   test.each(['absolute', 'relative'])(
     '%s urls with ascii characters are encoded correctly',
     type => {

packages/metro/src/lib/parseBundleOptionsFromBundleRequestUrl.js

@@ -70,16 +70,21 @@ export default function parseBundleOptionsFromBundleRequestUrl(
     hash,
   } = new URL(rawNonJscSafeUrlEncodedUrl, RESOLVE_BASE_URL /* baseURL */);
 
+  // e.g. "//localhost:8081/foo/bar.js?platform=ios"
   const isRelativeProtocol = rawNonJscSafeUrlEncodedUrl.startsWith('//');
+
+  // e.g. "/foo/bar.js?platform=ios"
   const isNoProtocol =
     !isRelativeProtocol && _tempProtocol + '//' === RESOLVE_BASE_URL;
 
-  // TODO: next diff (D79809398) will remove the support for "isNoProtocol" to make the requested URL more expected (either "//" or "http://")
-  const protocol = isNoProtocol // e.g. "./foo/bar.js" or "foo/bar.js" both converted to paths relative to root
-    ? ''
-    : isRelativeProtocol // e.g. "//localhost:8081/foo/bar.js?platform=ios"
-      ? '//'
-      : _tempProtocol + '//'; // e.g. "http://localhost:8081/foo/bar.js?platform=ios"
+  if (isNoProtocol) {
+    throw new Error(
+      'Expecting the request url to have a valid protocol, e.g. "http://", "https://", or "//"',
+      {cause: rawNonJscSafeUrlEncodedUrl},
+    );
+  }
+
+  const protocol = isRelativeProtocol ? '//' : _tempProtocol + '//';
 
   const sourceUrl = jscSafeUrl.toJscSafeUrl(
     protocol + host + requestPathname + search + hash,