wrangler 2.0.24 → 2.0.27

package/src/tail/index.ts

@@ -174,12 +174,12 @@ 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.
+	 * ScheduledEvent. If it's a durable object alarm, it's an AlarmEvent.
 	 *
 	 * Until workers-types exposes individual types for export, we'll have
 	 * to just re-define these types ourselves.
 	 */
-	event: RequestEvent | ScheduledEvent | undefined | null;
+	event: RequestEvent | ScheduledEvent | AlarmEvent | undefined | null;
 };
 
 /**
@@ -297,3 +297,16 @@ export type ScheduledEvent = {
 	 */
 	scheduledTime: number;
 };
+
+/**
+ * A event that was triggered from a durable object alarm
+ */
+export type AlarmEvent = {
+	/**
+	 * The datetime the alarm was scheduled for.
+	 *
+	 * This is sent as an ISO timestamp string (different than ScheduledEvent.scheduledTime),
+	 * you should parse it later on on your own.
+	 */
+	scheduledTime: string;
+};

package/src/tail/printing.ts

@@ -1,6 +1,11 @@
 import { logger } from "../logger";
-import type { RequestEvent, ScheduledEvent, TailEventMessage } from ".";
 import type { Outcome } from "./filters";
+import type {
+	AlarmEvent,
+	RequestEvent,
+	ScheduledEvent,
+	TailEventMessage,
+} from "./index";
 import type WebSocket from "ws";
 
 export function prettyPrintLogs(data: WebSocket.RawData): void {
@@ -14,7 +19,7 @@ export function prettyPrintLogs(data: WebSocket.RawData): void {
 		const outcome = prettifyOutcome(eventMessage.outcome);
 
 		logger.log(`"${cronPattern}" @ ${datetime} - ${outcome}`);
-	} else {
+	} else if (isRequestEvent(eventMessage.event)) {
 		const requestMethod = eventMessage.event?.request.method.toUpperCase();
 		const url = eventMessage.event?.request.url;
 		const outcome = prettifyOutcome(eventMessage.outcome);
@@ -25,6 +30,19 @@ export function prettyPrintLogs(data: WebSocket.RawData): void {
 				? `${requestMethod} ${url} - ${outcome} @ ${datetime}`
 				: `[missing request] - ${outcome} @ ${datetime}`
 		);
+	} else if (isAlarmEvent(eventMessage.event)) {
+		const outcome = prettifyOutcome(eventMessage.outcome);
+		const datetime = new Date(
+			eventMessage.event.scheduledTime
+		).toLocaleString();
+
+		logger.log(`Alarm @ ${datetime} - ${outcome}`);
+	} else {
+		// Unknown event type
+		const outcome = prettifyOutcome(eventMessage.outcome);
+		const datetime = new Date(eventMessage.eventTimestamp).toLocaleString();
+
+		logger.log(`Unknown Event - ${outcome} @ ${datetime}`);
 	}
 
 	if (eventMessage.logs.length > 0) {
@@ -44,12 +62,32 @@ export function jsonPrintLogs(data: WebSocket.RawData): void {
 	console.log(JSON.stringify(JSON.parse(data.toString()), null, 2));
 }
 
+function isRequestEvent(
+	event: TailEventMessage["event"]
+): event is RequestEvent {
+	return Boolean(event && "request" in event);
+}
+
 function isScheduledEvent(
-	event: RequestEvent | ScheduledEvent | undefined | null
+	event: TailEventMessage["event"]
 ): event is ScheduledEvent {
 	return Boolean(event && "cron" in event);
 }
 
+/**
+ * Check to see if an event sent from a worker is an AlarmEvent.
+ *
+ * Because the only property on `AlarmEvent` is "scheduledTime", which it
+ * shares with `ScheduledEvent`, `isAlarmEvent` checks if there's _not_
+ * a "cron" property in `event` to confirm it's an alarm event.
+ *
+ * @param event An event
+ * @returns true if the event is an AlarmEvent
+ */
+function isAlarmEvent(event: TailEventMessage["event"]): event is AlarmEvent {
+	return Boolean(event && "scheduledTime" in event && !("cron" in event));
+}
+
 function prettifyOutcome(outcome: Outcome): string {
 	switch (outcome) {
 		case "ok":
@@ -58,6 +96,8 @@ function prettifyOutcome(outcome: Outcome): string {
 			return "Canceled";
 		case "exceededCpu":
 			return "Exceeded CPU Limit";
+		case "exceededMemory":
+			return "Exceeded Memory Limit";
 		case "exception":
 			return "Exception Thrown";
 		case "unknown":

package/src/user/user.tsx

@@ -224,6 +224,7 @@ import {
 	saveToConfigCache,
 } from "../config-cache";
 import { getGlobalWranglerConfigPath } from "../global-wrangler-config-path";
+import { CI } from "../is-ci";
 import isInteractive from "../is-interactive";
 import { logger } from "../logger";
 import openInBrowser from "../open-in-browser";
@@ -878,10 +879,11 @@ type LoginProps = {
 export async function loginOrRefreshIfRequired(): Promise<boolean> {
 	// TODO: if there already is a token, then try refreshing
 	// TODO: ask permission before opening browser
+	const { isCI } = CI;
 	if (!getAPIToken()) {
 		// Not logged in.
 		// If we are not interactive, we cannot ask the user to login
-		return isInteractive() && (await login());
+		return isInteractive() && !isCI() && (await login());
 	} else if (isAccessTokenExpired()) {
 		// We're logged in, but the refresh token seems to have expired,
 		// so let's try to refresh it
@@ -891,7 +893,7 @@ export async function loginOrRefreshIfRequired(): Promise<boolean> {
 			return true;
 		} else {
 			// If the refresh token isn't valid, then we ask the user to login again
-			return isInteractive() && (await login());
+			return isInteractive() && !isCI() && (await login());
 		}
 	} else {
 		return true;
@@ -1088,7 +1090,7 @@ export async function getAccountId(): Promise<string | undefined> {
 		return accounts[0].id;
 	}
 
-	if (isInteractive()) {
+	if (isInteractive() && !CI.isCI()) {
 		const account = await new Promise<{ id: string; name: string }>(
 			(resolve, reject) => {
 				const { unmount } = render(
@@ -1128,7 +1130,7 @@ export async function requireAuth(config: {
 }): Promise<string> {
 	const loggedIn = await loginOrRefreshIfRequired();
 	if (!loggedIn) {
-		if (!isInteractive()) {
+		if (!isInteractive() || CI.isCI()) {
 			throw new Error(
 				"In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/api/tokens/create/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN."
 			);

package/src/whoami.tsx

@@ -1,6 +1,6 @@
 import { Text, render } from "ink";
 import Table from "ink-table";
-import React from "react";
+import React, { Fragment } from "react";
 import { fetchListResult, fetchResult } from "./cfetch";
 import { logger } from "./logger";
 import { getAPIToken, getAuthFromEnv, getScopes } from "./user";
@@ -64,12 +64,12 @@ function Permissions(props: {
 					and re-login.
 				</Text>
 				<Text>Scope (Access)</Text>
-				{permissions.map(([type, name]) => (
-					<>
+				{permissions.map(([scope, access], index) => (
+					<Fragment key={`${scope}${index}`}>
 						<Text>
-							- {type} {name && `(${name})`}
+							- {scope} {access && `(${access})`}
 						</Text>
-					</>
+					</Fragment>
 				))}
 			</>
 		) : null

package/templates/pages-template-plugin.ts

@@ -1,5 +1,8 @@
 import { match } from "path-to-regexp";
 
+//note: this explicitly does not include the * character, as pages requires this
+const escapeRegex = /[.+?^${}()|[\]\\]/g;
+
 type HTTPMethod =
 	| "HEAD"
 	| "OPTIONS"
@@ -67,8 +70,13 @@ function* executeRequest(request: Request, relativePathname: string) {
 			continue;
 		}
 
-		const routeMatcher = match(route.routePath, { end: false });
-		const mountMatcher = match(route.mountPath, { end: false });
+		// replaces with "\\$&", this prepends a backslash to the matched string, e.g. "[" becomes "\["
+		const routeMatcher = match(route.routePath.replace(escapeRegex, "\\$&"), {
+			end: false,
+		});
+		const mountMatcher = match(route.mountPath.replace(escapeRegex, "\\$&"), {
+			end: false,
+		});
 		const matchResult = routeMatcher(relativePathname);
 		const mountMatchResult = mountMatcher(relativePathname);
 		if (matchResult && mountMatchResult) {
@@ -88,8 +96,12 @@ function* executeRequest(request: Request, relativePathname: string) {
 			continue;
 		}
 
-		const routeMatcher = match(route.routePath, { end: true });
-		const mountMatcher = match(route.mountPath, { end: false });
+		const routeMatcher = match(route.routePath.replace(escapeRegex, "\\$&"), {
+			end: true,
+		});
+		const mountMatcher = match(route.mountPath.replace(escapeRegex, "\\$&"), {
+			end: false,
+		});
 		const matchResult = routeMatcher(relativePathname);
 		const mountMatchResult = mountMatcher(relativePathname);
 		if (matchResult && mountMatchResult && route.modules.length) {

package/templates/pages-template-worker.ts

@@ -1,5 +1,8 @@
 import { match } from "path-to-regexp";
 
+//note: this explicitly does not include the * character, as pages requires this
+const escapeRegex = /[.+?^${}()|[\]\\]/g;
+
 type HTTPMethod =
 	| "HEAD"
 	| "OPTIONS"
@@ -61,8 +64,13 @@ function* executeRequest(request: Request) {
 			continue;
 		}
 
-		const routeMatcher = match(route.routePath, { end: false });
-		const mountMatcher = match(route.mountPath, { end: false });
+		// replaces with "\\$&", this prepends a backslash to the matched string, e.g. "[" becomes "\["
+		const routeMatcher = match(route.routePath.replace(escapeRegex, "\\$&"), {
+			end: false,
+		});
+		const mountMatcher = match(route.mountPath.replace(escapeRegex, "\\$&"), {
+			end: false,
+		});
 		const matchResult = routeMatcher(requestPath);
 		const mountMatchResult = mountMatcher(requestPath);
 		if (matchResult && mountMatchResult) {
@@ -81,9 +89,12 @@ function* executeRequest(request: Request) {
 		if (route.method && route.method !== request.method) {
 			continue;
 		}
-
-		const routeMatcher = match(route.routePath, { end: true });
-		const mountMatcher = match(route.mountPath, { end: false });
+		const routeMatcher = match(route.routePath.replace(escapeRegex, "\\$&"), {
+			end: true,
+		});
+		const mountMatcher = match(route.mountPath.replace(escapeRegex, "\\$&"), {
+			end: false,
+		});
 		const matchResult = routeMatcher(requestPath);
 		const mountMatchResult = mountMatcher(requestPath);
 		if (matchResult && mountMatchResult && route.modules.length) {

package/templates/service-bindings-module-facade.js

@@ -16,20 +16,23 @@ export default {
 			if (details) {
 				facadeEnv[name] = {
 					async fetch(...reqArgs) {
+						const reqFromArgs = new Request(...reqArgs);
 						if (details.headers) {
-							const req = new Request(...reqArgs);
 							for (const [key, value] of Object.entries(details.headers)) {
 								// In remote mode, you need to add a couple of headers
 								// to make sure it's talking to the 'dev' preview session
 								// (much like wrangler dev already does via proxy.ts)
-								req.headers.set(key, value);
+								reqFromArgs.headers.set(key, value);
 							}
-							return env[name].fetch(req);
+							return env[name].fetch(reqFromArgs);
 						}
-						const url = `${details.protocol}://${details.host}${
-							details.port ? `:${details.port}` : ""
-						}`;
-						const request = new Request(url, ...reqArgs);
+
+						const url = new URL(reqFromArgs.url);
+						url.protocol = details.protocol;
+						url.host = details.host;
+						if (details.port !== undefined) url.port = details.port;
+
+						const request = new Request(url.toString(), reqFromArgs);
 						return fetch(request);
 					},
 				};

package/templates/service-bindings-sw-facade.js

@@ -7,20 +7,23 @@ for (const [name, details] of Object.entries(Workers)) {
 	if (details) {
 		globalThis[name] = {
 			async fetch(...reqArgs) {
+				const reqFromArgs = new Request(...reqArgs);
 				if (details.headers) {
-					const req = new Request(...reqArgs);
 					for (const [key, value] of Object.entries(details.headers)) {
 						// In remote mode, you need to add a couple of headers
 						// to make sure it's talking to the 'dev' preview session
 						// (much like wrangler dev already does via proxy.ts)
-						req.headers.set(key, value);
+						reqFromArgs.headers.set(key, value);
 					}
-					return env[name].fetch(req);
+					return env[name].fetch(reqFromArgs);
 				}
-				const url = `${details.protocol}://${details.host}${
-					details.port ? `:${details.port}` : ""
-				}`;
-				const request = new Request(url, ...reqArgs);
+
+				const url = new URL(reqFromArgs.url);
+				url.protocol = details.protocol;
+				url.host = details.host;
+				if (details.port !== undefined) url.port = details.port;
+
+				const request = new Request(url.toString(), reqFromArgs);
 				return fetch(request);
 			},
 		};

package/wrangler-dist/cli.d.ts

@@ -33,6 +33,7 @@ declare interface DevOptions {
     env?: string;
     ip?: string;
     port?: number;
+    inspectorPort?: number;
     localProtocol?: "http" | "https";
     assets?: string;
     site?: string;
@@ -40,6 +41,7 @@ declare interface DevOptions {
     siteExclude?: string[];
     nodeCompat?: boolean;
     compatibilityDate?: string;
+    compatibilityFlags?: string[];
     experimentalEnableLocalPersistence?: boolean;
     liveReload?: boolean;
     watch?: boolean;
@@ -57,6 +59,11 @@ declare interface DevOptions {
         script_name?: string | undefined;
         environment?: string | undefined;
     }[];
+    r2?: {
+        binding: string;
+        bucket_name: string;
+        preview_bucket_name?: string;
+    }[];
     showInteractiveDevSession?: boolean;
     logLevel?: "none" | "error" | "log" | "warn" | "debug";
     logPrefix?: string;