wrangler 2.0.28 → 2.0.29

package/src/dev.tsx

@@ -8,6 +8,7 @@ import { findWranglerToml, printBindings, readConfig } from "./config";
 import Dev from "./dev/dev";
 import { getVarsForDev } from "./dev/dev-vars";
 
+import { startDevServer } from "./dev/start-server";
 import { getEntry } from "./entry";
 import { logger } from "./logger";
 import * as metrics from "./metrics";
@@ -333,11 +334,17 @@ export async function startDev(args: StartDevOptions) {
 			});
 		}
 
-		const entry = await getEntry(
-			{ assets: args.assets, script: args.script },
-			config,
-			"dev"
-		);
+		const {
+			entry,
+			nodeCompat,
+			upstreamProtocol,
+			zoneId,
+			host,
+			routes,
+			getLocalPort,
+			getInspectorPort,
+			cliDefines,
+		} = await validateDevServerSettings(args, config);
 
 		await metrics.sendMetricsEvent(
 			"run dev",
@@ -348,196 +355,60 @@ export async function startDev(args: StartDevOptions) {
 			{ sendMetrics: config.send_metrics, offline: args.local }
 		);
 
-		if (config.services && config.services.length > 0) {
-			logger.warn(
-				`This worker is bound to live services: ${config.services
-					.map(
-						(service) =>
-							`${service.binding} (${service.service}${
-								service.environment ? `@${service.environment}` : ""
-							})`
-					)
-					.join(", ")}`
-			);
-		}
-
-		if (args.inspect) {
-			//devtools are enabled by default, but we still need to disable them if the caller doesn't want them
-			logger.warn(
-				"Passing --inspect is unnecessary, now you can always connect to devtools."
-			);
-		}
-
-		if (args["experimental-public"]) {
-			throw new Error(
-				"The --experimental-public field has been renamed to --assets"
-			);
-		}
-
-		if (args.public) {
-			throw new Error("The --public field has been renamed to --assets");
-		}
-
-		if ((args.assets || config.assets) && (args.site || config.site)) {
-			throw new Error(
-				"Cannot use Assets and Workers Sites in the same Worker."
-			);
-		}
-
-		if (args.assets) {
-			logger.warn(
-				"The --assets argument is experimental and may change or break at any time"
-			);
-		}
-
-		const upstreamProtocol =
-			args["upstream-protocol"] || config.dev.upstream_protocol;
-		if (upstreamProtocol === "http") {
-			logger.warn(
-				"Setting upstream-protocol to http is not currently implemented.\n" +
-					"If this is required in your project, please add your use case to the following issue:\n" +
-					"https://github.com/cloudflare/wrangler2/issues/583."
-			);
-		}
-
-		// TODO: if worker_dev = false and no routes, then error (only for dev)
-
-		// Compute zone info from the `host` and `route` args and config;
-		let host = args.host || config.dev.host;
-		let zoneId: string | undefined;
-		const routes: Route[] | undefined =
-			args.routes || (config.route && [config.route]) || config.routes;
-
-		if (args.forceLocal) {
-			args.local = true;
-		}
-
-		if (!args.local) {
-			if (host) {
-				zoneId = await getZoneIdFromHost(host);
-			}
-			if (!zoneId && routes) {
-				const firstRoute = routes[0];
-				const zone = await getZoneForRoute(firstRoute);
-				if (zone) {
-					zoneId = zone.id;
-					host = zone.host;
-				}
-			}
-		} else if (!host) {
-			if (routes) {
-				const firstRoute = routes[0];
-				host = getHostFromRoute(firstRoute);
-			}
-		}
-
-		const nodeCompat = args.nodeCompat ?? config.node_compat;
-		if (nodeCompat) {
-			logger.warn(
-				"Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details."
-			);
-		}
-
-		const getLocalPort = memoizeGetPort(DEFAULT_LOCAL_PORT);
-		const getInspectorPort = memoizeGetPort(DEFAULT_INSPECTOR_PORT);
-
-		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;
-			}, {}) || {};
-
 		// eslint-disable-next-line no-inner-declarations
 		async function getDevReactElement(configParam: Config) {
-			// now log all available bindings into the terminal
-			const bindings = await getBindings(configParam, {
-				kv: args.kv,
-				vars: { ...args.vars, ...cliVars },
-				durableObjects: args.durableObjects,
-				r2: args.r2,
-			});
-
-			// mask anything that was overridden in .dev.vars or cli args
-			// so that we don't log potential secrets into the terminal
-			const maskedVars = { ...bindings.vars };
-			for (const key of Object.keys(maskedVars)) {
-				if (maskedVars[key] !== configParam.vars[key]) {
-					// This means it was overridden in .dev.vars or cli args
-					// so let's mask it
-					maskedVars[key] = "(hidden)";
-				}
-			}
-
-			printBindings({
-				...bindings,
-				vars: maskedVars,
-			});
-
-			const assetPaths =
-				args.assets || config.assets
-					? getAssetPaths(config, args.assets)
-					: getSiteAssetPaths(
-							config,
-							args.site,
-							args.siteInclude,
-							args.siteExclude
-					  );
+			const { assetPaths, bindings } = await getBindingsAndAssetPaths(
+				args,
+				configParam
+			);
 
 			return (
 				<Dev
-					name={getScriptName({ name: args.name, env: args.env }, config)}
-					noBundle={!(args.bundle ?? !config.no_bundle)}
+					name={getScriptName({ name: args.name, env: args.env }, configParam)}
+					noBundle={!(args.bundle ?? !configParam.no_bundle)}
 					entry={entry}
 					env={args.env}
 					zone={zoneId}
 					host={host}
 					routes={routes}
-					rules={getRules(config)}
-					legacyEnv={isLegacyEnv(config)}
-					minify={args.minify ?? config.minify}
+					rules={getRules(configParam)}
+					legacyEnv={isLegacyEnv(configParam)}
+					minify={args.minify ?? configParam.minify}
 					nodeCompat={nodeCompat}
-					build={config.build || {}}
-					define={{ ...config.define, ...cliDefines }}
+					build={configParam.build || {}}
+					define={{ ...configParam.define, ...cliDefines }}
 					initialMode={args.local ? "local" : "remote"}
-					jsxFactory={args["jsx-factory"] || config.jsx_factory}
-					jsxFragment={args["jsx-fragment"] || config.jsx_fragment}
-					tsconfig={args.tsconfig ?? config.tsconfig}
+					jsxFactory={args["jsx-factory"] || configParam.jsx_factory}
+					jsxFragment={args["jsx-fragment"] || configParam.jsx_fragment}
+					tsconfig={args.tsconfig ?? configParam.tsconfig}
 					upstreamProtocol={upstreamProtocol}
-					localProtocol={args.localProtocol || config.dev.local_protocol}
+					localProtocol={args.localProtocol || configParam.dev.local_protocol}
 					localUpstream={args["local-upstream"] || host}
 					enableLocalPersistence={
 						args.experimentalEnableLocalPersistence || false
 					}
 					liveReload={args.liveReload || false}
-					accountId={config.account_id || getAccountFromCache()?.id}
+					accountId={configParam.account_id || getAccountFromCache()?.id}
 					assetPaths={assetPaths}
-					assetsConfig={config.assets}
-					port={args.port || config.dev.port || (await getLocalPort())}
-					ip={args.ip || config.dev.ip}
+					assetsConfig={configParam.assets}
+					port={args.port || configParam.dev.port || (await getLocalPort())}
+					ip={args.ip || configParam.dev.ip}
 					inspectorPort={
 						args.inspectorPort ||
-						config.dev.inspector_port ||
+						configParam.dev.inspector_port ||
 						(await getInspectorPort())
 					}
-					isWorkersSite={Boolean(args.site || config.site)}
+					isWorkersSite={Boolean(args.site || configParam.site)}
 					compatibilityDate={getDevCompatibilityDate(
-						config,
+						configParam,
 						args.compatibilityDate
 					)}
 					compatibilityFlags={
-						args.compatibilityFlags || config.compatibility_flags
+						args.compatibilityFlags || configParam.compatibility_flags
 					}
-					usageModel={config.usage_model}
+					usageModel={configParam.usage_model}
 					bindings={bindings}
-					crons={config.triggers.crons}
+					crons={configParam.triggers.crons}
 					logLevel={args.logLevel}
 					logPrefix={args.logPrefix}
 					onReady={args.onReady}
@@ -545,8 +416,8 @@ export async function startDev(args: StartDevOptions) {
 					showInteractiveDevSession={args.showInteractiveDevSession}
 					forceLocal={args.forceLocal}
 					enablePagesAssetsServiceBinding={args.enablePagesAssetsServiceBinding}
-					firstPartyWorker={config.first_party_worker}
-					sendMetrics={config.send_metrics}
+					firstPartyWorker={configParam.first_party_worker}
+					sendMetrics={configParam.send_metrics}
 				/>
 			);
 		}
@@ -560,7 +431,6 @@ export async function startDev(args: StartDevOptions) {
 				await watcher?.close();
 			},
 			fetch: async (init?: RequestInit) => {
-				//TODO: we are not guaranteed to be assigned this port, we should fix this ASAP
 				const port = args.port || config.dev.port || (await getLocalPort());
 				const address = args.ip || config.dev.ip || "localhost";
 
@@ -572,6 +442,116 @@ export async function startDev(args: StartDevOptions) {
 	}
 }
 
+export async function startApiDev(args: StartDevOptions) {
+	if (args.logLevel) {
+		// we don't define a "none" logLevel, so "error" will do for now.
+		logger.loggerLevel = args.logLevel === "none" ? "error" : args.logLevel;
+	}
+	await printWranglerBanner();
+
+	const configPath =
+		(args.config as ConfigPath) ||
+		((args.script &&
+			findWranglerToml(path.dirname(args.script))) as ConfigPath);
+	const config = readConfig(configPath, args);
+
+	const {
+		entry,
+		nodeCompat,
+		upstreamProtocol,
+		zoneId,
+		host,
+		routes,
+		getLocalPort,
+		getInspectorPort,
+		cliDefines,
+	} = await validateDevServerSettings(args, config);
+
+	await metrics.sendMetricsEvent(
+		"run dev (api)",
+		{ local: args.local },
+		{ sendMetrics: config.send_metrics, offline: args.local }
+	);
+
+	// eslint-disable-next-line no-inner-declarations
+	async function getDevServer(configParam: Config) {
+		const { assetPaths, bindings } = await getBindingsAndAssetPaths(
+			args,
+			configParam
+		);
+
+		return await startDevServer({
+			name: getScriptName({ name: args.name, env: args.env }, configParam),
+			noBundle: !(args.bundle ?? !configParam.no_bundle),
+			entry: entry,
+			env: args.env,
+			zone: zoneId,
+			host: host,
+			routes: routes,
+			rules: getRules(configParam),
+			legacyEnv: isLegacyEnv(configParam),
+			minify: args.minify ?? configParam.minify,
+			nodeCompat: nodeCompat,
+			build: configParam.build || {},
+			define: { ...config.define, ...cliDefines },
+			initialMode: args.local ? "local" : "remote",
+			jsxFactory: args["jsx-factory"] || configParam.jsx_factory,
+			jsxFragment: args["jsx-fragment"] || configParam.jsx_fragment,
+			tsconfig: args.tsconfig ?? configParam.tsconfig,
+			upstreamProtocol: upstreamProtocol,
+			localProtocol: args.localProtocol || configParam.dev.local_protocol,
+			localUpstream: args["local-upstream"] || host,
+			enableLocalPersistence: args.experimentalEnableLocalPersistence || false,
+			liveReload: args.liveReload || false,
+			accountId: configParam.account_id || getAccountFromCache()?.id,
+			assetPaths: assetPaths,
+			assetsConfig: configParam.assets,
+			port: args.port || configParam.dev.port || (await getLocalPort()),
+			ip: args.ip || configParam.dev.ip,
+			inspectorPort:
+				args["inspector-port"] ||
+				configParam.dev.inspector_port ||
+				(await getInspectorPort()),
+			isWorkersSite: Boolean(args.site || configParam.site),
+			compatibilityDate: getDevCompatibilityDate(
+				config,
+				args["compatibility-date"]
+			),
+			compatibilityFlags:
+				args["compatibility-flags"] || configParam.compatibility_flags,
+			usageModel: configParam.usage_model,
+			bindings: bindings,
+			crons: configParam.triggers.crons,
+			logLevel: args.logLevel,
+			logPrefix: args.logPrefix,
+			onReady: args.onReady,
+			inspect: args.inspect ?? true,
+			showInteractiveDevSession: args.showInteractiveDevSession,
+			forceLocal: args.forceLocal,
+			enablePagesAssetsServiceBinding: args.enablePagesAssetsServiceBinding,
+			local: true,
+			firstPartyWorker: undefined,
+			sendMetrics: undefined,
+		});
+	}
+
+	const devServer = await getDevServer(config);
+	if (!devServer) {
+		throw logger.error("Failed to start dev server.");
+	}
+
+	return {
+		stop: async () => {
+			await devServer.stop();
+		},
+		fetch: async (init?: RequestInit) => {
+			const port = args.port || config.dev.port || (await getLocalPort());
+			const address = args.ip || config.dev.ip || "localhost";
+
+			return await fetch(`http://${address}:${port}/`, init);
+		},
+	};
+}
 /**
  * Avoiding calling `getPort()` multiple times by memoizing the first result.
  */
@@ -581,6 +561,182 @@ function memoizeGetPort(defaultPort: number) {
 		return portValue || (portValue = await getPort({ port: defaultPort }));
 	};
 }
