wrangler 2.0.29 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.0.29",
+	"version": "2.1.2",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -97,7 +97,7 @@
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
 		"esbuild": "0.14.51",
-		"miniflare": "^2.7.1",
+		"miniflare": "^2.8.1",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
@@ -148,6 +148,7 @@
 		"jest-fetch-mock": "^3.0.3",
 		"jest-websocket-mock": "^2.3.0",
 		"mime": "^3.0.0",
+		"msw": "^0.47.1",
 		"open": "^8.4.0",
 		"p-queue": "^7.2.0",
 		"pretty-bytes": "^6.0.0",

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

@@ -4,8 +4,24 @@ import { pathToRegexp } from "path-to-regexp";
 import { Response } from "undici";
 import { getCloudflareApiBaseUrl } from "../../cfetch";
 import type { FetchResult, FetchError } from "../../cfetch";
+import type { fetchInternal, fetchR2Objects } from "../../cfetch/internal";
 import type { RequestInit, BodyInit, HeadersInit } from "undici";
 
+/**
+ * When the custom mocks fallthrough in tests because they aren't set, instead of throwing an error,
+ * we use real fetch to make the request which will use Mock Service Workers.
+ */
+const {
+	fetchInternal: realFetchInternal,
+}: { fetchInternal: typeof fetchInternal } = jest.requireActual(
+	"../../cfetch/internal"
+);
+const {
+	fetchR2Objects: realFetchR2Objects,
+}: { fetchR2Objects: typeof fetchR2Objects } = jest.requireActual(
+	"../../cfetch/internal"
+);
+
 /**
  * The signature of the function that will handle a mock request.
  */
@@ -34,7 +50,7 @@ const mocks: MockFetch<unknown>[] = [];
 export async function mockFetchInternal(
 	resource: string,
 	init: RequestInit = {},
-	queryParams: URLSearchParams = new URLSearchParams()
+	queryParams: URLSearchParams | undefined
 ) {
 	for (const { regexp, method, handler } of mocks) {
 		const resourcePath = new URL(resource, getCloudflareApiBaseUrl()).pathname;
@@ -43,12 +59,13 @@ export async function mockFetchInternal(
 		if (uri !== null && (!method || method === (init.method ?? "GET"))) {
 			// The `resource` regular expression will extract the labelled groups from the URL.
 			// These are passed through to the `handler` call, to allow it to do additional checks or behaviour.
-			return await handler(uri, init, queryParams); // TODO: should we have some kind of fallthrough system? we'll see.
+			return await handler(uri, init, queryParams ?? new URLSearchParams()); // TODO: should we have some kind of fallthrough system? we'll see.
 		}
 	}
-	throw new Error(
-		`no mocks found for ${init.method ?? "any HTTP"} request to ${resource}`
-	);
+
+	// let it fall through to mock-service-worker
+	// (do a real, unmocked fetch)
+	return await realFetchInternal(resource, init, queryParams);
 }
 
 /**
@@ -221,21 +238,24 @@ export async function mockFetchR2Objects(
 		method: "PUT" | "GET" | "DELETE";
 	}
 ): Promise<Response> {
-	/**
-	 * Here we destroy & removeListeners to "drain" the stream, for testing purposes
-	 * mimicking the fetch request taking in the stream and draining it.
-	 */
-	if (bodyInit.body instanceof Readable) {
-		bodyInit.body.destroy();
-		bodyInit.body.removeAllListeners();
-	}
-
 	if (r2GetMocks.has(resource)) {
+		/**
+		 * Here we destroy & removeListeners to "drain" the stream, for testing purposes
+		 * mimicking the fetch request taking in the stream and draining it.
+		 */
+		if (bodyInit.body instanceof Readable) {
+			bodyInit.body.destroy();
+			bodyInit.body.removeAllListeners();
+		}
+
 		const value = r2GetMocks.get(resource);
 
 		return new Response(value);
 	}
-	throw new Error(`no mock found for \`r2 object\` - ${resource}`);
+
+	// No mocks found for ${init.method ?? "any HTTP"} request to ${resource}
+	// let it fall through to Mock Service Worker with a real fetch.
+	return await realFetchR2Objects(resource, bodyInit);
 }
 
 /**
@@ -270,9 +290,7 @@ export function unsetSpecialMockFns() {
  */
 export async function mockFetchDashScript(resource: string): Promise<string> {
 	if (dashScriptMocks.has(resource)) {
-		const value = dashScriptMocks.get(resource) ?? "";
-
-		return value;
+		return dashScriptMocks.get(resource) ?? "";
 	}
 	throw new Error(`no mock found for \`init from-dash\` - ${resource}`);
 }
