wrangler 2.4.4 → 2.5.0

package/bin/wrangler.js

@@ -62,15 +62,21 @@ Consider using a Node.js version manager such as https://volta.sh/ or https://gi
 			...process.argv.slice(2),
 		],
 		{
-			stdio: "inherit",
+			stdio: ["inherit", "inherit", "inherit", "ipc"],
 			env: {
 				...process.env,
 				NODE_EXTRA_CA_CERTS: pathToCACerts,
 			},
 		}
-	).on("exit", (code) =>
-		process.exit(code === undefined || code === null ? 0 : code)
-	);
+	)
+		.on("exit", (code) =>
+			process.exit(code === undefined || code === null ? 0 : code)
+		)
+		.on("message", (message) => {
+			if (process.send) {
+				process.send(message);
+			}
+		});
 }
 
 /**
@@ -95,11 +101,17 @@ function runDelegatedWrangler() {
 		process.execPath,
 		[resolvedBinaryPath, ...process.argv.slice(2)],
 		{
-			stdio: "inherit",
+			stdio: ["inherit", "inherit", "inherit", "ipc"],
 		}
-	).on("exit", (code) =>
-		process.exit(code === undefined || code === null ? 0 : code)
-	);
+	)
+		.on("exit", (code) =>
+			process.exit(code === undefined || code === null ? 0 : code)
+		)
+		.on("message", (message) => {
+			if (process.send) {
+				process.send(message);
+			}
+		});
 }
 
 /**

package/miniflare-dist/index.mjs

@@ -5974,11 +5974,11 @@ function parseRedirects(input) {
 
 // src/miniflare-cli/assets.ts
 var import_mime = __toESM(require_mime());
-import { fetch as miniflareFetch2 } from "@miniflare/core";
 import {
   Response as MiniflareResponse2,
   Request as MiniflareRequest2
 } from "@miniflare/core";
+import { upgradingFetch as miniflareFetch2 } from "@miniflare/web-sockets";
 import { watch } from "chokidar";
 
 // src/pages/hash.tsx
@@ -6000,7 +6000,12 @@ async function generateASSETSBinding(options) {
       try {
         const url = new URL(miniflareRequest.url);
         url.host = `localhost:${options.proxyPort}`;
-        return await miniflareFetch2(url, miniflareRequest);
+        const proxyRequest = new MiniflareRequest2(url, miniflareRequest);
+        if (proxyRequest.headers.get("Upgrade") === "websocket") {
+          proxyRequest.headers.delete("Sec-WebSocket-Accept");
+          proxyRequest.headers.delete("Sec-WebSocket-Key");
+        }
+        return await miniflareFetch2(proxyRequest);
       } catch (thrown) {
         options.log.error(new Error(`Could not proxy request: ${thrown}`));
         return new MiniflareResponse2(
@@ -6288,7 +6293,7 @@ async function main() {
     }
     process.send && process.send(
       JSON.stringify({
-        mfPort,
+        port: mfPort,
         ready: true,
         durableObjectsPort: durableObjectsMfPort
       })

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.4.4",
+	"version": "2.5.0",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",

package/src/__tests__/delete.test.ts

@@ -1,7 +1,8 @@
+import { rest } from "msw";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
-import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { mockConfirm } from "./helpers/mock-dialogs";
+import { msw } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 import writeWranglerToml from "./helpers/write-wrangler-toml";
@@ -12,10 +13,6 @@ describe("delete", () => {
 	mockApiToken();
 	runInTempDir();
 
-	afterEach(() => {
-		unsetAllMocks();
-	});
-
 	const std = mockConsoleMethods();
 
 	it("should delete an entire service by name", async () => {
@@ -107,14 +104,19 @@ describe("delete", () => {
 		});
 		mockListKVNamespacesRequest(...kvNamespaces);
 		// it should only try to delete the site namespace associated with this worker
-		setMockResponse(
-			"/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
-			"DELETE",
-			([_url, accountId]) => {
-				expect(accountId).toEqual("some-account-id");
-				return null;
-			}
+		msw.use(
+			rest.delete(
+				"*/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
+				(req, res, ctx) => {
+					expect(req.params.accountId).toEqual("some-account-id");
+					return res.once(
+						ctx.status(200),
+						ctx.json({ success: true, errors: [], messages: [], result: null })
+					);
+				}
+			)
 		);
