wrangler 2.0.8 → 2.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {

package/src/__tests__/dev.test.tsx

@@ -3,7 +3,6 @@ import getPort from "get-port";
 import patchConsole from "patch-console";
 import dedent from "ts-dedent";
 import Dev from "../dev/dev";
-import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { runInTempDir } from "./helpers/run-in-tmp";
@@ -11,8 +10,6 @@ import { runWrangler } from "./helpers/run-wrangler";
 import writeWranglerToml from "./helpers/write-wrangler-toml";
 
 describe("wrangler dev", () => {
-  mockAccountId();
-  mockApiToken();
   runInTempDir();
   const std = mockConsoleMethods();
   afterEach(() => {
@@ -152,10 +149,12 @@ describe("wrangler dev", () => {
       fs.writeFileSync("index.js", `export default {};`);
       mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
       await runWrangler("dev --host some-host.com");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
-        host: "some-host.com",
-        id: "some-zone-id",
-      });
+      expect((Dev as jest.Mock).mock.calls[0][0]).toEqual(
+        expect.objectContaining({
+          host: "some-host.com",
+          zone: "some-zone-id",
+        })
+      );
     });
 
     it("should read wrangler.toml's dev.host", async () => {
@@ -168,9 +167,7 @@ describe("wrangler dev", () => {
       fs.writeFileSync("index.js", `export default {};`);
       mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
       await runWrangler("dev");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone.host).toEqual(
-        "some-host.com"
-      );
+      expect((Dev as jest.Mock).mock.calls[0][0].host).toEqual("some-host.com");
     });
 
     it("should read --route", async () => {
@@ -180,9 +177,7 @@ describe("wrangler dev", () => {
       fs.writeFileSync("index.js", `export default {};`);
       mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
       await runWrangler("dev --route http://some-host.com/some/path/*");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone.host).toEqual(
-        "some-host.com"
-      );
+      expect((Dev as jest.Mock).mock.calls[0][0].host).toEqual("some-host.com");
     });
 
     it("should read wrangler.toml's routes", async () => {
@@ -196,9 +191,7 @@ describe("wrangler dev", () => {
       fs.writeFileSync("index.js", `export default {};`);
       mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
       await runWrangler("dev");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone.host).toEqual(
-        "some-host.com"
-      );
+      expect((Dev as jest.Mock).mock.calls[0][0].host).toEqual("some-host.com");
     });
 
     it("should read wrangler.toml's environment specific routes", async () => {
@@ -220,9 +213,7 @@ describe("wrangler dev", () => {
       fs.writeFileSync("index.js", `export default {};`);
       mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
       await runWrangler("dev --env staging");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone.host).toEqual(
-        "some-host.com"
-      );
+      expect((Dev as jest.Mock).mock.calls[0][0].host).toEqual("some-host.com");
     });
 
     it("should strip leading `*` from given host when deducing a zone id", async () => {
@@ -233,9 +224,7 @@ describe("wrangler dev", () => {
       fs.writeFileSync("index.js", `export default {};`);
       mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
       await runWrangler("dev");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone.host).toEqual(
-        "some-host.com"
-      );
+      expect((Dev as jest.Mock).mock.calls[0][0].host).toEqual("some-host.com");
     });
 
     it("should strip leading `*.` from given host when deducing a zone id", async () => {
@@ -246,9 +235,7 @@ describe("wrangler dev", () => {
       fs.writeFileSync("index.js", `export default {};`);
       mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
       await runWrangler("dev");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone.host).toEqual(
-        "some-host.com"
-      );
+      expect((Dev as jest.Mock).mock.calls[0][0].host).toEqual("some-host.com");
     });
 
     it("should, when provided, use a configured zone_id", async () => {
@@ -260,10 +247,12 @@ describe("wrangler dev", () => {
       });
       fs.writeFileSync("index.js", `export default {};`);
       await runWrangler("dev");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
-        host: "some-domain.com",
-        id: "some-zone-id",
-      });
+      expect((Dev as jest.Mock).mock.calls[0][0]).toEqual(
+        expect.objectContaining({
+          host: "some-domain.com",
+          zone: "some-zone-id",
+        })
+      );
     });
 
     it("should, when provided, use a zone_name to get a zone_id", async () => {
@@ -276,11 +265,13 @@ describe("wrangler dev", () => {
       fs.writeFileSync("index.js", `export default {};`);
       mockGetZones("some-zone.com", [{ id: "a-zone-id" }]);
       await runWrangler("dev");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
-        // note that it uses the provided zone_name as a host too
-        host: "some-zone.com",
-        id: "a-zone-id",
-      });
+      expect((Dev as jest.Mock).mock.calls[0][0]).toEqual(
+        expect.objectContaining({
+          // note that it uses the provided zone_name as a host too
+          host: "some-zone.com",
+          zone: "a-zone-id",
+        })
+      );
     });
 
     it("given a long host, it should use the longest subdomain that resolves to a zone", async () => {
@@ -292,10 +283,12 @@ describe("wrangler dev", () => {
       mockGetZones("222.333.some-host.com", []);
       mockGetZones("333.some-host.com", [{ id: "some-zone-id" }]);
       await runWrangler("dev --host 111.222.333.some-host.com");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
-        host: "111.222.333.some-host.com",
-        id: "some-zone-id",
-      });
+      expect((Dev as jest.Mock).mock.calls[0][0]).toEqual(
+        expect.objectContaining({
+          host: "111.222.333.some-host.com",
+          zone: "some-zone-id",
+        })
+      );
     });
 
     it("should, in order, use args.host/config.dev.host/args.routes/(config.route|config.routes)", async () => {
@@ -310,10 +303,12 @@ describe("wrangler dev", () => {
         routes: ["http://5.some-host.com/some/path/*"],
       });
       await runWrangler("dev");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
-        host: "5.some-host.com",
-        id: "some-zone-id-5",
-      });
+      expect((Dev as jest.Mock).mock.calls[0][0]).toEqual(
+        expect.objectContaining({
+          host: "5.some-host.com",
+          zone: "some-zone-id-5",
+        })
+      );
       (Dev as jest.Mock).mockClear();
 
       // config.route
@@ -323,10 +318,12 @@ describe("wrangler dev", () => {
         route: "https://4.some-host.com/some/path/*",
       });
       await runWrangler("dev");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
-        host: "4.some-host.com",
-        id: "some-zone-id-4",
-      });
+      expect((Dev as jest.Mock).mock.calls[0][0]).toEqual(
+        expect.objectContaining({
+          host: "4.some-host.com",
+          zone: "some-zone-id-4",
+        })
+      );
       (Dev as jest.Mock).mockClear();
 
       // --routes
@@ -336,10 +333,12 @@ describe("wrangler dev", () => {
         route: "https://4.some-host.com/some/path/*",
       });
       await runWrangler("dev --routes http://3.some-host.com/some/path/*");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
-        host: "3.some-host.com",
-        id: "some-zone-id-3",
-      });
+      expect((Dev as jest.Mock).mock.calls[0][0]).toEqual(
+        expect.objectContaining({
+          host: "3.some-host.com",
+          zone: "some-zone-id-3",
+        })
+      );
       (Dev as jest.Mock).mockClear();
 
       // config.dev.host
@@ -352,10 +351,12 @@ describe("wrangler dev", () => {
         route: "4.some-host.com/some/path/*",
       });
       await runWrangler("dev --routes http://3.some-host.com/some/path/*");
-      expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
-        host: "2.some-host.com",
-        id: "some-zone-id-2",
-      });
+      expect((Dev as jest.Mock).mock.calls[0][0]).toEqual(
+        expect.objectContaining({
+          host: "2.some-host.com",
+          zone: "some-zone-id-2",
+        })
+      );
       (Dev as jest.Mock).mockClear();
 
       // --host
@@ -370,10 +371,12 @@ describe("wrangler dev", () => {
       await runWrangler(
         "dev --routes http://3.some-host.com/some/path/* --host 1.some-host.com"
       );
-      expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
-        host: "1.some-host.com",
-        id: "some-zone-id-1",
-      });
+      expect((Dev as jest.Mock).mock.calls[0][0]).toEqual(
+        expect.objectContaining({
+          host: "1.some-host.com",
+          zone: "some-zone-id-1",
+        })
+      );
       (Dev as jest.Mock).mockClear();
     });
 

