wrangler 0.0.0-e7a0cd5b → 0.0.0-e7cf0caa

package/src/queues/cli/commands/create.ts

@@ -1,14 +1,12 @@
-import { type Argv } from "yargs";
 import { readConfig } from "../../../config";
 import { logger } from "../../../logger";
 import { createQueue } from "../../client";
+import type {
+	CommonYargsArgv,
+	StrictYargsOptionsToInterface,
+} from "../../../yargs-types";
 
-interface Args {
-	config?: string;
-	name: string;
-}
-
-export function options(yargs: Argv): Argv<Args> {
+export function options(yargs: CommonYargsArgv) {
 	return yargs.positional("name", {
 		type: "string",
 		demandOption: true,
@@ -16,7 +14,9 @@ export function options(yargs: Argv): Argv<Args> {
 	});
 }
 
-export async function handler(args: Args) {
+export async function handler(
+	args: StrictYargsOptionsToInterface<typeof options>
+) {
 	const config = readConfig(args.config, args);
 
 	logger.log(`Creating queue ${args.name}.`);

package/src/queues/cli/commands/delete.ts

@@ -1,14 +1,12 @@
-import { type Argv } from "yargs";
 import { readConfig } from "../../../config";
 import { logger } from "../../../logger";
 import { deleteQueue } from "../../client";
+import type {
+	CommonYargsArgv,
+	StrictYargsOptionsToInterface,
+} from "../../../yargs-types";
 
-interface Args {
-	config?: string;
-	name: string;
-}
-
-export function options(yargs: Argv): Argv<Args> {
+export function options(yargs: CommonYargsArgv) {
 	// TODO(soon) --force option
 	return yargs.positional("name", {
 		type: "string",
@@ -17,7 +15,9 @@ export function options(yargs: Argv): Argv<Args> {
 	});
 }
 
-export async function handler(args: Args) {
+export async function handler(
+	args: StrictYargsOptionsToInterface<typeof options>
+) {
 	const config = readConfig(args.config, args);
 
 	logger.log(`Deleting queue ${args.name}.`);

package/src/queues/cli/commands/index.ts

@@ -1,12 +1,12 @@
-import { type BuilderCallback } from "yargs";
-import { type CommonYargsOptions } from "../../../yargs-types";
+import { HandleUnauthorizedError } from "../../utils";
 import { consumers } from "./consumer";
 
 import { options as createOptions, handler as createHandler } from "./create";
 import { options as deleteOptions, handler as deleteHandler } from "./delete";
 import { options as listOptions, handler as listHandler } from "./list";
+import type { CommonYargsArgv } from "../../../yargs-types";
 
-export const queues: BuilderCallback<CommonYargsOptions, unknown> = (yargs) => {
+export function queues(yargs: CommonYargsArgv) {
 	yargs.command("list", "List Queues", listOptions, listHandler);
 
 	yargs.command(
@@ -30,4 +30,6 @@ export const queues: BuilderCallback<CommonYargsOptions, unknown> = (yargs) => {
 			await consumers(consumersYargs);
 		}
 	);
-};
+
+	yargs.fail(HandleUnauthorizedError);
+}

package/src/queues/cli/commands/list.ts

@@ -1,14 +1,12 @@
-import { type Argv } from "yargs";
 import { readConfig } from "../../../config";
 import { logger } from "../../../logger";
 import { listQueues } from "../../client";
+import type {
+	CommonYargsArgv,
+	StrictYargsOptionsToInterface,
+} from "../../../yargs-types";
 
-interface Args {
-	config?: string;
-	page?: number;
-}
-
-export function options(yargs: Argv): Argv<Args> {
+export function options(yargs: CommonYargsArgv) {
 	return yargs.options({
 		page: {
 			type: "number",
@@ -17,7 +15,9 @@ export function options(yargs: Argv): Argv<Args> {
 	});
 }
 
-export async function handler(args: Args) {
+export async function handler(
+	args: StrictYargsOptionsToInterface<typeof options>
+) {
 	const config = readConfig(args.config, args);
 
 	const queues = await listQueues(config, args.page);

package/src/queues/client.ts

@@ -90,6 +90,7 @@ export interface ConsumerSettings {
 	batch_size?: number;
 	max_retries?: number;
 	max_wait_time_ms?: number;
+	max_concurrency?: number | null;
 }
 
 export interface ConsumerResponse extends PostConsumerBody {

package/src/queues/utils.ts

@@ -0,0 +1,18 @@
+import { logger } from "../logger";
+import { type ParseError } from "../parse";
+import { getAccountId } from "../user";
+
+const isFetchError = (err: unknown): err is ParseError => err instanceof Error;
+
+export const HandleUnauthorizedError = async (_msg: string, err: Error) => {
+	//@ts-expect-error non-standard property on Error
+	if (isFetchError(err) && err.code === 10023) {
+		const accountId = await getAccountId();
+		if (accountId) {
+			return logger.log(
+				`Queues is not currently enabled on this account. Go to https://dash.cloudflare.com/${accountId}/workers/queues to enable it.`
+			);
+		}
+	}
+	throw err;
+};

package/src/r2/constants.ts

@@ -0,0 +1,4 @@
+/**
+ * The maximum file size we can upload using the V4 API.
+ */
+export const MAX_UPLOAD_SIZE = 300 * 1024 * 1024;

package/src/r2/helpers.ts

@@ -113,6 +113,7 @@ export async function putR2Object(
 			body: object,
 			headers,
 			method: "PUT",
+			duplex: "half",
 		}
 	);
 }

package/src/r2/index.ts

@@ -1,11 +1,14 @@
 import * as fs from "node:fs";
 import * as stream from "node:stream";
 
+import prettyBytes from "pretty-bytes";
 import { readConfig } from "../config";
+import { FatalError } from "../errors";
 import { CommandLineArgsError, printWranglerBanner } from "../index";
 import { logger } from "../logger";
 import * as metrics from "../metrics";
 import { requireAuth } from "../user";
+import { MAX_UPLOAD_SIZE } from "./constants";
 import {
 	bucketAndKeyFromObjectPath,
 	createR2Bucket,
@@ -16,22 +19,23 @@ import {
 	putR2Object,
 } from "./helpers";
 
-import type { ConfigPath } from "../index";
+import type { CommonYargsArgv } from "../yargs-types";
 import type { Readable } from "node:stream";
-import type { BuilderCallback } from "yargs";
 
-export const r2: BuilderCallback<unknown, unknown> = (r2Yargs) => {
+export function r2(r2Yargs: CommonYargsArgv) {
 	return r2Yargs
 		.command("object", "Manage R2 objects", (r2ObjectYargs) => {
 			return r2ObjectYargs
 				.command(
 					"get <objectPath>",
 					"Fetch an object from an R2 bucket",
-					(Objectyargs) => {
-						return Objectyargs.positional("objectPath", {
-							describe: "The source object path in the form of {bucket}/{key}",
-							type: "string",
-						})
+					(objectArgs) => {
+						return objectArgs
+							.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",
@@ -48,10 +52,7 @@ export const r2: BuilderCallback<unknown, unknown> = (r2Yargs) => {
 							});
 					},
 					async (objectGetYargs) => {
-						const config = readConfig(
-							objectGetYargs.config as ConfigPath,
-							objectGetYargs
-						);
+						const config = readConfig(objectGetYargs.config, objectGetYargs);
 						const accountId = await requireAuth(config);
 						const { objectPath, pipe } = objectGetYargs;
 						const { bucket, key } = bucketAndKeyFromObjectPath(objectPath);
@@ -141,10 +142,7 @@ export const r2: BuilderCallback<unknown, unknown> = (r2Yargs) => {
 					async (objectPutYargs) => {
 						await printWranglerBanner();
 
-						const config = readConfig(
-							objectPutYargs.config as ConfigPath,
-							objectPutYargs
-						);
+						const config = readConfig(objectPutYargs.config, objectPutYargs);
 						const accountId = await requireAuth(config);
 						const { objectPath, file, pipe, ...options } = objectPutYargs;
 						const { bucket, key } = bucketAndKeyFromObjectPath(objectPath);
@@ -176,6 +174,15 @@ export const r2: BuilderCallback<unknown, unknown> = (r2Yargs) => {
 							objectSize = object.byteLength;
 						}
 
+						if (objectSize > MAX_UPLOAD_SIZE) {
+							throw new FatalError(
+								`Error: Wrangler only supports uploading files up to ${prettyBytes(
+									MAX_UPLOAD_SIZE
+								)} in size\n${key} is ${prettyBytes(objectSize)} in size`,
+								1
+							);
+						}
+
 						logger.log(`Creating object "${key}" in bucket "${bucket}".`);
 						await putR2Object(accountId, bucket, key, object, {
 							...options,
@@ -198,7 +205,7 @@ export const r2: BuilderCallback<unknown, unknown> = (r2Yargs) => {
 						const { objectPath } = args;
 						await printWranglerBanner();
 
-						const config = readConfig(args.config as ConfigPath, args);
+						const config = readConfig(args.config, args);
 						const accountId = await requireAuth(config);
 						const { bucket, key } = bucketAndKeyFromObjectPath(objectPath);
 						logger.log(`Deleting object "${key}" from bucket "${bucket}".`);
@@ -223,7 +230,7 @@ export const r2: BuilderCallback<unknown, unknown> = (r2Yargs) => {
 				async (args) => {
 					await printWranglerBanner();
 
-					const config = readConfig(args.config as ConfigPath, args);
+					const config = readConfig(args.config, args);
 
 					const accountId = await requireAuth(config);
 
@@ -236,16 +243,21 @@ export const r2: BuilderCallback<unknown, unknown> = (r2Yargs) => {
 				}
 			);
 
-			r2BucketYargs.command("list", "List R2 buckets", {}, async (args) => {
-				const config = readConfig(args.config as ConfigPath, args);
+			r2BucketYargs.command(
+				"list",
+				"List R2 buckets",
+				(listArgs) => listArgs,
+				async (args) => {
+					const config = readConfig(args.config, args);
 
-				const accountId = await requireAuth(config);
+					const accountId = await requireAuth(config);
 
-				logger.log(JSON.stringify(await listR2Buckets(accountId), null, 2));
-				await metrics.sendMetricsEvent("list r2 buckets", {
-					sendMetrics: config.send_metrics,
-				});
-			});
+					logger.log(JSON.stringify(await listR2Buckets(accountId), null, 2));
+					await metrics.sendMetricsEvent("list r2 buckets", {
+						sendMetrics: config.send_metrics,
+					});
+				}
+			);
 
 			r2BucketYargs.command(
 				"delete <name>",
@@ -260,7 +272,7 @@ export const r2: BuilderCallback<unknown, unknown> = (r2Yargs) => {
 				async (args) => {
 					await printWranglerBanner();
 
-					const config = readConfig(args.config as ConfigPath, args);
+					const config = readConfig(args.config, args);
 
 					const accountId = await requireAuth(config);
 
@@ -274,4 +286,4 @@ export const r2: BuilderCallback<unknown, unknown> = (r2Yargs) => {
 			);
 			return r2BucketYargs;
 		});
-};
+}

package/src/secret/index.ts

@@ -13,14 +13,12 @@ import * as metrics from "../metrics";
 import { parseJSON, readFileSync } from "../parse";
 import { requireAuth } from "../user";
 
-import type { ConfigPath } from "../index";
 import type {
-	CommonYargsOptions,
-	YargsOptionsToInterface,
+	CommonYargsArgv,
+	StrictYargsOptionsToInterface,
 } from "../yargs-types";
-import type { Argv } from "yargs";
 
-export const secret = (secretYargs: Argv<CommonYargsOptions>) => {
+export const secret = (secretYargs: CommonYargsArgv) => {
 	return secretYargs
 		.option("legacy-env", {
 			type: "boolean",
@@ -44,7 +42,7 @@ export const secret = (secretYargs: Argv<CommonYargsOptions>) => {
 			},
 			async (args) => {
 				await printWranglerBanner();
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 
 				const scriptName = getLegacyScriptName(args, config);
 				if (!scriptName) {
@@ -58,7 +56,7 @@ export const secret = (secretYargs: Argv<CommonYargsOptions>) => {
 				const isInteractive = process.stdin.isTTY;
 				const secretValue = trimTrailingWhitespace(
 					isInteractive
-						? await prompt("Enter a secret value:", "password")
+						? await prompt("Enter a secret value:", { isSecret: true })
 						: await readFromStdin()
 				);
 
@@ -102,19 +100,21 @@ export const secret = (secretYargs: Argv<CommonYargsOptions>) => {
 								},
 								bindings: {
 									kv_namespaces: [],
+									send_email: [],
 									vars: {},
-									metadata_binding: undefined,
 									durable_objects: { bindings: [] },
 									queues: [],
 									r2_buckets: [],
 									d1_databases: [],
 									services: [],
+									analytics_engine_datasets: [],
 									wasm_modules: {},
 									text_blobs: {},
 									data_blobs: {},
 									dispatch_namespaces: [],
+									mtls_certificates: [],
 									logfwdr: { schema: undefined, bindings: [] },
-									unsafe: [],
+									unsafe: { bindings: undefined, metadata: undefined },
 								},
 								modules: [],
 								migrations: undefined,
@@ -172,7 +172,7 @@ export const secret = (secretYargs: Argv<CommonYargsOptions>) => {
 					});
 			},
 			async (args) => {
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 
 				const scriptName = getLegacyScriptName(args, config);
 				if (!scriptName) {
@@ -222,7 +222,7 @@ export const secret = (secretYargs: Argv<CommonYargsOptions>) => {
 				});
 			},
 			async (args) => {
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 
 				const scriptName = getLegacyScriptName(args, config);
 				if (!scriptName) {
@@ -246,7 +246,7 @@ export const secret = (secretYargs: Argv<CommonYargsOptions>) => {
 		);
 };
 
-export const secretBulkOptions = (yargs: Argv<CommonYargsOptions>) => {
+export const secretBulkOptions = (yargs: CommonYargsArgv) => {
 	return yargs
 		.positional("json", {
 			describe: `The JSON file of key-value pairs to upload, in form {"key": value, ...}`,
@@ -301,14 +301,11 @@ function readFromStdin(): Promise<string> {
 	});
 }
 
-type SecretBulkArgs = YargsOptionsToInterface<typeof secretBulkOptions>;
+type SecretBulkArgs = StrictYargsOptionsToInterface<typeof secretBulkOptions>;
 
 export const secretBulkHandler = async (secretBulkArgs: SecretBulkArgs) => {
 	await printWranglerBanner();
-	const config = readConfig(
-		secretBulkArgs.config as ConfigPath,
-		secretBulkArgs
-	);
+	const config = readConfig(secretBulkArgs.config, secretBulkArgs);
 
 	const scriptName = getLegacyScriptName(secretBulkArgs, config);
 	if (!scriptName) {

package/src/{sites.tsx → sites.ts}

@@ -56,7 +56,7 @@ function hashFileContent(hasher: XXHashAPI, content: string): string {
  * Create a hashed asset key for the given asset.
  *
  * The key will change if the file path or content of the asset changes.
- * The algorithm used here matches that of Wrangler 1.
+ * The algorithm used here matches that of Wrangler v1.
  */
 function hashAsset(
 	hasher: XXHashAPI,

package/src/tail/createTail.ts

@@ -7,6 +7,8 @@ export { translateCLICommandToFilterMessage } from "./filters";
 export { jsonPrintLogs, prettyPrintLogs } from "./printing";
 import type { Request } from "undici";
 
+const TRACE_VERSION = "trace-v1";
+
 /**
  * When creating a Tail, the response from the API contains
  * - an ID used for identifying the tail
@@ -59,6 +61,68 @@ function makeDeleteTailUrl(
 		: `/accounts/${accountId}/workers/scripts/${workerName}/tails/${tailId}`;
 }
 
+interface CreatePagesTailOptions {
+	accountId: string;
+	projectName: string;
+	deploymentId: string;
+	filters: TailFilterMessage;
+	debug?: boolean;
+}
+
+/**
+ * Create and connect to a Pages Function Tail.
+ *
+ * Under the hood, this function
+ * - Registers a new Tail with the API
+ * - Connects to the tail worker
+ * - Sends any filters over the connection
+ *
+ * @returns a websocket connection, an expiration, and a function to call to delete the tail
+ */
+export async function createPagesTail({
+	accountId,
+	projectName,
+	deploymentId,
+	filters,
+	debug = false,
+}: CreatePagesTailOptions) {
+	const tailRecord = await fetchResult<TailCreationApiResponse>(
+		`/accounts/${accountId}/pages/projects/${projectName}/deployments/${deploymentId}/tails`,
+		{
+			method: "POST",
+			body: JSON.stringify(filters),
+		}
+	);
+
+	const deleteTail = async () =>
+		fetchResult(
+			`/accounts/${accountId}/pages/projects/${projectName}/deployments/${deploymentId}/tails/${tailRecord.id}`,
+			{ method: "DELETE" }
+		);
+
+	const tail = new WebSocket(tailRecord.url, TRACE_VERSION, {
+		headers: {
+			"Sec-WebSocket-Protocol": TRACE_VERSION, // needs to be `trace-v1` to be accepted
+			"User-Agent": `wrangler-js/${packageVersion}`,
+		},
+	});
+
+	// send filters when we open up
+	tail.on("open", () => {
+		tail.send(
+			JSON.stringify({ debug: debug }),
+			{ binary: false, compress: false, mask: false, fin: true },
+			(err) => {
+				if (err) {
+					throw err;
+				}
+			}
+		);
+	});
+
+	return { tail, deleteTail, expiration: tailRecord.expires_at };
+}
+
 /**
  * Create and connect to a tail.
  *
@@ -102,9 +166,9 @@ export async function createTail(
 	}
 
 	// connect to the tail
-	const tail = new WebSocket(websocketUrl, "trace-v1", {
+	const tail = new WebSocket(websocketUrl, TRACE_VERSION, {
 		headers: {
-			"Sec-WebSocket-Protocol": "trace-v1", // needs to be `trace-v1` to be accepted
+			"Sec-WebSocket-Protocol": TRACE_VERSION, // needs to be `trace-v1` to be accepted
 			"User-Agent": `wrangler-js/${packageVersion}`,
 		},
 	});
@@ -178,11 +242,18 @@ export type TailEventMessage = {
 	 * The event that triggered the worker. In the case of an HTTP request,
 	 * this will be a RequestEvent. If it's a cron trigger, it'll be a
 	 * ScheduledEvent. If it's a durable object alarm, it's an AlarmEvent.
+	 * If it's a email, it'a an EmailEvent
 	 *
 	 * Until workers-types exposes individual types for export, we'll have
 	 * to just re-define these types ourselves.
 	 */
-	event: RequestEvent | ScheduledEvent | AlarmEvent | undefined | null;
+	event:
+		| RequestEvent
+		| ScheduledEvent
+		| AlarmEvent
+		| EmailEvent
+		| undefined
+		| null;
 };
 
 /**
@@ -313,3 +384,23 @@ export type AlarmEvent = {
 	 */
 	scheduledTime: string;
 };
+
+/**
+ * An event that was triggered from an email
+ */
+export type EmailEvent = {
+	/**
+	 * Who sent the email
+	 */
+	mailFrom: string;
+
+	/**
+	 * Who was the email sent to
+	 */
+	rcptTo: string;
+
+	/**
+	 * Size of the email in bytes
+	 */
+	rawSize: number;
+};

package/src/tail/filters.ts

@@ -7,7 +7,7 @@
 
 /**
  * These are the filters we accept in the CLI. They
- * were copied directly from wrangler 1 in order to
+ * were copied directly from Wrangler v1 in order to
  * maintain compatability, so they aren't actually the exact
  * filters we need to send up to the tail worker. They generally map 1:1,
  * but often require some transformation or

package/src/tail/index.ts

@@ -3,7 +3,7 @@ import onExit from "signal-exit";
 
 import { fetchResult, fetchScriptContent } from "../cfetch";
 import { readConfig } from "../config";
-import { tailDOLogPrompt } from "../dialogs";
+import { confirm } from "../dialogs";
 import {
 	isLegacyEnv,
 	printWranglerBanner,
@@ -20,16 +20,14 @@ import {
 	translateCLICommandToFilterMessage,
 } from "./createTail";
 import type { WorkerMetadata } from "../create-worker-upload-form";
-import type { ConfigPath } from "../index";
 import type {
-	CommonYargsOptions,
-	YargsOptionsToInterface,
+	CommonYargsArgv,
+	StrictYargsOptionsToInterface,
 } from "../yargs-types";
 import type { TailCLIFilters } from "./createTail";
 import type { RawData } from "ws";
-import type { Argv } from "yargs";
 
-export function tailOptions(yargs: Argv<CommonYargsOptions>) {
+export function tailOptions(yargs: CommonYargsArgv) {
 	return yargs
 		.positional("worker", {
 			describe: "Name or route of the worker to tail",
@@ -86,13 +84,13 @@ export function tailOptions(yargs: Argv<CommonYargsOptions>) {
 		});
 }
 
-type TailArgs = YargsOptionsToInterface<typeof tailOptions>;
+type TailArgs = StrictYargsOptionsToInterface<typeof tailOptions>;
 
 export async function tailHandler(args: TailArgs) {
 	if (args.format === "pretty") {
 		await printWranglerBanner();
 	}
-	const config = readConfig(args.config as ConfigPath, args);
+	const config = readConfig(args.config, args);
 	await metrics.sendMetricsEvent("begin log stream", {
 		sendMetrics: config.send_metrics,
 	});
@@ -121,7 +119,7 @@ export async function tailHandler(args: TailArgs) {
 		status: args.status as ("ok" | "error" | "canceled")[] | undefined,
 		header: args.header,
 		method: args.method,
-		samplingRate: args["sampling-rate"],
+		samplingRate: args.samplingRate,
 		search: args.search,
 		clientIp: args.ip,
 	};
@@ -144,8 +142,7 @@ export async function tailHandler(args: TailArgs) {
 			`Beginning log collection requires restarting the Durable Objects associated with ${scriptName}. Any WebSocket connections or other non-persisted state will be lost as part of this restart.`
 		);
 
-		const shouldContinue = await tailDOLogPrompt();
-		if (!shouldContinue) {
+		if (!(await confirm("Would you like to continue?"))) {
 			return;
 		}
 	}

package/src/tail/printing.ts

@@ -1,6 +1,7 @@
 import { logger } from "../logger";
 import type {
 	AlarmEvent,
+	EmailEvent,
 	RequestEvent,
 	ScheduledEvent,
 	TailEventMessage,
@@ -30,6 +31,16 @@ export function prettyPrintLogs(data: WebSocket.RawData): void {
 				? `${requestMethod} ${url} - ${outcome} @ ${datetime}`
 				: `[missing request] - ${outcome} @ ${datetime}`
 		);
+	} else if (isEmailEvent(eventMessage.event)) {
+		const outcome = prettifyOutcome(eventMessage.outcome);
+		const datetime = new Date(eventMessage.eventTimestamp).toLocaleString();
+		const mailFrom = eventMessage.event.mailFrom;
+		const rcptTo = eventMessage.event.rcptTo;
+		const rawSize = eventMessage.event.rawSize;
+
+		logger.log(
+			`Email from:${mailFrom} to:${rcptTo} size:${rawSize} @ ${datetime} - ${outcome}`
+		);
 	} else if (isAlarmEvent(eventMessage.event)) {
 		const outcome = prettifyOutcome(eventMessage.outcome);
 		const datetime = new Date(
@@ -74,6 +85,10 @@ function isScheduledEvent(
 	return Boolean(event && "cron" in event);
 }
 
+function isEmailEvent(event: TailEventMessage["event"]): event is EmailEvent {
+	return Boolean(event && "mailFrom" in event);
+}
+
 /**
  * Check to see if an event sent from a worker is an AlarmEvent.
  *