wrangler 0.0.0-e178d6fb → 0.0.0-e1c2f5b9

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "0.0.0-e178d6fb",
+	"version": "0.0.0-e1c2f5b9",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -28,6 +28,11 @@
 	"bugs": {
 		"url": "https://github.com/cloudflare/wrangler2/issues"
 	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/cloudflare/wrangler2.git",
+		"directory": "packages/wrangler"
+	},
 	"license": "MIT OR Apache-2.0",
 	"author": "wrangler@cloudflare.com",
 	"main": "wrangler-dist/cli.js",
@@ -49,19 +54,20 @@
 		"Cloudflare_CA.pem"
 	],
 	"scripts": {
+		"assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts",
 		"build": "npm run clean && npm run bundle && npm run emit-types",
 		"bundle": "node -r esbuild-register scripts/bundle.ts",
-		"check:type": "tsc",
-		"clean": "rm -rf wrangler-dist miniflare-dist emitted-types",
+		"check:type": "node -r esbuild-register scripts/tsc-all.ts",
+		"clean": "rimraf wrangler-dist miniflare-dist emitted-types",
 		"dev": "npm run clean && concurrently -c black,blue --kill-others-on-fail false 'npm run bundle -- --watch' 'npm run check:type -- --watch --preserveWatchOutput'",
 		"emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
 		"prepublishOnly": "SOURCEMAPS=false npm run build",
-		"start": "npm run bundle && NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
-		"test": "jest --silent=false --verbose=true",
-		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch"
+		"start": "npm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
+		"test": "npm run assert-git-version && jest --silent=false --verbose=true",
+		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
+		"test:ci": "npm run test -- --verbose=true --coverage"
 	},
 	"jest": {
-		"collectCoverage": true,
 		"coverageReporters": [
 			"json",
 			"html",
@@ -87,27 +93,40 @@
 			]
 		},
 		"transformIgnorePatterns": [
-			"node_modules/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes)"
+			"node_modules/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes|npx-import)"
 		]
 	},
 	"dependencies": {
 		"@cloudflare/kv-asset-handler": "^0.2.0",
 		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
+		"@miniflare/core": "2.10.0",
+		"@miniflare/d1": "2.10.0",
+		"@miniflare/durable-objects": "2.10.0",
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
-		"esbuild": "0.14.47",
-		"miniflare": "^2.6.0",
+		"esbuild": "0.14.51",
+		"miniflare": "2.10.0",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
+		"source-map": "^0.7.4",
 		"xxhash-wasm": "^1.0.1"
 	},
 	"devDependencies": {
+		"@cloudflare/types": "^6.18.4",
+		"@cloudflare/workers-types": "^4.20221111.1",
+		"@databases/split-sql-query": "^1.0.3",
+		"@databases/sql": "^3.2.0",
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
+		"@miniflare/tre": "^3.0.0-next.8",
+		"@types/better-sqlite3": "^7.6.0",
+		"@types/busboy": "^1.5.0",
 		"@types/command-exists": "^1.2.0",
+		"@types/express": "^4.17.13",
 		"@types/glob-to-regexp": "0.4.1",
+		"@types/javascript-time-ago": "^2.0.3",
 		"@types/mime": "^2.0.3",
 		"@types/prompts": "^2.0.14",
 		"@types/react": "^17.0.37",
@@ -117,6 +136,8 @@
 		"@types/ws": "^8.5.3",
 		"@types/yargs": "^17.0.10",
 		"@webcontainer/env": "^1.0.1",
+		"body-parser": "^1.20.0",
+		"chalk": "^2.4.2",
 		"clipboardy": "^3.0.0",
 		"cmd-shim": "^4.1.0",
 		"command-exists": "^1.2.9",
@@ -124,7 +145,7 @@
 		"devtools-protocol": "^0.0.955664",
 		"dotenv": "^16.0.0",
 		"execa": "^6.1.0",
-		"faye-websocket": "^0.11.4",
+		"express": "^4.18.1",
 		"finalhandler": "^1.2.0",
 		"find-up": "^6.3.0",
 		"get-port": "^6.1.2",
@@ -138,22 +159,28 @@
 		"ink-testing-library": "^2.1.0",
 		"ink-text-input": "^4.0.3",
 		"is-ci": "^3.0.1",
+		"javascript-time-ago": "^2.5.4",
 		"jest-fetch-mock": "^3.0.3",
 		"jest-websocket-mock": "^2.3.0",
 		"mime": "^3.0.0",
+		"minimatch": "^5.1.0",
+		"msw": "^0.49.1",
+		"npx-import": "^1.1.3",
 		"open": "^8.4.0",
 		"p-queue": "^7.2.0",
 		"pretty-bytes": "^6.0.0",
 		"prompts": "^2.4.2",
 		"react": "^17.0.2",
 		"react-error-boundary": "^3.1.4",
+		"remove-accents-esm": "^0.0.1",
+		"semiver": "^1.1.0",
 		"serve-static": "^1.15.0",
 		"signal-exit": "^3.0.7",
 		"supports-color": "^9.2.2",
 		"timeago.js": "^4.0.2",
 		"tmp-promise": "^3.0.3",
 		"ts-dedent": "^2.2.0",
-		"undici": "^5.5.1",
+		"undici": "^5.11.0",
 		"update-check": "^1.5.4",
 		"ws": "^8.5.0",
 		"xdg-app-paths": "^7.3.0",
@@ -163,6 +190,6 @@
 		"fsevents": "~2.3.2"
 	},
 	"engines": {
-		"node": ">=16.7.0"
+		"node": ">=16.13.0"
 	}
 }