@@ -283,14 +301,16 @@ export async function mockFetchDashScript(resource: string): Promise<string> {
 export function setMockFetchDashScript({
 	accountId,
 	fromDashScriptName,
+	environment,
 	mockResponse,
 }: {
 	accountId: string;
 	fromDashScriptName: string;
+	environment: string;
 	mockResponse?: string;
 }) {
 	dashScriptMocks.set(
-		`/accounts/${accountId}/workers/scripts/${fromDashScriptName}`,
+		`/accounts/${accountId}/workers/services/${fromDashScriptName}/environments/${environment}/content`,
 		mockResponse
 	);
 }

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

@@ -29,7 +29,9 @@ const std = {
 function normalizeOutput(spy: jest.SpyInstance): string {
 	return normalizeErrorMarkers(
 		replaceByte(
-			stripTrailingWhitespace(normalizeSlashes(stripTimings(captureCalls(spy))))
+			stripTrailingWhitespace(
+				normalizeSlashes(normalizeTempDirs(stripTimings(captureCalls(spy))))
+			)
 		)
 	);
 }
@@ -93,5 +95,12 @@ export function stripTrailingWhitespace(str: string): string {
  * variation causing every few tests the value to change by ± .01
  */
 function replaceByte(stdout: string): string {
-	return stdout.replaceAll(/.[0-9][0-9] KiB/g, "xx KiB");
+	return stdout.replaceAll(/\d+\.\d+ KiB/g, "xx KiB");
+}
+
+/**
+ * Temp directories are created with random names, so we replace all comments temp dirs in them
+ */
+export function normalizeTempDirs(stdout: string): string {
+	return stdout.replaceAll(/\/\/.+\/tmp.+/g, "//tmpdir");
 }

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

@@ -0,0 +1,13 @@
+// barrel import for msw handlers
+import { mswNamespacesHandlers } from "./namespaces";
+import { mswOauthHandlers } from "./oauth";
+import { mswR2handlers } from "./r2";
+import { mswUserHandlers } from "./user";
+
+// All the handlers are used in msw/index for setting up the server
+export const mswDefaultHandlers = [
+	...mswOauthHandlers,
+	...mswR2handlers,
+	...mswUserHandlers,
+	...mswNamespacesHandlers,
+];

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

@@ -0,0 +1,104 @@
+import { rest } from "msw";
+
+export const mswNamespacesHandlers = [
+	rest.post(
+		"*/accounts/:accountId/workers/dispatch/namespaces",
+		(request, response, context) => {
+			return response(
+				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(
+				context.status(200),
+				context.json({
+					success: true,
+					errors: [],
+					messages: [],
+					result: null,
+				})
+			);
+		}
+	),
+	rest.put(
+		"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceName",
+		(_, response, context) => {
+			return response(
+				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(
+				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(
+				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,36 @@
+import { rest } from "msw";
+
+export const mswOauthHandlers = [
+	rest.all("*/oauth/callback", (_, response, context) => {
+		return response(
+			context.status(200),
+			context.json({
+				success: true,
+				errors: [],
+				messages: [],
+				code: "test-oauth-code",
+			})
+		);
+	}),
+	// revoke access token
+	rest.post(
+		"https://dash.cloudflare.com/oauth2/revoke",
+		(_, response, context) => response(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(
+				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 mswR2handlers = [
+	// List endpoint r2Buckets
+	rest.get("*/accounts/:accountId/r2/buckets", (_, response, context) =>
+		response(
+			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(
+			context.status(200),
+			context.json({ success: true, errors: [], messages: [], result: {} })
+		)
+	),
+	rest.put(
+		"*/accounts/:accountId/r2/buckets/:bucketName",
+		(_, response, context) =>
+			response(
+				context.status(200),
+				context.json({ success: true, errors: [], messages: [], result: {} })
+			)
+	),
+	rest.delete(
+		"*/accounts/:accountId/r2/buckets/:bucketName",
+		(_, response, context) =>
+			response(
+				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(
+				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(
+				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(
+				context.status(200),
+				context.json({ success: true, errors: [], messages: [], result: null })
+			)
+	),
+];

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

@@ -0,0 +1,63 @@
+import { rest } from "msw";
+
+export const mswUserHandlers = [
+	rest.get("*/user", (_, res, cxt) => {
+		return res(
+			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", (_, res, cxt) => {
+		return res(
+			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(
+			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/index.ts

@@ -0,0 +1,4 @@
+import { setupServer } from "msw/node";
+import { mswDefaultHandlers } from "./handlers";
+
+export const msw = setupServer(...mswDefaultHandlers);

package/src/__tests__/index.test.ts

@@ -36,6 +36,7 @@ describe("wrangler", () => {
 			  wrangler publish [script]    🆙 Publish your Worker to Cloudflare.
 			  wrangler tail [worker]       🦚 Starts a log tailing session for a published Worker.
 			  wrangler secret              🤫 Generate a secret that can be referenced in a Worker
+			  wrangler secret:bulk <json>  🗄️ Bulk upload secrets for a Worker
 			  wrangler kv:namespace        🗂️  Interact with your Workers KV Namespaces
 			  wrangler kv:key              🔑 Individually manage Workers KV key-value pairs
 			  wrangler kv:bulk             💪 Interact with multiple Workers KV key-value pairs at once
@@ -75,6 +76,7 @@ describe("wrangler", () => {
 			  wrangler publish [script]    🆙 Publish your Worker to Cloudflare.
 			  wrangler tail [worker]       🦚 Starts a log tailing session for a published Worker.
 			  wrangler secret              🤫 Generate a secret that can be referenced in a Worker
+			  wrangler secret:bulk <json>  🗄️ Bulk upload secrets for a Worker
 			  wrangler kv:namespace        🗂️  Interact with your Workers KV Namespaces
 			  wrangler kv:key              🔑 Individually manage Workers KV key-value pairs
 			  wrangler kv:bulk             💪 Interact with multiple Workers KV key-value pairs at once
@@ -227,16 +229,16 @@ describe("wrangler", () => {
 		await runWrangler("build");
 		await endEventLoop();
 		expect(std.out).toMatchInlineSnapshot(`
-		      "▲ [WARNING] Deprecation: \`wrangler build\` has been deprecated.
+		"▲ [WARNING] Deprecation: \`wrangler build\` has been deprecated.
 
-		        Please refer to https://developers.cloudflare.com/workers/wrangler/migration/deprecations/#build
-		        for more information.
-		        Attempting to run \`wrangler publish --dry-run --outdir=dist\` for you instead:
+		  Please refer to https://developers.cloudflare.com/workers/wrangler/migration/deprecations/#build
+		  for more information.
+		  Attempting to run \`wrangler publish --dry-run --outdir=dist\` for you instead:
 
 
-		      --dry-run: exiting now.
-		      Total Upload: 0xx KiB / gzip: 0xx KiB"
-	    `);
+		Total Upload: xx KiB / gzip: xx KiB
+		--dry-run: exiting now."
+	`);
 	});
 });