wrangler 2.0.25 → 2.0.26

package/src/__tests__/jest.setup.ts

@@ -1,5 +1,6 @@
 import fetchMock from "jest-fetch-mock";
 import {
+	fetchDashboardScript,
 	fetchInternal,
 	fetchKVGetValue,
 	fetchR2Objects,
@@ -7,6 +8,7 @@ import {
 } from "../cfetch/internal";
 import { confirm, prompt } from "../dialogs";
 import {
+	mockFetchDashScript,
 	mockFetchInternal,
 	mockFetchKVGetValue,
 	mockFetchR2Objects,
@@ -49,6 +51,7 @@ jest.mock("../cfetch/internal");
 	"https://api.cloudflare.com/client/v4"
 );
 (fetchR2Objects as jest.Mock).mockImplementation(mockFetchR2Objects);
+(fetchDashboardScript as jest.Mock).mockImplementation(mockFetchDashScript);
 
 jest.mock("../dialogs");
 

package/src/__tests__/pages.test.ts

@@ -97,6 +97,20 @@ describe("pages", () => {
 			expect(std.out).toMatchInlineSnapshot(`
         "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
 
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+      `);
+		});
+
+		it("should display for pages:functions:optimize-routes", async () => {
+			await expect(
+				runWrangler(
+					'pages functions optimize-routes --routes-path="/build/_routes.json" --output-routes-path="/build/_optimized-routes.json"'
+				)
+			).rejects.toThrowError();
+
+			expect(std.out).toMatchInlineSnapshot(`
+        "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+
         If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
 		});

package/src/__tests__/tail.test.ts

@@ -118,7 +118,7 @@ describe("tail", () => {
 			const api = mockWebsocketAPIs();
 			await runWrangler("tail test-worker --status error");
 			await expect(api.nextMessageJson()).resolves.toHaveProperty("filters", [
-				{ outcome: ["exception", "exceededCpu", "unknown"] },
+				{ outcome: ["exception", "exceededCpu", "exceededMemory", "unknown"] },
 			]);
 		});
 
@@ -126,7 +126,15 @@ describe("tail", () => {
 			const api = mockWebsocketAPIs();
 			await runWrangler("tail test-worker --status error --status canceled");
 			await expect(api.nextMessageJson()).resolves.toHaveProperty("filters", [
-				{ outcome: ["exception", "exceededCpu", "unknown", "canceled"] },
+				{
+					outcome: [
+						"exception",
+						"exceededCpu",
+						"exceededMemory",
+						"unknown",
+						"canceled",
+					],
+				},
 			]);
 		});
 
@@ -213,7 +221,15 @@ describe("tail", () => {
 			const expectedWebsocketMessage = {
 				filters: [
 					{ sampling_rate },
-					{ outcome: ["ok", "exception", "exceededCpu", "unknown"] },
+					{
+						outcome: [
+							"ok",
+							"exception",
+							"exceededCpu",
+							"exceededMemory",
+							"unknown",
+						],
+					},
 					{ method },
 					{ header: { key: "X-HELLO", query: "world" } },
 					{ client_ip },

package/src/api/dev.ts

@@ -16,6 +16,7 @@ interface DevOptions {
 	siteExclude?: string[];
 	nodeCompat?: boolean;
 	compatibilityDate?: string;
+	compatibilityFlags?: string[];
 	experimentalEnableLocalPersistence?: boolean;
 	liveReload?: boolean;
 	watch?: boolean;

package/src/cfetch/internal.ts

@@ -179,3 +179,42 @@ export async function fetchR2Objects(
 		);
 	}
 }
+
+/**
+ * This is a wrapper STOPGAP for getting the script which returns a raw text response.
+ */
+export async function fetchDashboardScript(
+	resource: string,
+	bodyInit: RequestInit = {}
+): Promise<string> {
+	await requireLoggedIn();
+	const auth = requireApiToken();
+	const headers = cloneHeaders(bodyInit.headers);
+	addAuthorizationHeaderIfUnspecified(headers, auth);
+	addUserAgent(headers);
+
+	const response = await fetch(`${getCloudflareAPIBaseURL()}${resource}`, {
+		...bodyInit,
+		headers,
+	});
+
+	if (!response.ok || !response.body) {
+		throw new Error(
+			`Failed to fetch ${resource} - ${response.status}: ${response.statusText});`
+		);
+	}
+
+	const usesModules = response.headers
+		.get("content-type")
+		?.startsWith("multipart");
+
+	if (usesModules) {
+		const file = await response.text();
+
+		// Follow up on issue in Undici about multipart/form-data support & replace the workaround: https://github.com/nodejs/undici/issues/974
+		// This should be using a builtin formData() parser pattern.
+		return file.split("\n").slice(4, -4).join("\n");
+	} else {
+		return response.text();
+	}
+}

package/src/dev/dev.tsx

@@ -493,6 +493,10 @@ function useHotkeys(props: {
 					break;
 				// open browser
 				case "b": {
+					if (ip === "0.0.0.0") {
+						await openInBrowser(`${localProtocol}://127.0.0.1:${port}`);
+						return;
+					}
 					await openInBrowser(`${localProtocol}://${ip}:${port}`);
 					break;
 				}

package/src/dev.tsx

@@ -502,10 +502,10 @@ export async function startDev(args: StartDevOptions) {
 					isWorkersSite={Boolean(args.site || config.site)}
 					compatibilityDate={getDevCompatibilityDate(
 						config,
-						args["compatibility-date"]
+						args.compatibilityDate
 					)}
 					compatibilityFlags={
-						args["compatibility-flags"] || config.compatibility_flags
+						args.compatibilityFlags || config.compatibility_flags
 					}
 					usageModel={config.usage_model}
 					bindings={bindings}

package/src/init.ts

@@ -5,12 +5,16 @@ import TOML from "@iarna/toml";
 import { findUp } from "find-up";
 import { version as wranglerVersion } from "../package.json";
 
+import { fetchDashboardScript } from "./cfetch/internal";
+import { readConfig } from "./config";
 import { confirm, select } from "./dialogs";
 import { initializeGit, isGitInstalled, isInsideGitRepo } from "./git-client";
 import { logger } from "./logger";
 import { getPackageManager } from "./package-manager";
 import { parsePackageJSON, parseTOML, readFileSync } from "./parse";
+import { requireAuth } from "./user";
 import { CommandLineArgsError, printWranglerBanner } from "./index";
+import type { ConfigPath } from "./index";
 
 import type { Argv, ArgumentsCamelCase } from "yargs";
 
@@ -36,6 +40,12 @@ export async function initOptions(yargs: Argv) {
 			describe: 'Answer "yes" to any prompts for new projects',
 			type: "boolean",
 			alias: "y",
+		})
+		.option("from-dash", {
+			describe: "Download script from the dashboard for local development",
+			type: "string",
+			requiresArg: true,
+			hidden: true,
 		});
 }
 
