wrangler 0.0.0-e1d50407 → 0.0.0-e1e76ce2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-e1d50407",
+  "version": "0.0.0-e1e76ce2",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -47,15 +47,10 @@
     "wrangler-dist",
     "templates",
     "kv-asset-handler.js",
-    "Cloudflare_CA.pem"
+    "Cloudflare_CA.pem",
+    "config-schema.json"
   ],
   "jest": {
-    "coverageReporters": [
-      "json",
-      "html",
-      "text",
-      "cobertura"
-    ],
     "moduleNameMapper": {
       "clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js",
       "miniflare/cli": "<rootDir>/../../node_modules/miniflare/dist/src/cli.js"
@@ -75,7 +70,7 @@
       ]
     },
     "transformIgnorePatterns": [
-      "node_modules/.pnpm/(?!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/.pnpm/(?!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|strip-ansi|ansi-regex)"
     ],
     "snapshotFormat": {
       "escapeString": true,
@@ -83,8 +78,6 @@
     }
   },
   "dependencies": {
-    "@cloudflare/kv-asset-handler": "^0.2.0",
-    "@cspotcode/source-map-support": "0.8.1",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "blake3-wasm": "^2.1.5",
@@ -92,17 +85,21 @@
     "esbuild": "0.17.19",
     "nanoid": "^3.3.3",
     "path-to-regexp": "^6.2.0",
+    "resolve": "^1.22.8",
     "resolve.exports": "^2.0.2",
     "selfsigned": "^2.0.1",
     "source-map": "0.6.1",
+    "ts-json-schema-generator": "^1.5.0",
     "xxhash-wasm": "^1.0.1",
-    "miniflare": "3.20231030.4"
+    "@cloudflare/kv-asset-handler": "0.3.1",
+    "miniflare": "3.20240405.1"
   },
   "devDependencies": {
     "@cloudflare/ai": "^1.0.35",
     "@cloudflare/eslint-config-worker": "*",
     "@cloudflare/types": "^6.18.4",
-    "@cloudflare/workers-types": "^4.20230914.0",
+    "@cloudflare/workers-types": "^4.20240405.0",
+    "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.28.3",
     "@sentry/node": "^7.86.0",
@@ -120,6 +117,7 @@
     "@types/minimatch": "^5.1.2",
     "@types/prompts": "^2.0.14",
     "@types/react": "^17.0.37",
+    "@types/resolve": "^1.20.6",
     "@types/serve-static": "^1.13.10",
     "@types/shell-quote": "^1.7.2",
     "@types/signal-exit": "^3.0.1",
@@ -137,6 +135,7 @@
     "concurrently": "^7.2.2",
     "devtools-protocol": "^0.0.955664",
     "dotenv": "^16.0.0",
+    "es-module-lexer": "^1.3.0",
     "esbuild-jest": "0.5.0",
     "execa": "^6.1.0",
     "express": "^4.18.1",
@@ -178,36 +177,48 @@
     "supports-color": "^9.2.2",
     "timeago.js": "^4.0.2",
     "ts-dedent": "^2.2.0",
-    "undici": "5.20.0",
+    "undici": "5.28.3",
     "update-check": "^1.5.4",
     "ws": "^8.5.0",
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
-    "@cloudflare/cli": "1.0.0",
-    "@cloudflare/pages-shared": "^0.11.4",
+    "@cloudflare/cli": "1.1.1",
+    "@cloudflare/pages-shared": "^0.11.28",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
   },
+  "peerDependencies": {
+    "@cloudflare/workers-types": "^4.20240405.0"
+  },
+  "peerDependenciesMeta": {
+    "@cloudflare/workers-types": {
+      "optional": true
+    }
+  },
   "engines": {
     "node": ">=16.17.0"
   },
