wrangler 2.2.2 → 2.3.0

package/src/publish/publish.ts

@@ -821,13 +821,13 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 
 	try {
 		const deploymentsList = await fetchResult<DeploymentListRes>(
-			`/accounts/${accountId}/workers/versions/by-script/${scriptTag}`
+			`/accounts/${accountId}/workers/deployments/by-script/${scriptTag}`
 		);
 
 		logger.log("Current Deployment ID:", deploymentsList.latest.id);
 	} catch (e) {
 		if ((e as { code: number }).code === 10023) {
-			// TODO: remove this try/catch once versions is completely rolled out
+			// TODO: remove this try/catch once deployments is completely rolled out
 		} else {
 			throw e;
 		}

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}`,
 		},
 	});

package/src/type-generation.ts

@@ -3,14 +3,11 @@ import { findUpSync } from "find-up";
 import { getEntry } from "./entry";
 import { logger } from "./logger";
 import type { Config } from "./config";
-import type { CfWorkerInit } from "./worker";
 
 // Currently includes bindings & rules for declaring modules
-export type PartialConfigToDTS = CfWorkerInit["bindings"] & {
-	rules: Config["rules"];
-};
+
 export async function generateTypes(
-	configToDTS: PartialConfigToDTS,
+	configToDTS: Partial<Config>,
 	config: Config
 ) {
 	const entry = await getEntry({}, config, "types");
@@ -85,11 +82,19 @@ export async function generateTypes(
 	}
 
 	if (configToDTS.unsafe) {
-		for (const unsafe of configToDTS.unsafe) {
+		for (const unsafe of configToDTS.unsafe.bindings) {
 			envTypeStructure.push(`	${unsafe.name}: any;`);
 		}
 	}
 
+	if (configToDTS.queues) {
+		if (configToDTS.queues.producers) {
+			for (const queue of configToDTS.queues.producers) {
+				envTypeStructure.push(`	${queue.binding}: Queue;`);
+			}
+		}
+	}
+
 	const modulesTypeStructure: string[] = [];
 	if (configToDTS.rules) {
 		const moduleTypeMap = {
@@ -113,47 +118,56 @@ export async function generateTypes(
 		}
 	}
 
-	function writeDTSFile(
-		typesString: string[],
-		formatType: "modules" | "service-worker"
-	) {
-		const wranglerOverrideDTSPath = findUpSync("worker-configuration.d.ts");
-		try {
-			if (
-				wranglerOverrideDTSPath !== undefined &&
-				!fs
-					.readFileSync(wranglerOverrideDTSPath, "utf8")
-					.includes("***AUTO GENERATED BY WORKERS CLI WRANGLER***")
-			) {
-				throw new Error(
-					"A non-wrangler worker-configuration.d.ts already exists, please rename and try again."
-				);
-			}
-		} catch (error) {
-			if (error instanceof Error && !error.message.includes("not found")) {
-				throw error;
-			}
-		}
-
-		let combinedTypeStrings = "";
-		if (formatType === "modules") {
-			combinedTypeStrings = `interface Env {\n${typesString.join(
-				"\n"
-			)} \n}\n${modulesTypeStructure.join("\n")}`;
-		} else {
-			combinedTypeStrings = `declare global {\n${typesString.join(
-				"\n"
-			)} \n}\n${modulesTypeStructure.join("\n")}`;
-		}
+	writeDTSFile({
+		envTypeStructure,
+		modulesTypeStructure,
+		formatType: entry.format,
+	});
+}
 
-		if (envTypeStructure.length || modulesTypeStructure.length) {
-			fs.writeFileSync(
-				"worker-configuration.d.ts",
-				`// Generated by Wrangler on ${new Date()}` + "\n" + combinedTypeStrings
+function writeDTSFile({
+	envTypeStructure,
+	modulesTypeStructure,
+	formatType,
+}: {
+	envTypeStructure: string[];
+	modulesTypeStructure: string[];
+	formatType: "modules" | "service-worker";
+}) {
+	const wranglerOverrideDTSPath = findUpSync("worker-configuration.d.ts");
+	try {
+		if (
+			wranglerOverrideDTSPath !== undefined &&
+			!fs
+				.readFileSync(wranglerOverrideDTSPath, "utf8")
+				.includes("Generated by Wrangler")
+		) {
+			throw new Error(
+				"A non-wrangler worker-configuration.d.ts already exists, please rename and try again."
 			);
-			logger.log(combinedTypeStrings);
 		}
+	} catch (error) {
+		if (error instanceof Error && !error.message.includes("not found")) {
+			throw error;
+		}
+	}
+
+	let combinedTypeStrings = "";
+	if (formatType === "modules") {
+		combinedTypeStrings += `interface Env {\n${envTypeStructure.join(
+			"\n"
+		)} \n}\n${modulesTypeStructure.join("\n")}`;
+	} else {
+		combinedTypeStrings += `declare global {\n${envTypeStructure.join(
+			"\n"
+		)} \n}\n${modulesTypeStructure.join("\n")}`;
 	}
 
-	writeDTSFile(envTypeStructure, entry.format);
+	if (envTypeStructure.length || modulesTypeStructure.length) {
+		fs.writeFileSync(
+			"worker-configuration.d.ts",
+			`// Generated by Wrangler on ${new Date()}` + "\n" + combinedTypeStrings
+		);
+		logger.log(combinedTypeStrings);
+	}
 }

