wrangler 0.0.0-e178d6fb → 0.0.0-e1c2f5b9

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,10 +1,10 @@
 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";
 import { logger } from "../logger";
 import { getMetricsDispatcher, getMetricsConfig } from "../metrics";
-import { CI } from "../metrics/is-ci";
 import {
 	CURRENT_METRICS_DATE,
 	readMetricsConfig,
@@ -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 { 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 };
@@ -26,6 +26,9 @@ describe("metrics", () => {
 	runInTempDir();
 
 	beforeEach(() => {
+		// Tell jest to use the original version of the `getMetricsConfig()` function in these tests.
+		const mockMetricsConfig = jest.requireMock("../metrics/metrics-config");
+		mockMetricsConfig.useOriginal = true;
 		global.SPARROW_SOURCE_KEY = "MOCK_KEY";
 		logger.loggerLevel = "debug";
 		// Create a node_modules directory to store config-cache files
@@ -33,8 +36,6 @@ describe("metrics", () => {
 	});
 	afterEach(() => {
 		global.SPARROW_SOURCE_KEY = ORIGINAL_SPARROW_SOURCE_KEY;
-		fetchMock.resetMocks();
-		unsetAllMocks();
 		purgeConfigCaches();
 	});
 
@@ -53,28 +54,24 @@ 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",
 							wranglerVersion,
+							os: process.platform + ":" + process.arch,
 							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}}"`
 				);
@@ -84,12 +81,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}}."`
 				);
@@ -99,12 +99,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(`""`);
@@ -115,7 +121,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 } }"`
 				);
@@ -127,28 +132,26 @@ 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",
 							wranglerVersion,
+							os: process.platform + ":" + process.arch,
 							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}}"`
 				);
@@ -158,12 +161,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}}."`
 				);
@@ -173,12 +180,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(`""`);
@@ -187,9 +199,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 } }"`
 				);
@@ -359,7 +373,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\`:
 
@@ -413,6 +427,8 @@ describe("metrics", () => {
 					sendMetrics: true,
 					offline: false,
 				});
+				await flushPromises();
+
 				expect(userId).toEqual("MOCK_USER_ID");
 				expect(userRequests.count).toBe(1);
 			});
@@ -433,13 +449,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

@@ -0,0 +1,145 @@
+import * as fs from "node:fs";
+import { unstable_dev } from "../api";
+import { runInTempDir } from "./helpers/run-in-tmp";
+
+jest.unmock("undici");
+
+describe("run scheduled events with middleware", () => {
+	describe("module workers", () => {
+		runInTempDir();
+
+		beforeEach(() => {
+			const scriptContent = `
+			export default {
+				fetch(request, env, ctx) {
+					const url = new URL(request.url);
+					if (url.pathname === "/__scheduled") {
+						return new Response("Fetch triggered at /__scheduled");
+					}
+					return new Response("Hello world!");
+				},
+				scheduled(controller, env, ctx) {
+					console.log("Doing something scheduled in modules...");
+				},
+			};
+			`;
+			fs.writeFileSync("index.js", scriptContent);
+		});
+
+		it("should not intercept when middleware is not enabled", async () => {
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
+
+			const resp = await worker.fetch("/__scheduled");
+			let text;
+			if (resp) text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Fetch triggered at /__scheduled"`);
+			await worker.stop();
+		});
+
+		it("should intercept when middleware is enabled", async () => {
+			const worker = await unstable_dev("index.js", {
+				testScheduled: true,
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
+
+			const resp = await worker.fetch("/__scheduled");
+			let text;
+			if (resp) text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Ran scheduled event"`);
+			await worker.stop();
+		});
+
+		it("should not trigger scheduled event on wrong route", async () => {
+			const worker = await unstable_dev("index.js", {
+				testScheduled: true,
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
+
+			const resp = await worker.fetch("/test");
+			let text;
+			if (resp) text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Hello world!"`);
+			await worker.stop();
+		});
+	});
+
+	describe("service workers", () => {
+		runInTempDir();
+
+		beforeEach(() => {
+			const scriptContent = `
+			addEventListener("scheduled", (event) => {
+				console.log("Doing something scheduled in service worker...");
+			});
+
+			addEventListener("fetch", (event) => {
+				const url = new URL(event.request.url);
+				if (url.pathname === "/__scheduled") {
+					event.respondWith(new Response("Fetch triggered at /__scheduled"));
+				} else {
+					event.respondWith(new Response("Hello world!"));
+				}
+			});
+			`;
+			fs.writeFileSync("index.js", scriptContent);
+		});
+
+		it("should not intercept when middleware is not enabled", async () => {
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
+
+			const resp = await worker.fetch("/__scheduled");
+			let text;
+			if (resp) text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Fetch triggered at /__scheduled"`);
+			await worker.stop();
+		});
+
+		it("should intercept when middleware is enabled", async () => {
+			const worker = await unstable_dev("index.js", {
+				testScheduled: true,
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
+
+			const resp = await worker.fetch("/__scheduled");
+			let text;
+			if (resp) text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Ran scheduled event"`);
+			await worker.stop();
+		});
+
+		it("should not trigger scheduled event on wrong route", async () => {
+			const worker = await unstable_dev("index.js", {
+				testScheduled: true,
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
+
+			const resp = await worker.fetch("/test");
+			let text;
+			if (resp) text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Hello world!"`);
+			await worker.stop();
+		});
+	});
+});