wrangler 0.0.0-e7a0cd5b → 0.0.0-e7cf0caa

package/src/__tests__/logger.test.ts

@@ -1,10 +1,11 @@
-import { logger } from "../logger";
+import { Logger } from "../logger";
 import { mockConsoleMethods } from "./helpers/mock-console";
 
 describe("logger", () => {
 	const std = mockConsoleMethods();
 
 	it("should add colored markers to error and warning messages", () => {
+		const logger = new Logger();
 		logger.loggerLevel = "debug";
 		logger.debug("This is a debug message");
 		logger.log("This is a log message");
@@ -27,6 +28,7 @@ describe("logger", () => {
 
 	describe("loggerLevel=debug", () => {
 		it("should render messages that are at or above the log level set in the logger", () => {
+			const logger = new Logger();
 			logger.loggerLevel = "debug";
 			logger.debug("This is a debug message");
 			logger.log("This is a log message");
@@ -50,6 +52,7 @@ describe("logger", () => {
 
 	describe("loggerLevel=log", () => {
 		it("should render messages that are at or above the log level set in the logger", () => {
+			const logger = new Logger();
 			logger.loggerLevel = "log";
 			logger.debug("This is a debug message");
 			logger.log("This is a log message");
@@ -73,6 +76,7 @@ describe("logger", () => {
 
 	describe("loggerLevel=warn", () => {
 		it("should render messages that are at or above the log level set in the logger", () => {
+			const logger = new Logger();
 			logger.loggerLevel = "warn";
 			logger.debug("This is a debug message");
 			logger.log("This is a log message");
@@ -96,6 +100,7 @@ describe("logger", () => {
 
 	describe("loggerLevel=error", () => {
 		it("should render messages that are at or above the log level set in the logger", () => {
+			const logger = new Logger();
 			logger.loggerLevel = "error";
 			logger.debug("This is a debug message");
 			logger.log("This is a log message");
@@ -122,7 +127,7 @@ describe("logger", () => {
 		});
 
 		it("should render messages that are at or above the log level set in the env var", () => {
-			logger.loggerLevel = "error";
+			const logger = new Logger();
 			logger.debug("This is a debug message");
 			logger.log("This is a log message");
 			logger.warn("This is a warn message");
@@ -138,4 +143,65 @@ describe("logger", () => {
       `);
 		});
 	});
+
+	describe("loggerLevelFromEnvVar case-insensitive", () => {
+		beforeEach(() => {
+			process.env.WRANGLER_LOG = "wARn";
+		});
+		afterEach(() => {
+			process.env.WRANGLER_LOG = undefined;
+		});
+
+		it("should render messages that are at or above the log level set in the env var", () => {
+			const logger = new Logger();
+			logger.debug("This is a debug message");
+			logger.log("This is a log message");
+			logger.warn("This is a warn message");
+			logger.error("This is a error message");
+
+			expect(std.debug).toMatchInlineSnapshot(`""`);
+			expect(std.out).toMatchInlineSnapshot(`""`);
+			expect(std.warn).toMatchInlineSnapshot(`
+        "▲ [WARNING] This is a warn message
+
+        "
+      `);
+			expect(std.err).toMatchInlineSnapshot(`
+        "X [ERROR] This is a error message
+
+        "
+      `);
+		});
+	});
+
+	describe("loggerLevelFromEnvVar falls back to log on invalid level", () => {
+		beforeEach(() => {
+			process.env.WRANGLER_LOG = "everything";
+		});
+		afterEach(() => {
+			process.env.WRANGLER_LOG = undefined;
+		});
+
+		it("should render messages that are at or above the log level set in the env var", () => {
+			const logger = new Logger();
+			logger.debug("This is a debug message");
+			logger.log("This is a log message");
+			logger.warn("This is a warn message");
+			logger.error("This is a error message");
+
+			expect(std.debug).toMatchInlineSnapshot(`""`);
+			expect(std.out).toMatchInlineSnapshot(`"This is a log message"`);
+			expect(std.warn).toMatchInlineSnapshot(`
+        "Unrecognised WRANGLER_LOG value \\"everything\\", expected \\"none\\" | \\"error\\" | \\"warn\\" | \\"info\\" | \\"log\\" | \\"debug\\", defaulting to \\"log\\"...
+        ▲ [WARNING] This is a warn message
+
+        "
+      `);
+			expect(std.err).toMatchInlineSnapshot(`
+        "X [ERROR] This is a error message
+
+        "
+      `);
+		});
+	});
 });

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;
+				return 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);
+	});
+});

package/src/__tests__/metrics.test.ts

@@ -1,5 +1,5 @@
 import { mkdirSync } from "node:fs";
-import fetchMock from "jest-fetch-mock";
+import { rest } from "msw";
 import { version as wranglerVersion } from "../../package.json";
 import { purgeConfigCaches, saveToConfigCache } from "../config-cache";
 import { CI } from "../is-ci";
@@ -12,10 +12,10 @@ import {
 	writeMetricsConfig,
 } from "../metrics/metrics-config";
 import { writeAuthConfigFile } from "../user";
-import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { mockConfirm } from "./helpers/mock-dialogs";
+import { mockConfirm, clearDialogs } from "./helpers/mock-dialogs";
 import { useMockIsTTY } from "./helpers/mock-istty";
+import { msw, mswSuccessOauthHandlers } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 
 declare const global: { SPARROW_SOURCE_KEY: string | undefined };
@@ -36,9 +36,8 @@ describe("metrics", () => {
 	});
 	afterEach(() => {
 		global.SPARROW_SOURCE_KEY = ORIGINAL_SPARROW_SOURCE_KEY;
-		fetchMock.resetMocks();
-		unsetAllMocks();
 		purgeConfigCaches();
+		clearDialogs();
 	});
 
 	describe("getMetricsDispatcher()", () => {
@@ -56,14 +55,8 @@ describe("metrics", () => {
 
 		describe("identify()", () => {
 			it("should send a request to the default URL", async () => {
-				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
-				fetchMock.mockResponse("");
-				await dispatcher.identify({ a: 1, b: 2 });
-				expect(fetchMock).toHaveBeenCalledTimes(1);
-				const [url, { body, headers }] = fetchMock.mock.calls[0];
-				expect(url).toEqual("https://sparrow.cloudflare.com/api/v1/identify");
-				expect(JSON.parse(body)).toEqual(
-					expect.objectContaining({
+				const request = mockMetricRequest(
+					{
 						event: "identify",
 						properties: {
 							category: "Workers",
@@ -72,13 +65,14 @@ describe("metrics", () => {
 							a: 1,
 							b: 2,
 						},
-					})
-				);
-				expect(headers).toEqual(
-					expect.objectContaining({
-						"Sparrow-Source-Key": "MOCK_KEY",
-					})
+					},
+					{ "Sparrow-Source-Key": "MOCK_KEY" },
+					"identify"
 				);
+				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
+				await dispatcher.identify({ a: 1, b: 2 });
+
+				expect(request.count).toBe(1);
 				expect(std.debug).toMatchInlineSnapshot(
 					`"Metrics dispatcher: Posting data {\\"type\\":\\"identify\\",\\"name\\":\\"identify\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}"`
 				);
@@ -88,12 +82,15 @@ describe("metrics", () => {
 			});
 
 			it("should write a debug log if the dispatcher is disabled", async () => {
+				const requests = mockMetricRequest({}, {}, "identify");
 				const dispatcher = await getMetricsDispatcher({
 					...MOCK_DISPATCHER_OPTIONS,
 					sendMetrics: false,
 				});
 				await dispatcher.identify({ a: 1, b: 2 });
-				expect(fetchMock).toHaveBeenCalledTimes(0);
+				await flushPromises();
+
+				expect(requests.count).toBe(0);
 				expect(std.debug).toMatchInlineSnapshot(
 					`"Metrics dispatcher: Dispatching disabled - would have sent {\\"type\\":\\"identify\\",\\"name\\":\\"identify\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}."`
 				);
@@ -103,12 +100,18 @@ describe("metrics", () => {
 			});
 
 			it("should write a debug log if the request fails", async () => {
+				msw.use(
+					rest.post("*/identify", async (req, res) => {
+						return res.networkError("BAD REQUEST");
+					})
+				);
+
 				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
-				fetchMock.mockReject(new Error("BAD REQUEST"));
 				await dispatcher.identify({ a: 1, b: 2 });
+				await flushPromises();
 				expect(std.debug).toMatchInlineSnapshot(`
 			"Metrics dispatcher: Posting data {\\"type\\":\\"identify\\",\\"name\\":\\"identify\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}
-			Metrics dispatcher: Failed to send request: BAD REQUEST"
+			Metrics dispatcher: Failed to send request: request to https://sparrow.cloudflare.com/api/v1/identify failed, reason: BAD REQUEST"
 		`);
 				expect(std.out).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -119,7 +122,6 @@ describe("metrics", () => {
 				global.SPARROW_SOURCE_KEY = undefined;
 				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
 				await dispatcher.identify({ a: 1, b: 2 });
-				expect(fetchMock).toHaveBeenCalledTimes(0);
 				expect(std.debug).toMatchInlineSnapshot(
 					`"Metrics dispatcher: Source Key not provided. Be sure to initialize before sending events. { type: 'identify', name: 'identify', properties: { a: 1, b: 2 } }"`
 				);
@@ -131,14 +133,8 @@ describe("metrics", () => {
 
 		describe("sendEvent()", () => {
 			it("should send a request to the default URL", async () => {
-				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
-				fetchMock.mockResponse("");
-				await dispatcher.sendEvent("some-event", { a: 1, b: 2 });
-				expect(fetchMock).toHaveBeenCalledTimes(1);
-				const [url, { body, headers }] = fetchMock.mock.calls[0];
-				expect(url).toEqual("https://sparrow.cloudflare.com/api/v1/event");
-				expect(JSON.parse(body)).toEqual(
-					expect.objectContaining({
+				const requests = mockMetricRequest(
+					{
 						event: "some-event",
 						properties: {
 							category: "Workers",
@@ -147,13 +143,16 @@ describe("metrics", () => {
 							a: 1,
 							b: 2,
 						},
-					})
-				);
-				expect(headers).toEqual(
-					expect.objectContaining({
+					},
+					{
 						"Sparrow-Source-Key": "MOCK_KEY",
-					})
+					},
+					"event"
 				);
+				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
+				await dispatcher.sendEvent("some-event", { a: 1, b: 2 });
+
+				expect(requests.count).toBe(1);
 				expect(std.debug).toMatchInlineSnapshot(
 					`"Metrics dispatcher: Posting data {\\"type\\":\\"event\\",\\"name\\":\\"some-event\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}"`
 				);
@@ -163,12 +162,16 @@ describe("metrics", () => {
 			});
 
 			it("should write a debug log if the dispatcher is disabled", async () => {
+				const requests = mockMetricRequest({}, {}, "event");
+
 				const dispatcher = await getMetricsDispatcher({
 					...MOCK_DISPATCHER_OPTIONS,
 					sendMetrics: false,
 				});
 				await dispatcher.sendEvent("some-event", { a: 1, b: 2 });
-				expect(fetchMock).toHaveBeenCalledTimes(0);
+				await flushPromises();
+
+				expect(requests.count).toBe(0);
 				expect(std.debug).toMatchInlineSnapshot(
 					`"Metrics dispatcher: Dispatching disabled - would have sent {\\"type\\":\\"event\\",\\"name\\":\\"some-event\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}."`
 				);
@@ -178,12 +181,17 @@ describe("metrics", () => {
 			});
 
 			it("should write a debug log if the request fails", async () => {
+				msw.use(
+					rest.post("*/event", async (_, res) => {
+						return res.networkError("BAD REQUEST");
+					})
+				);
 				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
-				fetchMock.mockReject(new Error("BAD REQUEST"));
 				await dispatcher.sendEvent("some-event", { a: 1, b: 2 });
+				await flushPromises();
 				expect(std.debug).toMatchInlineSnapshot(`
 			"Metrics dispatcher: Posting data {\\"type\\":\\"event\\",\\"name\\":\\"some-event\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}
-			Metrics dispatcher: Failed to send request: BAD REQUEST"
+			Metrics dispatcher: Failed to send request: request to https://sparrow.cloudflare.com/api/v1/event failed, reason: BAD REQUEST"
 		`);
 				expect(std.out).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -192,9 +200,11 @@ describe("metrics", () => {
 
 			it("should write a warning log if no source key has been provided", async () => {
 				global.SPARROW_SOURCE_KEY = undefined;
+				const requests = mockMetricRequest({}, {}, "event");
 				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
 				await dispatcher.sendEvent("some-event", { a: 1, b: 2 });
-				expect(fetchMock).toHaveBeenCalledTimes(0);
+
+				expect(requests.count).toBe(0);
 				expect(std.debug).toMatchInlineSnapshot(
 					`"Metrics dispatcher: Source Key not provided. Be sure to initialize before sending events. { type: 'event', name: 'some-event', properties: { a: 1, b: 2 } }"`
 				);
@@ -302,7 +312,7 @@ describe("metrics", () => {
 			});
 
 			it("should accept and store permission granting to send metrics if the user agrees", async () => {
-				const checkConfirmations = mockConfirm({
+				mockConfirm({
 					text: "Would you like to help improve Wrangler by sending usage metrics to Cloudflare?",
 					result: true,
 				});
@@ -314,14 +324,13 @@ describe("metrics", () => {
 				).toMatchObject({
 					enabled: true,
 				});
-				checkConfirmations();
 				expect((await readMetricsConfig()).permission).toMatchObject({
 					enabled: true,
 				});
 			});
 
 			it("should accept and store permission declining to send metrics if the user declines", async () => {
-				const checkConfirmations = mockConfirm({
+				mockConfirm({
 					text: "Would you like to help improve Wrangler by sending usage metrics to Cloudflare?",
 					result: false,
 				});
@@ -333,14 +342,13 @@ describe("metrics", () => {
 				).toMatchObject({
 					enabled: false,
 				});
-				checkConfirmations();
 				expect((await readMetricsConfig()).permission).toMatchObject({
 					enabled: false,
 				});
 			});
 
 			it("should ignore the config if the permission date is older than the current metrics date", async () => {
-				const checkConfirmations = mockConfirm({
+				mockConfirm({
 					text: "Would you like to help improve Wrangler by sending usage metrics to Cloudflare?",
 					result: false,
 				});
@@ -356,7 +364,6 @@ describe("metrics", () => {
 				).toMatchObject({
 					enabled: false,
 				});
-				checkConfirmations();
 				const { permission } = await readMetricsConfig();
 				expect(permission?.enabled).toBe(false);
 				// The date should be updated to today's date
@@ -364,7 +371,7 @@ describe("metrics", () => {
 
 				expect(std.out).toMatchInlineSnapshot(`
 			"Usage metrics tracking has changed since you last granted permission.
-			Your choice has been saved in the following file: home/.wrangler/config/metrics.json.
+			Your choice has been saved in the following file: test-xdg-config/metrics.json.
 
 			  You can override the user level setting for a project in \`wrangler.toml\`:
 
@@ -418,6 +425,8 @@ describe("metrics", () => {
 					sendMetrics: true,
 					offline: false,
 				});
+				await flushPromises();
+
 				expect(userId).toEqual("MOCK_USER_ID");
 				expect(userRequests.count).toBe(1);
 			});
@@ -438,13 +447,47 @@ describe("metrics", () => {
 function mockUserRequest() {
 	const requests = { count: 0 };
 	beforeEach(() => {
-		setMockResponse("/user", () => {
-			requests.count++;
-			return { id: "MOCK_USER_ID" };
-		});
+		msw.use(
+			...mswSuccessOauthHandlers,
+			rest.get("*/user", (_, res, cxt) => {
+				requests.count++;
+				return res(
+					cxt.status(200),
+					cxt.json({
+						success: true,
+						errors: [],
+						messages: [],
+						result: { id: "MOCK_USER_ID" },
+					})
+				);
+			})
+		);
 	});
 	afterEach(() => {
 		requests.count = 0;
 	});
 	return requests;
 }
+
+function mockMetricRequest(
+	body: unknown,
+	header: unknown,
+	endpoint: "identify" | "event"
+) {
+	const requests = { count: 0 };
+	msw.use(
+		rest.post(`*/${endpoint}`, async (req, res, cxt) => {
+			requests.count++;
+			expect(await req.json()).toEqual(body);
+			expect(req.headers).toContain(header);
+			return res.once(cxt.status(200), cxt.json({}));
+		})
+	);
+
+	return requests;
+}
+
+// Forces a tick to allow the non-awaited fetch promise to resolve.
+function flushPromises(): Promise<void> {
+	return new Promise((resolve) => setTimeout(resolve, 0));
+}

package/src/__tests__/middleware.scheduled.test.ts

@@ -19,7 +19,7 @@ describe("run scheduled events with middleware", () => {
 					return new Response("Hello world!");
 				},
 				scheduled(controller, env, ctx) {
-					console.log("Doing something scheduled in modules...");
+					// Doing something scheduled in modules...
 				},
 			};
 			`;
@@ -27,11 +27,12 @@ describe("run scheduled events with middleware", () => {
 		});
 
 		it("should not intercept when middleware is not enabled", async () => {
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch("/__scheduled");
 			let text;
@@ -41,11 +42,13 @@ describe("run scheduled events with middleware", () => {
 		});
 
 		it("should intercept when middleware is enabled", async () => {
-			const worker = await unstable_dev(
-				"index.js",
-				{ testScheduled: true },
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+					testScheduled: true,
+				},
+			});
 
 			const resp = await worker.fetch("/__scheduled");
 			let text;
@@ -55,11 +58,13 @@ describe("run scheduled events with middleware", () => {
 		});
 
 		it("should not trigger scheduled event on wrong route", async () => {
-			const worker = await unstable_dev(
-				"index.js",
-				{ testScheduled: true },
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+					testScheduled: true,
+				},
+			});
 
 			const resp = await worker.fetch("/test");
 			let text;
@@ -75,7 +80,7 @@ describe("run scheduled events with middleware", () => {
 		beforeEach(() => {
 			const scriptContent = `
 			addEventListener("scheduled", (event) => {
-				console.log("Doing something scheduled in service worker...");
+				// Doing something scheduled in service worker...
 			});
 
 			addEventListener("fetch", (event) => {
@@ -91,11 +96,12 @@ describe("run scheduled events with middleware", () => {
 		});
 
 		it("should not intercept when middleware is not enabled", async () => {
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch("/__scheduled");
 			let text;
@@ -105,11 +111,13 @@ describe("run scheduled events with middleware", () => {
 		});
 
 		it("should intercept when middleware is enabled", async () => {
-			const worker = await unstable_dev(
-				"index.js",
-				{ testScheduled: true },
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+					testScheduled: true,
+				},
+			});
 
 			const resp = await worker.fetch("/__scheduled");
 			let text;
@@ -119,11 +127,13 @@ describe("run scheduled events with middleware", () => {
 		});
 
 		it("should not trigger scheduled event on wrong route", async () => {
-			const worker = await unstable_dev(
-				"index.js",
-				{ testScheduled: true },
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+					testScheduled: true,
+				},
+			});
 
 			const resp = await worker.fetch("/test");
 			let text;