package/src/__tests__/access.test.ts

@@ -0,0 +1,25 @@
+import { domainUsesAccess, getAccessToken } from "../user/access";
+import { msw, mswAccessHandlers } from "./helpers/msw";
+
+describe("access", () => {
+	beforeEach(() => {
+		msw.use(...mswAccessHandlers);
+	});
+
+	describe("basic", () => {
+		it("should correctly detect an access protected domain", async () => {
+			expect(await domainUsesAccess("access-protected.com")).toBeTruthy();
+			expect(await domainUsesAccess("not-access-protected.com")).toBeFalsy();
+		});
+		it("should not fail without cloudflared installed", async () => {
+			expect(await getAccessToken("not-access-protected.com")).toBeFalsy();
+		});
+		it("should error without cloudflared installed on an access protected domain", async () => {
+			await expect(getAccessToken("access-protected.com")).rejects.toEqual(
+				new Error(
+					"To use Wrangler with Cloudflare Access, please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation"
+				)
+			);
+		});
+	});
+});

package/src/__tests__/api-dev.test.ts

@@ -0,0 +1,238 @@
+import * as fs from "node:fs";
+import { Request } from "undici";
+import { unstable_dev } from "../api";
+import { runInTempDir } from "./helpers/run-in-tmp";
+
+jest.unmock("undici");
+
+describe("unstable_dev", () => {
+	it("should return Hello World", async () => {
+		const worker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+			{
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			}
+		);
+		const resp = await worker.fetch();
+		if (resp) {
+			const text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
+		}
+		await worker.stop();
+	});
+
+	it("should return the port that the server started on (1)", async () => {
+		const worker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+			{
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			}
+		);
+		expect(worker.port).toBeGreaterThan(0);
+		await worker.stop();
+	});
+
+	it("should return the port that the server started on (2)", async () => {
+		const worker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+			{
+				port: 9191,
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			}
+		);
+		expect(worker.port).toBe(9191);
+		await worker.stop();
+	});
+});
+
+describe("unstable dev fetch input protocol", () => {
+	it("should use http localProtocol", async () => {
+		const worker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+			{
+				localProtocol: "http",
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			}
+		);
+		const res = await worker.fetch();
+		if (res) {
+			const text = await res.text();
+			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
+		}
+		await worker.stop();
+	});
+
+	it("should use undefined localProtocol", async () => {
+		const worker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+			{
+				localProtocol: undefined,
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			}
+		);
+		const res = await worker.fetch();
+		if (res) {
+			const text = await res.text();
+			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
+		}
+		await worker.stop();
+	});
+});
+
+describe("unstable dev fetch input parsing", () => {
+	runInTempDir();
+
+	it("should pass in a request object unchanged", async () => {
+		const scriptContent = `
+	export default {
+		fetch(request, env, ctx) {
+			const url = new URL(request.url);
+			if (url.pathname === "/test") {
+				if (request.method === "POST") {
+					return new Response("requestPOST");
+				}
+				return new Response("requestGET");
+			}
+			return new Response('Hello world');
+		}
+	};
+	`;
+		fs.writeFileSync("index.js", scriptContent);
+		const port = 21213;
+		const worker = await unstable_dev("index.js", {
+			port,
+			experimental: {
+				disableExperimentalWarning: true,
+				disableDevRegistry: true,
+			},
+		});
+		const req = new Request("http://0.0.0.0:21213/test", {
+			method: "POST",
+		});
+		const resp = await worker.fetch(req);
+		let text;
+		if (resp) text = await resp.text();
+		expect(text).toMatchInlineSnapshot(`"requestPOST"`);
+		await worker.stop();
+	});
+
+	it("should strip back to pathname for URL objects", async () => {
+		const scriptContent = `
+	export default {
+		fetch(request, env, ctx) {
+			const url = new URL(request.url);
+			if (url.pathname === "/test") {
+				return new Response("request");
+			}
+			return new Response('Hello world');
+		}
+	};
+	`;
+		fs.writeFileSync("index.js", scriptContent);
+		const worker = await unstable_dev("index.js", {
+			experimental: {
+				disableExperimentalWarning: true,
+				disableDevRegistry: true,
+			},
+		});
+		const url = new URL("http://localhost:80/test");
+		const resp = await worker.fetch(url);
+		let text;
+		if (resp) text = await resp.text();
+		expect(text).toMatchInlineSnapshot(`"request"`);
+		await worker.stop();
+	});
+
+	it("should allow full url passed in string, and stripped back to pathname", async () => {
+		const scriptContent = `
+	export default {
+		fetch(request, env, ctx) {
+			const url = new URL(request.url);
+			if (url.pathname === "/test") {
+				return new Response("request");
+			}
+			return new Response('Hello world');
+		}
+	};
+	`;
+		fs.writeFileSync("index.js", scriptContent);
+		const worker = await unstable_dev("index.js", {
+			experimental: {
+				disableExperimentalWarning: true,
+				disableDevRegistry: true,
+			},
+		});
+		const resp = await worker.fetch("http://example.com/test");
+		let text;
+		if (resp) text = await resp.text();
+		expect(text).toMatchInlineSnapshot(`"request"`);
+		await worker.stop();
+	});
+
+	it("should allow pathname to be passed in", async () => {
+		const scriptContent = `
+	export default {
+		fetch(request, env, ctx) {
+			const url = new URL(request.url);
+			if (url.pathname === "/test") {
+				return new Response("request");
+			}
+			return new Response('Hello world');
+		}
+	};
+	`;
+		fs.writeFileSync("index.js", scriptContent);
+		const worker = await unstable_dev("index.js", {
+			experimental: {
+				disableExperimentalWarning: true,
+				disableDevRegistry: true,
+			},
+		});
+		const resp = await worker.fetch("/test");
+		let text;
+		if (resp) text = await resp.text();
+		expect(text).toMatchInlineSnapshot(`"request"`);
+		await worker.stop();
+	});
+
+	it("should allow no input be passed in", async () => {
+		const scriptContent = `
+	export default {
+		fetch(request, env, ctx) {
+			const url = new URL(request.url);
+			if (url.pathname === "/test") {
+				return new Response("request");
+			}
+			return new Response('Hello world');
+		}
+	};
+	`;
+		fs.writeFileSync("index.js", scriptContent);
+		const worker = await unstable_dev("index.js", {
+			experimental: {
+				disableExperimentalWarning: true,
+				disableDevRegistry: true,
+			},
+		});
+		const resp = await worker.fetch("");
+		let text;
+		if (resp) text = await resp.text();
+		expect(text).toMatchInlineSnapshot(`"Hello world"`);
+		await worker.stop();
+	});
+});