+
 		mockDeleteWorkerRequest({ name: "my-script" });
 		await runWrangler("delete --name my-script");
 		expect(std).toMatchInlineSnapshot(`
@@ -155,22 +157,40 @@ describe("delete", () => {
 		mockListKVNamespacesRequest(...kvNamespaces);
 		// it should only try to delete the site namespace associated with this worker
 
-		setMockResponse(
-			"/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
-			"DELETE",
-			([_url, accountId]) => {
-				expect(accountId).toEqual("some-account-id");
-				return null;
-			}
+		msw.use(
+			rest.delete(
+				"*/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
+				(req, res, ctx) => {
+					expect(req.params.accountId).toEqual("some-account-id");
+					return res.once(
+						ctx.status(200),
+						ctx.json({
+							success: true,
+							errors: [],
+							messages: [],
+							result: {},
+						})
+					);
+				}
+			)
 		);
 
-		setMockResponse(
-			"/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-preview-ns",
-			"DELETE",
-			([_url, accountId]) => {
-				expect(accountId).toEqual("some-account-id");
-				return null;
-			}
+		msw.use(
+			rest.delete(
+				"*/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-preview-ns",
+				(req, res, ctx) => {
+					expect(req.params.accountId).toEqual("some-account-id");
+					return res.once(
+						ctx.status(200),
+						ctx.json({
+							success: true,
+							errors: [],
+							messages: [],
+							result: {},
+						})
+					);
+				}
+			)
 		);
 
 		mockDeleteWorkerRequest({ name: "my-script" });
@@ -197,34 +217,47 @@ function mockDeleteWorkerRequest(
 	} = {}
 ) {
 	const { env, legacyEnv, name } = options;
-	setMockResponse(
-		// there's no special handling for environments yet
-		"/accounts/:accountId/workers/services/:scriptName",
-		"DELETE",
-		async ([_url, accountId, scriptName], { method }, queryParams) => {
-			expect(accountId).toEqual("some-account-id");
-			expect(method).toEqual("DELETE");
-			expect(scriptName).toEqual(
-				legacyEnv && env
-					? `${name || "test-name"}-${env}`
-					: `${name || "test-name"}`
-			);
+	msw.use(
+		rest.delete(
+			"*/accounts/:accountId/workers/services/:scriptName",
+			(req, res, ctx) => {
+				expect(req.params.accountId).toEqual("some-account-id");
+				expect(req.params.scriptName).toEqual(
+					legacyEnv && env
+						? `${name ?? "test-name"}-${env}`
+						: `${name ?? "test-name"}`
+				);
 
-			expect(queryParams.get("force")).toEqual("true");
+				expect(req.url.searchParams.get("force")).toEqual("true");
 
-			return null;
-		}
+				return res.once(
+					ctx.status(200),
+					ctx.json({
+						success: true,
+						errors: [],
+						messages: [],
+						result: null,
+					})
+				);
+			}
+		)
 	);
 }
 
 /** Create a mock handler for the request to get a list of all KV namespaces. */
 function mockListKVNamespacesRequest(...namespaces: KVNamespaceInfo[]) {
-	setMockResponse(
-		"/accounts/:accountId/storage/kv/namespaces",
-		"GET",
-		([_url, accountId]) => {
-			expect(accountId).toEqual("some-account-id");
-			return namespaces;
-		}
+	msw.use(
+		rest.get("*/accounts/:accountId/storage/kv/namespaces", (req, res, ctx) => {
+			expect(req.params.accountId).toEqual("some-account-id");
+			return res.once(
+				ctx.status(200),
+				ctx.json({
+					success: true,
+					errors: [],
+					messages: [],
+					result: namespaces,
+				})
+			);
+		})
 	);
 }

package/src/__tests__/dev.test.tsx

@@ -792,7 +792,7 @@ describe("wrangler dev", () => {
 			});
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev");
-			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("0.0.0.0");
+			expect((Dev as jest.Mock).mock.calls[0][0].initialIp).toEqual("0.0.0.0");
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -807,7 +807,7 @@ describe("wrangler dev", () => {
 			});
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev");
-			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("1.2.3.4");
+			expect((Dev as jest.Mock).mock.calls[0][0].initialIp).toEqual("1.2.3.4");
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -822,7 +822,7 @@ describe("wrangler dev", () => {
 			});
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev --ip=5.6.7.8");
-			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("5.6.7.8");
+			expect((Dev as jest.Mock).mock.calls[0][0].initialIp).toEqual("5.6.7.8");
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -933,7 +933,7 @@ describe("wrangler dev", () => {
 			});
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev");
-			expect((Dev as jest.Mock).mock.calls[0][0].port).toEqual(8787);
+			expect((Dev as jest.Mock).mock.calls[0][0].initialPort).toEqual(8787);
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -951,7 +951,7 @@ describe("wrangler dev", () => {
 			(getPort as jest.Mock).mockResolvedValue(98765);
 
 			await runWrangler("dev");
-			expect((Dev as jest.Mock).mock.calls[0][0].port).toEqual(8888);
+			expect((Dev as jest.Mock).mock.calls[0][0].initialPort).toEqual(8888);
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -985,7 +985,7 @@ describe("wrangler dev", () => {
 			(getPort as jest.Mock).mockResolvedValue(98765);
 
 			await runWrangler("dev --port=9999");
-			expect((Dev as jest.Mock).mock.calls[0][0].port).toEqual(9999);
+			expect((Dev as jest.Mock).mock.calls[0][0].initialPort).toEqual(9999);
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -1000,7 +1000,7 @@ describe("wrangler dev", () => {
 			(getPort as jest.Mock).mockResolvedValue(98765);
 
 			await runWrangler("dev");
-			expect((Dev as jest.Mock).mock.calls[0][0].port).toEqual(98765);
+			expect((Dev as jest.Mock).mock.calls[0][0].initialPort).toEqual(98765);
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -1030,7 +1030,7 @@ describe("wrangler dev", () => {
 			});
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev");
-			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("0.0.0.0");
+			expect((Dev as jest.Mock).mock.calls[0][0].initialIp).toEqual("0.0.0.0");
 			expect(std.out).toMatchInlineSnapshot(`
 			        "Your worker has access to the following bindings:
 			        - Durable Objects:

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

@@ -42,10 +42,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 +71,7 @@ export const mockOAuthFlow = () => {
 		});
 	};
 