@@ -61,7 +71,11 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 	const devDepsToInstall: string[] = [];
 	const instructions: string[] = [];
 	let shouldRunPackageManagerInstall = false;
-	const creationDirectory = path.resolve(process.cwd(), args.name ?? "");
+	const fromDashScriptName = args["from-dash"] as string;
+	const creationDirectory = path.resolve(
+		process.cwd(),
+		(args.name ? args.name : fromDashScriptName) ?? ""
+	);
 
 	if (args.site) {
 		const gitDirectory =
@@ -90,6 +104,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 
 	// TODO: ask which directory to make the worker in (defaults to args.name)
 	// TODO: if args.name isn't provided, ask what to name the worker
+	// Note: `--from-dash` will be a fallback creationDir/Worker name if none is provided.
 
 	const wranglerTomlDestination = path.join(
 		creationDirectory,
@@ -98,12 +113,15 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 	let justCreatedWranglerToml = false;
 
 	if (fs.existsSync(wranglerTomlDestination)) {
+		let shouldContinue = false;
 		logger.warn(
 			`${path.relative(process.cwd(), wranglerTomlDestination)} already exists!`
 		);
-		const shouldContinue = await confirm(
-			"Do you want to continue initializing this project?"
-		);
+		if (!fromDashScriptName) {
+			shouldContinue = await confirm(
+				"Do you want to continue initializing this project?"
+			);
+		}
 		if (!shouldContinue) {
 			return;
 		}
@@ -438,27 +456,23 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 				process.cwd(),
 				path.join(creationDirectory, "./src/index.ts")
 			);
-
-			const newWorkerType = yesFlag
-				? "fetch"
-				: await getNewWorkerType(newWorkerFilename);
-
-			if (newWorkerType !== "none") {
-				const template = getNewWorkerTemplate("ts", newWorkerType);
-
+			if (fromDashScriptName) {
+				const config = readConfig(args.config as ConfigPath, args);
+				const accountId = await requireAuth(config);
 				await mkdir(path.join(creationDirectory, "./src"), {
 					recursive: true,
 				});
-				await writeFile(
-					path.join(creationDirectory, "./src/index.ts"),
-					readFileSync(path.join(__dirname, `../templates/${template}`))
+
+				const dashScript = await fetchDashboardScript(
+					`/accounts/${accountId}/workers/scripts/${fromDashScriptName}`,
+					{
+						method: "GET",
+					}
 				);
 
-				logger.log(
-					`✨ Created ${path.relative(
-						process.cwd(),
-						path.join(creationDirectory, "./src/index.ts")
-					)}`
+				await writeFile(
+					path.join(creationDirectory, "./src/index.ts"),
+					dashScript
 				);
 
 				await writePackageJsonScriptsAndUpdateWranglerToml(
@@ -466,8 +480,39 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 					justCreatedWranglerToml,
 					pathToPackageJson,
 					"src/index.ts",
-					getNewWorkerToml(newWorkerType)
+					{}
 				);
+			} else {
+				const newWorkerType = yesFlag
+					? "fetch"
+					: await getNewWorkerType(newWorkerFilename);
+
+				if (newWorkerType !== "none") {
+					const template = getNewWorkerTemplate("ts", newWorkerType);
+
+					await mkdir(path.join(creationDirectory, "./src"), {
+						recursive: true,
+					});
+					await writeFile(
+						path.join(creationDirectory, "./src/index.ts"),
+						readFileSync(path.join(__dirname, `../templates/${template}`))
+					);
+
+					logger.log(
+						`✨ Created ${path.relative(
+							process.cwd(),
+							path.join(creationDirectory, "./src/index.ts")
+						)}`
+					);
+
+					await writePackageJsonScriptsAndUpdateWranglerToml(
+						shouldWritePackageJsonScripts,
+						justCreatedWranglerToml,
+						pathToPackageJson,
+						"src/index.ts",
+						getNewWorkerToml(newWorkerType)
+					);
+				}
 			}
 		}
 	} else {
@@ -477,35 +522,63 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 				path.join(creationDirectory, "./src/index.js")
 			);
 
-			const newWorkerType = yesFlag
-				? "fetch"
-				: await getNewWorkerType(newWorkerFilename);
-
-			if (newWorkerType !== "none") {
-				const template = getNewWorkerTemplate("js", newWorkerType);
-
+			if (fromDashScriptName) {
+				const config = readConfig(args.config as ConfigPath, args);
+				const accountId = await requireAuth(config);
 				await mkdir(path.join(creationDirectory, "./src"), {
 					recursive: true,
 				});
-				await writeFile(
-					path.join(creationDirectory, "./src/index.js"),
-					readFileSync(path.join(__dirname, `../templates/${template}`))
+
+				const dashScript = await fetchDashboardScript(
+					`/accounts/${accountId}/workers/scripts/${fromDashScriptName}`,
+					{
+						method: "GET",
+					}
 				);
 
-				logger.log(
-					`✨ Created ${path.relative(
-						process.cwd(),
-						path.join(creationDirectory, "./src/index.js")
-					)}`
+				await writeFile(
+					path.join(creationDirectory, "./src/index.js"),
+					dashScript
 				);
 
 				await writePackageJsonScriptsAndUpdateWranglerToml(
 					shouldWritePackageJsonScripts,
 					justCreatedWranglerToml,
 					pathToPackageJson,
-					"src/index.js",
-					getNewWorkerToml(newWorkerType)
+					"src/index.ts",
+					{}
 				);
+			} else {
+				const newWorkerType = yesFlag
+					? "fetch"
+					: await getNewWorkerType(newWorkerFilename);
+
+				if (newWorkerType !== "none") {
+					const template = getNewWorkerTemplate("js", newWorkerType);
+
+					await mkdir(path.join(creationDirectory, "./src"), {
+						recursive: true,
+					});
+					await writeFile(
+						path.join(creationDirectory, "./src/index.js"),
+						readFileSync(path.join(__dirname, `../templates/${template}`))
+					);
+
+					logger.log(
+						`✨ Created ${path.relative(
+							process.cwd(),
+							path.join(creationDirectory, "./src/index.js")
+						)}`
+					);
+
+					await writePackageJsonScriptsAndUpdateWranglerToml(
+						shouldWritePackageJsonScripts,
+						justCreatedWranglerToml,
+						pathToPackageJson,
+						"src/index.js",
+						getNewWorkerToml(newWorkerType)
+					);
+				}
 			}
 		}
 	}

package/src/miniflare-cli/assets.ts

@@ -466,6 +466,14 @@ async function generateAssetsFetch(
 				return deconstructedResponse;
 			}
 		} else if (hasFileExtension(assetName)) {
+			if ((asset = getAsset(assetName + ".html"))) {
+				deconstructedResponse.body = serveAsset(asset);
+				deconstructedResponse.headers.set(
+					"Content-Type",
+					getType(asset) || "application/octet-stream"
+				);
+				return deconstructedResponse;
+			}
 			notFound();
 			return deconstructedResponse;
 		}

package/src/miniflare-cli/index.ts

@@ -76,10 +76,13 @@ async function main() {
 				namespace.get = (id) => {
 					const stub = new DurableObjectStub(factory, id);
 					stub.fetch = (...reqArgs) => {
-						const url = `http://${host}${port ? `:${port}` : ""}`;
+						const requestFromArgs = new MiniflareRequest(...reqArgs);
+						const url = new URL(requestFromArgs.url);
+						url.host = host;
+						if (port !== undefined) url.port = port.toString();
 						const request = new MiniflareRequest(
-							url,
-							new MiniflareRequest(...reqArgs)
+							url.toString(),
+							requestFromArgs
 						);
 						request.headers.set("x-miniflare-durable-object-name", name);
 						request.headers.set("x-miniflare-durable-object-id", id.toString());

package/src/pages/build.tsx

@@ -1,10 +1,16 @@
 import { writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
+import { FatalError } from "../errors";
 import { logger } from "../logger";
 import * as metrics from "../metrics";
 import { toUrlPath } from "../paths";
 import { isInPagesCI } from "./constants";
+import {
+	EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR,
+	FunctionsNoRoutesError,
+	getFunctionsNoRoutesWarning,
+} from "./errors";
 import { buildPlugin } from "./functions/buildPlugin";
 import { buildWorker } from "./functions/buildWorker";
 import { generateConfigFromFileTree } from "./functions/filepath-routing";
@@ -104,23 +110,37 @@ export const Handler = async ({
 	}
 
 	buildOutputDirectory ??= dirname(outfile);
-
-	await buildFunctions({
-		outfile,
-		outputConfigPath,
-		functionsDirectory: directory,
-		minify,
-		sourcemap,
-		fallbackService,
-		watch,
-		plugin,
-		buildOutputDirectory,
-		nodeCompat,
-		routesOutputPath,
-	});
+	try {
+		await buildFunctions({
+			outfile,
+			outputConfigPath,
+			functionsDirectory: directory,
+			minify,
+			sourcemap,
+			fallbackService,
+			watch,
+			plugin,
+			buildOutputDirectory,
+			nodeCompat,
+			routesOutputPath,
+		});
+	} catch (e) {
+		if (e instanceof FunctionsNoRoutesError) {
+			throw new FatalError(
+				getFunctionsNoRoutesWarning(directory),
+				EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR
+			);
+		} else {
+			throw e;
+		}
+	}
 	await metrics.sendMetricsEvent("build pages functions");
 };
 
+/**
+ * Builds a Functions worker based on the functions directory, with filepath and handler based routing.
+ * @throws FunctionsNoRoutesError when there are no routes found in the functions directory
+ */
 export async function buildFunctions({
 	outfile,
 	outputConfigPath,
@@ -164,7 +184,13 @@ export async function buildFunctions({
 		baseURL,
 	});
 
-	if (config.routes && routesOutputPath) {
+	if (!config.routes || config.routes.length === 0) {
+		throw new FunctionsNoRoutesError(
+			`Failed to find any routes while compiling Functions in: ${functionsDirectory}`
+		);
+	}
+
+	if (routesOutputPath) {
 		const routesJSON = convertRoutesToRoutesJSONSpec(config.routes);
 		writeFileSync(routesOutputPath, JSON.stringify(routesJSON, null, 2));
 	}

package/src/pages/constants.ts

@@ -8,4 +8,5 @@ export const SECONDS_TO_WAIT_FOR_PROXY = 5;
 export const isInPagesCI = !!process.env.CF_PAGES;
 /** The max number of rules in _routes.json */
 export const MAX_FUNCTIONS_ROUTES_RULES = 100;
+export const MAX_FUNCTIONS_ROUTES_RULE_LENGTH = 100;
 export const ROUTES_SPEC_VERSION = 1;