wrangler 0.0.0-e7a0cd5b → 0.0.0-e7cf0caa

package/src/__tests__/helpers/mock-process.ts

@@ -5,22 +5,17 @@
 
 let writeSpy: jest.SpyInstance;
 
-function captureLastWriteCall(spy: jest.SpyInstance): Buffer {
+function captureLastWriteCall(spy: jest.SpyInstance): Buffer | undefined {
 	const calls = spy.mock.calls;
-	if (calls.length > 1) {
-		throw new Error(
-			"Unexpected calls to `stdout.write()`: " + JSON.stringify(calls)
-		);
-	}
-	const buffer = calls[0]?.[0] ?? Buffer.alloc(0);
+
+	// Loop through and find the buffer in calls
+	// (we don't know the index of the buffer in the calls array)
+	const buffer = calls
+		.map((call) => call[0])
+		.find((call) => call instanceof Buffer);
+
 	if (buffer instanceof Buffer) {
 		return buffer;
-	} else {
-		throw new Error(
-			`Unexpected non-Buffer passed to \`stdout.write()\`: "${JSON.stringify(
-				buffer
-			)}"`
-		);
 	}
 }
 

package/src/__tests__/helpers/mock-set-timeout.ts

@@ -0,0 +1,16 @@
+let setTimeoutSpy: jest.SpyInstance;
+
+export function mockSetTimeout() {
+	beforeEach(() => {
+		setTimeoutSpy = jest
+			.spyOn(global, "setTimeout")
+			// @ts-expect-error we're using a very simple setTimeout mock here
+			.mockImplementation((fn, _period) => {
+				setImmediate(fn);
+			});
+	});
+
+	afterEach(() => {
+		setTimeoutSpy.mockRestore();
+	});
+}

package/src/__tests__/helpers/msw/blob-worker.cjs

@@ -0,0 +1,19 @@
+/*! Read blob sync in NodeJS. MIT License. Jimmy Wärting <https://jimmy.warting.se/opensource>
+ * Special Thanks to Jimmy Wärting helping in https://github.com/nodejs/undici/issues/1830
+ */
+
+const { workerData } = require("worker_threads");
+
+const { signal, port, blob } = workerData;
+
+blob.arrayBuffer().then((ab) => {
+	// Post the result back to the main thread before unlocking 'signal'
+	port.postMessage(ab, [ab]);
+	port.close();
+
+	// Change the value of signal[0] to 1
+	Atomics.store(signal, 0, 1);
+
+	// This will unlock the main thread when we notify it
+	Atomics.notify(signal, 0);
+});

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

@@ -1,37 +1,40 @@
 import { rest } from "msw";
+import { createFetchResult } from "../index";
 
-import type { DeploymentListRes } from "../../../../deployments";
-
+const latestDeployment = {
+	id: "Galaxy-Class",
+	number: "1701-E",
+	annotations: {
+		"workers/triggered_by": "rollback",
+		"workers/rollback_from": "MOCK-DEPLOYMENT-ID-2222",
+	},
+	metadata: {
+		author_id: "Picard-Gamma-6-0-7-3",
+		author_email: "Jean-Luc-Picard@federation.org",
+		source: "wrangler",
+		created_on: "2021-01-04T00:00:00.000000Z",
+		modified_on: "2021-01-04T00:00:00.000000Z",
+	},
+	resources: {
+		script: "MOCK-TAG",
+		bindings: [],
+	},
+};
 export const mswSuccessDeployments = [
 	rest.get(
-		"*/accounts/:accountId/workers/versions/by-script/:scriptTag",
+		"*/accounts/:accountId/workers/deployments/by-script/:scriptTag",
 		(_, response, context) =>
 			response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: {
-						latest: {
-							id: "Galaxy-Class",
-							number: "1701-E",
-							metadata: {
-								author_id: "Picard-Gamma-6-0-7-3",
-								author_email: "Jean-Luc-Picard@federation.org",
-								source: "wrangler",
-								created_on: "2021-01-01T00:00:00.000000Z",
-								modified_on: "2021-01-01T00:00:00.000000Z",
-							},
-							resources: {
-								script: "MOCK-TAG",
-								bindings: [],
-							},
-						},
+				context.json(
+					createFetchResult({
+						latest: latestDeployment,
 						items: [
 							{
-								id: "Galaxy-Class",
+								id: "Constitution-Class",
 								number: "1701-E",
+								annotations: {
+									"workers/triggered_by": "upload",
+								},
 								metadata: {
 									author_id: "Picard-Gamma-6-0-7-3",
 									author_email: "Jean-Luc-Picard@federation.org",
@@ -43,6 +46,11 @@ export const mswSuccessDeployments = [
 							{
 								id: "Intrepid-Class",
 								number: "NCC-74656",
+								annotations: {
+									"workers/triggered_by": "rollback",
+									"workers/rollback_from": "MOCK-DEPLOYMENT-ID-1111",
+									"workers/message": "Rolled back for this version",
+								},
 								metadata: {
 									author_id: "Kathryn-Jane-Gamma-6-0-7-3",
 									author_email: "Kathryn-Janeway@federation.org",
@@ -51,9 +59,102 @@ export const mswSuccessDeployments = [
 									modified_on: "2021-02-02T00:00:00.000000Z",
 								},
 							},
+							{
+								id: "3mEgaU1T-Intrepid-someThing",
+								number: "NCC-74656",
+								metadata: {
+									author_id: "Kathryn-Jane-Gamma-6-0-7-3",
+									author_email: "Kathryn-Janeway@federation.org",
+									source: "wrangler",
+									created_on: "2021-02-03T00:00:00.000000Z",
+									modified_on: "2021-02-03T00:00:00.000000Z",
+								},
+							},
+							latestDeployment,
 						],
-					} as DeploymentListRes,
-				})
+					})
+				)
 			)
 	),
 ];
+
+export const mswSuccessDeploymentScriptMetadata = [
+	rest.get(
+		"*/accounts/:accountId/workers/services/:scriptName",
+		(_, res, ctx) => {
+			return res.once(
+				ctx.json(
+					createFetchResult({
+						default_environment: {
+							script: { last_deployed_from: "wrangler", tag: "MOCK-TAG" },
+						},
+					})
+				)
+			);
+		}
+	),
+];
+
+export const mswSuccessDeploymentDetails = [
+	rest.get(
+		"*/accounts/:accountId/workers/deployments/by-script/:scriptTag/detail/:deploymentId",
+		(req, res, ctx) => {
+			let bindings: object[] = [];
+			if (req.url.toString().includes("bindings-tag")) {
+				bindings = [
+					{
+						bucket_name: "testr2",
+						name: "MY_BUCKET",
+						type: "r2_bucket",
+					},
+				];
+			}
+
+			expect(req.url.toString().includes("1701-E"));
+			return res.once(
+				ctx.json(
+					createFetchResult({
+						id: "1701-E",
+						Number: 0,
+						metadata: {
+							author_id: "Picard-Gamma-6-0-7-3",
+							author_email: "Jean-Luc-Picard@federation.org",
+							source: "wrangler",
+							created_on: "2021-01-01T00:00:00.000000Z",
+							modified_on: "2021-01-01T00:00:00.000000Z",
+						},
+						resources: {
+							script: {
+								etag: "mock-e-tag",
+								handlers: ["fetch"],
+								last_deployed_from: "wrangler",
+							},
+							script_runtime: {
+								usage_model: "bundled",
+							},
+							bindings: bindings,
+						},
+					})
+				)
+			);
+		}
+	),
+	// ?deployment=<deploymentid> param used to get deployment <script content> as text
+	rest.get(
+		"*/accounts/:accountId/workers/scripts/:scriptName",
+		(req, res, ctx) => {
+			let scriptContent = "";
+			if (req.url.searchParams.get("deployment") === "1701-E") {
+				scriptContent = `
+			export default {
+				async fetch(request) {
+					return new Response('Hello World from Deployment 1701-E');
+				},
+			};`;
+			} else {
+				return res(ctx.status(400));
+			}
+			return res.once(ctx.text(scriptContent));
+		}
+	),
+];

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

@@ -1,59 +1,44 @@
 import { rest } from "msw";
+import { createFetchResult } from "../index";
 
 export const mswSuccessNamespacesHandlers = [
 	rest.post(
 		"*/accounts/:accountId/workers/dispatch/namespaces",
 		(_, response, context) => {
 			return response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: {
+				context.json(
+					createFetchResult({
 						namespace_id: "some-namespace-id",
 						namespace_name: "namespace-name",
 						created_on: "2022-06-29T14:30:08.16152Z",
 						created_by: "1fc1df98cc4420fe00367c3ab68c1639",
 						modified_on: "2022-06-29T14:30:08.16152Z",
 						modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
-					},
-				})
+					})
+				)
 			);
 		}
 	),
 	rest.delete(
 		"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceName",
 		(_, response, context) => {
-			return response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: null,
-				})
-			);
+			return response.once(context.json(createFetchResult(null)));
 		}
 	),
 	rest.put(
 		"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceName",
 		(_, response, context) => {
 			return response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: {
+				context.json(
+					createFetchResult({
 						namespace_id: "some-namespace-id",
 						namespace_name: "namespace-name",
 						created_on: "2022-06-29T14:30:08.16152Z",
 						created_by: "1fc1df98cc4420fe00367c3ab68c1639",
 						modified_on: "2022-06-29T14:30:08.16152Z",
 						modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
-					},
-				})
+					})
+				)
 			);
 		}
 	),
