Compare origin against WEBSITE_BASE

Author: MattIPv4

src/utils/respond.ts

@@ -77,7 +77,7 @@ export const withCache = (ctx: Context, age: number, immutable = false) => {
  * @param ctx Request context.
  */
 export const isWebsite = (ctx: Context) =>
-    env.WEBSITE_BASE && ctx.req.url.startsWith(env.WEBSITE_BASE);
+    env.WEBSITE_BASE && new URL(ctx.req.url).origin === env.WEBSITE_BASE;
 
 /**
  * Respond to a request with data, handling if it should be returned as JSON or rendered as a React response.

src/utils/spec/playwright.ts

@@ -2,9 +2,6 @@ import { test as base, expect } from '@playwright/test';
 import { type TestHarness, createTestHarness } from 'wrangler';
 
 const configPath = './wrangler.jsonc';
-// isWebsite() uses startsWith(), so the trailing colon matches every
-// dynamically allocated loopback port without matching another host.
-const websiteBase = 'http://127.0.0.1:';
 
 interface TestFixtures {
     reset: undefined;
@@ -19,7 +16,7 @@ export const createServer = (vars?: Record<string, string>) =>
         workers: [
             {
                 configPath,
-                vars: { WEBSITE_BASE: websiteBase, ...vars },
+                vars,
             },
         ],
     });
@@ -55,7 +52,24 @@ export const test = base.extend<TestFixtures, WorkerFixtures>({
         }
 
         const { url } = await server.listen();
-        await use(url.href);
+        const { WEBSITE_BASE } = await server.getWorker().getEnv();
+        if (WEBSITE_BASE !== url.origin) {
+            await server.update((opts) => {
+                const worker = opts.workers[0];
+                if (!worker || !('vars' in worker)) {
+                    throw new Error('Worker not found in test harness');
+                }
+
+                worker.vars = {
+                    ...worker.vars,
+                    WEBSITE_BASE: url.origin,
+                };
+
+                return opts;
+            });
+        }
+
+        await use(url.origin);
     },
     reset: [
         async ({ server }, use, testInfo) => {