wrangler 0.0.0-e7a0cd5b → 0.0.0-e7cf0caa

package/src/__tests__/middleware.test.ts

@@ -27,11 +27,12 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -50,18 +51,19 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 			export default {
 				middleware: [middleware],
 				scheduled(controller, env, ctx) {
-					console.log("Scheduled worker called");
+					// Scheduled worker called
 				}
 			}
 			`;
 
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -90,11 +92,12 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -121,11 +124,12 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -150,11 +154,12 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -173,17 +178,18 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 			addMiddleware(middleware);
 
 			addEventListener("scheduled", (event) => {
-				console.log("Scheduled worker called");
+				// Scheduled worker called
 			});
 			`;
 
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -211,11 +217,12 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -242,11 +249,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			if (resp) {
@@ -267,11 +275,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -295,11 +304,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			if (resp) {
@@ -328,11 +338,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -356,11 +367,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			const status = resp?.status;
@@ -396,11 +408,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -419,11 +432,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			if (resp) {
@@ -443,11 +457,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -470,11 +485,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			if (resp) {
@@ -502,11 +518,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -532,11 +549,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -563,11 +581,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -593,11 +612,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -624,11 +644,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -649,11 +670,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			const status = resp?.status;
@@ -680,11 +702,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -710,11 +733,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -724,3 +748,69 @@ describe("unchanged functionality when wrapping with middleware", () => {
 		});
 	});
 });
+
+describe("multiple middleware", () => {
+	runInTempDir();
+	it("should respond correctly with D1 databases, scheduled testing, and formatted dev errors", async () => {
+		// Kitchen sink test to check interaction between multiple middlewares
+		const scriptContent = `
+			export default {
+				async fetch(request, env, ctx) {
+					const { pathname } = new URL(request.url);
+					if (pathname === "/setup") {
+						await env.DB.exec("CREATE TABLE IF NOT EXISTS test (id INTEGER PRIMARY KEY, value TEXT);");
+						return new Response(null, { status: 204 });
+					} else if (pathname === "/query") {
+      			const rows = await env.DB.prepare("SELECT * FROM test;").all();
+      			return Response.json(rows.results);
+					}
+					throw new Error("Not found!");
+			  },
+			  async scheduled(controller, env, ctx) {
+					const stmt = await env.DB.prepare("INSERT INTO test (id, value) VALUES (?, ?)");
+					await stmt.bind(1, "one").run();
+			  }
+			}
+		`;
+		fs.writeFileSync("index.js", scriptContent);
+
+		const originalFormatErrors = process.env.FORMAT_WRANGLER_ERRORS;
+		process.env.FORMAT_WRANGLER_ERRORS = "true";
+
+		const worker = await unstable_dev("index.js", {
+			experimental: {
+				disableExperimentalWarning: true,
+				disableDevRegistry: true,
+				testScheduled: true,
+				d1Databases: [
+					{
+						binding: "DB",
+						database_name: "db",
+						database_id: "00000000-0000-0000-0000-000000000000",
+					},
+				],
+			},
+		});
+
+		try {
+			let res = await worker.fetch("http://localhost/setup");
+			expect(res.status).toBe(204);
+
+			res = await worker.fetch("http://localhost/__scheduled");
+			expect(res.status).toBe(200);
+			expect(await res.text()).toBe("Ran scheduled event");
+
+			res = await worker.fetch("http://localhost/query");
+			expect(res.status).toBe(200);
+			expect(await res.json()).toEqual([{ id: 1, value: "one" }]);
+
+			res = await worker.fetch("http://localhost/bad");
+			expect(res.status).toBe(500);
+			expect(res.headers.get("Content-Type")).toBe("text/html");
+			expect(await res.text()).toContain("Error: Not found!");
+		} finally {
+			process.env.FORMAT_WRANGLER_ERRORS = originalFormatErrors;
+			await worker.stop();
+		}
+	});
+});