wrangler 2.7.1 → 2.8.1

package/src/__tests__/helpers/msw/handlers/r2.ts

@@ -1,44 +1,31 @@
 import { rest } from "msw";
+import { createFetchResult } from "../index";
 
 export const mswSuccessR2handlers = [
 	// List endpoint r2Buckets
 	rest.get("*/accounts/:accountId/r2/buckets", (_, response, context) =>
 		response.once(
-			context.status(200),
-			context.json({
-				success: true,
-				errors: [],
-				messages: [],
-				result: {
+			context.json(
+				createFetchResult({
 					buckets: [
 						{ name: "bucket-1", creation_date: "01-01-2001" },
 						{ name: "bucket-2", creation_date: "01-01-2001" },
 					],
-				},
-			})
+				})
+			)
 		)
 	),
 	rest.post("*/accounts/:accountId/r2/buckets", (_, response, context) =>
-		response.once(
-			context.status(200),
-			context.json({ success: true, errors: [], messages: [], result: {} })
-		)
+		response.once(context.json(createFetchResult({})))
 	),
 	rest.put(
 		"*/accounts/:accountId/r2/buckets/:bucketName",
-		(_, response, context) =>
-			response.once(
-				context.status(200),
-				context.json({ success: true, errors: [], messages: [], result: {} })
-			)
+		(_, response, context) => response.once(context.json(createFetchResult({})))
 	),
 	rest.delete(
 		"*/accounts/:accountId/r2/buckets/:bucketName",
 		(_, response, context) =>
-			response.once(
-				context.status(200),
-				context.json({ success: true, errors: [], messages: [], result: null })
-			)
+			response.once(context.json(createFetchResult(null)))
 	),
 	rest.get(
 		"*/accounts/:accountId/r2/buckets/:bucketName/objects/:objectName",
@@ -47,7 +34,7 @@ export const mswSuccessR2handlers = [
 			return response.once(
 				context.set("Content-Length", imageBuffer.byteLength.toString()),
 				context.set("Content-Type", "image/png"),
-				context.status(200),
+
 				context.body(imageBuffer)
 			);
 		}
@@ -56,25 +43,18 @@ export const mswSuccessR2handlers = [
 		"*/accounts/:accountId/r2/buckets/:bucketName/objects/:objectName",
 		(_, response, context) =>
 			response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: {
+				context.json(
+					createFetchResult({
 						accountId: "some-account-id",
 						bucketName: "bucketName-object-test",
 						objectName: "wormhole-img.png",
-					},
-				})
+					})
+				)
 			)
 	),
 	rest.delete(
 		"*/accounts/:accountId/r2/buckets/:bucketName/objects/:objectName",
 		(_, response, context) =>
-			response.once(
-				context.status(200),
-				context.json({ success: true, errors: [], messages: [], result: null })
-			)
+			response.once(context.json(createFetchResult(null)))
 	),
 ];

package/src/__tests__/helpers/msw/handlers/script.ts

@@ -1,4 +1,5 @@
 import { rest } from "msw";
