wrangler 2.0.24 → 2.0.25

package/src/dev/dev.tsx

@@ -40,6 +40,7 @@ import type { CfWorkerInit } from "../worker";
 function useDevRegistry(
 	name: string | undefined,
 	services: Config["services"] | undefined,
+	durableObjects: Config["durable_objects"] | undefined,
 	mode: "local" | "remote"
 ): WorkerRegistry {
 	const [workers, setWorkers] = useState<WorkerRegistry>({});
@@ -55,6 +56,9 @@ function useDevRegistry(
 		const serviceNames = (services || []).map(
 			(serviceBinding) => serviceBinding.service
 		);
+		const durableObjectServices = (
+			durableObjects || { bindings: [] }
+		).bindings.map((durableObjectBinding) => durableObjectBinding.script_name);
 
 		const interval =
 			// TODO: enable this for remote mode as well
@@ -67,7 +71,9 @@ function useDevRegistry(
 								// so let's filter out the others
 								const filteredWorkers = Object.fromEntries(
 									Object.entries(workerDefinitions || {}).filter(
-										([key, _value]) => serviceNames.includes(key)
+										([key, _value]) =>
+											serviceNames.includes(key) ||
+											durableObjectServices.includes(key)
 									)
 								);
 								setWorkers((prevWorkers) => {
@@ -109,7 +115,7 @@ function useDevRegistry(
 				}
 			);
 		};
-	}, [name, services, mode]);
+	}, [name, services, durableObjects, mode]);
 
 	return workers;
 }
@@ -228,6 +234,7 @@ function DevSession(props: DevSessionProps) {
 	const workerDefinitions = useDevRegistry(
 		props.name,
 		props.bindings.services,
+		props.bindings.durable_objects,
 		props.local ? "local" : "remote"
 	);
 
@@ -248,6 +255,7 @@ function DevSession(props: DevSessionProps) {
 		assets: props.assetsConfig,
 		workerDefinitions,
 		services: props.bindings.services,
+		durableObjects: props.bindings.durable_objects || { bindings: [] },
 		firstPartyWorkerDevFacade: props.firstPartyWorker,
 	});
 