+  "workers-sdk": {
+    "prerelease": true
+  },
   "scripts": {
     "assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts",
-    "build": "pnpm run clean && pnpm run bundle && pnpm run emit-types",
+    "build": "pnpm run clean && pnpm run bundle && pnpm run emit-types && pnpm run generate-json-schema",
     "bundle": "node -r esbuild-register scripts/bundle.ts",
     "check:lint": "eslint .",
     "check:type": "tsc",
     "clean": "rimraf wrangler-dist miniflare-dist emitted-types",
     "dev": "pnpm run clean && concurrently -c black,blue --kill-others-on-fail false \"pnpm run bundle --watch\" \"pnpm run check:type --watch --preserveWatchOutput\"",
     "emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
+    "generate-json-schema": "pnpm exec ts-json-schema-generator --no-type-check --path src/config/config.ts --type RawConfig --out config-schema.json",
     "start": "pnpm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
     "test": "pnpm run assert-git-version && jest",
-    "test:ci": "pnpm run test --coverage",
+    "test:ci": "pnpm run test",
     "test:debug": "pnpm run test --silent=false --verbose=true",
-    "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e --retry 2 run",
+    "test:e2e": "vitest -c ./e2e/vitest.config.ts",
     "test:watch": "pnpm run test --testTimeout=50000 --watch",
     "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
   }

package/templates/facade.d.ts

@@ -1,9 +1,11 @@
 declare module "__ENTRY_POINT__" {
-	import type { Middleware } from "./middleware/common";
-	const worker: ExportedHandler & {
-		middleware?: Middleware[];
-		envWrappers: ((env: Record<string, unknown>) => Record<string, unknown>)[];
-	};
+	import { Middleware } from "./middleware/common";
+	import { WorkerEntrypoint } from "cloudflare:workers";
+
+	export type WorkerEntrypointConstructor = typeof WorkerEntrypoint;
+	export type WithMiddleware<T> = T & { middleware?: Middleware[] };
+
+	const worker: WithMiddleware<ExportedHandler | WorkerEntrypointConstructor>;
 	export default worker;
 }
 

package/templates/gitignore

@@ -165,8 +165,3 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.\*
-
-# wrangler project
-
-.dev.vars
-.wrangler/

package/templates/init-tests/test-vitest-new-worker.js

@@ -1,5 +1,5 @@
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
 import { unstable_dev } from "wrangler";
