wrangler 2.0.24 → 2.0.25

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":

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;
@@ -57,6 +58,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;