wrangler 0.0.0-e043479 → 0.0.0-e0621809

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

@@ -0,0 +1,160 @@
+import { rest } from "msw";
+import { createFetchResult } from "../index";
+
+const latestDeployment = {
+	id: "Galaxy-Class",
+	number: "1701-E",
+	annotations: {
+		"workers/triggered_by": "rollback",
+		"workers/rollback_from": "MOCK-DEPLOYMENT-ID-2222",
+	},
+	metadata: {
+		author_id: "Picard-Gamma-6-0-7-3",
+		author_email: "Jean-Luc-Picard@federation.org",
+		source: "wrangler",
+		created_on: "2021-01-04T00:00:00.000000Z",
+		modified_on: "2021-01-04T00:00:00.000000Z",
+	},
+	resources: {
+		script: "MOCK-TAG",
+		bindings: [],
+	},
+};
+export const mswSuccessDeployments = [
+	rest.get(
+		"*/accounts/:accountId/workers/deployments/by-script/:scriptTag",
+		(_, response, context) =>
+			response.once(
+				context.json(
+					createFetchResult({
+						latest: latestDeployment,
+						items: [
+							{
+								id: "Constitution-Class",
+								number: "1701-E",
+								annotations: {
+									"workers/triggered_by": "upload",
+								},
+								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",
+								annotations: {
+									"workers/triggered_by": "rollback",
+									"workers/rollback_from": "MOCK-DEPLOYMENT-ID-1111",
+									"workers/message": "Rolled back for this version",
+								},
+								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",
+								},
+							},
+							{
+								id: "3mEgaU1T-Intrepid-someThing",
+								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-03T00:00:00.000000Z",
+									modified_on: "2021-02-03T00:00:00.000000Z",
+								},
+							},
+							latestDeployment,
+						],
+					})
+				)
+			)
+	),
+];
+
+export const mswSuccessDeploymentScriptMetadata = [
+	rest.get(
+		"*/accounts/:accountId/workers/services/:scriptName",
+		(_, res, ctx) => {
+			return res.once(
+				ctx.json(
+					createFetchResult({
+						default_environment: {
+							script: { last_deployed_from: "wrangler", tag: "MOCK-TAG" },
+						},
+					})
+				)
+			);
+		}
+	),
+];
+
+export const mswSuccessDeploymentDetails = [
+	rest.get(
+		"*/accounts/:accountId/workers/deployments/by-script/:scriptTag/detail/:deploymentId",
+		(req, res, ctx) => {
+			let bindings: object[] = [];
+			if (req.url.toString().includes("bindings-tag")) {
+				bindings = [
+					{
+						bucket_name: "testr2",
+						name: "MY_BUCKET",
+						type: "r2_bucket",
+					},
+				];
+			}
+
+			expect(req.url.toString().includes("1701-E"));
+			return res.once(
+				ctx.json(
+					createFetchResult({
+						id: "1701-E",
+						Number: 0,
+						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: {
+								etag: "mock-e-tag",
+								handlers: ["fetch"],
+								last_deployed_from: "wrangler",
+							},
+							script_runtime: {
+								usage_model: "bundled",
+							},
+							bindings: bindings,
+						},
+					})
+				)
+			);
+		}
+	),
+	// ?deployment=<deploymentid> param used to get deployment <script content> as text
+	rest.get(
+		"*/accounts/:accountId/workers/scripts/:scriptName",
+		(req, res, ctx) => {
+			let scriptContent = "";
+			if (req.url.searchParams.get("deployment") === "1701-E") {
+				scriptContent = `
+			export default {
+				async fetch(request) {
+					return new Response('Hello World from Deployment 1701-E');
+				},
+			};`;
+			} else {
+				return res(ctx.status(400));
+			}
+			return res.once(ctx.text(scriptContent));
+		}
+	),
+];

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

