wrangler 0.0.0-e178d6fb → 0.0.0-e1c2f5b9

package/src/__tests__/helpers/mock-oauth-flow.ts

@@ -1,11 +1,7 @@
 import fetchMock from "jest-fetch-mock";
 import { Request } from "undici";
 import openInBrowser from "../../open-in-browser";
-import {
-	createFetchResult,
-	setMockRawResponse,
-	setMockResponse,
-} from "./mock-cfetch";
+import { setMockResponse } from "./mock-cfetch";
 import { mockHttpServer } from "./mock-http-server";
 
 export function mockGetMemberships(
@@ -16,12 +12,6 @@ export function mockGetMemberships(
 	});
 }
 
-export function mockGetMembershipsFail() {
-	setMockRawResponse("/memberships", () => {
-		return createFetchResult([], false);
-	});
-}
-
 // the response to send when wrangler wants an oauth grant
 let oauthGrantResponse: GrantResponseOptions | "timeout" = {};
 
@@ -42,10 +32,13 @@ export const mockOAuthFlow = () => {
 	 * at the OAuth URL, it will automatically trigger the callback URL on the mock HttpServer that
 	 * we have created as part of the call to `mockOAuthFlow()`.
 	 */
-	const mockOAuthServerCallback = () => {
+	const mockOAuthServerCallback = (
+		respondWith?: "timeout" | "success" | "failure" | GrantResponseOptions
+	) => {
 		(
 			openInBrowser as jest.MockedFunction<typeof openInBrowser>
 		).mockImplementation(async (url: string) => {
+			if (respondWith) mockGrantAuthorization({ respondWith });
 			// We don't support the grant response timing out.
 			if (oauthGrantResponse === "timeout") {
 				throw "unimplemented";
@@ -68,6 +61,7 @@ export const mockOAuthFlow = () => {
 		});
 	};
 
+	//TODO: this can just handled in `mockOAuthServerCallback`
 	const mockGrantAuthorization = ({
 		respondWith,
 	}: {
@@ -88,16 +82,19 @@ export const mockOAuthFlow = () => {
 		}
 	};
 
-	const mockRevokeAuthorization = () => {
+	const mockRevokeAuthorization = ({
+		domain = "dash.cloudflare.com",
+	}: { domain?: string } = {}) => {
 		const outcome = {
 			actual: new Request("https://example.org"),
-			expected: new Request("https://dash.cloudflare.com/oauth2/revoke", {
+			expected: new Request(`https://${domain}/oauth2/revoke`, {
 				method: "POST",
 			}),
 		};
 
 		fetchMock.mockIf(outcome.expected.url, async (req) => {
-			outcome.actual = req;
+			// TODO: update Miniflare typings to match full undici Request
+			outcome.actual = req as unknown as Request;
 			return "";
 		});
 
@@ -106,18 +103,21 @@ export const mockOAuthFlow = () => {
 
 	const mockGrantAccessToken = ({
 		respondWith,
+		domain = "dash.cloudflare.com",
 	}: {
 		respondWith: MockTokenResponse;
+		domain?: string;
 	}) => {
 		const outcome = {
 			actual: new Request("https://example.org"),
-			expected: new Request("https://dash.cloudflare.com/oauth2/token", {
+			expected: new Request(`https://${domain}/oauth2/token`, {
 				method: "POST",
 			}),
 		};
 
 		fetchMock.mockOnceIf(outcome.expected.url, async (req) => {
-			outcome.actual = req;
+			// TODO: update Miniflare typings to match full undici Request
+			outcome.actual = req as unknown as Request;
 			return makeTokenResponse(respondWith);
 		});
 
@@ -126,49 +126,70 @@ export const mockOAuthFlow = () => {
 
 	const mockExchangeRefreshTokenForAccessToken = ({
 		respondWith,
+		domain = "dash.cloudlfare.com",
 	}: {
 		respondWith: "refreshSuccess" | "refreshError" | "badResponse";
+		domain?: string;
 	}) => {
-		fetchMock.mockOnceIf(
-			"https://dash.cloudflare.com/oauth2/token",
-			async () => {
-				switch (respondWith) {
-					case "refreshSuccess":
-						return {
-							status: 200,
-							body: JSON.stringify({
-								access_token: "access_token_success_mock",
-								expires_in: 1701,
-								refresh_token: "refresh_token_sucess_mock",
-								scope: "scope_success_mock",
-								token_type: "bearer",
-							}),
-						};
-					case "refreshError":
-						return {
-							status: 400,
-							body: JSON.stringify({
-								error: "invalid_request",
-								error_description: "error_description_mock",
-								error_hint: "error_hint_mock",
-								error_verbose: "error_verbose_mock",
-								status_code: 400,
-							}),
-						};
-					case "badResponse":
-						return {
-							status: 400,
-							body: `<html> <body> This shouldn't be sent, but should be handled </body> </html>`,
-						};
-
-					default:
-						return "Not a respondWith option for `mockExchangeRefreshTokenForAccessToken`";
-				}
+		fetchMock.mockOnceIf(`https://${domain}/oauth2/token`, async () => {
+			switch (respondWith) {
+				case "refreshSuccess":
+					return {
+						status: 200,
+						body: JSON.stringify({
+							access_token: "access_token_success_mock",
+							expires_in: 1701,
+							refresh_token: "refresh_token_success_mock",
+							scope: "scope_success_mock",
+							token_type: "bearer",
+						}),
+					};
+				case "refreshError":
+					return {
+						status: 400,
+						body: JSON.stringify({
+							error: "invalid_request",
+							error_description: "error_description_mock",
+							error_hint: "error_hint_mock",
+							error_verbose: "error_verbose_mock",
+							status_code: 400,
+						}),
+					};
+				case "badResponse":
+					return {
+						status: 400,
+						body: `<html> <body> This shouldn't be sent, but should be handled </body> </html>`,
+					};
+
+				default:
+					return "Not a respondWith option for `mockExchangeRefreshTokenForAccessToken`";
 			}
-		);
+		});
+	};
+
+	const mockDomainUsesAccess = ({
+		usesAccess,
+		domain = "dash.cloudflare.com",
+	}: {
+		usesAccess: boolean;
+		domain?: string;
+	}) => {
+		// If the domain relies upon Cloudflare Access, then a request to the domain
+		// will result in a redirect to the `cloudflareaccess.com` domain.
+		fetchMock.mockOnceIf(`https://${domain}/`, async () => {
+			if (usesAccess) {
+				return {
+					status: 302,
+					headers: { location: "cloudflareaccess.com" },
+				};
+			} else {
+				return { status: 200 };
+			}
+		});
 	};
 
 	return {
+		mockDomainUsesAccess,
 		mockGrantAccessToken,
 		mockGrantAuthorization,
 		mockOAuthServerCallback,

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/msw/handlers/access.ts

@@ -0,0 +1,13 @@
+import { rest } from "msw";
+
+export default [
+	rest.get("*access-protected.com*", (_, response, cxt) => {
+		return response.once(
+			cxt.status(302),
+			cxt.set("location", "access-protected-com.cloudflareaccess.com")
+		);
+	}),
+	rest.get("*not-access-protected.com*", (_, response, cxt) => {
+		return response.once(cxt.status(200), cxt.body("OK"));
+	}),
+];

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

@@ -0,0 +1,59 @@
+import { rest } from "msw";
+
+import type { DeploymentListRes } from "../../../../deployments";
+
+export const mswSuccessDeployments = [
+	rest.get(
+		"*/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: [],
+							},
+						},
+						items: [
+							{
+								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",
+								},
+							},
+							{
+								id: "Intrepid-Class",
+								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-02T00:00:00.000000Z",
+									modified_on: "2021-02-02T00:00:00.000000Z",
+								},
+							},
+						],
+					} as DeploymentListRes,
+				})
+			)
+	),
+];

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

@@ -0,0 +1,104 @@
+import { rest } from "msw";
+
+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: {
+						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,
+				})
+			);
+		}
+	),
+	rest.put(
+		"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceName",
+		(_, response, context) => {
+			return response.once(
+				context.status(200),
+				context.json({
+					success: true,
+					errors: [],
+					messages: [],
+					result: {
+						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.get(
+		"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceName",
+		(_, response, context) => {
+			return response.once(
+				context.status(200),
+				context.json({
+					success: true,
+					errors: [],
+					messages: [],
+					result: {
+						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.get(
+		"*/accounts/:accountId/workers/dispatch/namespaces",
+		(_, response, context) => {
+			return response.once(
+				context.status(200),
+				context.json({
+					success: true,
+					errors: [],
+					messages: [],
+					result: [
+						{
+							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",
+						},
+					],
+				})
+			);
+		}
+	),
+];

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

@@ -0,0 +1,31 @@
+import { rest } from "msw";
+
+export const mswSuccessOauthHandlers = [
+	rest.all("*/oauth/callback", (_, response, context) => {
+		return response.once(
+			context.status(200),
+			context.json({
+				success: true,
+				errors: [],
+				messages: [],
+				code: "test-oauth-code",
+			})
+		);
+	}),
+	// revoke access token
+	rest.post("*/oauth2/revoke", (_, response, context) =>
+		response.once(context.status(200), context.text(""))
+	),
+	// exchange (auth code | refresh token) for access token
+	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

@@ -0,0 +1,80 @@
+import { rest } from "msw";
+
+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: {
+					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: {} })
+		)
+	),
+	rest.put(
+		"*/accounts/:accountId/r2/buckets/:bucketName",
+		(_, response, context) =>
+			response.once(
+				context.status(200),
+				context.json({ success: true, errors: [], messages: [], result: {} })
+			)
+	),
+	rest.delete(
+		"*/accounts/:accountId/r2/buckets/:bucketName",
+		(_, response, context) =>
+			response.once(
+				context.status(200),
+				context.json({ success: true, errors: [], messages: [], result: null })
+			)
+	),
+	rest.get(
+		"*/accounts/:accountId/r2/buckets/:bucketName/objects/:objectName",
+		(_, response, context) => {
+			const imageBuffer = Buffer.from("wormhole-img.png");
+			return response.once(
+				context.set("Content-Length", imageBuffer.byteLength.toString()),
+				context.set("Content-Type", "image/png"),
+				context.status(200),
+				context.body(imageBuffer)
+			);
+		}
+	),
+	rest.put(
+		"*/accounts/:accountId/r2/buckets/:bucketName/objects/:objectName",
+		(_, response, context) =>
+			response.once(
+				context.status(200),
+				context.json({
+					success: true,
+					errors: [],
+					messages: [],
+					result: {
+						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 })
+			)
+	),
+];

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

@@ -0,0 +1,75 @@
+import { rest } from "msw";
+import type { WorkerMetadata } from "../../../../create-worker-upload-form";
+
+const bindings: Record<string, WorkerMetadata["bindings"]> = {
+	"durable-object": [
+		{
+			type: "durable_object_namespace",
+			name: "TestDO",
+			class_name: "TestDO",
+		},
+	],
+};
+const scripts: Record<string, string> = {
+	websocket: `new WebSocket("ws://dummy")`,
+	response: `return new Response("ok")`,
+};
+function getBindings(scriptName: string) {
+	return scriptName.split("--").flatMap((part) => bindings[part] ?? []);
+}
+function getScript(scriptName: string) {
+	return `export default {fetch(request){
+    ${scriptName
+			.split("--")
+			.map((part) => scripts[part] ?? "")
+			.join(";\n")}
+  }}`;
+}
+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))
+			);
+		}
+	),
+	rest.get(
+		"*/accounts/:accountId/workers/scripts/:scriptName",
+		({ params: { scriptName } }, res, context) => {
+			return res(
+				context.status(200),
+				context.text(getScript(scriptName as string))
+			);
+		}
+	),
+	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),
+				})
+			);
+		}
+	),
+	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),
+				})
+			);
+		}
+	),
+];

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

@@ -0,0 +1,63 @@
+import { rest } from "msw";
+
+export const mswSuccessUserHandlers = [
+	rest.get("*/user", (_, response, cxt) => {
+		return response.once(
+			cxt.status(200),
+			cxt.json({
+				success: true,
+				errors: [],
+				messages: [],
+				result: {
+					id: "7c5dae5552338874e5053f2534d2767a",
+					email: "user@example.com",
+					first_name: "John",
+					last_name: "Appleseed",
+					username: "cfuser12345",
+					telephone: "+1 123-123-1234",
+					country: "US",
+					zipcode: "12345",
+					created_on: "2014-01-01T05:20:00Z",
+					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: [
+					{ 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: [
+					{
+						id: "membership-id-1",
+						account: { id: "account-id-1", name: "My Personal Account" },
+					},
+					{
+						id: "membership-id-2",
+						account: { id: "account-id-2", name: "Enterprise Account" },
+					},
+				],
+			})
+		);
+	}),
+];

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

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