package/src/worker.ts

@@ -126,12 +126,16 @@ export interface CfR2Bucket {
 export const D1_BETA_PREFIX = `__D1_BETA__` as const;
 export type D1PrefixedBinding = `${typeof D1_BETA_PREFIX}${string}`;
 
+// TODO: figure out if this is duplicated in packages/wrangler/src/config/environment.ts
 export interface CfD1Database {
-	// For now, all D1 bindings are beta
+	// For now, all D1 bindings are alpha
 	binding: D1PrefixedBinding;
 	database_id: string;
 	database_name?: string;
 	preview_database_id?: string;
+	database_internal_env?: string;
+	migrations_table?: string;
+	migrations_dir?: string;
 }
 
 interface CfService {

package/src/yargs-types.ts

@@ -9,6 +9,10 @@ export interface CommonYargsOptions {
 	env: string | undefined;
 }
 
+export type YargvToInterface<T> = T extends Argv<infer P>
+	? ArgumentsCamelCase<P>
+	: never;
+
 /**
  * Given some Yargs Options function factory, extract the interface
  * that corresponds to the yargs arguments

package/templates/d1-beta-facade.js

@@ -18,10 +18,16 @@ var D1Database = class {
 			},
 		});
 		if (response.status !== 200) {
-			const err = await response.json();
-			throw new Error("D1_DUMP_ERROR", {
-				cause: new Error(err.error),
-			});
+			try {
+				const err = await response.json();
+				throw new Error("D1_DUMP_ERROR", {
+					cause: new Error(err.error),
+				});
+			} catch (e) {
+				throw new Error("D1_DUMP_ERROR", {
+					cause: new Error("Status " + response.status),
+				});
+			}
 		}
 		return await response.arrayBuffer();
 	}
@@ -35,7 +41,7 @@ var D1Database = class {
 	}
 	async exec(query) {
 		const lines = query.trim().split("\n");
-		const _exec = await this._send("/query", lines, []);
+		const _exec = await this._send("/query", lines, [], false);
 		const exec = Array.isArray(_exec) ? _exec : [_exec];
 		const error = exec
 			.map((r) => {
@@ -45,19 +51,24 @@ var D1Database = class {
 		if (error !== -1) {
 			throw new Error("D1_EXEC_ERROR", {
 				cause: new Error(
-					`Error in line ${error + 1}: ${lines[error]}: ${exec[error].error}`
+					"Error in line " +
+						(error + 1) +
+						": " +
+						lines[error] +
+						": " +
+						exec[error].error
 				),
 			});
 		} else {
 			return {
 				count: exec.length,
 				duration: exec.reduce((p, c) => {
-					return p + c.duration;
+					return p + c.meta.duration;
 				}, 0),
 			};
 		}
 	}
-	async _send(endpoint, query, params) {
+	async _send(endpoint, query, params, dothrow = true) {
 		const body = JSON.stringify(
 			typeof query == "object"
 				? query.map((s, index) => {
@@ -75,12 +86,21 @@ var D1Database = class {
 			},
 			body,
 		});
-		if (response.status !== 200) {
-			const err = await response.json();
-			throw new Error("D1_ERROR", { cause: new Error(err.error) });
+		try {
+			const answer = await response.json();
+			if (answer.error && dothrow) {
+				const err = answer;
+				throw new Error("D1_ERROR", { cause: new Error(err.error) });
+			} else {
+				return Array.isArray(answer)
+					? answer.map((r) => mapD1Result(r))
+					: mapD1Result(answer);
+			}
+		} catch (e) {
+			throw new Error("D1_ERROR", {
+				cause: new Error(e.cause || "Something went wrong"),
+			});
 		}
-		const answer = await response.json();
-		return Array.isArray(answer) ? answer : answer;
 	}
 };
 var D1PreparedStatement = class {
@@ -97,19 +117,15 @@ var D1PreparedStatement = class {
 			await this.database._send("/query", this.statement, this.params)
 		);
 		const results = info.results;
-		if (results.length < 1) {
-			throw new Error("D1_NORESULTS", { cause: new Error("No results") });
-		}
-		const result = results[0];
 		if (colName !== void 0) {
-			if (result[colName] === void 0) {
+			if (results.length > 0 && results[0][colName] === void 0) {
 				throw new Error("D1_COLUMN_NOTFOUND", {
-					cause: new Error(`Column not found`),
+					cause: new Error("Column not found"),
 				});
 			}
-			return result[colName];
+			return results.length < 1 ? null : results[0][colName];
 		} else {
-			return result;
+			return results.length < 1 ? null : results[0];
 		}
 	}
 	async run() {
@@ -139,6 +155,15 @@ var D1PreparedStatement = class {
 function firstIfArray(results) {
 	return Array.isArray(results) ? results[0] : results;
 }
+function mapD1Result(result) {
+	let map = {
+		results: result.results || [],
+		success: result.success === void 0 ? true : result.success,
+		meta: result.meta || {},
+	};
+	result.error && (map.error = result.error);
+	return map;
+}
 
 // src/shim.ts
 var D1_IMPORTS = __D1_IMPORTS__;
@@ -163,12 +188,9 @@ function getMaskedEnv(env) {
 	return newEnvObj;
 }
 var shim_default = {
+	...worker,
 	async fetch(request, env, ctx) {
 		return worker.fetch(request, getMaskedEnv(env), ctx);
 	},
-
-	async scheduled(controller, env, ctx) {
-		return worker.scheduled(controller, getMaskedEnv(env), ctx);
-	},
 };
 export { shim_default as default };

package/wrangler-dist/cli.d.ts

@@ -501,6 +501,12 @@ declare interface EnvironmentNonInheritable {
         database_id: string;
         /** The UUID of this D1 database for Wrangler Dev (if specified). */
         preview_database_id?: string;
+        /** The name of the migrations table for this D1 database (defaults to 'd1_migrations'). */
+        migrations_table?: string;
+        /** The path to the directory of migrations for this D1 database (defaults to './migrations'). */
+        migrations_dir?: string;
+        /** Internal use only. */
+        database_internal_env?: string;
     }[];
     /**
      * Specifies service bindings (worker-to-worker) that are bound to this Worker environment.