wrangler 0.0.0-e2b7352 → 0.0.0-e305903a

package/src/tail/index.ts

@@ -14,9 +14,9 @@ import type { Request } from "undici";
  * - an expiration date when the tail is no longer guaranteed to be valid
  */
 type TailCreationApiResponse = {
-  id: string;
-  url: string;
-  expires_at: Date;
+	id: string;
+	url: string;
+	expires_at: Date;
 };
 
 /**
@@ -29,13 +29,13 @@ type TailCreationApiResponse = {
  * @returns a `cfetch`-ready URL for creating a new tail
  */
 function makeCreateTailUrl(
-  accountId: string,
-  workerName: string,
-  env: string | undefined
+	accountId: string,
+	workerName: string,
+	env: string | undefined
 ): string {
-  return env
-    ? `/accounts/${accountId}/workers/services/${workerName}/environments/${env}/tails`
-    : `/accounts/${accountId}/workers/scripts/${workerName}/tails`;
+	return env
+		? `/accounts/${accountId}/workers/services/${workerName}/environments/${env}/tails`
+		: `/accounts/${accountId}/workers/scripts/${workerName}/tails`;
 }
 
 /**
@@ -49,14 +49,14 @@ function makeCreateTailUrl(
  * @returns a `cfetch`-ready URL for deleting a tail
  */
 function makeDeleteTailUrl(
-  accountId: string,
-  workerName: string,
-  tailId: string,
-  env: string | undefined
+	accountId: string,
+	workerName: string,
+	tailId: string,
+	env: string | undefined
 ): string {
-  return env
-    ? `/accounts/${accountId}/workers/services/${workerName}/environments/${env}/tails/${tailId}`
-    : `/accounts/${accountId}/workers/scripts/${workerName}/tails/${tailId}`;
+	return env
+		? `/accounts/${accountId}/workers/services/${workerName}/environments/${env}/tails/${tailId}`
+		: `/accounts/${accountId}/workers/scripts/${workerName}/tails/${tailId}`;
 }
 
 /**
@@ -69,57 +69,60 @@ function makeDeleteTailUrl(
  *
  * @param accountId the account ID associated with the worker to tail
  * @param workerName the name of the worker to tail
- * @param message a `TailFilterMessage` to send up to the tail worker
+ * @param filters A list of `TailAPIFilters` given to the tail
+ * @param debug Flag to run tail in debug mode
  * @returns a websocket connection, an expiration, and a function to call to delete the tail
  */
 export async function createTail(
-  accountId: string,
-  workerName: string,
-  message: TailFilterMessage,
-  env: string | undefined
+	accountId: string,
+	workerName: string,
+	filters: TailFilterMessage,
+	debug: boolean,
+	env: string | undefined
 ): Promise<{
-  tail: WebSocket;
-  expiration: Date;
-  deleteTail: () => Promise<void>;
+	tail: WebSocket;
+	expiration: Date;
+	deleteTail: () => Promise<void>;
 }> {
-  // create the tail
-  const createTailUrl = makeCreateTailUrl(accountId, workerName, env);
-  const {
-    id: tailId,
-    url: websocketUrl,
-    expires_at: expiration,
-  } = await fetchResult<TailCreationApiResponse>(createTailUrl, {
-    method: "POST",
-  });
-
-  // delete the tail (not yet!)
-  const deleteUrl = makeDeleteTailUrl(accountId, workerName, tailId, env);
-  async function deleteTail() {
-    await fetchResult(deleteUrl, { method: "DELETE" });
-  }
-
-  // connect to the tail
-  const tail = new WebSocket(websocketUrl, "trace-v1", {
-    headers: {
-      "Sec-WebSocket-Protocol": "trace-v1", // needs to be `trace-v1` to be accepted
-      "User-Agent": `wrangler-js/${packageVersion}`,
-    },
-  });
-
-  // send filters when we open up
-  tail.on("open", function () {
-    tail.send(
-      JSON.stringify(message),
-      { binary: false, compress: false, mask: false, fin: true },
-      (err) => {
-        if (err) {
-          throw err;
-        }
-      }
-    );
-  });
-
-  return { tail, expiration, deleteTail };
+	// create the tail
+	const createTailUrl = makeCreateTailUrl(accountId, workerName, env);
+	const {
+		id: tailId,
+		url: websocketUrl,
+		expires_at: expiration,
+	} = await fetchResult<TailCreationApiResponse>(createTailUrl, {
+		method: "POST",
+		body: JSON.stringify(filters),
+	});
+
+	// delete the tail (not yet!)
+	const deleteUrl = makeDeleteTailUrl(accountId, workerName, tailId, env);
+	async function deleteTail() {
+		await fetchResult(deleteUrl, { method: "DELETE" });
+	}
+
+	// connect to the tail
+	const tail = new WebSocket(websocketUrl, "trace-v1", {
+		headers: {
+			"Sec-WebSocket-Protocol": "trace-v1", // needs to be `trace-v1` to be accepted
+			"User-Agent": `wrangler-js/${packageVersion}`,
+		},
+	});
+
+	// send filters when we open up
+	tail.on("open", function () {
+		tail.send(
+			JSON.stringify({ debug: debug }),
+			{ binary: false, compress: false, mask: false, fin: true },
+			(err) => {
+				if (err) {
+					throw err;
+				}
+			}
+		);
+	});
+
+	return { tail, expiration, deleteTail };
 }
 
 /**
@@ -127,59 +130,59 @@ export async function createTail(
  * `wrangler tail` is structured JSON that deserializes to this type.
  */
 export type TailEventMessage = {
-  /**
-   * Whether the execution of this worker succeeded or failed
-   */
-  outcome: Outcome;
-
-  /**
-   * The name of the script we're tailing
-   */
-  scriptName?: string;
-
-  /**
-   * Any exceptions raised by the worker
-   */
-  exceptions: {
-    /**
-     * The name of the exception.
-     */
-    name: string;
-
-    /**
-     * The error message
-     */
-    message: unknown;
-
-    /**
-     * When the exception was raised/thrown
-     */
-    timestamp: number;
-  }[];
-
-  /**
-   * Any logs sent out by the worker
-   */
-  logs: {
-    message: unknown[];
-    level: string; // TODO: make this a union of possible values
-    timestamp: number;
-  }[];
-
-  /**
-   * When the event was triggered
-   */
-  eventTimestamp: number;
-
-  /**
-   * 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.
-   *
-   * Until workers-types exposes individual types for export, we'll have
-   * to just re-define these types ourselves.
-   */
-  event: RequestEvent | ScheduledEvent;
+	/**
+	 * Whether the execution of this worker succeeded or failed
+	 */
+	outcome: Outcome;
+
+	/**
+	 * The name of the script we're tailing
+	 */
+	scriptName?: string;
+
+	/**
+	 * Any exceptions raised by the worker
+	 */
+	exceptions: {
+		/**
+		 * The name of the exception.
+		 */
+		name: string;
+
+		/**
+		 * The error message
+		 */
+		message: unknown;
+
+		/**
+		 * When the exception was raised/thrown
+		 */
+		timestamp: number;
+	}[];
+
+	/**
+	 * Any logs sent out by the worker
+	 */
+	logs: {
+		message: unknown[];
+		level: string; // TODO: make this a union of possible values
+		timestamp: number;
+	}[];
+
+	/**
+	 * When the event was triggered
+	 */
+	eventTimestamp: number;
+
+	/**
+	 * 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.
+	 *
+	 * Until workers-types exposes individual types for export, we'll have
+	 * to just re-define these types ourselves.
+	 */
+	event: RequestEvent | ScheduledEvent | AlarmEvent | undefined | null;
 };
 
 /**
@@ -187,113 +190,126 @@ export type TailEventMessage = {
  */
 
 export type RequestEvent = {
-  request: Pick<Request, "url" | "method" | "headers"> & {
-    /**
-     * Cloudflare-specific properties
-     * https://developers.cloudflare.com/workers/runtime-apis/request#incomingrequestcfproperties
-     */
-    cf: {
-      /**
-       * How long (in ms) it took for the client's TCP connection to make a
-       * round trip to the worker and back. For all my gamers out there,
-       * this is the request's ping
-       */
-      clientTcpRtt?: number;
-
-      /**
-       * Longitude and Latitude of where the request originated from
-       */
-      longitude?: string;
-      latitude?: string;
-
-      /**
-       * What cipher was used to establish the TLS connection
-       */
-      tlsCipher: string;
-
-      /**
-       * Which continent the request came from.
-       */
-      continent?: "NA";
-
-      /**
-       * ASN of the incoming request
-       */
-      asn: number;
-
-      /**
-       * The country the incoming request is coming from
-       */
-      country?: string;
-
-      /**
-       * The TLS version the connection used
-       */
-      tlsVersion: string;
-
-      /**
-       * The colo that processed the request (i.e. the airport code
-       * of the closest city to the server that spun up the worker)
-       */
-      colo: string;
-
-      /**
-       * The timezone where the request came from
-       */
-      timezone?: string;
-
-      /**
-       * The city where the request came from
-       */
-      city?: string;
-
-      /**
-       * The browser-requested prioritization information in the request object
-       */
-      requestPriority?: string;
-
-      /**
-       * Which version of HTTP the request came over e.g. "HTTP/2"
-       */
-      httpProtocol: string;
-
-      /**
-       * The region where the request originated from
-       */
-      region?: string;
-      regionCode?: string;
-
-      /**
-       * The organization which owns the ASN of the incoming request, for example, Google Cloud.
-       */
-      asOrganization: string;
-
-      /**
-       * Metro code (DMA) of the incoming request, for example, "635".
-       */
-      metroCode?: string;
-
-      /**
-       * Postal code of the incoming request, for example, "78701".
-       */
-      postalCode?: string;
-    };
-  };
+	request: Pick<Request, "url" | "method" | "headers"> & {
+		/**
+		 * Cloudflare-specific properties
+		 * https://developers.cloudflare.com/workers/runtime-apis/request#incomingrequestcfproperties
+		 */
+		cf: {
+			/**
+			 * How long (in ms) it took for the client's TCP connection to make a
+			 * round trip to the worker and back. For all my gamers out there,
+			 * this is the request's ping
+			 */
+			clientTcpRtt?: number;
+
+			/**
+			 * Longitude and Latitude of where the request originated from
+			 */
+			longitude?: string;
+			latitude?: string;
+
+			/**
+			 * What cipher was used to establish the TLS connection
+			 */
+			tlsCipher: string;
+
+			/**
+			 * Which continent the request came from.
+			 */
+			continent?: "NA";
+
+			/**
+			 * ASN of the incoming request
+			 */
+			asn: number;
+
+			/**
+			 * The country the incoming request is coming from
+			 */
+			country?: string;
+
+			/**
+			 * The TLS version the connection used
+			 */
+			tlsVersion: string;
+
+			/**
+			 * The colo that processed the request (i.e. the airport code
+			 * of the closest city to the server that spun up the worker)
+			 */
+			colo: string;
+
+			/**
+			 * The timezone where the request came from
+			 */
+			timezone?: string;
+
+			/**
+			 * The city where the request came from
+			 */
+			city?: string;
+
+			/**
+			 * The browser-requested prioritization information in the request object
+			 */
+			requestPriority?: string;
+
+			/**
+			 * Which version of HTTP the request came over e.g. "HTTP/2"
+			 */
+			httpProtocol: string;
+
+			/**
+			 * The region where the request originated from
+			 */
+			region?: string;
+			regionCode?: string;
+
+			/**
+			 * The organization which owns the ASN of the incoming request, for example, Google Cloud.
+			 */
+			asOrganization: string;
+
+			/**
+			 * Metro code (DMA) of the incoming request, for example, "635".
+			 */
+			metroCode?: string;
+
+			/**
+			 * Postal code of the incoming request, for example, "78701".
+			 */
+			postalCode?: string;
+		};
+	};
 };
 
 /**
  * An event that was triggered at a certain time
  */
 export type ScheduledEvent = {
-  /**
-   * The cron pattern that matched when this event fired
-   */
-  cron: string;
-
-  /**
-   * The time this worker was scheduled to run.
-   * For some reason, this doesn't...work correctly when we
-   * do it directly as a Date. So parse it later on your own.
-   */
-  scheduledTime: number;
+	/**
+	 * The cron pattern that matched when this event fired
+	 */
+	cron: string;
+
+	/**
+	 * The time this worker was scheduled to run.
+	 * For some reason, this doesn't...work correctly when we
+	 * do it directly as a Date. So parse it later on your own.
+	 */
+	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,62 +1,107 @@
-import type { RequestEvent, ScheduledEvent, TailEventMessage } from ".";
+import { logger } from "../logger";
 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 {
-  const eventMessage: TailEventMessage = JSON.parse(data.toString());
-
-  if (isScheduledEvent(eventMessage.event)) {
-    const cronPattern = eventMessage.event.cron;
-    const datetime = new Date(
-      eventMessage.event.scheduledTime
-    ).toLocaleString();
-    const outcome = prettifyOutcome(eventMessage.outcome);
-
-    console.log(`"${cronPattern}" @ ${datetime} - ${outcome}`);
-  } else {
-    const requestMethod = eventMessage.event.request.method.toUpperCase();
-    const url = eventMessage.event.request.url;
-    const outcome = prettifyOutcome(eventMessage.outcome);
-    const datetime = new Date(eventMessage.eventTimestamp).toLocaleString();
-
-    console.log(`${requestMethod} ${url} - ${outcome} @ ${datetime}`);
-  }
-
-  if (eventMessage.logs.length > 0) {
-    eventMessage.logs.forEach(({ level, message }) => {
-      console.log(`  (${level})`, ...message);
-    });
-  }
-
-  if (eventMessage.exceptions.length > 0) {
-    eventMessage.exceptions.forEach(({ name, message }) => {
-      console.error(`  ${name}:`, message);
-    });
-  }
+	const eventMessage: TailEventMessage = JSON.parse(data.toString());
+
+	if (isScheduledEvent(eventMessage.event)) {
+		const cronPattern = eventMessage.event.cron;
+		const datetime = new Date(
+			eventMessage.event.scheduledTime
+		).toLocaleString();
+		const outcome = prettifyOutcome(eventMessage.outcome);
+
+		logger.log(`"${cronPattern}" @ ${datetime} - ${outcome}`);
+	} else if (isRequestEvent(eventMessage.event)) {
+		const requestMethod = eventMessage.event?.request.method.toUpperCase();
+		const url = eventMessage.event?.request.url;
+		const outcome = prettifyOutcome(eventMessage.outcome);
+		const datetime = new Date(eventMessage.eventTimestamp).toLocaleString();
+
+		logger.log(
+			url
+				? `${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) {
+		eventMessage.logs.forEach(({ level, message }) => {
+			logger.log(`  (${level})`, ...message);
+		});
+	}
+
+	if (eventMessage.exceptions.length > 0) {
+		eventMessage.exceptions.forEach(({ name, message }) => {
+			logger.error(`  ${name}:`, message);
+		});
+	}
 }
 
 export function jsonPrintLogs(data: WebSocket.RawData): void {
-  console.log(JSON.stringify(JSON.parse(data.toString()), null, 2));
+	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
+	event: TailEventMessage["event"]
 ): event is ScheduledEvent {
-  return "cron" in event;
+	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":
-      return "Ok";
-    case "canceled":
-      return "Canceled";
-    case "exceededCpu":
-      return "Exceeded CPU Limit";
-    case "exception":
-      return "Exception Thrown";
-    case "unknown":
-    default:
-      return "Unknown";
-  }
+	switch (outcome) {
+		case "ok":
+			return "Ok";
+		case "canceled":
+			return "Canceled";
+		case "exceededCpu":
+			return "Exceeded CPU Limit";
+		case "exceededMemory":
+			return "Exceeded Memory Limit";
+		case "exception":
+			return "Exception Thrown";
+		case "unknown":
+		default:
+			return "Unknown";
+	}
 }