wrangler 2.13.0 → 2.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.13.0",
+	"version": "2.14.0",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -66,7 +66,8 @@
 		"test": "npm run assert-git-version && jest",
 		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
 		"test:ci": "npm run test -- --coverage",
-		"test:debug": "npm run test -- --silent=false --verbose=true"
+		"test:debug": "npm run test -- --silent=false --verbose=true",
+		"test:e2e": "vitest --no-threads ./e2e"
 	},
 	"jest": {
 		"coverageReporters": [
@@ -83,7 +84,7 @@
 		"setupFilesAfterEnv": [
 			"<rootDir>/src/__tests__/jest.setup.ts"
 		],
-		"testRegex": ".*.(test|spec)\\.[jt]sx?$",
+		"testRegex": "src/__tests__/.*\\.(test|spec)\\.[jt]sx?$",
 		"testTimeout": 30000,
 		"transform": {
 			"^.+\\.c?(t|j)sx?$": [
@@ -101,13 +102,13 @@
 		"@cloudflare/kv-asset-handler": "^0.2.0",
 		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
-		"@miniflare/core": "2.12.1",
-		"@miniflare/d1": "2.12.1",
-		"@miniflare/durable-objects": "2.12.1",
+		"@miniflare/core": "2.13.0",
+		"@miniflare/d1": "2.13.0",
+		"@miniflare/durable-objects": "2.13.0",
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
 		"esbuild": "0.16.3",
-		"miniflare": "2.12.1",
+		"miniflare": "2.13.0",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
@@ -175,13 +176,16 @@
 		"remove-accents-esm": "^0.0.1",
 		"semiver": "^1.1.0",
 		"serve-static": "^1.15.0",
+		"shellac": "^0.7.3",
 		"signal-exit": "^3.0.7",
+		"strip-ansi": "^7.0.1",
 		"supports-color": "^9.2.2",
 		"timeago.js": "^4.0.2",
 		"tmp-promise": "^3.0.3",
 		"ts-dedent": "^2.2.0",
 		"undici": "5.20.0",
 		"update-check": "^1.5.4",
+		"vitest": "^0.29.2",
 		"ws": "^8.5.0",
 		"xdg-app-paths": "^7.3.0",
 		"yargs": "^17.4.1",

package/src/__tests__/api-devregistry.test.ts

@@ -0,0 +1,121 @@
+import { fetch } from "undici";
+import { unstable_dev } from "../api";
+
+jest.unmock("undici");
+
+/**
+ * a huge caveat to how testing multi-worker scripts works:
+ * you can't shutdown the first worker you spun up, or it'll kill the devRegistry
+ */
+describe("multi-worker testing", () => {
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	let childWorker: any;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	let parentWorker: any;
+
+	beforeAll(async () => {
+		childWorker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+			{
+				config: "src/__tests__/helpers/worker-scripts/child-wrangler.toml",
+				experimental: {
+					disableExperimentalWarning: true,
+				},
+			}
+		);
+		parentWorker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/parent-worker.js",
+			{
+				config: "src/__tests__/helpers/worker-scripts/parent-wrangler.toml",
+				experimental: {
+					disableExperimentalWarning: true,
+				},
+			}
+		);
+	});
+
+	afterAll(async () => {
+		await childWorker.stop();
+		await parentWorker.stop();
+	});
+
+	it("parentWorker and childWorker should be added devRegistry", async () => {
+		const resp = await fetch("http://localhost:6284/workers");
+		if (resp) {
+			const parsedResp = (await resp.json()) as {
+				parent: unknown;
+				child: unknown;
+			};
+			expect(parsedResp.parent).toBeTruthy();
+			expect(parsedResp.child).toBeTruthy();
+		}
+	});
+
+	it("childWorker should return Hello World itself", async () => {
+		const resp = await childWorker.fetch();
+		if (resp) {
+			const text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
+		}
+	});
+
+	it("parentWorker should return Hello World by invoking the child worker", async () => {
+		const resp = await parentWorker.fetch();
+		if (resp) {
+			const parsedResp = await resp.text();
+			expect(parsedResp).toEqual("Parent worker sees: Hello World!");
+		}
+	});
+
+	it("should be able to stop and start the server with no warning logs", async () => {
+		// Spy on all the console methods
+		let logs = "";
+		(["debug", "info", "log", "warn", "error"] as const).forEach((method) =>
+			jest
+				.spyOn(console, method)
+				.mockImplementation((...args: unknown[]) => (logs += `\n${args}`))
+		);
+
+		// Spy on the std out that is written to by Miniflare 2
+		jest
+			.spyOn(process.stdout, "write")
+			.mockImplementation((chunk: unknown) => ((logs += `\n${chunk}`), true));
+
+		async function startWorker() {
+			return await unstable_dev(
+				"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+				{
+					// We need the wrangler.toml config to specify a Worker name
+					// otherwise unstable_dev will not register the worker with the DevRegistry
+					config: "src/__tests__/helpers/worker-scripts/child-wrangler.toml",
+					// We need debug logs because this is where the message is written if registering the worker fails.
+					logLevel: "debug",
+					experimental: {
+						disableExperimentalWarning: true,
+					},
+				}
+			);
+		}
+
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		let worker: any;
+		try {
+			worker = await startWorker();
+
+			// Stop the worker and start it again
+			await worker.stop();
+			await new Promise((r) => setTimeout(r, 2000));
+
+			worker = await startWorker();
+
+			const resp = await worker.fetch();
+			expect(resp).not.toBe(undefined);
+
+			expect(logs).not.toMatch(
+				/Failed to register worker in local service registry/
+			);
+		} finally {
+			await worker?.stop();
+		}
+	}, 10000);
+});

package/src/__tests__/api.test.ts

@@ -5,7 +5,7 @@ describe("parseRequestInput for fetch on unstable dev", () => {
 	it("should allow no input to be passed in", () => {
 		const [input, _] = parseRequestInput("0.0.0.0", 8080);
 
-		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080"`);
+		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/"`);
 	});
 
 	it("should allow string of pathname to be passed in", () => {
@@ -14,14 +14,24 @@ describe("parseRequestInput for fetch on unstable dev", () => {
 		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/test"`);
 	});
 
+	it("should allow string of pathname and querystring to be passed in", () => {
+		const [input, _] = parseRequestInput("0.0.0.0", 8080, "/test?q=testparam");
+
+		expect(input).toMatchInlineSnapshot(
+			`"http://0.0.0.0:8080/test?q=testparam"`
+		);
+	});
+
 	it("should allow full url to be passed in as string and stripped", () => {
 		const [input, _] = parseRequestInput(
 			"0.0.0.0",
 			8080,
-			"http://cloudflare.com/test"
+			"http://cloudflare.com/test?q=testparam"
 		);
 
-		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/test"`);
+		expect(input).toMatchInlineSnapshot(
+			`"http://0.0.0.0:8080/test?q=testparam"`
+		);
 	});
 
 	it("should allow URL object without pathname to be passed in and stripped", () => {
@@ -44,18 +54,30 @@ describe("parseRequestInput for fetch on unstable dev", () => {
 		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/test"`);
 	});
 
+	it("should allow URL object with pathname and querystring to be passed in and stripped", () => {
+		const [input, _] = parseRequestInput(
+			"0.0.0.0",
+			8080,
+			new URL("http://cloudflare.com/test?q=testparam")
+		);
+
+		expect(input).toMatchInlineSnapshot(
+			`"http://0.0.0.0:8080/test?q=testparam"`
+		);
+	});
+
 	it("should allow request object to be passed in", () => {
 		const [input, init] = parseRequestInput(
 			"0.0.0.0",
 			8080,
-			new Request("http://cloudflare.com/test", { method: "POST" })
+			new Request("http://cloudflare.com/test?q=testparam", { method: "POST" })
 		);
 
 		expect(init).toBeUndefined();
 		expect(input).toBeInstanceOf(Request);
 		// We don't expect the request to be modified
 		expect((input as Request).url).toMatchInlineSnapshot(
-			`"http://cloudflare.com/test"`
+			`"http://cloudflare.com/test?q=testparam"`
 		);
 		expect((input as Request).method).toMatchInlineSnapshot(`"POST"`);
 	});

package/src/__tests__/configuration.test.ts

@@ -40,6 +40,7 @@ describe("normalizeAndValidateConfig()", () => {
 			jsx_fragment: "React.Fragment",
 			tsconfig: undefined,
 			kv_namespaces: [],
+			send_email: [],
 			legacy_env: true,
 			logfwdr: {
 				bindings: [],
@@ -903,6 +904,17 @@ describe("normalizeAndValidateConfig()", () => {
 						preview_id: "KV_PREVIEW_1",
 					},
 				],
+				send_email: [
+					{ name: "SEB_TARGET", destination_address: "teste@example.com" },
+					{ name: "SEB_UNRESTRICTED" },
+					{
+						name: "SEB_ALLOWLIST",
+						allowed_destination_addresses: [
+							"email1@example.com",
+							"email2@example.com",
+						],
+					},
+				],
 				r2_buckets: [
 					{ binding: "R2_BINDING_1", bucket_name: "R2_BUCKET_1" },
 					{
@@ -1629,6 +1641,39 @@ describe("normalizeAndValidateConfig()", () => {
 			});
 		});
 
+		it("should error if send_email.bindings are not valid", () => {
+			const { diagnostics } = normalizeAndValidateConfig(
+				{
+					send_email: [
+						{},
+						{ binding: "VALID" },
+						{ name: "SEB", destination_address: 123 },
+						{
+							name: "SEB2",
+							allowed_destination_addresses: 123,
+						},
+						{
+							name: "SEB3",
+							destination_address: "email@example.com",
+							allowed_destination_addresses: ["email@example.com"],
+						},
+					],
+				} as unknown as RawConfig,
+				undefined,
+				{ env: undefined }
+			);
+
+			expect(diagnostics.hasWarnings()).toBe(false);
+			expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+			            - \\"send_email[0]\\" bindings should have a string \\"name\\" field but got {}.
+			            - \\"send_email[1]\\" bindings should have a string \\"name\\" field but got {\\"binding\\":\\"VALID\\"}.
+			            - \\"send_email[2]\\" bindings should, optionally, have a string \\"destination_address\\" field but got {\\"name\\":\\"SEB\\",\\"destination_address\\":123}.
+			            - \\"send_email[3]\\" bindings should, optionally, have a []string \\"allowed_destination_addresses\\" field but got {\\"name\\":\\"SEB2\\",\\"allowed_destination_addresses\\":123}.
+			            - \\"send_email[4]\\" bindings should have either a \\"destination_address\\" or \\"allowed_destination_addresses\\" field, but not both."
+		        `);
+		});
+
 		describe("[d1_databases]", () => {
 			it("should error if d1_databases is an object", () => {
 				const { diagnostics } = normalizeAndValidateConfig(

package/src/__tests__/pages/publish.test.ts

@@ -2245,20 +2245,22 @@ and that at least one include rule is provided.
 		mkdirSync("public");
 		writeFileSync("public/README.md", "This is a readme");
 
-		// set up hello.wasm
-		mkdirSync("wasm");
-		writeFileSync("wasm/hello.wasm", "HELLO WORLD");
+		// set up some "external" modules
+		mkdirSync("external");
+		writeFileSync("external/hello.wasm", "Hello Wasm modules world!");
+		writeFileSync("external/hello.txt", "Hello Text modules world!");
 
 		// set up Functions
 		mkdirSync("functions");
 		writeFileSync(
 			"functions/hello.js",
 			`
-			import hello from "./../wasm/hello.wasm";
+			import wasm from "./../external/hello.wasm";
+			import text from "./../external/hello.txt"
 			export async function onRequest() {
-				const helloModule = await WebAssembly.instantiate(hello);
-				const greeting = helloModule.exports.hello;
-				return new Response(greeting);
+				const helloModule = await WebAssembly.instantiate(wasm);
+				const wasmGreeting = helloModule.exports.hello;
+				return new Response(wasmGreeting + text);
 			}
 			`
 		);
@@ -2363,6 +2365,10 @@ and that at least one include rule is provided.
 						/[0-9a-z]*-hello.wasm/g,
 						"test-hello.wasm"
 					);
+					workerBundleWithConstantData = workerBundleWithConstantData.replace(
+						/[0-9a-z]*-hello.txt/g,
+						"test-hello.txt"
+					);
 
 					// check we appended the metadata
 					expect(workerBundleWithConstantData).toContain(
@@ -2377,18 +2383,29 @@ and that at least one include rule is provided.
 						`Content-Disposition: form-data; name="functionsWorker-0.test.js"; filename="functionsWorker-0.test.js"`
 					);
 					expect(workerBundleWithConstantData).toContain(`
-import hello from "./test-hello.wasm";
+import wasm from "./test-hello.wasm";
+import text from "./test-hello.txt";
 async function onRequest() {
-  const helloModule = await WebAssembly.instantiate(hello);
-  const greeting = helloModule.exports.hello;
-  return new Response(greeting);
+  const helloModule = await WebAssembly.instantiate(wasm);
+  const wasmGreeting = helloModule.exports.hello;
+  return new Response(wasmGreeting + text);
 }`);
 
 					// check we appended the wasm module
 					expect(workerBundleWithConstantData).toContain(
 						`Content-Disposition: form-data; name="./test-hello.wasm"; filename="./test-hello.wasm"`
 					);
-					expect(workerBundleWithConstantData).toContain(`HELLO WORLD`);
+					expect(workerBundleWithConstantData).toContain(
+						`Hello Wasm modules world!`
+					);
+
+					// check we appended the text module
+					expect(workerBundleWithConstantData).toContain(
+						`Content-Disposition: form-data; name="./test-hello.txt"; filename="./test-hello.txt"`
+					);
+					expect(workerBundleWithConstantData).toContain(
+						`Hello Text modules world!`
+					);
 
 					return res.once(
 						ctx.status(200),
@@ -2445,20 +2462,31 @@ async function onRequest() {
 		writeFileSync("public/README.md", "This is a readme");
 
 		// set up hello.wasm
-		mkdirSync("wasm");
-		writeFileSync("wasm/hello.wasm", "HELLO");
+		mkdirSync("external");
+		writeFileSync("external/hello.wasm", "Hello wasm modules");
+		writeFileSync(
+			"external/hello.html",
+			"<html><body>Hello text modules</body></html>"
+		);
 
 		// set up _worker.js
 		writeFileSync(
 			"public/_worker.js",
 			`
-			import hello from "./../wasm/hello.wasm";
+			import wasm from "./../external/hello.wasm";
+			import html from "./../external/hello.html";
 			export default {
 				async fetch(request, env) {
 					const url = new URL(request.url);
-					const helloModule = await WebAssembly.instantiate(hello);
-					const greeting = helloModule.exports.hello;
-					return url.pathname.startsWith('/hello') ? new Response(greeting) : env.ASSETS.fetch(request);
+					const helloModule = await WebAssembly.instantiate(wasm);
+					const wasmGreeting = helloModule.exports.hello;
+					if(url.pathname.startsWith('/hello-wasm')) {
+						return new Response(wasmGreeting);
+					}
+					if(url.pathname.startsWith('/hello-text')) {
+						return new Response(html);
+					}
+					return env.ASSETS.fetch(request);
 				}
 			};
 		`
@@ -2558,6 +2586,10 @@ async function onRequest() {
 						/[0-9a-z]*-hello.wasm/g,
 						"test-hello.wasm"
 					);
+					workerBundleWithConstantData = workerBundleWithConstantData.replace(
+						/[0-9a-z]*-hello.html/g,
+						"test-hello.html"
+					);
 
 					// we care about a couple of things here, like the presence of `metadata`,
 					// `bundledWorker`, the wasm import, etc., and since `workerBundle` is
@@ -2572,13 +2604,20 @@ async function onRequest() {
 				Content-Type: application/javascript+module
 
 				// _worker.js
-				import hello from \\"./test-hello.wasm\\";
+				import wasm from \\"./test-hello.wasm\\";
+				import html from \\"./test-hello.html\\";
 				var worker_default = {
 				  async fetch(request, env) {
 				    const url = new URL(request.url);
-				    const helloModule = await WebAssembly.instantiate(hello);
-				    const greeting = helloModule.exports.hello;
-				    return url.pathname.startsWith(\\"/hello\\") ? new Response(greeting) : env.ASSETS.fetch(request);
+				    const helloModule = await WebAssembly.instantiate(wasm);
+				    const wasmGreeting = helloModule.exports.hello;
+				    if (url.pathname.startsWith(\\"/hello-wasm\\")) {
+				      return new Response(wasmGreeting);
+				    }
+				    if (url.pathname.startsWith(\\"/hello-text\\")) {
+				      return new Response(html);
+				    }
+				    return env.ASSETS.fetch(request);
 				  }
 				};
 				export {
@@ -2590,7 +2629,12 @@ async function onRequest() {
 				Content-Disposition: form-data; name=\\"./test-hello.wasm\\"; filename=\\"./test-hello.wasm\\"
 				Content-Type: application/wasm
 
-				HELLO
+				Hello wasm modules
+				------formdata-undici-0.test
+				Content-Disposition: form-data; name=\\"./test-hello.html\\"; filename=\\"./test-hello.html\\"
+				Content-Type: text/plain
+
+				<html><body>Hello text modules</body></html>
 				------formdata-undici-0.test--"
 			`);