wrangler 0.0.0-e322475 → 0.0.0-e33294b0

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

@@ -4,32 +4,32 @@ const ORIGINAL_STDIN = process.stdin;
  * Mock process.stdin so that we can pipe in text for non-interactive mode tests.
  */
 export function useMockStdin({ isTTY }: { isTTY: boolean }) {
-  const mockStdin = new MockStdIn(isTTY);
+	const mockStdin = new MockStdIn(isTTY);
 
-  beforeEach(() => {
-    mockStdin.reset();
-    Object.defineProperty(process, "stdin", {
-      value: mockStdin,
-      configurable: true,
-      writable: false,
-    });
-  });
+	beforeEach(() => {
+		mockStdin.reset();
+		Object.defineProperty(process, "stdin", {
+			value: mockStdin,
+			configurable: true,
+			writable: false,
+		});
+	});
 
-  afterEach(() => {
-    Object.defineProperty(process, "stdin", {
-      value: ORIGINAL_STDIN,
-      configurable: true,
-      writable: false,
-    });
-  });
+	afterEach(() => {
+		Object.defineProperty(process, "stdin", {
+			value: ORIGINAL_STDIN,
+			configurable: true,
+			writable: false,
+		});
+	});
 
-  return mockStdin;
+	return mockStdin;
 }
 
 const failCallback: (value: unknown) => void = () => {
-  throw new Error(
-    "TEST FAILURE: stdin callback called before being initialized."
-  );
+	throw new Error(
+		"TEST FAILURE: stdin callback called before being initialized."
+	);
 };
 
 /**
@@ -37,67 +37,72 @@ const failCallback: (value: unknown) => void = () => {
  * into the wrangler process in non-interactive mode.
  */
 class MockStdIn {
-  private endCallback = failCallback;
-  private errorCallback = failCallback;
-  private chunks: string[] = [];
-  private error: Error | undefined;
+	private endCallback = failCallback;
+	private errorCallback = failCallback;
+	private chunks: string[] = [];
+	private error: Error | undefined;
 
-  /**
-   * Set this to true if you want the stdin stream to error.
-   */
-  throwError(error: Error) {
-    this.error = error;
-  }
+	/**
+	 * Set this to true if you want the stdin stream to error.
+	 */
+	throwError(error: Error) {
+		this.error = error;
+	}
 
-  /**
-   * Call this to clean out the chunks that are queued for sending.
-   */
-  reset() {
-    this.chunks.length = 0;
-    this.error = undefined;
-  }
+	/**
+	 * Call this to clean out the chunks that are queued for sending.
+	 */
+	reset() {
+		this.chunks.length = 0;
+		this.error = undefined;
+	}
 
-  /**
-   * Queue up some chunks to be sent.
-   */
-  send(...chunks: string[]) {
-    this.chunks.push(...chunks);
-  }
+	/**
+	 * Queue up some chunks to be sent.
+	 */
+	send(...chunks: string[]) {
+		this.chunks.push(...chunks);
+	}
 
-  constructor(
-    /**
-     * Used by wrangler to check whether stdin is interactive.
-     */
-    readonly isTTY: boolean
-  ) {}
+	constructor(
+		/**
+		 * Used by wrangler to check whether stdin is interactive.
+		 */
+		readonly isTTY: boolean
+	) {}
 
-  /**
-   * Used by wrangler to add event listeners.
-   */
-  on(eventName: string, callback: () => void) {
-    switch (eventName) {
-      case "readable":
-        setImmediate(callback);
-        break;
-      case "end":
-        this.endCallback = callback;
-        break;
-      case "error":
-        this.errorCallback = callback;
-        break;
-    }
-  }
+	/**
+	 * Used by wrangler to add event listeners.
+	 */
+	on(eventName: string, callback: () => void) {
+		switch (eventName) {
+			case "readable":
+				setImmediate(callback);
+				break;
+			case "end":
+				this.endCallback = callback;
+				break;
+			case "error":
+				this.errorCallback = callback;
+				break;
+		}
+	}
 
-  /**
-   * Used by wrangler to get the next chunk of data in the stream.
-   */
-  read() {
-    if (this.error) {
-      setImmediate(() => this.errorCallback(this.error));
-    }
-    if (this.chunks.length === 0) {
-      setImmediate(this.endCallback);
-    }
-    return this.chunks.shift() ?? null;
-  }
+	/**
+	 * Used by wrangler to get the next chunk of data in the stream.
+	 */
+	read() {
+		if (this.error) {
+			setImmediate(() => this.errorCallback(this.error));
+		}
+		if (this.chunks.length === 0) {
+			setImmediate(this.endCallback);
+		}
+		return this.chunks.shift() ?? null;
+	}
+
+	/**
+	 * Used by Ink.js to set the encoding of the stdout.
+	 */
+	setEncoding() {}
 }

package/src/__tests__/helpers/mock-web-socket.ts

@@ -4,26 +4,26 @@ import { WebSocket } from "mock-socket";
  * A version of the mock WebSocket that supports the methods that we use.
  */
 export class MockWebSocket extends WebSocket {
-  on(event: string | symbol, listener: (...args: unknown[]) => void): this {
-    switch (event) {
-      case "message":
-        this.onmessage = ({ data }) => {
-          listener(data);
-        };
-        break;
-      case "open":
-        this.onopen = listener;
-        break;
-      case "close":
-        this.onclose = listener;
-        break;
-      default:
-        throw new Error("Unknown event type: " + event.toString());
-    }
-    return this;
-  }
+	on(event: string | symbol, listener: (...args: unknown[]) => void): this {
+		switch (event) {
+			case "message":
+				this.onmessage = ({ data }) => {
+					listener(data);
+				};
+				break;
+			case "open":
+				this.onopen = listener;
+				break;
+			case "close":
+				this.onclose = listener;
+				break;
+			default:
+				throw new Error("Unknown event type: " + event.toString());
+		}
+		return this;
+	}
 
-  terminate() {
-    this.close();
-  }
+	terminate() {
+		this.close();
+	}
 }

package/src/__tests__/helpers/msw/blob-worker.cjs

@@ -0,0 +1,19 @@
+/*! 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 { workerData } = require("worker_threads");
+
+const { signal, port, blob } = workerData;
+
+blob.arrayBuffer().then((ab) => {
+	// Post the result back to the main thread before unlocking 'signal'
+	port.postMessage(ab, [ab]);
+	port.close();
+
+	// Change the value of signal[0] to 1
+	Atomics.store(signal, 0, 1);
+
+	// This will unlock the main thread when we notify it
+	Atomics.notify(signal, 0);
+});

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

@@ -0,0 +1,13 @@
+import { rest } from "msw";
+
+export default [
+	rest.get("*access-protected.com*", (_, response, cxt) => {
+		return response.once(
+			cxt.status(302),
+			cxt.set("location", "access-protected-com.cloudflareaccess.com")
+		);
+	}),
+	rest.get("*not-access-protected.com*", (_, response, cxt) => {
+		return response.once(cxt.status(200), cxt.body("OK"));
+	}),
+];

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

@@ -0,0 +1,93 @@
+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",
+								},
+								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: "Intrepid-Class",
+								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 mswSuccessLastDeployment = [
+	rest.get(
+		"*/accounts/:accountId/workers/services/:scriptName",
+		(_, res, ctx) => {
+			return res.once(
+				ctx.json(
+					createFetchResult({
+						default_environment: { script: { last_deployed_from: "wrangler" } },
+					})
+				)
+			);
+		}
+	),
+];

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",
+								},
+						  ]
+						: []
+				)
+			)
+		);
+	}),
+];