+/**
+ * mask anything that was overridden in .dev.vars
+ * so that we don't log potential secrets into the terminal
+ */
+function maskVars(bindings: CfWorkerInit["bindings"], configParam: Config) {
+	const maskedVars = { ...bindings.vars };
+	for (const key of Object.keys(maskedVars)) {
+		if (maskedVars[key] !== configParam.vars[key]) {
+			// This means it was overridden in .dev.vars
+			// so let's mask it
+			maskedVars[key] = "(hidden)";
+		}
+	}
+	return maskedVars;
+}
+
+async function getZoneIdHostAndRoutes(args: StartDevOptions, config: Config) {
+	// TODO: if worker_dev = false and no routes, then error (only for dev)
+	// Compute zone info from the `host` and `route` args and config;
+	let host = args.host || config.dev.host;
+	let zoneId: string | undefined;
+	const routes: Route[] | undefined =
+		args.routes || (config.route && [config.route]) || config.routes;
+
+	if (args.forceLocal) {
+		args.local = true;
+	}
+
+	if (!args.local) {
+		if (host) {
+			zoneId = await getZoneIdFromHost(host);
+		}
+		if (!zoneId && routes) {
+			const firstRoute = routes[0];
+			const zone = await getZoneForRoute(firstRoute);
+			if (zone) {
+				zoneId = zone.id;
+				host = zone.host;
+			}
+		}
+	} else if (!host) {
+		if (routes) {
+			const firstRoute = routes[0];
+			host = getHostFromRoute(firstRoute);
+		}
+	}
+	return { host, routes, zoneId };
+}
+
+async function validateDevServerSettings(
+	args: StartDevOptions,
+	config: Config
+) {
+	const entry = await getEntry(
+		{ assets: args.assets, script: args.script },
+		config,
+		"dev"
+	);
+
+	const { zoneId, host, routes } = await getZoneIdHostAndRoutes(args, config);
+	const getLocalPort = memoizeGetPort(DEFAULT_LOCAL_PORT);
+	const getInspectorPort = memoizeGetPort(DEFAULT_INSPECTOR_PORT);
+
+	if (config.services && config.services.length > 0) {
+		logger.warn(
+			`This worker is bound to live services: ${config.services
+				.map(
+					(service) =>
+						`${service.binding} (${service.service}${
+							service.environment ? `@${service.environment}` : ""
+						})`
+				)
+				.join(", ")}`
+		);
+	}
+
+	if (args.inspect) {
+		//devtools are enabled by default, but we still need to disable them if the caller doesn't want them
+		logger.warn(
+			"Passing --inspect is unnecessary, now you can always connect to devtools."
+		);
+	}
+
+	if (args["experimental-public"]) {
+		throw new Error(
+			"The --experimental-public field has been renamed to --assets"
+		);
+	}
+
+	if (args.public) {
+		throw new Error("The --public field has been renamed to --assets");
+	}
+
+	if ((args.assets || config.assets) && (args.site || config.site)) {
+		throw new Error("Cannot use Assets and Workers Sites in the same Worker.");
+	}
+
+	if (args.assets) {
+		logger.warn(
+			"The --assets argument is experimental and may change or break at any time"
+		);
+	}
+
+	const upstreamProtocol =
+		args["upstream-protocol"] || config.dev.upstream_protocol;
+	if (upstreamProtocol === "http") {
+		logger.warn(
+			"Setting upstream-protocol to http is not currently implemented.\n" +
+				"If this is required in your project, please add your use case to the following issue:\n" +
+				"https://github.com/cloudflare/wrangler2/issues/583."
+		);
+	}
+	const nodeCompat = args.nodeCompat ?? config.node_compat;
+	if (nodeCompat) {
+		logger.warn(
+			"Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details."
+		);
+	}
+
+	const cliDefines =
+		args.define?.reduce<Record<string, string>>((collectDefines, d) => {
+			const [key, ...value] = d.split(":");
+			collectDefines[key] = value.join("");
+			return collectDefines;
+		}, {}) || {};
+
+	return {
+		entry,
+		upstreamProtocol,
+		nodeCompat,
+		getLocalPort,
+		getInspectorPort,
+		zoneId,
+		host,
+		routes,
+		cliDefines,
+	};
+}
+
+async function getBindingsAndAssetPaths(
+	args: StartDevOptions,
+	configParam: Config
+) {
+	const cliVars =
+		args.var?.reduce<Record<string, string>>((collectVars, v) => {
+			const [key, ...value] = v.split(":");
+			collectVars[key] = value.join("");
+			return collectVars;
+		}, {}) || {};
+
+	// now log all available bindings into the terminal
+	const bindings = await getBindings(configParam, {
+		kv: args.kv,
+		vars: { ...args.vars, ...cliVars },
+		durableObjects: args.durableObjects,
+		r2: args.r2,
+	});
+
+	const maskedVars = maskVars(bindings, configParam);
+
+	printBindings({
+		...bindings,
+		vars: maskedVars,
+	});
+
+	const assetPaths =
+		args.assets || configParam.assets
+			? getAssetPaths(configParam, args.assets)
+			: getSiteAssetPaths(
+					configParam,
+					args.site,
+					args.siteInclude,
+					args.siteExclude
+			  );
+	return { assetPaths, bindings };
+}
 
 async function getBindings(
 	configParam: Config,

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/init.ts

@@ -12,10 +12,10 @@ import { initializeGit, isGitInstalled, isInsideGitRepo } from "./git-client";
 import { logger } from "./logger";
 import { getPackageManager } from "./package-manager";
 import { parsePackageJSON, parseTOML, readFileSync } from "./parse";
+import { getBasePath } from "./paths";
 import { requireAuth } from "./user";
 import { CommandLineArgsError, printWranglerBanner } from "./index";
 import type { ConfigPath } from "./index";
-
 import type { Argv, ArgumentsCamelCase } from "yargs";
 
 export async function initOptions(yargs: Argv) {
@@ -162,7 +162,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 			await initializeGit(creationDirectory);
 			await writeFile(
 				path.join(creationDirectory, ".gitignore"),
-				readFileSync(path.join(__dirname, "../templates/gitignore"))
+				readFileSync(path.join(getBasePath(), "templates/gitignore"))
 			);
 			logger.log(
 				args.name && args.name !== "."
@@ -254,7 +254,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 			isTypescriptProject = true;
 			await writeFile(
 				path.join(creationDirectory, "./tsconfig.json"),
-				readFileSync(path.join(__dirname, "../templates/tsconfig.json"))
+				readFileSync(path.join(getBasePath(), "templates/tsconfig.json"))
 			);
 			devDepsToInstall.push("@cloudflare/workers-types");
 			devDepsToInstall.push("typescript");
@@ -495,7 +495,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 					});
 					await writeFile(
 						path.join(creationDirectory, "./src/index.ts"),
-						readFileSync(path.join(__dirname, `../templates/${template}`))
+						readFileSync(path.join(getBasePath(), `templates/${template}`))
 					);
 
 					logger.log(
@@ -561,7 +561,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 					});
 					await writeFile(
 						path.join(creationDirectory, "./src/index.js"),
-						readFileSync(path.join(__dirname, `../templates/${template}`))
+						readFileSync(path.join(getBasePath(), `templates/${template}`))
 					);
 
 					logger.log(

package/src/metrics/send-event.ts

@@ -51,6 +51,7 @@ export type EventNames =
 	| "list pages deployments"
 	| "build pages functions"
 	| "run dev"
+	| "run dev (api)"
 	| "run pages dev";
 
 /**