wrangler 2.0.27 → 2.1.0

package/src/{worker-namespace.ts → dispatch-namespace.ts}

@@ -34,7 +34,7 @@ async function createWorkerNamespace(accountId: string, name: string) {
 		}
 	);
 	logger.log(
-		`Created Worker namespace "${name}" with ID "${namespace.namespace_id}"`
+		`Created dispatch namespace "${name}" with ID "${namespace.namespace_id}"`
 	);
 }
 
@@ -46,7 +46,7 @@ async function deleteWorkerNamespace(accountId: string, name: string) {
 		`/accounts/${accountId}/workers/dispatch/namespaces/${name}`,
 		{ method: "DELETE" }
 	);
-	logger.log(`Deleted Worker namespace "${name}"`);
+	logger.log(`Deleted dispatch namespace "${name}"`);
 }
 
 /**
@@ -101,7 +101,7 @@ async function renameWorkerNamespace(
 			body: JSON.stringify({ name: newName }),
 		}
 	);
-	logger.log(`Renamed Worker namespace "${oldName}" to "${newName}"`);
+	logger.log(`Renamed dispatch namespace "${oldName}" to "${newName}"`);
 }
 
 export function workerNamespaceCommands(
@@ -110,20 +110,20 @@ export function workerNamespaceCommands(
 ): Argv {
 	return workerNamespaceYargs
 		.command(subHelp)
-		.command("list", "List all Worker namespaces", {}, async (args) => {
+		.command("list", "List all dispatch namespaces", {}, async (args) => {
 			const config = readConfig(args.config as ConfigPath, args);
 			const accountId = await requireAuth(config);
 			await listWorkerNamespaces(accountId);
-			await metrics.sendMetricsEvent("list worker namespaces", {
+			await metrics.sendMetricsEvent("list dispatch namespaces", {
 				sendMetrics: config.send_metrics,
 			});
 		})
 		.command(
 			"get <name>",
-			"Get information about a Worker namespace",
+			"Get information about a dispatch namespace",
 			(yargs) => {
 				return yargs.positional("name", {
-					describe: "Name of the Worker namespace",
+					describe: "Name of the dispatch namespace",
 					type: "string",
 					demandOption: true,
 				});
@@ -132,17 +132,17 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await getWorkerNamespaceInfo(accountId, args.name);
-				await metrics.sendMetricsEvent("view worker namespace", {
+				await metrics.sendMetricsEvent("view dispatch namespace", {
 					sendMetrics: config.send_metrics,
 				});
 			}
 		)
 		.command(
 			"create <name>",
-			"Create a Worker namespace",
+			"Create a dispatch namespace",
 			(yargs) => {
 				return yargs.positional("name", {
-					describe: "Name of the Worker namespace",
+					describe: "Name of the dispatch namespace",
 					type: "string",
 					demandOption: true,
 				});
@@ -152,17 +152,17 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await createWorkerNamespace(accountId, args.name);
-				await metrics.sendMetricsEvent("create worker namespace", {
+				await metrics.sendMetricsEvent("create dispatch namespace", {
 					sendMetrics: config.send_metrics,
 				});
 			}
 		)
 		.command(
 			"delete <name>",
-			"Delete a Worker namespace",
+			"Delete a dispatch namespace",
 			(yargs) => {
 				return yargs.positional("name", {
-					describe: "Name of the Worker namespace",
+					describe: "Name of the dispatch namespace",
 					type: "string",
 					demandOption: true,
 				});
@@ -172,23 +172,23 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await deleteWorkerNamespace(accountId, args.name);
-				await metrics.sendMetricsEvent("delete worker namespace", {
+				await metrics.sendMetricsEvent("delete dispatch namespace", {
 					sendMetrics: config.send_metrics,
 				});
 			}
 		)
 		.command(
 			"rename <old-name> <new-name>",
-			"Rename a Worker namespace",
+			"Rename a dispatch namespace",
 			(yargs) => {
 				return yargs
 					.positional("old-name", {
-						describe: "Name of the Worker namespace",
+						describe: "Name of the dispatch namespace",
 						type: "string",
 						demandOption: true,
 					})
 					.positional("new-name", {
-						describe: "New name of the Worker namespace",
+						describe: "New name of the dispatch namespace",
 						type: "string",
 						demandOption: true,
 					});
@@ -198,7 +198,7 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await renameWorkerNamespace(accountId, args.oldName, args.newName);
-				await metrics.sendMetricsEvent("rename worker namespace", {
+				await metrics.sendMetricsEvent("rename dispatch namespace", {
 					sendMetrics: config.send_metrics,
 				});
 			}

package/src/entry.ts

@@ -4,6 +4,7 @@ import path from "node:path";
 import * as esbuild from "esbuild";
 import { execaCommand } from "execa";
 import { logger } from "./logger";
+import { getBasePath } from "./paths";
 import type { Config } from "./config";
 import type { CfScriptFormat } from "./worker";
 import type { Metafile } from "esbuild";
@@ -40,7 +41,7 @@ export async function getEntry(
 				: // site.entry-point could be a directory
 				  path.resolve(config.site?.["entry-point"], "index.js");
 		} else if (args.assets || config.assets) {
-			file = path.resolve(__dirname, "../templates/no-op-worker.js");
+			file = path.resolve(getBasePath(), "templates/no-op-worker.js");
 		} else {
 			throw new Error(
 				`Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler ${command} path/to/script\`) or the \`main\` config field.`

package/src/index.tsx

@@ -15,6 +15,7 @@ import { findWranglerToml, readConfig } from "./config";
 import { createWorkerUploadForm } from "./create-worker-upload-form";
 import { devHandler, devOptions } from "./dev";
 import { confirm, prompt } from "./dialogs";
+import { workerNamespaceCommands } from "./dispatch-namespace";
 import { getEntry } from "./entry";
 import { DeprecationError } from "./errors";
 import { generateHandler, generateOptions } from "./generate";
@@ -73,7 +74,7 @@ import {
 } from "./user";
 import { whoami } from "./whoami";
 
-import { workerNamespaceCommands } from "./worker-namespace";
+import { getWorkerForZone } from "./zones";
 import type { Config } from "./config";
 import type { KeyValue } from "./kv";
 import type { TailCLIFilters } from "./tail";
@@ -98,6 +99,9 @@ const proxy =
 
 if (proxy) {
 	setGlobalDispatcher(new ProxyAgent(proxy));
+	logger.log(
+		`Proxy environment variables detected. We'll use your proxy for fetch requests.`
+	);
 }
 
 export function getRules(config: Config): Config["rules"] {
@@ -469,6 +473,19 @@ function createCLIParser(argv: string[]) {
 						requiresArg: true,
 						array: true,
 					})
+					.option("var", {
+						describe:
+							"A key-value pair to be injected into the script as a variable",
+						type: "string",
+						requiresArg: true,
+						array: true,
+					})
+					.option("define", {
+						describe: "A key-value pair to be substituted in the script",
+						type: "string",
+						requiresArg: true,
+						array: true,
+					})
 					.option("triggers", {
 						describe: "cron schedules to attach",
 						alias: ["schedule", "schedules"],
@@ -562,6 +579,20 @@ function createCLIParser(argv: string[]) {
 				);
 			}
 
+			const cliVars =
+				args.var?.reduce<Record<string, string>>((collectVars, v) => {
+					const [key, ...value] = v.split(":");
+					collectVars[key] = value.join("");
+					return collectVars;
+				}, {}) || {};
+
+			const cliDefines =
+				args.define?.reduce<Record<string, string>>((collectDefines, d) => {
+					const [key, ...value] = d.split(":");
+					collectDefines[key] = value.join("");
+					return collectDefines;
+				}, {}) || {};
+
 			const accountId = args.dryRun ? undefined : await requireAuth(config);
 
 			const assetPaths =
@@ -585,6 +616,8 @@ function createCLIParser(argv: string[]) {
 					? new Date().toISOString().substring(0, 10)
 					: args["compatibility-date"],
 				compatibilityFlags: args["compatibility-flags"],
+				vars: cliVars,
+				defines: cliDefines,
 				triggers: args.triggers,
 				jsxFactory: args["jsx-factory"],
 				jsxFragment: args["jsx-fragment"],
@@ -604,12 +637,12 @@ function createCLIParser(argv: string[]) {
 
 	// tail
 	wrangler.command(
-		"tail [name]",
+		"tail [worker]",
 		"🦚 Starts a log tailing session for a published Worker.",
 		(yargs) => {
 			return yargs
-				.positional("name", {
-					describe: "Name of the worker",
+				.positional("worker", {
+					describe: "Name or route of the worker to tail",
 					type: "string",
 				})
 				.option("format", {
@@ -677,7 +710,22 @@ function createCLIParser(argv: string[]) {
 				sendMetrics: config.send_metrics,
 			});
 
-			const scriptName = getLegacyScriptName(args, config);
+			let scriptName;
+
+			// Worker names can't contain "." (and most routes should), so use that as a discriminator
+			if (args.worker?.includes(".")) {
+				scriptName = await getWorkerForZone(args.worker);
+				if (args.format === "pretty") {
+					logger.log(
+						`Connecting to worker ${scriptName} at route ${args.worker}`
+					);
+				}
+			} else {
+				scriptName = getLegacyScriptName(
+					{ name: args.worker, ...args },
+					config
+				);
+			}
 
 			if (!scriptName) {
 				throw new Error(
@@ -696,15 +744,13 @@ function createCLIParser(argv: string[]) {
 				clientIp: args.ip,
 			};
 
-			const filters = translateCLICommandToFilterMessage(
-				cliFilters,
-				args.debug
-			);
+			const filters = translateCLICommandToFilterMessage(cliFilters);
 
 			const { tail, expiration, deleteTail } = await createTail(
 				accountId,
 				scriptName,
 				filters,
+				args.debug,
 				!isLegacyEnv(config) ? args.env : undefined
 			);
 
@@ -966,7 +1012,7 @@ function createCLIParser(argv: string[]) {
 											wasm_modules: {},
 											text_blobs: {},
 											data_blobs: {},
-											worker_namespaces: [],
+											dispatch_namespaces: [],
 											logfwdr: { schema: undefined, bindings: [] },
 											unsafe: [],
 										},
@@ -975,6 +1021,7 @@ function createCLIParser(argv: string[]) {
 										compatibility_date: undefined,
 										compatibility_flags: undefined,
 										usage_model: undefined,
+										keep_bindings: false, // this doesn't matter since it's a new script anyway
 									}),
 								}
 							);
@@ -2022,8 +2069,8 @@ function createCLIParser(argv: string[]) {
 	});
 
 	wrangler.command(
-		"worker-namespace",
-		"📦 Interact with a worker namespace",
+		"dispatch-namespace",
+		"📦 Interact with a dispatch namespace",
 		(workerNamespaceYargs) => {
 			return workerNamespaceCommands(workerNamespaceYargs, subHelp);
 		}