@@ -258,7 +266,9 @@ function DevSession(props: DevSessionProps) {
 			format={props.entry.format}
 			compatibilityDate={props.compatibilityDate}
 			compatibilityFlags={props.compatibilityFlags}
+			usageModel={props.usageModel}
 			bindings={props.bindings}
+			workerDefinitions={workerDefinitions}
 			assetPaths={props.assetPaths}
 			port={props.port}
 			ip={props.ip}

package/src/dev/local.tsx

@@ -10,6 +10,7 @@ import { logger } from "../logger";
 import { DEFAULT_MODULE_RULES } from "../module-collection";
 import { waitForPortToBeAvailable } from "../proxy";
 import type { Config } from "../config";
+import type { WorkerRegistry } from "../dev-registry";
 import type { EnablePagesAssetsServiceBindingOptions } from "../miniflare-cli";
 import type { AssetPaths } from "../sites";
 import type { CfWorkerInit, CfScriptFormat } from "../worker";
@@ -22,7 +23,9 @@ interface LocalProps {
 	format: CfScriptFormat | undefined;
 	compatibilityDate: string;
 	compatibilityFlags: string[] | undefined;
+	usageModel: "bundled" | "unbound" | undefined;
 	bindings: CfWorkerInit["bindings"];
+	workerDefinitions: WorkerRegistry;
 	assetPaths: AssetPaths | undefined;
 	port: number;
 	ip: string;
@@ -56,7 +59,9 @@ function useLocalWorker({
 	format,
 	compatibilityDate,
 	compatibilityFlags,
+	usageModel,
 	bindings,
+	workerDefinitions,
 	assetPaths,
 	port,
 	inspectorPort,
@@ -96,6 +101,18 @@ function useLocalWorker({
 		}
 	}, [bindings.services]);
 
+	useEffect(() => {
+		const externalDurableObjects = (
+			bindings.durable_objects?.bindings || []
+		).filter((binding) => binding.script_name);
+
+		if (externalDurableObjects.length > 0) {
+			logger.warn(
+				"⎔ Support for external Durable Objects in local mode is experimental and may change."
+			);
+		}
+	}, [bindings.durable_objects?.bindings]);
+
 	useEffect(() => {
 		const abortController = new AbortController();
 		async function startLocalWorker() {
@@ -180,6 +197,15 @@ function useLocalWorker({
 					? `${localProtocol}://${localUpstream}`
 					: undefined;
 
+			const internalDurableObjects = (
+				bindings.durable_objects?.bindings || []
+			).filter((binding) => !binding.script_name);
+			const externalDurableObjects = (
+				bindings.durable_objects?.bindings || []
+			).filter((binding) => binding.script_name);
+
+			// TODO: This was already messy with the custom `disableLogs` and `logOptions`.
+			// It's now getting _really_ messy now with Pages ASSETS binding outside and the external Durable Objects inside.
 			const options: MiniflareOptions = {
 				name: workerName,
 				port,
@@ -196,12 +222,37 @@ function useLocalWorker({
 					})),
 				compatibilityDate,
 				compatibilityFlags,
+				usageModel,
 				kvNamespaces: bindings.kv_namespaces?.map((kv) => kv.binding),
 				r2Buckets: bindings.r2_buckets?.map((r2) => r2.binding),
 				durableObjects: Object.fromEntries(
-					(bindings.durable_objects?.bindings ?? []).map<[string, string]>(
-						(value) => [value.name, value.class_name]
-					)
+					internalDurableObjects.map((binding) => [
+						binding.name,
+						binding.class_name,
+					])
+				),
+				externalDurableObjects: Object.fromEntries(
+					externalDurableObjects
+						.map((binding) => {
+							const service = workerDefinitions[binding.script_name as string];
+							if (!service) return [binding.name, undefined];
+
+							const name = service.durableObjects.find(
+								(durableObject) =>
+									durableObject.className === binding.class_name
+							)?.name;
+							if (!name) return [binding.name, undefined];
+
+							return [
+								binding.name,
+								{
+									name,
+									host: service.durableObjectsHost,
+									port: service.durableObjectsPort,
+								},
+							];
+						})
+						.filter(([_, details]) => !!details)
 				),
 				...(localPersistencePath
 					? {
@@ -275,8 +326,9 @@ function useLocalWorker({
 				stdio: "pipe",
 			}));
 
-			child.on("message", async (message) => {
-				if (message === "ready") {
+			child.on("message", async (messageString) => {
+				const message = JSON.parse(messageString as string);
+				if (message.ready) {
 					// Let's register our presence in the dev registry
 					if (workerName) {
 						await registerWorker(workerName, {
@@ -284,6 +336,16 @@ function useLocalWorker({
 							mode: "local",
 							port,
 							host: ip,
+							durableObjects: internalDurableObjects.map((binding) => ({
+								name: binding.name,
+								className: binding.class_name,
+							})),
+							...(message.durableObjectsPort
+								? {
+										durableObjectsHost: ip,
+										durableObjectsPort: message.durableObjectsPort,
+								  }
+								: {}),
 						});
 					}
 					onReady?.();
@@ -363,8 +425,10 @@ function useLocalWorker({
 		bindings.r2_buckets,
 		bindings.vars,
 		bindings.services,
+		workerDefinitions,
 		compatibilityDate,
 		compatibilityFlags,
+		usageModel,
 		localPersistencePath,
 		liveReload,
 		assetPaths,

package/src/dev/use-esbuild.ts

@@ -34,6 +34,7 @@ export function useEsbuild({
 	noBundle,
 	workerDefinitions,
 	services,
+	durableObjects,
 	firstPartyWorkerDevFacade,
 }: {
 	entry: Entry;
@@ -50,6 +51,7 @@ export function useEsbuild({
 	nodeCompat: boolean | undefined;
 	noBundle: boolean;
 	workerDefinitions: WorkerRegistry;
+	durableObjects: Config["durable_objects"];
 	firstPartyWorkerDevFacade: boolean | undefined;
 }): EsbuildBundle | undefined {
 	const [bundle, setBundle] = useState<EsbuildBundle>();
@@ -168,6 +170,7 @@ export function useEsbuild({
 		define,
 		assets,
 		services,
+		durableObjects,
 		workerDefinitions,
 		firstPartyWorkerDevFacade,
 	]);

package/src/dev-registry.tsx

@@ -22,6 +22,9 @@ type WorkerDefinition = {
 	host: string | undefined;
 	mode: "local" | "remote";
 	headers?: Record<string, string>;
+	durableObjects: { name: string; className: string }[];
+	durableObjectsHost?: string;
+	durableObjectsPort?: number;
 };
 
 /**

package/src/dev.tsx

@@ -127,9 +127,9 @@ export function devOptions(yargs: Argv): Argv<DevArgs> {
 				default: true,
 			})
 			.option("ip", {
-				describe: "IP address to listen on, defaults to `localhost`",
+				describe: "IP address to listen on",
 				type: "string",
-				requiresArg: true,
+				default: "0.0.0.0",
 			})
 			.option("port", {
 				describe: "Port to listen on",
@@ -275,6 +275,11 @@ export type AdditionalDevProps = {
 		script_name?: string | undefined;
 		environment?: string | undefined;
 	}[];
+	r2?: {
+		binding: string;
+		bucket_name: string;
+		preview_bucket_name?: string;
+	}[];
 };
 type StartDevOptions = ArgumentsCamelCase<DevArgs> &
 	// These options can be passed in directly when called with the `wrangler.dev()` API.
@@ -429,6 +434,7 @@ export async function startDev(args: StartDevOptions) {
 				kv: args.kv,
 				vars: args.vars,
 				durableObjects: args.durableObjects,
+				r2: args.r2,
 			});
 
 			// mask anything that was overridden in .dev.vars
@@ -489,7 +495,7 @@ export async function startDev(args: StartDevOptions) {
 					port={args.port || config.dev.port || (await getLocalPort())}
 					ip={args.ip || config.dev.ip}
 					inspectorPort={
-						args["inspector-port"] ||
+						args.inspectorPort ||
 						config.dev.inspector_port ||
 						(await getInspectorPort())
 					}
@@ -591,21 +597,24 @@ async function getBindings(
 				...(args.durableObjects || []),
 			],
 		},
-		r2_buckets: configParam.r2_buckets?.map(
-			({ binding, preview_bucket_name, bucket_name: _bucket_name }) => {
-				// same idea as kv namespace preview id,
-				// same copy-on-write TODO
-				if (!preview_bucket_name) {
-					throw new Error(
-						`In development, you should use a separate r2 bucket than the one you'd use in production. Please create a new r2 bucket with "wrangler r2 bucket create <name>" and add its name as preview_bucket_name to the r2_buckets "${binding}" in your wrangler.toml`
-					);
+		r2_buckets: [
+			...(configParam.r2_buckets?.map(
+				({ binding, preview_bucket_name, bucket_name: _bucket_name }) => {
+					// same idea as kv namespace preview id,
+					// same copy-on-write TODO
+					if (!preview_bucket_name) {
+						throw new Error(
+							`In development, you should use a separate r2 bucket than the one you'd use in production. Please create a new r2 bucket with "wrangler r2 bucket create <name>" and add its name as preview_bucket_name to the r2_buckets "${binding}" in your wrangler.toml`
+						);
+					}
+					return {
+						binding,
+						bucket_name: preview_bucket_name,
+					};
 				}
-				return {
-					binding,
-					bucket_name: preview_bucket_name,
-				};
-			}
-		),
+			) || []),
+			...(args.r2 || []),
+		],
 		worker_namespaces: configParam.worker_namespaces,
 		services: configParam.services,
 		unsafe: configParam.unsafe?.bindings,

package/src/index.tsx

@@ -51,6 +51,7 @@ import {
 	bucketAndKeyFromObjectPath,
 	createR2Bucket,
 	deleteR2Bucket,
+	deleteR2Object,
 	getR2Object,
 	listR2Buckets,
 	putR2Object,
@@ -1731,6 +1732,7 @@ function createCLIParser(argv: string[]) {
 								);
 							}
 						}
+
 						if (errors.length > 0) {
 							throw new Error(
 								`Unexpected JSON input from "${filename}".\n` +
@@ -1768,13 +1770,12 @@ function createCLIParser(argv: string[]) {
 					.command(
 						"get <objectPath>",
 						"Fetch an object from an R2 bucket",
-						(yargs) => {
-							return yargs
-								.positional("objectPath", {
-									describe:
-										"The source object path in the form of {bucket}/{key}",
-									type: "string",
-								})
+						(Objectyargs) => {
+							return Objectyargs.positional("objectPath", {
+								describe:
+									"The source object path in the form of {bucket}/{key}",
+								type: "string",
+							})
 								.option("file", {
 									describe: "The destination file to create",
 									alias: "f",
@@ -1790,13 +1791,16 @@ function createCLIParser(argv: string[]) {
 									type: "boolean",
 								});
 						},
-						async (args) => {
-							const config = readConfig(args.config as ConfigPath, args);
+						async (objectGetYargs) => {
+							const config = readConfig(
+								objectGetYargs.config as ConfigPath,
+								objectGetYargs
+							);
 							const accountId = await requireAuth(config);
-							const { objectPath, pipe } = args;
+							const { objectPath, pipe } = objectGetYargs;
 							const { bucket, key } = bucketAndKeyFromObjectPath(objectPath);
 
-							let file = args.file;
+							let file = objectGetYargs.file;
 							if (!file && !pipe) {
 								file = key;
 							}
@@ -1817,13 +1821,12 @@ function createCLIParser(argv: string[]) {
 					.command(
 						"put <objectPath>",
 						"Create an object in an R2 bucket",
-						(yargs) => {
-							return yargs
-								.positional("objectPath", {
-									describe:
-										"The destination object path in the form of {bucket}/{key}",
-									type: "string",
-								})
+						(Objectyargs) => {
+							return Objectyargs.positional("objectPath", {
+								describe:
+									"The destination object path in the form of {bucket}/{key}",
+								type: "string",
+							})
 								.option("file", {
 									describe: "The path of the file to upload",
 									alias: "f",
@@ -1880,12 +1883,15 @@ function createCLIParser(argv: string[]) {
 									type: "string",
 								});
 						},
-						async (args) => {
+						async (objectPutYargs) => {
 							await printWranglerBanner();
 
-							const config = readConfig(args.config as ConfigPath, args);
+							const config = readConfig(
+								objectPutYargs.config as ConfigPath,
+								objectPutYargs
+							);
 							const accountId = await requireAuth(config);
-							const { objectPath, file, pipe, ...options } = args;
+							const { objectPath, file, pipe, ...options } = objectPutYargs;
 							const { bucket, key } = bucketAndKeyFromObjectPath(objectPath);
 							if (!file && !pipe) {
 								throw new CommandLineArgsError(
@@ -1922,8 +1928,32 @@ function createCLIParser(argv: string[]) {
 							});
 							logger.log("Upload complete.");
 						}
+					)
+					.command(
+						"delete <objectPath>",
+						"Delete an object in an R2 bucket",
+						(objectDeleteYargs) => {
+							return objectDeleteYargs.positional("objectPath", {
+								describe:
+									"The destination object path in the form of {bucket}/{key}",
+								type: "string",
+							});
+						},
+						async (args) => {
+							const { objectPath } = args;
+							await printWranglerBanner();
+
+							const config = readConfig(args.config as ConfigPath, args);
+							const accountId = await requireAuth(config);
+							const { bucket, key } = bucketAndKeyFromObjectPath(objectPath);
+							logger.log(`Deleting object "${key}" from bucket "${bucket}".`);
+
+							await deleteR2Object(accountId, bucket, key);
+							logger.log("Delete complete.");
+						}
 					);
 			})
+
 			.command("bucket", "Manage R2 buckets", (r2BucketYargs) => {
 				r2BucketYargs.command(
 					"create <name>",

package/src/inspect.ts

@@ -320,10 +320,7 @@ export default function useInspector(props: InspectorProps) {
 														const convertedFnName =
 															pos.name || functionName || "";
 														exceptionLines.push(
-															`    at ${convertedFnName} (${pos.source?.replace(
-																`${mapContent.sourceRoot}/`,
-																""
-															)}:${pos.line}:${pos.column})`
+															`    at ${convertedFnName} (${pos.source}:${pos.line}:${pos.column})`
 														);
 													}
 												}

package/src/miniflare-cli/assets.ts

@@ -335,6 +335,11 @@ async function generateAssetsFetch(
 
 	const generateResponse = (request: MiniflareRequest) => {
 		const url = new URL(request.url);
+		let assetName = url.pathname;
+		try {
+			//it's possible for someone to send a URL like http://fakehost/abc%2 which would fail to decode
+			assetName = decodeURIComponent(url.pathname);
+		} catch {}
 
 		const deconstructedResponse: {
 			status: number;
@@ -377,7 +382,7 @@ async function generateAssetsFetch(
 		}
 
 		const notFound = () => {
-			let cwd = url.pathname;
+			let cwd = assetName;
 			while (cwd) {
 				cwd = cwd.slice(0, cwd.lastIndexOf("/"));
 
@@ -407,38 +412,36 @@ async function generateAssetsFetch(
 
 		let asset;
 
-		if (url.pathname.endsWith("/")) {
-			if ((asset = getAsset(`${url.pathname}/index.html`))) {
+		if (assetName.endsWith("/")) {
+			if ((asset = getAsset(`${assetName}/index.html`))) {
 				deconstructedResponse.body = serveAsset(asset);
 				deconstructedResponse.headers.set(
 					"Content-Type",
 					getType(asset) || "application/octet-stream"
 				);
 				return deconstructedResponse;
-			} else if (
-				(asset = getAsset(`${url.pathname.replace(/\/$/, ".html")}`))
-			) {
+			} else if ((asset = getAsset(`${assetName.replace(/\/$/, ".html")}`))) {
 				deconstructedResponse.status = 301;
 				deconstructedResponse.headers.set(
 					"Location",
-					`${url.pathname.slice(0, -1)}${url.search}`
+					`${assetName.slice(0, -1)}${url.search}`
 				);
 				return deconstructedResponse;
 			}
 		}
 
-		if (url.pathname.endsWith("/index")) {
+		if (assetName.endsWith("/index")) {
 			deconstructedResponse.status = 301;
 			deconstructedResponse.headers.set(
 				"Location",
-				`${url.pathname.slice(0, -"index".length)}${url.search}`
+				`${assetName.slice(0, -"index".length)}${url.search}`
 			);
 			return deconstructedResponse;
 		}
 
-		if ((asset = getAsset(url.pathname))) {
-			if (url.pathname.endsWith(".html")) {
-				const extensionlessPath = url.pathname.slice(0, -".html".length);
+		if ((asset = getAsset(assetName))) {
+			if (assetName.endsWith(".html")) {
+				const extensionlessPath = assetName.slice(0, -".html".length);
 				if (getAsset(extensionlessPath) || extensionlessPath === "/") {
 					deconstructedResponse.body = serveAsset(asset);
 					deconstructedResponse.headers.set(
@@ -462,12 +465,12 @@ async function generateAssetsFetch(
 				);
 				return deconstructedResponse;
 			}
-		} else if (hasFileExtension(url.pathname)) {
+		} else if (hasFileExtension(assetName)) {
 			notFound();
 			return deconstructedResponse;
 		}
 
-		if ((asset = getAsset(`${url.pathname}.html`))) {
+		if ((asset = getAsset(`${assetName}.html`))) {
 			deconstructedResponse.body = serveAsset(asset);
 			deconstructedResponse.headers.set(
 				"Content-Type",
@@ -476,11 +479,11 @@ async function generateAssetsFetch(
 			return deconstructedResponse;
 		}
 
-		if ((asset = getAsset(`${url.pathname}/index.html`))) {
+		if ((asset = getAsset(`${assetName}/index.html`))) {
 			deconstructedResponse.status = 301;
 			deconstructedResponse.headers.set(
 				"Location",
-				`${url.pathname}/${url.search}`
+				`${assetName}/${url.search}`
 			);
 			return deconstructedResponse;
 		} else {