+	//TODO: this can just handled in `mockOAuthServerCallback`
 	const mockGrantAuthorization = ({
 		respondWith,
 	}: {

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__/logout.test.ts

@@ -0,0 +1,47 @@
+import fs from "node:fs";
+import path from "node:path";
+import { rest } from "msw";
+import { getGlobalWranglerConfigPath } from "../global-wrangler-config-path";
+import { USER_AUTH_CONFIG_FILE, writeAuthConfigFile } from "../user";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { msw } from "./helpers/msw";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+
+describe("logout", () => {
+	runInTempDir();
+	const std = mockConsoleMethods();
+
+	it("should exit with a message stating the user is not logged in", async () => {
+		await runWrangler("logout");
+		expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
+	});
+
+	it("should logout user that has been properly logged in", async () => {
+		writeAuthConfigFile({
+			oauth_token: "some-oauth-tok",
+			refresh_token: "some-refresh-tok",
+		});
+		// Make sure that logout removed the config file containing the auth tokens.
+		const config = path.join(
+			getGlobalWranglerConfigPath(),
+			USER_AUTH_CONFIG_FILE
+		);
+		let counter = 0;
+		msw.use(
+			rest.post("*/oauth2/revoke", (_, response, context) => {
+				// Make sure that we made the request to logout.
+				counter += 1;
+				response.once(context.status(200), context.text(""));
+			})
+		);
+
+		expect(fs.existsSync(config)).toBeTruthy();
+
+		await runWrangler("logout");
+
+		expect(std.out).toMatchInlineSnapshot(`"Successfully logged out."`);
+		expect(fs.existsSync(config)).toBeFalsy();
+		expect(counter).toBe(1);
+	});
+});