package/src/__tests__/api-devregistry.test.js

@@ -0,0 +1,64 @@
+import { unstable_dev } from "../api";
+import { fetch } from "undici";
+
+jest.unmock("undici");
+
+/**
+ * a huge caveat to how testing multi-worker scripts works:
+ * you can't shutdown the first worker you spun up, or it'll kill the devRegistry
+ */
+describe("multi-worker testing", () => {
+	let childWorker;
+	let parentWorker;
+
+	beforeAll(async () => {
+		childWorker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+			{
+				config: "src/__tests__/helpers/worker-scripts/child-wrangler.toml",
+				experimental: {
+					disableExperimentalWarning: true,
+				},
+			}
+		);
+		parentWorker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/parent-worker.js",
+			{
+				config: "src/__tests__/helpers/worker-scripts/parent-wrangler.toml",
+				experimental: {
+					disableExperimentalWarning: true,
+				},
+			}
+		);
+	});
+
+	afterAll(async () => {
+		await childWorker.stop();
+		await parentWorker.stop();
+	});
+
+	it("parentWorker and childWorker should be added devRegistry", async () => {
+		const resp = await fetch("http://localhost:6284/workers");
+		if (resp) {
+			const parsedResp = await resp.json();
+			expect(parsedResp.parent).toBeTruthy();
+			expect(parsedResp.child).toBeTruthy();
+		}
+	});
+
+	it("childWorker should return Hello World itself", async () => {
+		const resp = await childWorker.fetch();
+		if (resp) {
+			const text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
+		}
+	});
+
+	it("parentWorker should return Hello World by invoking the child worker", async () => {
+		const resp = await parentWorker.fetch();
+		if (resp) {
+			const parsedResp = await resp.text();
+			expect(parsedResp).toEqual("Parent worker sees: Hello World!");
+		}
+	});
+});

