wrangler 2.18.0 → 2.20.0

package/miniflare-dist/index.mjs

@@ -180,7 +180,7 @@ function mergeHeaders(base, extra) {
   });
 }
 function stripLeadingDoubleSlashes(location) {
-  return location.replace(/^(\/|%2F|%2f|%5C|%5c|\\)+(.*)/, "/$2");
+  return location.replace(/^(\/|%2F|%2f|%5C|%5c|%09|\s|\\)+(.*)/, "/$2");
 }
 var OkResponse, MovedPermanentlyResponse, FoundResponse, NotModifiedResponse, PermanentRedirectResponse, NotFoundResponse, MethodNotAllowedResponse, NotAcceptableResponse, InternalServerErrorResponse, SeeOtherResponse, TemporaryRedirectResponse;
 var init_responses = __esm({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.18.0",
+	"version": "2.20.0",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",

package/src/__tests__/configuration.test.ts

@@ -84,6 +84,7 @@ describe("normalizeAndValidateConfig()", () => {
 			first_party_worker: undefined,
 			keep_vars: undefined,
 			logpush: undefined,
+			placement: undefined,
 		});
 		expect(diagnostics.hasErrors()).toBe(false);
 		expect(diagnostics.hasWarnings()).toBe(false);
@@ -955,6 +956,9 @@ describe("normalizeAndValidateConfig()", () => {
 				node_compat: true,
 				first_party_worker: true,
 				logpush: true,
+				placement: {
+					mode: "smart",
+				},
 			};
 
 			const { config, diagnostics } = normalizeAndValidateConfig(
@@ -1030,6 +1034,9 @@ describe("normalizeAndValidateConfig()", () => {
 				node_compat: "INVALID",
 				first_party_worker: "INVALID",
 				logpush: "INVALID",
+				placement: {
+					mode: "INVALID",
+				},
 			} as unknown as RawEnvironment;
 
 			const { config, diagnostics } = normalizeAndValidateConfig(
@@ -1093,6 +1100,7 @@ describe("normalizeAndValidateConfig()", () => {
 			  - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got 111.
 			  - Expected \\"main\\" to be of type string but got 1333.
 			  - Expected \\"usage_model\\" field to be one of [\\"bundled\\",\\"unbound\\"] but got \\"INVALID\\".
+			  - Expected \\"placement.mode\\" field to be one of [\\"off\\",\\"smart\\"] but got \\"INVALID\\".
 			  - The field \\"define.DEF1\\" should be a string but got 1777.
 			  - Expected \\"no_bundle\\" to be of type boolean but got \\"INVALID\\".
 			  - Expected \\"minify\\" to be of type boolean but got \\"INVALID\\".

package/src/__tests__/constellation.test.ts

@@ -0,0 +1,371 @@
+import * as fs from "node:fs";
+import { rest } from "msw";
+import { endEventLoop } from "./helpers/end-event-loop";
+import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { clearDialogs, mockConfirm } from "./helpers/mock-dialogs";
+import { useMockIsTTY } from "./helpers/mock-istty";
+import { createFetchResult, msw } from "./helpers/msw";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+
+describe("constellation help", () => {
+	const std = mockConsoleMethods();
+	runInTempDir();
+
+	it("should show help when no argument is passed", async () => {
+		await runWrangler("constellation");
+		await endEventLoop();
+
+		expect(std.out).toMatchInlineSnapshot(`
+		"wrangler constellation
+
+		🤖 Interact with Constellation AI models
+
+		Commands:
+		  wrangler constellation project  Manage your projects
+		  wrangler constellation model    Manage your models
+		  wrangler constellation catalog  Check the curated model catalog
+		  wrangler constellation runtime  Check the suported runtimes
+
+		Flags:
+		  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+		  -c, --config                    Path to .toml configuration file  [string]
+		  -e, --env                       Environment to use for operations and .env files  [string]
+		  -h, --help                      Show help  [boolean]
+		  -v, --version                   Show version number  [boolean]"
+	`);
+	});
+
+	it("should show help when an invalid argument is passed", async () => {
+		await expect(() => runWrangler("constellation asdf")).rejects.toThrow(
+			"Unknown argument: asdf"
+		);
+
+		expect(std.err).toMatchInlineSnapshot(`
+		"X [ERROR] Unknown argument: asdf
+
+		"
+	`);
+		expect(std.out).toMatchInlineSnapshot(`
+		"
+		wrangler constellation
+
+		🤖 Interact with Constellation AI models
+
+		Commands:
+		  wrangler constellation project  Manage your projects
+		  wrangler constellation model    Manage your models
+		  wrangler constellation catalog  Check the curated model catalog
+		  wrangler constellation runtime  Check the suported runtimes
+
+		Flags:
+		  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+		  -c, --config                    Path to .toml configuration file  [string]
+		  -e, --env                       Environment to use for operations and .env files  [string]
+		  -h, --help                      Show help  [boolean]
+		  -v, --version                   Show version number  [boolean]"
+	`);
+	});
+});
+
+describe("constellation commands", () => {
+	mockAccountId();
+	mockApiToken();
+	runInTempDir();
+	const { setIsTTY } = useMockIsTTY();
+
+	const std = mockConsoleMethods();
+
+	beforeEach(() => {
+		// @ts-expect-error we're using a very simple setTimeout mock here
+		jest.spyOn(global, "setTimeout").mockImplementation((fn, _period) => {
+			setImmediate(fn);
+		});
+		setIsTTY(true);
+	});
+
+	afterEach(() => {
+		clearDialogs();
+	});
+
+	it("should handle project creation", async () => {
+		mockConstellationRequest();
+		await runWrangler("constellation project create new_project ONNX");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		✅ Successfully created Project \\"new_project3\\"!"
+	`);
+	});
+
+	it("should handle project listing", async () => {
+		mockConstellationRequest();
+		await runWrangler("constellation project list");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		┌──────────────────────────────────────┬──────────────┬─────────┬─────────────────────────────┐
+		│ id                                   │ name         │ runtime │ created_at                  │
+		├──────────────────────────────────────┼──────────────┼─────────┼─────────────────────────────┤
+		│ 4806cdcf-9aa7-4fa2-b6a1-77fe9e196680 │ new_project3 │ ONNX    │ 2023-04-28T13:25:58.513105Z │
+		└──────────────────────────────────────┴──────────────┴─────────┴─────────────────────────────┘"
+	`);
+	});
+
+	it("should handle project deletion", async () => {
+		mockConstellationRequest();
+		mockConfirm({
+			text: "Ok to proceed?",
+			result: true,
+		});
+
+		await runWrangler("constellation project delete new_project3");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		About to delete Project 'new_project3' (4806cdcf-9aa7-4fa2-b6a1-77fe9e196680).
+		Deleting...
+		Deleted 'new_project3' successfully."
+	`);
+	});
+
+	it("should handle catalog list", async () => {
+		mockConstellationRequest();
+		await runWrangler("constellation catalog list");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		┌──────────────────────────────────────┬──────────────────────┬─────────────────┬───────────────┐
+		│ project_id                           │ project_name         │ project_runtime │ models        │
+		├──────────────────────────────────────┼──────────────────────┼─────────────────┼───────────────┤
+		│ b162a29d-0a6d-4155-bedf-54a01fc8d0ef │ image-classification │ ONNX            │ squeezenet1_1 │
+		└──────────────────────────────────────┴──────────────────────┴─────────────────┴───────────────┘"
+	`);
+	});
+
+	it("should handle runtime list", async () => {
+		mockConstellationRequest();
+		await runWrangler("constellation runtime list");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		┌─────────┐
+		│ name    │
+		├─────────┤
+		│ ONNX    │
+		├─────────┤
+		│ XGBoost │
+		└─────────┘"
+	`);
+	});
+
+	it("should handle model upload", async () => {
+		mockConstellationRequest();
+		await fs.promises.writeFile("model.onnx", `model`);
+		await runWrangler(
+			"constellation model upload new_project3 model2 model.onnx"
+		);
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		✅ Successfully uploaded Model \\"model2\\"!"
+	`);
+	});
+
+	it("should handle model list", async () => {
+		mockConstellationRequest();
+		await runWrangler("constellation model list new_project3");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		┌──────────────────────────────────────┬──────────────────────────────────────┬────────┬─────────────┬─────────────────────────────┐
+		│ id                                   │ project_id                           │ name   │ description │ created_at                  │
+		├──────────────────────────────────────┼──────────────────────────────────────┼────────┼─────────────┼─────────────────────────────┤
+		│ 450bb086-3c09-4991-a0cc-eed48c504ae0 │ 9d478427-dea6-4988-9b16-f6f8888d974c │ model1 │             │ 2023-04-28T11:15:14.806217Z │
+		├──────────────────────────────────────┼──────────────────────────────────────┼────────┼─────────────┼─────────────────────────────┤
+		│ 2dd35b4e-0c7a-4c7a-a9e2-e33c0e17bc02 │ 9d478427-dea6-4988-9b16-f6f8888d974c │ model2 │             │ 2023-04-28T13:50:37.494090Z │
+		└──────────────────────────────────────┴──────────────────────────────────────┴────────┴─────────────┴─────────────────────────────┘"
+	`);
+	});
+
+	it("should handle model deletion", async () => {
+		mockConstellationRequest();
+		mockConfirm({
+			text: "Ok to proceed?",
+			result: true,
+		});
+
+		await runWrangler("constellation model delete new_project3 model2");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		About to delete Model 'model2' (2dd35b4e-0c7a-4c7a-a9e2-e33c0e17bc02).
+		Deleting...
+		Deleted 'model2' successfully."
+	`);
+	});
+});
+
+/** Create a mock handler for Constellation API */
+function mockConstellationRequest() {
+	msw.use(
+		rest.get("*/accounts/:accountId/constellation/project", (req, res, ctx) => {
+			return res.once(
+				ctx.json(
+					createFetchResult(
+						[
+							{
+								id: "4806cdcf-9aa7-4fa2-b6a1-77fe9e196680",
+								name: "new_project3",
+								runtime: "ONNX",
+								created_at: "2023-04-28T13:25:58.513105Z",
+							},
+						],
+						true
+					)
+				)
+			);
+		}),
+		rest.post(
+			"*/accounts/:accountId/constellation/project",
+			(req, res, ctx) => {
+				return res.once(
+					ctx.json(
+						createFetchResult(
+							{
+								id: "4806cdcf-9aa7-4fa2-b6a1-77fe9e196680",
+								name: "new_project3",
+								runtime: "ONNX",
+								created_at: "2023-04-28T13:25:58.513105Z",
+							},
+							true
+						)
+					)
+				);
+			}
+		),
+		rest.delete(
+			"*/accounts/:accountId/constellation/project/4806cdcf-9aa7-4fa2-b6a1-77fe9e196680",
+			(req, res, ctx) => {
+				return res.once(ctx.json(createFetchResult(null, true)));
+			}
+		),
+		rest.get("*/accounts/:accountId/constellation/catalog", (req, res, ctx) => {
+			return res.once(
+				ctx.json(
+					createFetchResult(
+						[
+							{
+								project: {
+									id: "b162a29d-0a6d-4155-bedf-54a01fc8d0ef",
+									name: "image-classification",
+									runtime: "ONNX",
+									created_at: "2023-04-27T18:55:38.417187Z",
+								},
+								models: [
+									{
+										id: "edb202d3-f4ac-43ab-8762-3ae6b43c4c57",
+										project_id: "b162a29d-0a6d-4155-bedf-54a01fc8d0ef",
+										name: "squeezenet1_1",
+										description: null,
+										created_at: "2023-04-27T18:56:15.305087Z",
+									},
+								],
+							},
+						],
+						true
+					)
+				)
+			);
+		}),
+		rest.get("*/accounts/:accountId/constellation/runtime", (req, res, ctx) => {
+			return res.once(ctx.json(createFetchResult(["ONNX", "XGBoost"], true)));
+		}),
+		rest.post(
+			"*/accounts/:accountId/constellation/project/4806cdcf-9aa7-4fa2-b6a1-77fe9e196680/model",
+			(req, res, ctx) => {
+				return res.once(
+					ctx.json(
+						createFetchResult(
+							{
+								id: "2dd35b4e-0c7a-4c7a-a9e2-e33c0e17bc02",
+								project_id: "4806cdcf-9aa7-4fa2-b6a1-77fe9e196680",
+								name: "model2",
+								description: null,
+								created_at: "2023-04-28T13:50:37.494090Z",
+							},
+							true
+						)
+					)
+				);
+			}
+		),
+		rest.get(
+			"*/accounts/:accountId/constellation/project/4806cdcf-9aa7-4fa2-b6a1-77fe9e196680/model",
+			(req, res, ctx) => {
+				return res.once(
+					ctx.json(
+						createFetchResult(
+							[
+								{
+									id: "450bb086-3c09-4991-a0cc-eed48c504ae0",
+									project_id: "9d478427-dea6-4988-9b16-f6f8888d974c",
+									name: "model1",
+									description: null,
+									created_at: "2023-04-28T11:15:14.806217Z",
+								},
+								{
+									id: "2dd35b4e-0c7a-4c7a-a9e2-e33c0e17bc02",
+									project_id: "9d478427-dea6-4988-9b16-f6f8888d974c",
+									name: "model2",
+									description: null,
+									created_at: "2023-04-28T13:50:37.494090Z",
+								},
+							],
+							true
+						)
+					)
+				);
+			}
+		),
+		rest.delete(
+			"*/accounts/:accountId/constellation/project/4806cdcf-9aa7-4fa2-b6a1-77fe9e196680/model/2dd35b4e-0c7a-4c7a-a9e2-e33c0e17bc02",
+			(req, res, ctx) => {
+				return res.once(ctx.json(createFetchResult(null, true)));
+			}
+		)
+	);
+}

package/src/__tests__/index.test.ts

@@ -49,6 +49,7 @@ describe("wrangler", () => {
 			  wrangler r2                          📦 Interact with an R2 store
 			  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 			  wrangler d1                          🗄  Interact with a D1 database
+			  wrangler constellation               🤖 Interact with Constellation AI models
 			  wrangler pubsub                      📮 Interact and manage Pub/Sub Brokers
 			  wrangler mtls-certificate            🪪 Manage certificates used for mTLS connections
 			  wrangler login                       🔓 Login to Cloudflare
@@ -102,6 +103,7 @@ describe("wrangler", () => {
 			  wrangler r2                          📦 Interact with an R2 store
 			  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 			  wrangler d1                          🗄  Interact with a D1 database
+			  wrangler constellation               🤖 Interact with Constellation AI models
 			  wrangler pubsub                      📮 Interact and manage Pub/Sub Brokers
 			  wrangler mtls-certificate            🪪 Manage certificates used for mTLS connections
 			  wrangler login                       🔓 Login to Cloudflare

package/src/__tests__/mtls-certificates.test.ts

@@ -379,6 +379,7 @@ describe("wrangler", () => {
 				  wrangler r2                          📦 Interact with an R2 store
 				  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 				  wrangler d1                          🗄  Interact with a D1 database
+				  wrangler constellation               🤖 Interact with Constellation AI models
 				  wrangler pubsub                      📮 Interact and manage Pub/Sub Brokers
 				  wrangler mtls-certificate            🪪 Manage certificates used for mTLS connections
 				  wrangler login                       🔓 Login to Cloudflare

package/src/__tests__/pages/functions-build.test.ts

@@ -448,5 +448,81 @@ export default {
 		"Build failed with 1 error:
 		hello.js:2:36: ERROR: Could not resolve \\"node:async_hooks\\""
 	`);
+		expect(std.err).toContain(
+			'The package "node:async_hooks" wasn\'t found on the file system but is built into node.'
+		);
+		expect(std.err).toContain(
+			'Add the "nodejs_compat" compatibility flag to your Pages project to enable Node.js compatibility.'
+		);
+	});
+
+	it("should compile a _worker.js/ directory", async () => {
+		mkdirSync("public");
+		mkdirSync("public/_worker.js");
+		writeFileSync(
+			"public/_worker.js/index.js",
+			`
+import { cat } from "./cat.js";
+
+export default {
+  async fetch(request, env) {
+		return new Response("Hello from _worker.js/index.js" + cat);
+	},
+};`
+		);
+		writeFileSync(
+			"public/_worker.js/cat.js",
+			`
+export const cat = "cat";`
+		);
+
+		await runWrangler(`pages functions build --outfile=public/_worker.bundle`);
+
+		expect(existsSync("public/_worker.bundle")).toBe(true);
+		expect(std.out).toMatchInlineSnapshot(`
+		"🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		✨ Compiled Worker successfully"
+	`);
+
+		const workerBundleContents = readFileSync("public/_worker.bundle", "utf-8");
+		const workerBundleWithConstantData = replaceRandomWithConstantData(
+			workerBundleContents,
+			[
+				[/------formdata-undici-0.[0-9]*/g, "------formdata-undici-0.test"],
+				[/bundledWorker-0.[0-9]*.mjs/g, "bundledWorker-0.test.mjs"],
+				[/bundledWorker-0.[0-9]*.map/g, "bundledWorker-0.test.map"],
+			]
+		);
+
+		expect(workerBundleWithConstantData).toMatchInlineSnapshot(`
+		"------formdata-undici-0.test
+		Content-Disposition: form-data; name=\\"metadata\\"
+
+		{\\"main_module\\":\\"bundledWorker-0.test.mjs\\"}
+		------formdata-undici-0.test
+		Content-Disposition: form-data; name=\\"bundledWorker-0.test.mjs\\"; filename=\\"bundledWorker-0.test.mjs\\"
+		Content-Type: application/javascript+module
+
+		import { cat } from \\"./cat.js\\";
+		var worker_default = {
+		  async fetch(request, env) {
+		    return new Response(\\"Hello from _worker.js/index.js\\" + cat);
+		  }
+		};
+		export {
+		  worker_default as default
+		};
+		//# sourceMappingURL=bundledWorker-0.test.mjs.map
+
+		------formdata-undici-0.test
+		Content-Disposition: form-data; name=\\"cat.js\\"; filename=\\"cat.js\\"
+		Content-Type: application/javascript+module
+
+
+		export const cat = \\"cat\\";
+		------formdata-undici-0.test--"
+	`);
+
+		expect(std.err).toMatchInlineSnapshot(`""`);
 	});
 });

package/src/__tests__/pages-deployment-tail.test.ts

@@ -13,6 +13,7 @@ import type {
 	ScheduledEvent,
 	AlarmEvent,
 	EmailEvent,
+	TailInfo,
 } from "../tail/createTail";
 import type { RequestInit } from "undici";
 import type WebSocket from "ws";
@@ -655,6 +656,7 @@ function isRequest(
 		| RequestEvent
 		| AlarmEvent
 		| EmailEvent
+		| TailInfo
 		| undefined
 		| null
 ): event is RequestEvent {

package/src/__tests__/publish.test.ts

@@ -140,7 +140,7 @@ describe("publish", () => {
 
 			expect(std.out).toMatchInlineSnapshot(`
 			"Attempting to login via OAuth...
-			Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20ssl_certs%3Awrite%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
+			Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20ssl_certs%3Awrite%20constellation%3Awrite%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
 			Successfully logged in.
 			Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
@@ -180,7 +180,7 @@ describe("publish", () => {
 
 				expect(std.out).toMatchInlineSnapshot(`
 			"Attempting to login via OAuth...
-			Opening a link in your default browser: https://dash.staging.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20ssl_certs%3Awrite%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
+			Opening a link in your default browser: https://dash.staging.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20ssl_certs%3Awrite%20constellation%3Awrite%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
 			Successfully logged in.
 			Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
@@ -7224,7 +7224,7 @@ export default{
 			expect(
 				esbuild.formatMessagesSync(err?.errors ?? [], { kind: "error" }).join()
 			).toMatch(
-				/The package "path" wasn't found on the file system but is built into node\.\s+Add "node_compat = true" to your wrangler\.toml file to enable Node compatibility\./
+				/The package "path" wasn't found on the file system but is built into node\.\s+Add "node_compat = true" to your wrangler\.toml file to enable Node.js compatibility\./
 			);
 		});
 

package/src/__tests__/tail.test.ts

@@ -14,6 +14,7 @@ import type {
 	ScheduledEvent,
 	AlarmEvent,
 	EmailEvent,
+	TailInfo,
 } from "../tail/createTail";
 import type { RequestInit } from "undici";
 import type WebSocket from "ws";
@@ -56,10 +57,10 @@ describe("tail", () => {
 			await runWrangler("tail durable-object--websocket--response");
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-"▲ [WARNING] Beginning log collection requires restarting the Durable Objects associated with durable-object--websocket--response. Any WebSocket connections or other non-persisted state will be lost as part of this restart.
+			"▲ [WARNING] Beginning log collection requires restarting the Durable Objects associated with durable-object--websocket--response. Any WebSocket connections or other non-persisted state will be lost as part of this restart.
 
-"
-`);
+			"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 		it("creates and then delete tails", async () => {
@@ -503,10 +504,31 @@ describe("tail", () => {
 					)
 					.replace(mockTailExpiration.toISOString(), "[mock expiration date]")
 			).toMatchInlineSnapshot(`
-			        "Successfully created tail, expires at [mock expiration date]
-			        Connected to test-worker, waiting for logs...
-			        Email from:${mockEmailEventFrom} to:${mockEmailEventTo} size:${mockEmailEventSize} @ [mock event timestamp] - Ok"
-		      `);
+			"Successfully created tail, expires at [mock expiration date]
+			Connected to test-worker, waiting for logs...
+			Email from:from@example.com to:to@example.com size:45416 @ [mock event timestamp] - Ok"
+		`);
+		});
+
+		it("logs tail overload message", async () => {
+			const api = mockWebsocketAPIs();
+			await runWrangler("tail test-worker --format pretty");
+
+			const event = generateTailInfo();
+			const message = generateMockEventMessage({ event });
+			const serializedMessage = serialize(message);
+
+			api.ws.send(serializedMessage);
+			expect(
+				std.out.replace(
+					mockTailExpiration.toISOString(),
+					"[mock expiration date]"
+				)
+			).toMatchInlineSnapshot(`
+			"Successfully created tail, expires at [mock expiration date]
+			Connected to test-worker, waiting for logs...
+			Tail is currently in sampling mode due to the high volume of messages. To prevent messages from being dropped consider adding filters."
+		`);
 		});
 
 		it("should not crash when the tail message has a void event", async () => {
@@ -675,6 +697,7 @@ function isRequest(
 		| RequestEvent
 		| AlarmEvent
 		| EmailEvent
+		| TailInfo
 		| undefined
 		| null
 ): event is RequestEvent {
@@ -956,3 +979,11 @@ function generateMockEmailEvent(opts?: Partial<EmailEvent>): EmailEvent {
 		rawSize: opts?.rawSize || mockEmailEventSize,
 	};
 }
+
+function generateTailInfo(): TailInfo {
+	return {
+		message:
+			"Tail is currently in sampling mode due to the high volume of messages. To prevent messages from being dropped consider adding filters.",
+		type: "overload",
+	};
+}