wrangler 0.0.0-e7cf0caa → 0.0.0-e87ad068

package/src/dev.tsx

@@ -28,10 +28,10 @@ import {
 	printWranglerBanner,
 } from "./index";
 import type { Config, Environment } from "./config";
-import type { Route } from "./config/environment";
+import type { Route, Rule } from "./config/environment";
 import type { LoggerLevel } from "./logger";
 import type { EnablePagesAssetsServiceBindingOptions } from "./miniflare-cli/types";
-import type { CfWorkerInit } from "./worker";
+import type { CfWorkerInit, CfModule } from "./worker";
 import type {
 	CommonYargsArgv,
 	StrictYargsOptionsToInterface,
@@ -334,6 +334,11 @@ export type AdditionalDevProps = {
 		preview_bucket_name?: string;
 	}[];
 	d1Databases?: Environment["d1_databases"];
+	processEntrypoint?: boolean;
+	additionalModules?: CfModule[];
+	moduleRoot?: string;
+	rules?: Rule[];
+	constellation?: Environment["constellation"];
 };
 
 type StartDevOptions = DevArguments &
@@ -397,6 +402,8 @@ export async function startDev(args: StartDevOptions) {
 			getInspectorPort,
 			cliDefines,
 			localPersistencePath,
+			processEntrypoint,
+			additionalModules,
 		} = await validateDevServerSettings(args, config);
 
 		await metrics.sendMetricsEvent(
@@ -424,7 +431,9 @@ export async function startDev(args: StartDevOptions) {
 					zone={zoneId}
 					host={host}
 					routes={routes}
-					rules={getRules(configParam)}
+					processEntrypoint={processEntrypoint}
+					additionalModules={additionalModules}
+					rules={args.rules ?? getRules(configParam)}
 					legacyEnv={isLegacyEnv(configParam)}
 					minify={args.minify ?? configParam.minify}
 					legacyNodeCompat={legacyNodeCompat}
@@ -533,6 +542,8 @@ export async function startApiDev(args: StartDevOptions) {
 		getInspectorPort,
 		cliDefines,
 		localPersistencePath,
+		processEntrypoint,
+		additionalModules,
 	} = await validateDevServerSettings(args, config);
 
 	await metrics.sendMetricsEvent(
@@ -560,7 +571,9 @@ export async function startApiDev(args: StartDevOptions) {
 			zone: zoneId,
 			host: host,
 			routes: routes,
-			rules: getRules(configParam),
+			processEntrypoint,
+			additionalModules,
+			rules: args.rules ?? getRules(configParam),
 			legacyEnv: isLegacyEnv(configParam),
 			minify: args.minify ?? configParam.minify,
 			legacyNodeCompat,
@@ -661,7 +674,7 @@ async function getZoneIdHostAndRoutes(args: StartDevOptions, config: Config) {
 		args.local = true;
 	}
 
-	if (!args.local) {
+	if (!args.local && !args.experimentalLocal) {
 		if (host) {
 			zoneId = await getZoneIdFromHost(host);
 		}
@@ -687,7 +700,7 @@ async function validateDevServerSettings(
 	config: Config
 ) {
 	const entry = await getEntry(
-		{ assets: args.assets, script: args.script },
+		{ assets: args.assets, script: args.script, moduleRoot: args.moduleRoot },
 		config,
 		"dev"
 	);
@@ -787,6 +800,8 @@ async function validateDevServerSettings(
 		routes,
 		cliDefines,
 		localPersistencePath,
+		processEntrypoint: !!args.processEntrypoint,
+		additionalModules: args.additionalModules ?? [],
 	};
 }
 
@@ -860,6 +875,7 @@ function getBindings(
 		},
 		wasm_modules: configParam.wasm_modules,
 		text_blobs: configParam.text_blobs,
+		browser: configParam.browser,
 		data_blobs: configParam.data_blobs,
 		durable_objects: {
 			bindings: [
@@ -923,6 +939,7 @@ function getBindings(
 			}),
 			...(args.d1Databases || []),
 		]),
+		constellation: configParam.constellation,
 	};
 
 	return bindings;

package/src/docs/helpers.ts

@@ -0,0 +1,50 @@
+import assert from "node:assert";
+import { fetch } from "undici";
+import { logger } from "../logger";
+
+// The ALGOLIA_APP_ID and ALGOLIA_PUBLIC_KEY are provided at esbuild time as a `define` for production and beta releases.
+// Otherwise it is left undefined, which disables search.
+declare const ALGOLIA_APP_ID: string;
+declare const ALGOLIA_PUBLIC_KEY: string;
+
+export async function runSearch(searchTerm: string) {
+	const id = ALGOLIA_APP_ID;
+	const index = "developers-cloudflare2";
+	const key = ALGOLIA_PUBLIC_KEY;
+	const params = new URLSearchParams({
+		query: searchTerm,
+		hitsPerPage: "1",
+		getRankingInfo: "0",
+	});
+
+	assert(id, "Missing Algolia App ID");
+	assert(key, "Missing Algolia Key");
+
+	const searchResp = await fetch(
+		`https://${id}-dsn.algolia.net/1/indexes/${index}/query`,
+		{
+			method: "POST",
+			body: JSON.stringify({
+				params: params.toString(),
+			}),
+			headers: {
+				"X-Algolia-API-Key": key,
+				"X-Algolia-Application-Id": id,
+			},
+		}
+	);
+	if (!searchResp.ok) {
+		logger.error(`Could not search the docs. Please try again later.`);
+		return;
+	}
+	const searchData = (await searchResp.json()) as { hits: { url: string }[] };
+	logger.debug("searchData: ", searchData);
+	if (searchData.hits[0]) {
+		return searchData.hits[0].url;
+	} else {
+		logger.error(
+			`Could not find docs for: ${searchTerm}. Please try again with another search term.`
+		);
+		return;
+	}
+}

package/src/docs/index.ts

@@ -3,89 +3,46 @@ import { readConfig } from "../config";
 import { logger } from "../logger";
 import * as metrics from "../metrics";
 import openInBrowser from "../open-in-browser";
-
+import { runSearch } from "./helpers";
 import type {
 	CommonYargsArgv,
 	StrictYargsOptionsToInterface,
 } from "../yargs-types";
 
-const argToUrlHash = {
-	d1: "d1",
-	docs: "docs",
-	init: "init",
-	generate: "generate",
-	dev: "dev",
-	publish: "publish",
-	delete: "delete",
-	"kv:namespace": "kvnamespace",
-	"kv:key": "kvkey",
-	"kv:bulk": "kvbulk",
-	"r2 bucket": "r2-bucket",
-	"r2 object": "r2-object",
-	secret: "secret",
-	"secret:bulk": "secretbulk",
-	tail: "tail",
-	pages: "pages",
-	login: "login",
-	logout: "logout",
-	whoami: "whoami",
-	types: "types",
-	deployments: "deployments",
-};
-
 export function docsOptions(yargs: CommonYargsArgv) {
-	return yargs.positional("command", {
-		describe: "Enter the wrangler command you want to know more about",
-		type: "string",
-		// requiresArg: true,
-		choices: [
-			"docs",
-			"init",
-			"generate",
-			"dev",
-			"publish",
-			"delete",
-			"tail",
-			"secret",
-			"secret:bulk",
-			"kv:namespace",
-			"kv:key",
-			"kv:bulk",
-			"pages",
-			// "queues", //TODO: Undocumented
-			"r2 object",
-			"r2 bucket",
-			// "dispatch-namespace", // TODO: Undocumented - Workers for Platforms
-			"d1",
-			// "pubsub", //TODO: Undocumented
-			"login",
-			"logout",
-			"whoami",
-			"types",
-			"deployments",
-			"api",
-		],
-	});
-}
-
-function isValidParam(k: string): k is keyof typeof argToUrlHash {
-	return k in argToUrlHash;
+	return yargs
+		.positional("command", {
+			describe: "Enter the wrangler command you want to know more about",
+			type: "string",
+			array: true,
+		})
+		.option("yes", {
+			alias: "y",
+			type: "boolean",
+			description: "Takes you to the docs, even if search fails",
+		});
 }
 
 export async function docsHandler(
 	args: StrictYargsOptionsToInterface<typeof docsOptions>
 ) {
+	//if no command is provided, open the docs homepage
+	//or, if a command IS provided, but we can't find anything, open the docs homepage
 	let urlToOpen =
-		"https://developers.cloudflare.com/workers/wrangler/commands/";
+		args.yes || !args.command || args.command.length === 0
+			? "https://developers.cloudflare.com/workers/wrangler/commands/"
+			: "";
+
+	if (args.command && args.command.length > 0) {
+		const searchTerm = args.command.join(" ");
+		const searchResult = await runSearch(searchTerm);
 
-	if (args.command === "api") {
-		//if api, take them to the API docs
-		urlToOpen = "https://developers.cloudflare.com/workers/wrangler/api/";
-	} else if (args.command && isValidParam(args.command)) {
-		//otherwise, they get the wrangler commands page
-		urlToOpen += `#${argToUrlHash[args.command]}`;
+		urlToOpen = searchResult ?? urlToOpen;
 	}
 
+	if (!urlToOpen) {
+		return;
+	}
 	await printWranglerBanner();
 
 	logger.log(`Opening a link in your default browser: ${urlToOpen}`);

package/src/entry.ts

@@ -25,6 +25,11 @@ export type Entry = {
 	format: CfScriptFormat;
 	/** The directory that contains all of a `--no-bundle` worker's modules. Usually `${directory}/src`. Defaults to path.dirname(file) */
 	moduleRoot: string;
+
+	/**
+	 * A worker's name
+	 */
+	name?: string | undefined;
 };
 
 /**
@@ -35,6 +40,7 @@ export async function getEntry(
 		script?: string;
 		format?: CfScriptFormat | undefined;
 		assets?: string | undefined;
+		moduleRoot?: string;
 	},
 	config: Config,
 	command: "dev" | "publish" | "types"
@@ -113,7 +119,8 @@ export async function getEntry(
 		file,
 		directory,
 		format,
-		moduleRoot: config.base_dir ?? path.dirname(file),
+		moduleRoot: args.moduleRoot ?? config.base_dir ?? path.dirname(file),
+		name: config.name ?? "worker",
 	};
 }
 

package/src/environment-variables/factory.ts

@@ -14,7 +14,8 @@ type VariableNames =
 	| "WRANGLER_AUTH_URL"
 	| "WRANGLER_TOKEN_URL"
 	| "WRANGLER_REVOKE_URL"
-	| "WRANGLER_CF_AUTHORIZATION_TOKEN";
+	| "WRANGLER_CF_AUTHORIZATION_TOKEN"
+	| "NO_CONSTELLATION_WARNING";
 
 type DeprecatedNames =
 	| "CF_ACCOUNT_ID"

package/src/generate/index.ts

@@ -59,6 +59,11 @@ export async function generateHandler(args: GenerateArgs) {
 	// print down here cuz `init` prints it own its own
 	await printWranglerBanner();
 
+	logger.warn(
+		`The \`generate\` command is no longer supported and will be removed in a future version.`
+		// TODO: recommend replacement commands
+	);
+
 	if (args.type) {
 		let message = "The --type option is no longer supported.";
 		if (args.type === "webpack") {

package/src/index.ts

@@ -7,6 +7,7 @@ import makeCLI from "yargs";
 import { version as wranglerVersion } from "../package.json";
 import { isBuildFailure } from "./bundle";
 import { loadDotEnv, readConfig } from "./config";
+import { constellation } from "./constellation";
 import { d1 } from "./d1";
 import { deleteHandler, deleteOptions } from "./delete";
 import {
@@ -271,7 +272,7 @@ export function createCLIParser(argv: string[]) {
 
 	// docs
 	wrangler.command(
-		"docs [command]",
+		"docs [command..]",
 		"📚 Open wrangler's docs in your browser",
 		docsOptions,
 		docsHandler
@@ -431,6 +432,15 @@ export function createCLIParser(argv: string[]) {
 		return d1(d1Yargs.command(subHelp));
 	});
 
+	// ai
+	wrangler.command(
+		"constellation",
+		"🤖 Interact with Constellation models",
+		(aiYargs) => {
+			return constellation(aiYargs.command(subHelp));
+		}
+	);
+
 	// pubsub
 	wrangler.command(
 		"pubsub",
@@ -569,6 +579,7 @@ export function createCLIParser(argv: string[]) {
 				unsafe: config.unsafe,
 				rules: config.rules,
 				queues: config.queues,
+				constellation: config.constellation,
 			};
 
 			await generateTypes(configBindings, config);

package/src/init.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
 import { writeFile, mkdir } from "node:fs/promises";
-import path from "node:path";
+import path, { dirname } from "node:path";
 import TOML from "@iarna/toml";
 import { findUp } from "find-up";
 import { version as wranglerVersion } from "../package.json";
@@ -18,7 +18,7 @@ import { requireAuth } from "./user";
 import { CommandLineArgsError, printWranglerBanner } from "./index";
 
 import type { RawConfig } from "./config";
-import type { Route, SimpleRoute } from "./config/environment";
+import type { Route, SimpleRoute, TailConsumer } from "./config/environment";
 import type {
 	WorkerMetadata,
 	WorkerMetadataBinding,
@@ -29,6 +29,7 @@ import type {
 	CommonYargsArgv,
 	StrictYargsOptionsToInterface,
 } from "./yargs-types";
+import type { ReadableStream } from "stream/web";
 
 export function initOptions(yargs: CommonYargsArgv) {
 	return yargs
@@ -80,6 +81,8 @@ export type ServiceMetadataRes = {
 			usage_model: "bundled" | "unbound";
 			compatibility_date: string;
 			last_deployed_from?: "wrangler" | "dash" | "api";
+			placement_mode?: "smart";
+			tail_consumers?: TailConsumer[];
 		};
 	};
 	created_on: string;
@@ -485,10 +488,20 @@ export async function initHandler(args: InitArgs) {
 					`/accounts/${accountId}/workers/services/${fromDashScriptName}/environments/${defaultEnvironment}/content`
 				);
 
-				await writeFile(
-					path.join(creationDirectory, "./src/index.ts"),
-					dashScript
-				);
+				// writeFile in small batches (of 10) to not exhaust system file descriptors
+				for (const files of createBatches(dashScript, 10)) {
+					await Promise.all(
+						files.map(async (file) => {
+							const filepath = path
+								.join(creationDirectory, `./src/${file.name}`)
+								.replace(/\.js$/, ".ts"); // change javascript extension to typescript extension
+							const directory = dirname(filepath);
+
+							await mkdir(directory, { recursive: true });
+							await writeFile(filepath, file.stream() as ReadableStream);
+						})
+					);
+				}
 
 				await writePackageJsonScriptsAndUpdateWranglerToml({
 					isWritingScripts: shouldWritePackageJsonScripts,
@@ -591,10 +604,21 @@ export async function initHandler(args: InitArgs) {
 					`/accounts/${accountId}/workers/services/${fromDashScriptName}/environments/${defaultEnvironment}/content`
 				);
 
-				await writeFile(
-					path.join(creationDirectory, "./src/index.js"),
-					dashScript
-				);
+				// writeFile in small batches (of 10) to not exhaust system file descriptors
+				for (const files of createBatches(dashScript, 10)) {
+					await Promise.all(
+						files.map(async (file) => {
+							const filepath = path.join(
+								creationDirectory,
+								`./src/${file.name}`
+							);
+							const directory = dirname(filepath);
+
+							await mkdir(directory, { recursive: true });
+							await writeFile(filepath, file.stream() as ReadableStream);
+						})
+					);
+				}
 
 				await writePackageJsonScriptsAndUpdateWranglerToml({
 					isWritingScripts: shouldWritePackageJsonScripts,
@@ -868,6 +892,10 @@ async function getWorkerConfig(
 			new Date().toISOString().substring(0, 10),
 		...routeOrRoutesToConfig,
 		usage_model: serviceEnvMetadata.script.usage_model,
+		placement:
+			serviceEnvMetadata.script.placement_mode === "smart"
+				? { mode: "smart" }
+				: undefined,
 		...(durableObjectClassNames.length
 			? {
 					migrations: [
@@ -888,6 +916,7 @@ async function getWorkerConfig(
 				return { ...envObj, [environment]: {} };
 				// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			}, {} as RawConfig["env"]),
+		tail_consumers: serviceEnvMetadata.script.tail_consumers,
 		...mappedBindings,
 	};
 }
@@ -942,6 +971,13 @@ export function mapBindings(bindings: WorkerMetadataBinding[]): RawConfig {
 							};
 						}
 						break;
+					case "browser":
+						{
+							configObj.browser = {
+								binding: binding.name,
+							};
+						}
+						break;
 					case "r2_bucket":
 						{
 							configObj.r2_buckets = [
@@ -1030,3 +1066,9 @@ export function mapBindings(bindings: WorkerMetadataBinding[]): RawConfig {
 			}, {} as RawConfig)
 	);
 }
+
+function* createBatches<T>(array: T[], size: number): IterableIterator<T[]> {
+	for (let i = 0; i < array.length; i += size) {
+		yield array.slice(i, i + size);
+	}
+}

package/src/inspect.ts

@@ -1,9 +1,10 @@
+import { readFileSync } from "fs";
 import { readFile } from "fs/promises";
 import assert from "node:assert";
 import { createServer } from "node:http";
 import os from "node:os";
 import { URL } from "node:url";
-
+import path from "path";
 import open from "open";
 import { useEffect, useRef, useState } from "react";
 import { SourceMapConsumer } from "source-map";
@@ -40,6 +41,13 @@ import type { MessageEvent } from "ws";
  * - handle more methods from console
  */
 
+// Information about Wrangler's bundling process that needs passsed through
+// for DevTools sourcemap transformation
+export interface SourceMapMetadata {
+	tmpDir: string;
+	entryDirectory: string;
+}
+
 interface InspectorProps {
 	/**
 	 * The port that the local proxy server should listen on.
@@ -58,9 +66,13 @@ interface InspectorProps {
 	/**
 	 * Sourcemap path, so that stacktraces can be interpretted
 	 */
-	sourceMapPath?: string | undefined;
+	sourceMapPath: string | undefined;
+
+	sourceMapMetadata: SourceMapMetadata | undefined;
 
 	host?: string;
+
+	name?: string;
 }
 
 export default function useInspector(props: InspectorProps) {
@@ -493,6 +505,65 @@ export default function useInspector(props: InspectorProps) {
 
 		/** Send a message from the local websocket to the remote websocket */
 		function sendMessageToRemoteWebSocket(event: MessageEvent) {
+			try {
+				// Intercept Network.loadNetworkResource to load sourcemaps
+				const message = JSON.parse(event.data as string);
+				if (
+					message.method === "Network.loadNetworkResource" &&
+					props.sourceMapPath !== undefined &&
+					props.sourceMapMetadata !== undefined
+				) {
+					// Read the generated source map from esbuild
+					const sourceMap = JSON.parse(
+						readFileSync(props.sourceMapPath, "utf-8")
+					);
+
+					// The source root is a temporary directory (`tmpDir`), and so shouldn't be user-visible
+					// It provides no useful info to the user
+					sourceMap.sourceRoot = "";
+
+					const tmpDir = props.sourceMapMetadata.tmpDir;
+
+					// See https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit#heading=h.mt2g20loc2ct
+					// The above link documents the x_google_ignoreList property, which is intended to mark code that shouldn't be visible in DevTools
+					// Here we use it to indicate specifically Wrangler-injected code (facades & middleware)
+					sourceMap.x_google_ignoreList = sourceMap.sources
+						// Filter anything in the generated tmpDir, and anything from Wrangler's templates
+						// This should cover facades and middleware, but intentionally doesn't include all non-user code e.g. node_modules
+						.map((s: string, idx: number) =>
+							s.includes(tmpDir) || s.includes("wrangler/templates")
+								? idx
+								: null
+						)
+						.filter((i: number | null) => i !== null);
+
+					const entryDirectory = props.sourceMapMetadata.entryDirectory;
+
+					sourceMap.sources = sourceMap.sources.map(
+						(s: string) =>
+							// These are never loaded by Wrangler or DevTools. However, the presence of a scheme is required for DevTools to show the path as folders in the Sources view
+							// The scheme is intentially not the same as for the sourceMappingURL
+							// Without this difference in scheme, DevTools will not strip prefix `../` path elements from top level folders (../node_modules -> node_modules, for instance)
+							`worker://${props.name}/${path.relative(entryDirectory, s)}`
+					);
+
+					sendMessageToLocalWebSocket({
+						data: JSON.stringify({
+							id: message.id,
+							result: {
+								resource: {
+									success: true,
+									text: JSON.stringify(sourceMap),
+								},
+							},
+						}),
+					});
+					return;
+				}
+			} catch (e) {
+				logger.debug(e);
+				// Ignore errors, fallthrough to the remote inspector
+			}
 			try {
 				assert(
 					remoteWebSocket,
@@ -517,11 +588,28 @@ export default function useInspector(props: InspectorProps) {
 		}
 
 		/** Send a message from the local websocket to the remote websocket */
-		function sendMessageToLocalWebSocket(event: MessageEvent) {
+		function sendMessageToLocalWebSocket(event: Pick<MessageEvent, "data">) {
 			assert(
 				localWebSocket,
 				"Trying to send a message to an undefined `localWebSocket`"
 			);
+			try {
+				// Intercept Debugger.scriptParsed responses to inject URL schemes
+				const message = JSON.parse(event.data as string);
+				if (message.method === "Debugger.scriptParsed") {
+					// Add the worker:// scheme conditionally, since some module types already have schemes (e.g. wasm)
+					message.params.url = new URL(
+						message.params.url,
+						`worker://${props.name}`
+					).href;
+					localWebSocket.send(JSON.stringify(message));
+					return;
+				}
+			} catch (e) {
+				logger.debug(e);
+				// Ignore errors, fallthrough to the local websocket
+			}
+
 			localWebSocket.send(event.data);
 		}
 
@@ -555,7 +643,13 @@ export default function useInspector(props: InspectorProps) {
 				);
 			}
 		};
-	}, [localWebSocket, remoteWebSocket]);
+	}, [
+		localWebSocket,
+		remoteWebSocket,
+		props.name,
+		props.sourceMapMetadata,
+		props.sourceMapPath,
+	]);
 }
 
 // Credit: https://stackoverflow.com/a/2117523
@@ -744,8 +838,15 @@ function logConsoleMessage(evt: Protocol.Runtime.ConsoleAPICalledEvent): void {
 /**
  * Opens the chrome debugger
  */
-export const openInspector = async (inspectorPort: number) => {
-	const url = `https://devtools.devprod.cloudflare.dev/js_app?theme=systemPreferred&ws=localhost:${inspectorPort}/ws`;
+export const openInspector = async (
+	inspectorPort: number,
+	worker: string | undefined
+) => {
+	const query = new URLSearchParams();
+	query.set("theme", "systemPreferred");
+	query.set("ws", `localhost:${inspectorPort}/ws`);
+	if (worker) query.set("domain", worker);
+	const url = `https://devtools.devprod.cloudflare.dev/js_app?${query.toString()}`;
 	const errorMessage =
 		"Failed to open inspector.\nInspector depends on having a Chromium-based browser installed, maybe you need to install one?";