package/src/__tests__/init.test.ts

@@ -435,6 +435,9 @@ describe("init", () => {
       `);
       expect(fs.lstatSync(".git").isDirectory()).toBe(true);
       expect(fs.lstatSync(".gitignore").isFile()).toBe(true);
+      expect((await execa("git", ["branch", "--show-current"])).stdout).toEqual(
+        "main"
+      );
     });
 
     it("should not offer to initialize a git repo if it's already inside one", async () => {

package/src/__tests__/pages.test.ts

@@ -19,7 +19,7 @@ function assertLater(fn: () => void) {
 }
 
 function mockGetToken(jwt: string) {
-  setMockResponse(
+  return setMockResponse(
     "/accounts/:accountId/pages/projects/foo/upload-token",
     async ([_url, accountId]) => {
       assertLater(() => {
@@ -488,6 +488,103 @@ describe("pages", () => {
       `);
     });
 
+    it("should refetch a JWT if it expires while uploading", async () => {
+      writeFileSync("logo.txt", "foobar");
+
+      const cancelMockGetToken = mockGetToken("<<funfetti-auth-jwt>>");
+
+      setMockResponse(
+        "/pages/assets/check-missing",
+        "POST",
+        async (_, init) => {
+          const body = JSON.parse(init.body as string) as { hashes: string[] };
+          assertLater(() => {
+            expect(init.headers).toMatchObject({
+              Authorization: "Bearer <<funfetti-auth-jwt>>",
+            });
+            expect(body).toMatchObject({
+              hashes: ["1a98fb08af91aca4a7df1764a2c4ddb0"],
+            });
+          });
+          return body.hashes;
+        }
+      );
+
+      // Accumulate multiple requests then assert afterwards
+      const requests: RequestInit[] = [];
+      setMockRawResponse("/pages/assets/upload", "POST", async (_, init) => {
+        requests.push(init);
+
+        // Fail just the first request
+        if (requests.length < 2) {
+          cancelMockGetToken();
+          mockGetToken("<<funfetti-auth-jwt2>>");
+          return createFetchResult(null, false, [
+            {
+              code: 8000013,
+              message: "Authorization failed",
+            },
+          ]);
+        } else {
+          return createFetchResult(null, true);
+        }
+      });
+
+      setMockResponse(
+        "/accounts/:accountId/pages/projects/foo/deployments",
+        async ([_url, accountId], init) => {
+          assertLater(() => {
+            expect(accountId).toEqual("some-account-id");
+            expect(init.method).toEqual("POST");
+            const body = init.body as FormData;
+            const manifest = JSON.parse(body.get("manifest") as string);
+            expect(manifest).toMatchInlineSnapshot(`
+                          Object {
+                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+                          }
+                      `);
+          });
+
+          return {
+            url: "https://abcxyz.foo.pages.dev/",
+          };
+        }
+      );
+
+      await runWrangler("pages publish . --project-name=foo");
+
+      // Assert two requests
+      expect(requests.length).toBe(2);
+
+      expect(requests[0].headers).toMatchObject({
+        Authorization: "Bearer <<funfetti-auth-jwt>>",
+      });
+
+      expect(requests[1].headers).toMatchObject({
+        Authorization: "Bearer <<funfetti-auth-jwt2>>",
+      });
+
+      for (const init of requests) {
+        const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+        expect(body).toMatchObject([
+          {
+            key: "1a98fb08af91aca4a7df1764a2c4ddb0",
+            value: Buffer.from("foobar").toString("base64"),
+            metadata: {
+              contentType: "text/plain",
+            },
+            base64: true,
+          },
+        ]);
+      }
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "✨ Success! Uploaded 1 files (TIMINGS)
+
+        ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+      `);
+    });
+
     it("should try to use multiple buckets (up to the max concurrency)", async () => {
       writeFileSync("logo.txt", "foobar");
       writeFileSync("logo.png", "foobar");

package/src/__tests__/publish.test.ts

@@ -649,8 +649,85 @@ describe("publish", () => {
       await runWrangler("publish ./index --env dev --legacy-env false");
     });
 
+    it("should fallback to the Wrangler 1 zone-based API if the bulk-routes API fails", async () => {
+      writeWranglerToml({
+        routes: ["example.com/some-route/*"],
+      });
+      writeWorkerSource();
+      mockUpdateWorkerRequest({ enabled: false });
+      mockUploadWorkerRequest({ expectedType: "esm" });
+      // Simulate the bulk-routes API failing with a not authorized error.
+      mockUnauthorizedPublishRoutesRequest();
+      // Simulate that the worker has already been deployed to another route in this zone.
+      mockCollectKnownRoutesRequest([
+        {
+          pattern: "foo.example.com/other-route",
+          script: "test-name",
+        },
+      ]);
+      mockGetZoneFromHostRequest("example.com", "some-zone-id");
+      mockPublishRoutesFallbackRequest({
+        pattern: "example.com/some-route/*",
+        script: "test-name",
+      });
+      await runWrangler("publish ./index");
+
+      expect(std.err).toMatchInlineSnapshot(`""`);
+      expect(std.warn).toMatchInlineSnapshot(`
+        "▲ [WARNING] The current authentication token does not have 'All Zones' permissions.
+
+          Falling back to using the zone-based API endpoint to update each route individually.
+          Note that there is no access to routes associated with zones that the API token does not have
+          permission for.
+          Existing routes for this Worker in such zones will not be deleted.
+
+
+        ▲ [WARNING] Previously deployed routes:
+
+          The following routes were already associated with this worker, and have not been deleted:
+           - \\"foo.example.com/other-route\\"
+          If these routes are not wanted then you can remove them in the dashboard.
+
+        "
+      `);
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          example.com/some-route/*"
+      `);
+    });
+
+    it("should error if the bulk-routes API fails and trying to push to a non-production environment", async () => {
+      writeWranglerToml({
+        routes: ["example.com/some-route/*"],
+        legacy_env: false,
+      });
+      writeWorkerSource();
+      mockUpdateWorkerRequest({ env: "staging", enabled: false });
+      mockUploadWorkerRequest({ env: "staging", expectedType: "esm" });
+      // Simulate the bulk-routes API failing with a not authorized error.
+      mockUnauthorizedPublishRoutesRequest({ env: "staging" });
+      // Simulate that the worker has already been deployed to another route in this zone.
+      mockCollectKnownRoutesRequest([
+        {
+          pattern: "foo.example.com/other-route",
+          script: "test-name",
+        },
+      ]);
+      mockGetZoneFromHostRequest("example.com", "some-zone-id");
+      mockPublishRoutesFallbackRequest({
+        pattern: "example.com/some-route/*",
+        script: "test-name",
+      });
+      await expect(runWrangler("publish ./index --env=staging")).rejects
+        .toThrowErrorMatchingInlineSnapshot(`
+              "Service environments combined with an API token that doesn't have 'All Zones' permissions is not supported.
+              Either turn off service environments by setting \`legacy_env = true\`, creating an API token with 'All Zones' permissions, or logging in via OAuth"
+            `);
+    });
+
     describe("custom domains", () => {
-      it("should publish routes marked with 'custom_domain' as seperate custom domains", async () => {
+      it("should publish routes marked with 'custom_domain' as separate custom domains", async () => {
         writeWranglerToml({
           routes: [{ pattern: "api.example.com", custom_domain: true }],
         });
@@ -5004,7 +5081,7 @@ addEventListener('fetch', event => {});`
           "debug": "",
           "err": "",
           "out": "--dry-run: exiting now.",
-          "warn": "▲ [WARNING] Enabling node.js compatibility mode for builtins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
+          "warn": "▲ [WARNING] Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
 
         ",
         }
@@ -5048,7 +5125,7 @@ addEventListener('fetch', event => {});`
           "debug": "",
           "err": "",
           "out": "--dry-run: exiting now.",
-          "warn": "▲ [WARNING] Enabling node.js compatibility mode for builtins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
+          "warn": "▲ [WARNING] Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
 
         ",
         }
@@ -5226,6 +5303,49 @@ function mockPublishRoutesRequest({
   );
 }
 
+function mockUnauthorizedPublishRoutesRequest({
+  env = undefined,
+  legacyEnv = false,
+}: {
+  env?: string | undefined;
+  legacyEnv?: boolean | undefined;
+} = {}) {
+  const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
+  const environment = env && !legacyEnv ? "/environments/:envName" : "";
+
+  setMockRawResponse(
+    `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/routes`,
+    "PUT",
+    () =>
+      createFetchResult(null, false, [
+        { message: "Authentication error", code: 10000 },
+      ])
+  );
+}
+
+function mockCollectKnownRoutesRequest(
+  routes: { pattern: string; script: string }[]
+) {
+  setMockResponse(`/zones/:zoneId/workers/routes`, "GET", () => routes);
+}
+
+function mockGetZoneFromHostRequest(host: string, zone: string) {
+  setMockResponse("/zones", (_uri, _init, queryParams) => {
+    expect(queryParams.get("name")).toEqual(host);
+    return [{ id: zone }];
+  });
+}
+
+function mockPublishRoutesFallbackRequest(route: {
+  pattern: string;
+  script: string;
+}) {
+  setMockResponse(`/zones/:zoneId/workers/routes`, "POST", (_url, { body }) => {
+    expect(JSON.parse(body as string)).toEqual(route);
+    return route.pattern;
+  });
+}
+
 function mockPublishCustomDomainsRequest({
   publishFlags,
   domains = [],

package/src/__tests__/whoami.test.tsx

@@ -9,6 +9,8 @@ import { runInTempDir } from "./helpers/run-in-tmp";
 import type { UserInfo } from "../whoami";
 
 describe("getUserInfo()", () => {
+  const ENV_COPY = process.env;
+
   runInTempDir({ homedir: "./home" });
   const std = mockConsoleMethods();
   const { setIsTTY } = useMockIsTTY();
@@ -17,6 +19,10 @@ describe("getUserInfo()", () => {
     setIsTTY(true);
   });
 
+  afterEach(() => {
+    process.env = ENV_COPY;
+  });
+
   it("should return undefined if there is no config file", async () => {
     const userInfo = await getUserInfo();
     expect(userInfo).toBeUndefined();
@@ -28,6 +34,34 @@ describe("getUserInfo()", () => {
     expect(userInfo).toBeUndefined();
   });
 
+  it("should say it's using an API token when one is set", async () => {
+    process.env = {
+      CLOUDFLARE_API_TOKEN: "123456789",
+    };
+    setMockResponse("/user", () => {
+      return { email: "user@example.com" };
+    });
+    setMockResponse("/accounts", () => {
+      return [
+        { name: "Account One", id: "account-1" },
+        { name: "Account Two", id: "account-2" },
+        { name: "Account Three", id: "account-3" },
+      ];
+    });
+
+    const userInfo = await getUserInfo();
+    expect(userInfo).toEqual({
+      authType: "API",
+      apiToken: "123456789",
+      email: "user@example.com",
+      accounts: [
+        { name: "Account One", id: "account-1" },
+        { name: "Account Two", id: "account-2" },
+        { name: "Account Three", id: "account-3" },
+      ],
+    });
+  });
+
   it("should return the user's email and accounts if authenticated via config token", async () => {
     writeAuthConfigFile({ oauth_token: "some-oauth-token" });
 

package/src/cfetch/internal.ts

@@ -1,8 +1,9 @@
+import assert from "node:assert";
 import { fetch, Headers } from "undici";
 import { version as wranglerVersion } from "../../package.json";
 import { getEnvironmentVariableFactory } from "../environment-variables";
 import { ParseError, parseJSON } from "../parse";
-import { getAPIToken, loginOrRefreshIfRequired } from "../user";
+import { loginOrRefreshIfRequired, requireApiToken } from "../user";
 import type { URLSearchParams } from "node:url";
 import type { RequestInit, HeadersInit } from "undici";
 
@@ -30,6 +31,10 @@ export async function fetchInternal<ResponseType>(
   queryParams?: URLSearchParams,
   abortSignal?: AbortSignal
 ): Promise<ResponseType> {
+  assert(
+    resource.startsWith("/"),
+    `CF API fetch - resource path must start with a "/" but got "${resource}"`
+  );
   await requireLoggedIn();
   const apiToken = requireApiToken();
   const headers = cloneHeaders(init.headers);
@@ -90,14 +95,6 @@ async function requireLoggedIn(): Promise<void> {
   }
 }
 
-function requireApiToken(): string {
-  const authToken = getAPIToken();
-  if (!authToken) {
-    throw new Error("No API token found.");
-  }
-  return authToken;
-}
-
 function addAuthorizationHeaderIfUnspecified(
   headers: Record<string, string>,
   apiToken: string

package/src/config/config.ts

@@ -184,7 +184,7 @@ export interface DevConfig {
   /**
    * Host to forward requests to, defaults to the host of the first route of project
    */
-  host: Config["route"];
+  host: string | undefined;
 }
 
 export type RawDevConfig = Partial<DevConfig>;

package/src/create-worker-preview.ts

@@ -63,7 +63,7 @@ async function sessionToken(
 ): Promise<CfPreviewToken> {
   const { accountId } = account;
   const initUrl = ctx.zone
-    ? `/zones/${ctx.zone.id}/workers/edge-preview`
+    ? `/zones/${ctx.zone}/workers/edge-preview`
     : `/accounts/${accountId}/workers/subdomain/edge-preview`;
 
   const { exchange_url } = await fetchResult<{ exchange_url: string }>(
@@ -111,7 +111,7 @@ async function createPreviewToken(
   );
 
   const { accountId } = account;
-  const scriptId = ctx.zone ? randomId() : worker.name || host.split(".")[0];
+  const scriptId = worker.name || (ctx.zone ? randomId() : host.split(".")[0]);
   const url =
     ctx.env && !ctx.legacyEnv
       ? `/accounts/${accountId}/workers/services/${scriptId}/environments/${ctx.env}/edge-preview`
@@ -139,19 +139,19 @@ async function createPreviewToken(
 
   return {
     value: preview_token,
-    host: ctx.zone
-      ? ctx.zone.host
-      : worker.name
-      ? `${
-          worker.name
-          // TODO: this should also probably have the env prefix
-          // but it doesn't appear to work yet, instead giving us the
-          // "There is nothing here yet" screen
-          // ctx.env && !ctx.legacyEnv
-          //   ? `${ctx.env}.${worker.name}`
-          //   : worker.name
-        }.${host.split(".").slice(1).join(".")}`
-      : host,
+    host:
+      ctx.host ??
+      (worker.name
+        ? `${
+            worker.name
+            // TODO: this should also probably have the env prefix
+            // but it doesn't appear to work yet, instead giving us the
+            // "There is nothing here yet" screen
+            // ctx.env && !ctx.legacyEnv
+            //   ? `${ctx.env}.${worker.name}`
+            //   : worker.name
+          }.${host.split(".").slice(1).join(".")}`
+        : host),
 
     inspectorUrl,
     prewarmUrl,