+import { createFetchResult } from "../index";
 import type { WorkerMetadata } from "../../../../create-worker-upload-form";
 
 const bindings: Record<string, WorkerMetadata["bindings"]> = {
@@ -14,10 +15,12 @@ const scripts: Record<string, string> = {
 	websocket: `new WebSocket("ws://dummy")`,
 	response: `return new Response("ok")`,
 };
-function getBindings(scriptName: string) {
+function getBindings(scriptName: string | readonly string[]) {
+	if (typeof scriptName !== "string") return "";
 	return scriptName.split("--").flatMap((part) => bindings[part] ?? []);
 }
-function getScript(scriptName: string) {
+function getScript(scriptName: string | readonly string[]): string {
+	if (typeof scriptName !== "string") return "";
 	return `export default {fetch(request){
     ${scriptName
 			.split("--")
@@ -29,47 +32,25 @@ export default [
 	rest.get(
 		"*/accounts/:accountId/workers/services/:scriptName/environments/:env/content",
 		({ params: { scriptName } }, res, context) => {
-			return res(
-				context.status(200),
-				context.text(getScript(scriptName as string))
-			);
+			return res(context.text(getScript(scriptName)));
 		}
 	),
 	rest.get(
 		"*/accounts/:accountId/workers/scripts/:scriptName",
 		({ params: { scriptName } }, res, context) => {
-			return res(
-				context.status(200),
-				context.text(getScript(scriptName as string))
-			);
+			return res(context.text(getScript(scriptName)));
 		}
 	),
 	rest.get(
 		"*/accounts/:accountId/workers/services/:scriptName/environments/:env/bindings",
 		({ params: { scriptName } }, res, context) => {
-			return res(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: getBindings(scriptName as string),
-				})
-			);
+			return res(context.json(createFetchResult(getBindings(scriptName))));
 		}
 	),
 	rest.get(
 		"*/accounts/:accountId/workers/scripts/:scriptName/bindings",
 		({ params: { scriptName } }, res, context) => {
-			return res(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: getBindings(scriptName as string),
-				})
-			);
+			return res(context.json(createFetchResult(getBindings(scriptName))));
 		}
 	),
 ];

package/src/__tests__/helpers/msw/handlers/user.ts

@@ -1,14 +1,11 @@
 import { rest } from "msw";
+import { createFetchResult } from "../index";
 
 export const mswSuccessUserHandlers = [
 	rest.get("*/user", (_, response, cxt) => {
 		return response.once(
-			cxt.status(200),
-			cxt.json({
-				success: true,
-				errors: [],
-				messages: [],
-				result: {
+			cxt.json(
+				createFetchResult({
 					id: "7c5dae5552338874e5053f2534d2767a",
 					email: "user@example.com",
 					first_name: "John",
@@ -21,33 +18,25 @@ export const mswSuccessUserHandlers = [
 					modified_on: "2014-01-01T05:20:00Z",
 					two_factor_authentication_enabled: false,
 					suspended: false,
-				},
-			})
+				})
+			)
 		);
 	}),
 	rest.get("*/accounts", (_, response, cxt) => {
 		return response.once(
-			cxt.status(200),
-			cxt.json({
-				success: true,
-				errors: [],
-				messages: [],
-				result: [
+			cxt.json(
+				createFetchResult([
 					{ name: "Account One", id: "account-1" },
 					{ name: "Account Two", id: "account-2" },
 					{ name: "Account Three", id: "account-3" },
-				],
-			})
+				])
+			)
 		);
 	}),
 	rest.get("*/memberships", (_, response, context) => {
 		return response.once(
-			context.status(200),
-			context.json({
-				success: true,
-				errors: [],
-				messages: [],
-				result: [
+			context.json(
+				createFetchResult([
 					{
 						id: "membership-id-1",
 						account: { id: "account-id-1", name: "My Personal Account" },
@@ -56,8 +45,8 @@ export const mswSuccessUserHandlers = [
 						id: "membership-id-2",
 						account: { id: "account-id-2", name: "Enterprise Account" },
 					},
-				],
-			})
+				])
+			)
 		);
 	}),
 ];

package/src/__tests__/helpers/msw/handlers/zones.ts

@@ -1,22 +1,20 @@
 import { rest } from "msw";
+import { createFetchResult } from "../index";
 
 export default [
 	rest.get("*/zones", ({ url: { searchParams } }, res, context) => {
 		return res(
-			context.status(200),
-			context.json({
-				success: true,
-				errors: [],
-				messages: [],
-				result:
+			context.json(
+				createFetchResult(
 					searchParams.get("name") === "exists.com"
 						? [
 								{
 									id: "exists-com",
 								},
 						  ]
-						: [],
-			})
+						: []
+				)
+			)
 		);
 	}),
 ];

package/src/__tests__/helpers/msw/index.ts

@@ -1,15 +1,43 @@
 import { setupServer } from "msw/node";
 import { default as mswAccessHandlers } from "./handlers/access";
-import { mswSuccessDeployments } from "./handlers/deployments";
+import {
+	mswSuccessDeployments,
+	mswSuccessLastDeployment,
+} from "./handlers/deployments";
 import { mswSuccessNamespacesHandlers } from "./handlers/namespaces";
 import { mswSuccessOauthHandlers } from "./handlers/oauth";
 import { mswSuccessR2handlers } from "./handlers/r2";
 import { default as mswSucessScriptHandlers } from "./handlers/script";
 import { mswSuccessUserHandlers } from "./handlers/user";
 import { default as mswZoneHandlers } from "./handlers/zones";
+
 export const msw = setupServer();
 
+function createFetchResult(
+	result: unknown,
+	success = true,
+	errors: unknown[] = [],
+	messages: unknown[] = [],
+	result_info?: Record<string, unknown>
+) {
+	return result_info
+		? {
+				result,
+				success,
+				errors,
+				messages,
+				result_info,
+		  }
+		: {
+				result,
+				success,
+				errors,
+				messages,
+		  };
+}
+
 export {
+	createFetchResult,
 	mswSuccessUserHandlers,
 	mswSuccessR2handlers,
 	mswSuccessOauthHandlers,
@@ -18,4 +46,5 @@ export {
 	mswZoneHandlers,
 	mswSuccessDeployments,
 	mswAccessHandlers,
+	mswSuccessLastDeployment,
 };

package/src/__tests__/init.test.ts

@@ -4,9 +4,7 @@ import * as TOML from "@iarna/toml";
 import { execa, execaSync } from "execa";
 import { rest } from "msw";
 import { parseConfigFileTextToJson } from "typescript";
-import { FormData } from "undici";
 import { version as wranglerVersion } from "../../package.json";
-import { fetchDashboardScript } from "../cfetch/internal";
 import { getPackageManager } from "../package-manager";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
@@ -46,8 +44,6 @@ describe("init", () => {
 
 	afterEach(() => {
 		clearDialogs();
-		msw.resetHandlers();
-		msw.restoreHandlers();
 	});
 
 	const std = mockConsoleMethods();
@@ -2798,6 +2794,7 @@ describe("init", () => {
 					"isolinear-optical-chip/wrangler.toml": wranglerToml({
 						...mockConfigExpected,
 						name: "isolinear-optical-chip",
+						main: "src/index.js",
 					}),
 				},
 			});
@@ -3070,19 +3067,11 @@ export function setMockFetchDashScript(mockResponse: string) {
 	msw.use(
 		rest.get(
 			`*/accounts/:accountId/workers/services/:fromDashScriptName/environments/:environment/content`,
-			(req, res, ctx) => {
-				// This is a fake FormData object, until we can get MSW (beta) that supports FormData
-				const mockForm = new FormData();
-				mockForm.append("name", mockResponse);
-				// Sending it as JSON will result in empty object, but cause the fetchDashboardScript to execute its code
-				return res(ctx.status(200), ctx.json(mockForm));
+			(_, res, ctx) => {
+				return res(ctx.text(mockResponse));
 			}
 		)
 	);
-	// Mock the actual return value that FormData would return
-	(fetchDashboardScript as jest.Mock).mockImplementationOnce(() => {
-		return mockResponse;
-	});
 }
 
 /**

package/src/__tests__/jest.setup.ts

@@ -1,16 +1,4 @@
 import fetchMock from "jest-fetch-mock";
-import {
-	fetchDashboardScript,
-	fetchInternal,
-	fetchKVGetValue,
-	fetchR2Objects,
-	performApiFetch,
-} from "../cfetch/internal";
-import {
-	mockFetchInternal,
-	mockFetchR2Objects,
-	mockPerformApiFetch,
-} from "./helpers/mock-cfetch";
 import { MockWebSocket } from "./helpers/mock-web-socket";
 import { msw } from "./helpers/msw";
 
@@ -89,17 +77,6 @@ afterEach(() => {
 });
 afterAll(() => msw.close());
 
-jest.mock("../cfetch/internal");
-(fetchDashboardScript as jest.Mock).mockImplementation(
-	jest.requireActual("../cfetch/internal")["fetchDashboardScript"]
-);
-(fetchInternal as jest.Mock).mockImplementation(mockFetchInternal);
-(fetchKVGetValue as jest.Mock).mockImplementation(
-	jest.requireActual("../cfetch/internal").fetchKVGetValue
-);
-(fetchR2Objects as jest.Mock).mockImplementation(mockFetchR2Objects);
-(performApiFetch as jest.Mock).mockImplementation(mockPerformApiFetch);
-
 jest.mock("../dev/dev", () => {
 	const { useApp } = jest.requireActual("ink");
 	const { useEffect } = jest.requireActual("react");

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

@@ -12,6 +12,7 @@ import type {
 	RequestEvent,
 	ScheduledEvent,
 	AlarmEvent,
+	EmailEvent,
 } from "../tail/createTail";
 import type { RequestInit } from "undici";
 import type WebSocket from "ws";
@@ -355,6 +356,20 @@ describe("pages deployment tail", () => {
 			expect(std.out).toMatch(deserializeToJson(serializedMessage));
 		});
 
+		it("logs email messages in json format", async () => {
+			const api = mockTailAPIs();
+			await runWrangler(
+				"pages deployment tail mock-deployment-id --project-name mock-project --format json"
+			);
+
+			const event = generateMockEmailEvent();
+			const message = generateMockEventMessage({ event });
+			const serializedMessage = serialize(message);
+
+			api.ws.send(serializedMessage);
+			expect(std.out).toMatch(deserializeToJson(serializedMessage));
+		});
+
 		it("logs request messages in pretty format", async () => {
 			const api = mockTailAPIs();
 			await runWrangler(
@@ -436,6 +451,33 @@ describe("pages deployment tail", () => {
 			`);
 		});
 
+		it("logs email messages in pretty format", async () => {
+			const api = mockTailAPIs();
+			await runWrangler(
+				"pages deployment tail mock-deployment-id --project-name mock-project --format pretty"
+			);
+
+			const event = generateMockEmailEvent();
+			const message = generateMockEventMessage({ event });
+			const serializedMessage = serialize(message);
+
+			api.ws.send(serializedMessage);
+			expect(
+				std.out
+					.replace(
+						new Date(mockEventTimestamp).toLocaleString(),
+						"[mock event timestamp]"
+					)
+					.replace(
+						mockTailExpiration.toLocaleString(),
+						"[mock expiration date]"
+					)
+			).toMatchInlineSnapshot(`
+					"Connected to deployment mock-deployment-id, waiting for logs...
+					Email from:${mockEmailEventFrom} to:${mockEmailEventTo} size:${mockEmailEventSize} @ [mock event timestamp] - Ok"
+			`);
+		});
+
 		it("should not crash when the tail message has a void event", async () => {
 			const api = mockTailAPIs();
 			await runWrangler(
@@ -608,7 +650,13 @@ function serialize(message: TailEventMessage): WebSocket.RawData {
  * @returns true if `event` is a RequestEvent
  */
 function isRequest(
-	event: ScheduledEvent | RequestEvent | AlarmEvent | undefined | null
+	event:
+		| ScheduledEvent
+		| RequestEvent
+		| AlarmEvent
+		| EmailEvent
+		| undefined
+		| null
 ): event is RequestEvent {
 	return Boolean(event && "request" in event);
 }
@@ -742,6 +790,21 @@ const mockEventTimestamp = 1645454470467;
  */
 const mockEventScheduledTime = new Date(mockEventTimestamp).toISOString();
 
+/**
+ * Default value for email event from
+ */
+const mockEmailEventFrom = "from@example.com";
+
+/**
+ * Default value for email event to
+ */
+const mockEmailEventTo = "to@example.com";
+
+/**
+ * Default value for email event mail size
+ */
+const mockEmailEventSize = 45416;
+
 /**
  * Mock out the API hit during Tail deletion
  *
@@ -882,3 +945,11 @@ function generateMockAlarmEvent(opts?: Partial<AlarmEvent>): AlarmEvent {
 		scheduledTime: opts?.scheduledTime || mockEventScheduledTime,
 	};
 }
+
+function generateMockEmailEvent(opts?: Partial<EmailEvent>): EmailEvent {
+	return {
+		mailFrom: opts?.mailFrom || mockEmailEventFrom,
+		rcptTo: opts?.rcptTo || mockEmailEventTo,
+		rawSize: opts?.rawSize || mockEmailEventSize,
+	};
+}