package/src/__tests__/api.test.ts

@@ -0,0 +1,80 @@
+import { Request } from "undici";
+import { parseRequestInput } from "../api/dev";
+
+describe("parseRequestInput for fetch on unstable dev", () => {
+	it("should allow no input to be passed in", () => {
+		const [input, _] = parseRequestInput("0.0.0.0", 8080);
+
+		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080"`);
+	});
+
+	it("should allow string of pathname to be passed in", () => {
+		const [input, _] = parseRequestInput("0.0.0.0", 8080, "/test");
+
+		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/test"`);
+	});
+
+	it("should allow full url to be passed in as string and stripped", () => {
+		const [input, _] = parseRequestInput(
+			"0.0.0.0",
+			8080,
+			"http://cloudflare.com/test"
+		);
+
+		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/test"`);
+	});
+
+	it("should allow URL object without pathname to be passed in and stripped", () => {
+		const [input, _] = parseRequestInput(
+			"0.0.0.0",
+			8080,
+			new URL("http://cloudflare.com")
+		);
+
+		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/"`);
+	});
+
+	it("should allow URL object with pathname to be passed in and stripped", () => {
+		const [input, _] = parseRequestInput(
+			"0.0.0.0",
+			8080,
+			new URL("http://cloudflare.com/test")
+		);
+
+		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/test"`);
+	});
+
+	it("should allow request object to be passed in", () => {
+		const [input, init] = parseRequestInput(
+			"0.0.0.0",
+			8080,
+			new Request("http://cloudflare.com/test", { method: "POST" })
+		);
+
+		expect(init).toBeUndefined();
+		expect(input).toBeInstanceOf(Request);
+		// We don't expect the request to be modified
+		expect((input as Request).url).toMatchInlineSnapshot(
+			`"http://cloudflare.com/test"`
+		);
+		expect((input as Request).method).toMatchInlineSnapshot(`"POST"`);
+	});
+
+	it("should parse to give https url with localProtocol = https", () => {
+		const [input, _] = parseRequestInput("0.0.0.0", 8080, "/test", {}, "https");
+
+		expect(input).toMatchInlineSnapshot(`"https://0.0.0.0:8080/test"`);
+	});
+
+	it("should parse to give http url with localProtocol = http", () => {
+		const [input, _] = parseRequestInput("0.0.0.0", 8080, "/test", {}, "http");
+
+		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/test"`);
+	});
+
+	it("should parse to give http url with localProtocol not set", () => {
+		const [input, _] = parseRequestInput("0.0.0.0", 8080, "/test", {});
+
+		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/test"`);
+	});
+});