-import { describe, expect, it, beforeAll, afterAll } from "vitest";
 
 describe("Worker", () => {
 	let worker;

package/templates/init-tests/test-vitest-new-worker.ts

@@ -1,6 +1,6 @@
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
 import { unstable_dev } from "wrangler";
 import type { UnstableDevWorker } from "wrangler";
-import { describe, expect, it, beforeAll, afterAll } from "vitest";
 
 describe("Worker", () => {
 	let worker: UnstableDevWorker;

package/templates/middleware/loader-modules.ts

@@ -1,23 +1,20 @@
-// // This loads all middlewares exposed on the middleware object
-// // and then starts the invocation chain.
-// // The big idea is that we can add these to the middleware export dynamically
-// // through wrangler, or we can potentially let users directly add them as a sort
-// // of "plugin" system.
-
-import {
-	Dispatcher,
-	Middleware,
-	__facade_invoke__,
-	__facade_register__,
-} from "./common";
-
-import worker from "__ENTRY_POINT__";
-
-// We need to preserve all of the exports from the worker
+// This loads all middlewares exposed on the middleware object and then starts
+// the invocation chain. The big idea is that we can add these to the middleware
+// export dynamically through wrangler, or we can potentially let users directly
+// add them as a sort of "plugin" system.
+
+import ENTRY from "__ENTRY_POINT__";
+import { __facade_invoke__, __facade_register__, Dispatcher } from "./common";
+import type {
+	WithMiddleware,
+	WorkerEntrypointConstructor,
+} from "__ENTRY_POINT__";
+
+// Preserve all the exports from the worker
 export * from "__ENTRY_POINT__";
 
 class __Facade_ScheduledController__ implements ScheduledController {
-	#noRetry: ScheduledController["noRetry"];
+	readonly #noRetry: ScheduledController["noRetry"];
 
 	constructor(
 		readonly scheduledTime: number,
@@ -36,71 +33,33 @@ class __Facade_ScheduledController__ implements ScheduledController {
 	}
 }
 
-const __facade_modules_fetch__: ExportedHandlerFetchHandler = function (
-	request,
-	env,
-	ctx
-) {
-	if (worker.fetch === undefined)
-		throw new Error("Handler does not export a fetch() function.");
-	return worker.fetch(request, env, ctx);
-};
-
-function getMaskedEnv(rawEnv: unknown) {
-	let env = rawEnv as Record<string, unknown>;
-	if (worker.envWrappers && worker.envWrappers.length > 0) {
-		for (const wrapFn of worker.envWrappers) {
-			env = wrapFn(env);
-		}
+function wrapExportedHandler(
+	worker: WithMiddleware<ExportedHandler>
+): ExportedHandler {
+	// If we don't have any middleware defined, just return the handler as is
+	if (worker.middleware === undefined || worker.middleware.length === 0) {
+		return worker;
+	}
+	// Otherwise, register all middleware once
+	for (const middleware of worker.middleware) {
+		__facade_register__(middleware);
 	}
-	return env;
-}
-
-/**
- * This type is here to cause a type error if a new export handler is added to
- * `ExportHandler` without it being included in the `facade` below.
- */
-type MissingExportHandlers = Omit<
-	Required<ExportedHandler>,
-	"tail" | "trace" | "scheduled" | "queue" | "test" | "email" | "fetch"
->;
-
-let registeredMiddleware = false;
-
-const facade: ExportedHandler<unknown> & MissingExportHandlers = {
-	...(worker.tail && {
-		tail: maskHandlerEnv(worker.tail),
-	}),
-	...(worker.trace && {
-		trace: maskHandlerEnv(worker.trace),
-	}),
-	...(worker.scheduled && {
-		scheduled: maskHandlerEnv(worker.scheduled),
-	}),
-	...(worker.queue && {
-		queue: maskHandlerEnv(worker.queue),
-	}),
-	...(worker.test && {
-		test: maskHandlerEnv(worker.test),
-	}),
-	...(worker.email && {
-		email: maskHandlerEnv(worker.email),
-	}),
 
-	fetch(request, rawEnv, ctx) {
-		const env = getMaskedEnv(rawEnv);
-		// Get the chain of middleware from the worker object
-		if (worker.middleware && worker.middleware.length > 0) {
-			// Make sure we only register middleware once:
-			// https://github.com/cloudflare/workers-sdk/issues/2386#issuecomment-1614715911
-			if (!registeredMiddleware) {
-				registeredMiddleware = true;
-				for (const middleware of worker.middleware) {
-					__facade_register__(middleware);
-				}
-			}
+	const fetchDispatcher: ExportedHandlerFetchHandler = function (
+		request,
+		env,
+		ctx
+	) {
+		if (worker.fetch === undefined) {
+			throw new Error("Handler does not export a fetch() function.");
+		}
+		return worker.fetch(request, env, ctx);
+	};
 
-			const __facade_modules_dispatch__: Dispatcher = function (type, init) {
+	return {
+		...worker,
+		fetch(request, env, ctx) {
+			const dispatcher: Dispatcher = function (type, init) {
 				if (type === "scheduled" && worker.scheduled !== undefined) {
 					const controller = new __Facade_ScheduledController__(
 						Date.now(),
@@ -110,28 +69,65 @@ const facade: ExportedHandler<unknown> & MissingExportHandlers = {
 					return worker.scheduled(controller, env, ctx);
 				}
 			};
+			return __facade_invoke__(request, env, ctx, dispatcher, fetchDispatcher);
+		},
+	};
+}
+
+function wrapWorkerEntrypoint(
+	klass: WithMiddleware<WorkerEntrypointConstructor>
+): WorkerEntrypointConstructor {
+	// If we don't have any middleware defined, just return the handler as is
+	if (klass.middleware === undefined || klass.middleware.length === 0) {
+		return klass;
+	}
+	// Otherwise, register all middleware once
+	for (const middleware of klass.middleware) {
+		__facade_register__(middleware);
+	}
 
+	// `extend`ing `klass` here so other RPC methods remain callable
+	return class extends klass {
+		#fetchDispatcher: ExportedHandlerFetchHandler<Record<string, unknown>> = (
+			request,
+			env,
+			ctx
+		) => {
+			this.env = env;
+			this.ctx = ctx;
+			if (super.fetch === undefined) {
+				throw new Error("Entrypoint class does not define a fetch() function.");
+			}
+			return super.fetch(request);
+		};
+
+		#dispatcher: Dispatcher = (type, init) => {
+			if (type === "scheduled" && super.scheduled !== undefined) {
+				const controller = new __Facade_ScheduledController__(
+					Date.now(),
+					init.cron ?? "",
+					() => {}
+				);
+				return super.scheduled(controller);
+			}
+		};
+
+		fetch(request: Request<unknown, IncomingRequestCfProperties>) {
 			return __facade_invoke__(
 				request,
-				env,
-				ctx,
-				__facade_modules_dispatch__,
-				__facade_modules_fetch__
+				this.env,
+				this.ctx,
+				this.#dispatcher,
+				this.#fetchDispatcher
 			);
-		} else {
-			// We didn't have any middleware so we can skip the invocation chain,
-			// and just call the fetch handler directly
-
-			// We "don't care" if this is undefined as we want to have the same behavior
-			// as if the worker completely bypassed middleware.
-			return __facade_modules_fetch__(request, env, ctx);
 		}
-	},
-};
-
-type HandlerFn<D, R> = (data: D, env: unknown, ctx: ExecutionContext) => R;
-function maskHandlerEnv<D, R>(handler: HandlerFn<D, R>): HandlerFn<D, R> {
-	return (data, env, ctx) => handler(data, getMaskedEnv(env), ctx);
+	};
 }
 
-export default facade;
+let WRAPPED_ENTRY: ExportedHandler | WorkerEntrypointConstructor | undefined;
+if (typeof ENTRY === "object") {
+	WRAPPED_ENTRY = wrapExportedHandler(ENTRY);
+} else if (typeof ENTRY === "function") {
+	WRAPPED_ENTRY = wrapWorkerEntrypoint(ENTRY);
+}
+export default WRAPPED_ENTRY;

package/templates/middleware/loader-sw.ts

@@ -1,12 +1,13 @@
 import {
+	__facade_invoke__,
+	__facade_register__,
+	__facade_registerInternal__,
 	Awaitable,
 	Dispatcher,
 	IncomingRequest,
 	Middleware,
-	__facade_invoke__,
-	__facade_register__,
-	__facade_registerInternal__,
 } from "./common";
+
 export { __facade_register__, __facade_registerInternal__ };
 
 // Miniflare 2's `EventTarget` follows the spec and doesn't allow exceptions to

package/templates/middleware/middleware-dispatchee.ts

@@ -0,0 +1,53 @@
+import type { Middleware } from "./common";
+
+const HEADER_OUTBOUND_URL = "X-Miniflare-Dispatch-Outbound-URL";
+const HEADER_URL = "X-Miniflare-Dispatch-URL";
+const HEADER_OUTBOUND_PROXY_URL = "X-Miniflare-Dispatch-Outbound-Proxy-URL";
+const HEADER_PARAMETERS = "X-Miniflare-Dispatch-Outbound-Parameters";
+const HEADER_CF_BLOB = "X-Miniflare-Dispatch-Cf-Blob";
+
+// A middleware has to be a function of type Middleware
+const dispatchee: Middleware = async (request, env, _ctx, middlewareCtx) => {
+	const url = request.headers.get(HEADER_URL);
+	if (!url) {
+		throw new Error(
+			`This Worker is configured to belong to a dispatch namespace and cannot be access directly. Instead, fetch it from a dispatch namespace binding.`
+		);
+	}
+	const cfString = request.headers.get(HEADER_CF_BLOB);
+	if (!cfString) {
+		throw new Error(`Missing ${HEADER_CF_BLOB} header`);
+	}
+	const cf = JSON.parse(cfString);
+
+	const outboundProxyUrl = request.headers.get(HEADER_OUTBOUND_PROXY_URL);
+	const parameters = request.headers.get(HEADER_PARAMETERS);
+
+	request = new Request(url, { ...request, cf });
+
+	request.headers.delete(HEADER_URL);
+	request.headers.delete(HEADER_OUTBOUND_PROXY_URL);
+	request.headers.delete(HEADER_PARAMETERS);
+	request.headers.delete(HEADER_CF_BLOB);
+
+	if (outboundProxyUrl) {
+		const originalFetch = globalThis.fetch;
+		globalThis.fetch = (outboundRequestInit, outboundRequestInfo) => {
+			const outboundRequest = new Request(
+				outboundRequestInit,
+				outboundRequestInfo
+			);
+			outboundRequest.headers.set(HEADER_OUTBOUND_URL, outboundRequest.url);
+			outboundRequest.headers.set(HEADER_CF_BLOB, cfString); // cfString here, or outboundRequest.cf?
+			if (parameters) {
+				outboundRequest.headers.set(HEADER_PARAMETERS, parameters);
+			}
+			console.log(outboundProxyUrl);
+			return originalFetch(outboundProxyUrl, outboundRequest);
+		};
+	}
+
+	return middlewareCtx.next(request, env);
+};
+
+export default dispatchee;

package/templates/middleware/middleware-ensure-req-body-drained.ts

@@ -0,0 +1,18 @@
+import type { Middleware } from "./common";
+
+const drainBody: Middleware = async (request, env, _ctx, middlewareCtx) => {
+	try {
+		return await middlewareCtx.next(request, env);
+	} finally {
+		try {
+			if (request.body !== null && !request.bodyUsed) {
+				const reader = request.body.getReader();
+				while (!(await reader.read()).done) {}
+			}
+		} catch (e) {
+			console.error("Failed to drain the unused request body.", e);
+		}
+	}
+};
+
+export default drainBody;

package/templates/middleware/middleware-miniflare3-json-error.ts

@@ -30,4 +30,3 @@ const jsonError: Middleware = async (request, env, _ctx, middlewareCtx) => {
 };
 
 export default jsonError;
-export const wrap = undefined;

package/templates/middleware/middleware-outbound.ts

@@ -0,0 +1,35 @@
+import type { Middleware } from "./common";
+
+const HEADER_OUTBOUND_URL = "X-Miniflare-Dispatch-Outbound-URL";
+const HEADER_PARAMETERS = "X-Miniflare-Dispatch-Outbound-Parameters";
+const HEADER_CF_BLOB = "X-Miniflare-Dispatch-Cf-Blob";
+
+// A middleware has to be a function of type Middleware
+const outbound: Middleware = async (request, env, _ctx, middlewareCtx) => {
+	const url = request.headers.get(HEADER_OUTBOUND_URL);
+	if (!url) {
+		return middlewareCtx.next(request, env);
+	}
+	const cfString = request.headers.get(HEADER_CF_BLOB);
+	if (!cfString) {
+		throw new Error(`Missing ${HEADER_CF_BLOB} header`);
+	}
+	const cf = JSON.parse(cfString);
+
+	const parametersString = request.headers.get(HEADER_PARAMETERS);
+	const parameters = parametersString ? JSON.parse(parametersString) : {};
+
+	for (const [key, value] of Object.entries(parameters)) {
+		env[key] = value;
+	}
+
+	request = new Request(url, { ...request, cf });
+
+	request.headers.delete(HEADER_OUTBOUND_URL);
+	request.headers.delete(HEADER_CF_BLOB);
+	request.headers.delete(HEADER_PARAMETERS);
+
+	return middlewareCtx.next(request, env);
+};
+
+export default outbound;

package/templates/middleware/middleware-serve-static-assets.ts

@@ -1,18 +1,18 @@
 /// <reference path="middleware-serve-static-assets.d.ts"/>
 
+import manifest from "__STATIC_CONTENT_MANIFEST";
 import {
 	getAssetFromKV,
-	NotFoundError,
 	MethodNotAllowedError,
+	NotFoundError,
 	serveSinglePageApp,
 } from "@cloudflare/kv-asset-handler";
+import { cacheControl, spaMode } from "config:middleware/serve-static-assets";
+import type { Middleware } from "./common";
 import type { Options } from "@cloudflare/kv-asset-handler";
-import { spaMode, cacheControl } from "config:middleware/serve-static-assets";
 import type * as kvAssetHandler from "@cloudflare/kv-asset-handler";
-import manifest from "__STATIC_CONTENT_MANIFEST";
-const ASSET_MANIFEST = JSON.parse(manifest);
 
-import type { Middleware } from "./common";
+const ASSET_MANIFEST = JSON.parse(manifest);
 
 const staticAssets: Middleware = async (request, env, _ctx, middlewareCtx) => {
 	let options: Partial<Options> = {

package/templates/pages-dev-pipeline.ts

@@ -1,8 +1,9 @@
 // @ts-ignore entry point will get replaced
 import worker from "__ENTRY_POINT__";
+import { isRoutingRuleMatch } from "./pages-dev-util";
+
 // @ts-ignore entry point will get replaced
 export * from "__ENTRY_POINT__";
-import { isRoutingRuleMatch } from "./pages-dev-util";
 
 // @ts-ignore routes are injected
 const routes = __ROUTES__;

package/templates/startDevWorker/InspectorProxyWorker.ts

@@ -5,10 +5,6 @@ import {
 	DevToolsCommandResponses,
 	DevToolsEvent,
 	DevToolsEvents,
-	type InspectorProxyWorkerIncomingWebSocketMessage,
-	type InspectorProxyWorkerOutgoingRequestBody,
-	type InspectorProxyWorkerOutgoingWebsocketMessage,
-	type ProxyData,
 	serialiseError,
 } from "../../src/api/startDevWorker/events";
 import {
@@ -18,6 +14,12 @@ import {
 	MaybePromise,
 	urlFromParts,
 } from "../../src/api/startDevWorker/utils";
+import type {
+	InspectorProxyWorkerIncomingWebSocketMessage,
+	InspectorProxyWorkerOutgoingRequestBody,
+	InspectorProxyWorkerOutgoingWebsocketMessage,
+	ProxyData,
+} from "../../src/api/startDevWorker/events";
 
 const ALLOWED_HOST_HOSTNAMES = ["127.0.0.1", "[::1]", "localhost"];
 const ALLOWED_ORIGIN_HOSTNAMES = [
@@ -291,6 +293,13 @@ export class InspectorProxyWorker implements DurableObject {
 
 		this.sendDebugLog("NEW RUNTIME WEBSOCKET", runtimeWebSocketUrl);
 
+		// Make sure DevTools re-fetches script contents,
+		// and uses the newly created execution context
+		this.sendDevToolsMessage({
+			method: "Runtime.executionContextsCleared",
+			params: undefined,
+		});
+
 		const upgrade = await fetch(runtimeWebSocketUrl, {
 			headers: {
 				...this.proxyData.headers,