@@ -0,0 +1,81 @@
+import { rest } from "msw";
+import { createFetchResult } from "../index";
+
+export const mswSuccessNamespacesHandlers = [
+	rest.post(
+		"*/accounts/:accountId/workers/dispatch/namespaces",
+		(_, response, context) => {
+			return response.once(
+				context.json(
+					createFetchResult({
+						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.json(createFetchResult(null)));
+		}
+	),
+	rest.put(
+		"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceName",
+		(_, response, context) => {
+			return response.once(
+				context.json(
+					createFetchResult({
+						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.json(
+					createFetchResult({
+						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.json(
+					createFetchResult([
+						{
+							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,60 @@
+import { rest } from "msw";
+import { createFetchResult } from "../index";
+
+export const mswSuccessR2handlers = [
+	// List endpoint r2Buckets
+	rest.get("*/accounts/:accountId/r2/buckets", (_, response, context) =>
+		response.once(
+			context.json(
+				createFetchResult({
+					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.json(createFetchResult({})))
+	),
+	rest.put(
+		"*/accounts/:accountId/r2/buckets/:bucketName",
+		(_, response, context) => response.once(context.json(createFetchResult({})))
+	),
+	rest.delete(
+		"*/accounts/:accountId/r2/buckets/:bucketName",
+		(_, response, context) =>
+			response.once(context.json(createFetchResult(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.body(imageBuffer)
+			);
+		}
+	),
+	rest.put(
+		"*/accounts/:accountId/r2/buckets/:bucketName/objects/:objectName",
+		(_, response, context) =>
+			response.once(
+				context.json(
+					createFetchResult({
+						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.json(createFetchResult(null)))
+	),
+];

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

@@ -0,0 +1,56 @@
+import { rest } from "msw";
+import { createFetchResult } from "../index";
+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 | readonly string[]) {
+	if (typeof scriptName !== "string") return "";
+	return scriptName.split("--").flatMap((part) => bindings[part] ?? []);
+}
+function getScript(scriptName: string | readonly string[]): string {
+	if (typeof scriptName !== "string") return "";
+	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.text(getScript(scriptName)));
+		}
+	),
+	rest.get(
+		"*/accounts/:accountId/workers/scripts/:scriptName",
+		({ params: { scriptName } }, res, context) => {
+			return res(context.text(getScript(scriptName)));
+		}
+	),
+	rest.get(
+		"*/accounts/:accountId/workers/services/:scriptName/environments/:env/bindings",
+		({ params: { scriptName } }, res, context) => {
+			return res(context.json(createFetchResult(getBindings(scriptName))));
+		}
+	),
+	rest.get(
+		"*/accounts/:accountId/workers/scripts/:scriptName/bindings",
+		({ params: { scriptName } }, res, context) => {
+			return res(context.json(createFetchResult(getBindings(scriptName))));
+		}
+	),
+];

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

@@ -0,0 +1,52 @@
+import { rest } from "msw";
+import { createFetchResult } from "../index";
+
+export const mswSuccessUserHandlers = [
+	rest.get("*/user", (_, response, cxt) => {
+		return response.once(
+			cxt.json(
+				createFetchResult({
+					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.json(
+				createFetchResult([
+					{ 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.json(
+				createFetchResult([
+					{
+						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,20 @@
+import { rest } from "msw";
+import { createFetchResult } from "../index";
+
+export default [
+	rest.get("*/zones", ({ url: { searchParams } }, res, context) => {
+		return res(
+			context.json(
+				createFetchResult(
+					searchParams.get("name") === "exists.com"
+						? [
+								{
+									id: "exists-com",
+								},
+						  ]
+						: []
+				)
+			)
+		);
+	}),
+];

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

@@ -0,0 +1,52 @@
+import { setupServer } from "msw/node";
+import { default as mswAccessHandlers } from "./handlers/access";
+import {
+	mswSuccessDeployments,
+	mswSuccessDeploymentScriptMetadata,
+	mswSuccessDeploymentDetails,
+} from "./handlers/deployments";
+import { mswSuccessNamespacesHandlers } from "./handlers/namespaces";
+import { mswSuccessOauthHandlers } from "./handlers/oauth";
+import { mswSuccessR2handlers } from "./handlers/r2";
+import { default as mswSucessScriptHandlers } from "./handlers/script";
+import { mswSuccessUserHandlers } from "./handlers/user";
+import { default as mswZoneHandlers } from "./handlers/zones";
+
+export const msw = setupServer();
+
+function createFetchResult(
+	result: unknown,
+	success = true,
+	errors: unknown[] = [],
+	messages: unknown[] = [],
+	result_info?: Record<string, unknown>
+) {
+	return result_info
+		? {
+				result,
+				success,
+				errors,
+				messages,
+				result_info,
+		  }
+		: {
+				result,
+				success,
+				errors,
+				messages,
+		  };
+}
+
+export {
+	createFetchResult,
+	mswSuccessUserHandlers,
+	mswSuccessR2handlers,
+	mswSuccessOauthHandlers,
+	mswSuccessNamespacesHandlers,
+	mswSucessScriptHandlers,
+	mswZoneHandlers,
+	mswSuccessDeployments,
+	mswSuccessDeploymentDetails,
+	mswAccessHandlers,
+	mswSuccessDeploymentScriptMetadata,
+};

package/src/__tests__/helpers/msw/read-file-sync.js

@@ -0,0 +1,61 @@
+/*! Read blob sync in NodeJS. MIT License. Jimmy Wärting <https://jimmy.warting.se/opensource>
+ * Special Thanks to Jimmy Wärting helping in https://github.com/nodejs/undici/issues/1830
+ */
+const { join } = require("path");
+const {
+	Worker,
+	receiveMessageOnPort,
+	MessageChannel,
+} = require("worker_threads");
+
+/**
+ * blob-worker & read-file-sync are part of a polyfill to synchronously read a blob in NodeJS
+ * this is needed for MSW FormData patching to work and support Blobs, serializing them to a string before recreating the FormData.
+ */
+function read(blob) {
+	const subChannel = new MessageChannel();
+	const signal = new Int32Array(new SharedArrayBuffer(4));
+	signal[0] = 0;
+
+	const path = join(__dirname, "blob-worker.cjs");
+
+	const worker = new Worker(path, {
+		transferList: [subChannel.port1],
+		workerData: {
+			signal,
+			port: subChannel.port1,
+			blob,
+		},
+	});
+
+	// Sleep until the other thread sets signal[0] to 1
+	Atomics.wait(signal, 0, 0);
+
+	// Close the worker thread
+	worker.terminate();
+
+	return receiveMessageOnPort(subChannel.port2)?.message;
+}
+
+class FileReaderSync {
+	readAsArrayBuffer(blob) {
+		this.result = read(blob);
+	}
+
+	readAsDataURL(blob) {
+		const ab = read(blob);
+		this.result = `data:${blob.type};base64,${Buffer.from(ab).toString(
+			"base64"
+		)}`;
+	}
+
+	readAsText(blob) {
+		const ab = read(blob);
+		this.result = new TextDecoder().decode(ab);
+	}
+
+	// Should not be used, use readAsArrayBuffer instead
+	// readAsBinaryString(blob) { ... }
+}
+
+exports.FileReaderSync = FileReaderSync;

package/src/__tests__/helpers/run-in-tmp.ts

@@ -1,29 +1,38 @@
 import * as fs from "node:fs";
 import os from "node:os";
 import * as path from "node:path";
+import { reinitialiseAuthTokens } from "../../user";
 
 const originalCwd = process.cwd();
 
-export function runInTempDir({ homedir }: { homedir?: string } = {}) {
-  let tmpDir: string;
+export function runInTempDir({ homedir } = { homedir: "./home" }) {
+	let tmpDir: string;
 
-  beforeEach(() => {
-    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "wrangler-tests"));
-    process.chdir(tmpDir);
-    if (homedir !== undefined) {
-      // Override where the home directory is so that we can write our own user config,
-      // without destroying the real thing.
-      fs.mkdirSync(homedir);
-      // Note it is very important that we use the "default" value from "node:os" (e.g. `import os from "node:os";`)
-      // rather than an alias to the module (e.g. `import * as os from "node:os";`).
-      // This is because the module gets transpiled so that the "method" `homedir()` gets converted to a
-      // getter that is not configurable (and so cannot be spied upon).
-      jest.spyOn(os, "homedir").mockReturnValue(homedir);
-    }
-  });
+	beforeEach(() => {
+		// Use realpath because the temporary path can point to a symlink rather than the actual path.
+		tmpDir = fs.realpathSync(
+			fs.mkdtempSync(path.join(os.tmpdir(), "wrangler-tests"))
+		);
 
-  afterEach(() => {
-    process.chdir(originalCwd);
-    fs.rmSync(tmpDir, { recursive: true });
-  });
+		process.chdir(tmpDir);
+		// The path that is returned from `homedir()` should be absolute.
+		const absHomedir = path.resolve(tmpDir, homedir);
+		// Override where the home directory is so that we can write our own user config,
+		// without destroying the real thing.
+		fs.mkdirSync(absHomedir, { recursive: true });
+		// Note it is very important that we use the "default" value from "node:os" (e.g. `import os from "node:os";`)
+		// rather than an alias to the module (e.g. `import * as os from "node:os";`).
+		// This is because the module gets transpiled so that the "method" `homedir()` gets converted to a
+		// getter that is not configurable (and so cannot be spied upon).
+		jest.spyOn(os, "homedir")?.mockReturnValue(absHomedir);
+		// Now that we have changed the home directory location, we must reinitialize the user auth state
+		reinitialiseAuthTokens();
+	});
+
+	afterEach(() => {
+		if (fs.existsSync(tmpDir)) {
+			process.chdir(originalCwd);
+			fs.rmSync(tmpDir, { recursive: true });
+		}
+	});
 }

package/src/__tests__/helpers/run-wrangler.ts

@@ -5,12 +5,12 @@ import { normalizeSlashes, stripTimings } from "./mock-console";
  * A helper to 'run' wrangler commands for tests.
  */
 export async function runWrangler(cmd?: string) {
-  try {
-    await main(cmd?.split(" ") ?? []);
-  } catch (err) {
-    if (err instanceof Error) {
-      err.message = normalizeSlashes(stripTimings(err.message));
-    }
-    throw err;
-  }
+	try {
+		await main(cmd?.split(" ") ?? []);
+	} catch (err) {
+		if (err instanceof Error) {
+			err.message = normalizeSlashes(stripTimings(err.message));
+		}
+		throw err;
+	}
 }

package/src/__tests__/helpers/string-dynamic-values-matcher.ts

@@ -0,0 +1,28 @@
+export type PatternReplacementPair = [string | RegExp, string];
+
+/**
+ * Sometimes, we might need to test strings that contain dynamic |
+ * random | generated data (such as file hashes, IDs, etc.).
+ *
+ * This helper function replaces the dynamic parts of such strings with
+ * static values, thus enabling us to properly test the contents of the
+ * string.
+ *
+ * see https://jestjs.io/docs/snapshot-testing#property-matchers
+ */
+export function replaceRandomWithConstantData(
+	stringWithRandomData: string,
+	patternReplacementPairs: Array<PatternReplacementPair>
+) {
+	let stringWithConstantData = stringWithRandomData;
+
+	patternReplacementPairs.forEach(
+		(pair) =>
+			(stringWithConstantData = stringWithConstantData.replace(
+				pair[0], // pattern
+				pair[1] // replacement
+			))
+	);
+
+	return stringWithConstantData;
+}

package/src/__tests__/helpers/worker-scripts/child-wrangler.toml

@@ -0,0 +1 @@
+name = 'child'