@@ -61,20 +46,16 @@ export const mswSuccessNamespacesHandlers = [
 		"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceName",
 		(_, response, context) => {
 			return response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: {
+				context.json(
+					createFetchResult({
 						namespace_id: "some-namespace-id",
 						namespace_name: "namespace-name",
 						created_on: "2022-06-29T14:30:08.16152Z",
 						created_by: "1fc1df98cc4420fe00367c3ab68c1639",
 						modified_on: "2022-06-29T14:30:08.16152Z",
 						modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
-					},
-				})
+					})
+				)
 			);
 		}
 	),
@@ -82,12 +63,8 @@ export const mswSuccessNamespacesHandlers = [
 		"*/accounts/:accountId/workers/dispatch/namespaces",
 		(_, response, context) => {
 			return response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: [
+				context.json(
+					createFetchResult([
 						{
 							namespace_id: "some-namespace-id",
 							namespace_name: "namespace-name",
@@ -96,8 +73,8 @@ export const mswSuccessNamespacesHandlers = [
 							modified_on: "2022-06-29T14:30:08.16152Z",
 							modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
 						},
-					],
-				})
+					])
+				)
 			);
 		}
 	),

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

@@ -13,24 +13,19 @@ export const mswSuccessOauthHandlers = [
 		);
 	}),
 	// revoke access token
-	rest.post(
-		"https://dash.cloudflare.com/oauth2/revoke",
-		(_, response, context) =>
-			response.once(context.status(200), context.text(""))
+	rest.post("*/oauth2/revoke", (_, response, context) =>
+		response.once(context.status(200), context.text(""))
 	),
 	// exchange (auth code | refresh token) for access token
-	rest.post(
-		"https://dash.cloudflare.com/oauth2/token",
-		(_, response, context) => {
-			return response.once(
-				context.status(200),
-				context.json({
-					access_token: "test-access-token",
-					expires_in: 100000,
-					refresh_token: "test-refresh-token",
-					scope: "account:read",
-				})
-			);
-		}
-	),
+	rest.post("*/oauth2/token", (_, response, context) => {
+		return response.once(
+			context.status(200),
+			context.json({
+				access_token: "test-access-token",
+				expires_in: 100000,
+				refresh_token: "test-refresh-token",
+				scope: "account:read",
+			})
+		);
+	}),
 ];

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",
 								},
 						  ]
-						: [],
-			})
+						: []
+				)
+			)
 		);
 	}),
 ];