Implement new alarm methods

Author: zephraph

packages/actor-core/src/actor/driver.ts

@@ -14,6 +14,8 @@ export interface ActorDriver {
 
 	// Schedule
 	setAlarm(actor: AnyActorInstance, timestamp: number): Promise<void>;
+	getAlarm(actor: AnyActorInstance): Promise<number | null>;
+	deleteAlarm(actor: AnyActorInstance): Promise<void>;
 
 	// TODO:
 	//destroy(): Promise<void>;

packages/actor-core/src/test/driver/actor.ts

@@ -8,9 +8,11 @@ export interface ActorDriverContext {
 
 export class TestActorDriver implements ActorDriver {
 	#state: TestGlobalState;
+	#alarms: Map<string, { timeout: NodeJS.Timeout, timestamp: number }>;
 
 	constructor(state: TestGlobalState) {
 		this.#state = state;
+		this.#alarms = new Map();
 	}
 
 	getContext(_actorId: string): ActorDriverContext {
@@ -29,8 +31,23 @@ export class TestActorDriver implements ActorDriver {
 
 	async setAlarm(actor: AnyActorInstance, timestamp: number): Promise<void> {
 		const delay = Math.max(timestamp - Date.now(), 0);
-		setTimeout(() => {
+		const timeout = setTimeout(() => {
+			this.#alarms.delete(actor.id);
 			actor.onAlarm();
 		}, delay);
+		this.#alarms.set(actor.id, { timeout, timestamp });
+	}
+
+	async getAlarm(actor: AnyActorInstance): Promise<number | null> {
+		const alarm = this.#alarms.get(actor.id);
+		return alarm ? alarm.timestamp : null;
+	}
+
+	async deleteAlarm(actor: AnyActorInstance): Promise<void> {
+		const alarm = this.#alarms.get(actor.id);
+		if (alarm) {
+			clearTimeout(alarm.timeout);
+			this.#alarms.delete(actor.id);
+		}
 	}
 }

packages/drivers/file-system/src/actor.ts

@@ -8,9 +8,11 @@ export type ActorDriverContext = Record<never, never>;
  */
 export class FileSystemActorDriver implements ActorDriver {
     #state: FileSystemGlobalState;
+    #alarms: Map<string, { timeout: NodeJS.Timeout, timestamp: number }>;
 
     constructor(state: FileSystemGlobalState) {
         this.#state = state;
+        this.#alarms = new Map();
     }
 
     /**
@@ -36,9 +38,24 @@ export class FileSystemActorDriver implements ActorDriver {
     }
 
     async setAlarm(actor: AnyActorInstance, timestamp: number): Promise<void> {
-        const delay = Math.max(0, timestamp - Date.now());
-        setTimeout(() => {
+        const delay = Math.max(timestamp - Date.now(), 0);
+        const timeout = setTimeout(() => {
+            this.#alarms.delete(actor.id);
             actor.onAlarm();
         }, delay);
+        this.#alarms.set(actor.id, { timeout, timestamp });
     }
-}
+
+    async getAlarm(actor: AnyActorInstance): Promise<number | null> {
+        const alarm = this.#alarms.get(actor.id);
+        return alarm ? alarm.timestamp : null;
+    }
+
+    async deleteAlarm(actor: AnyActorInstance): Promise<void> {
+        const alarm = this.#alarms.get(actor.id);
+        if (alarm) {
+            clearTimeout(alarm.timeout);
+            this.#alarms.delete(actor.id);
+        }
+    }
+}

packages/drivers/memory/src/actor.ts

@@ -5,9 +5,11 @@ export type ActorDriverContext = Record<never, never>;
 
 export class MemoryActorDriver implements ActorDriver {
 	#state: MemoryGlobalState;
+	#alarms: Map<string, { timeout: NodeJS.Timeout, timestamp: number }>;
 
 	constructor(state: MemoryGlobalState) {
 		this.#state = state;
+		this.#alarms = new Map();
 	}
 
 	getContext(_actorId: string): ActorDriverContext {
@@ -24,8 +26,23 @@ export class MemoryActorDriver implements ActorDriver {
 
 	async setAlarm(actor: AnyActorInstance, timestamp: number): Promise<void> {
 		const delay = Math.max(timestamp - Date.now(), 0);
-		setTimeout(() => {
+		const timeout = setTimeout(() => {
+			this.#alarms.delete(actor.id);
 			actor.onAlarm();
 		}, delay);
+		this.#alarms.set(actor.id, { timeout, timestamp });
+	}
+
+	async getAlarm(actor: AnyActorInstance): Promise<number | null> {
+		const alarm = this.#alarms.get(actor.id);
+		return alarm ? alarm.timestamp : null;
+	}
+
+	async deleteAlarm(actor: AnyActorInstance): Promise<void> {
+		const alarm = this.#alarms.get(actor.id);
+		if (alarm) {
+			clearTimeout(alarm.timeout);
+			this.#alarms.delete(actor.id);
+		}
 	}
 }

packages/drivers/redis/src/actor.ts

@@ -8,9 +8,11 @@ export interface ActorDriverContext {
 
 export class RedisActorDriver implements ActorDriver {
 	#redis: Redis;
+	#alarms: Map<string, { timeout: NodeJS.Timeout, timestamp: number }>;
 
 	constructor(redis: Redis) {
 		this.#redis = redis;
+		this.#alarms = new Map();
 	}
 
 	getContext(_actorId: string): ActorDriverContext {
@@ -32,8 +34,23 @@ export class RedisActorDriver implements ActorDriver {
 
 	async setAlarm(actor: AnyActorInstance, timestamp: number): Promise<void> {
 		const delay = Math.max(timestamp - Date.now(), 0);
-		setTimeout(() => {
+		const timeout = setTimeout(() => {
+			this.#alarms.delete(actor.id);
 			actor.onAlarm();
 		}, delay);
+		this.#alarms.set(actor.id, { timeout, timestamp });
+	}
+
+	async getAlarm(actor: AnyActorInstance): Promise<number | null> {
+		const alarm = this.#alarms.get(actor.id);
+		return alarm ? alarm.timestamp : null;
+	}
+
+	async deleteAlarm(actor: AnyActorInstance): Promise<void> {
+		const alarm = this.#alarms.get(actor.id);
+		if (alarm) {
+			clearTimeout(alarm.timeout);
+			this.#alarms.delete(actor.id);
+		}
 	}
 }

packages/platforms/cloudflare-workers/src/actor_driver.ts

@@ -61,4 +61,12 @@ export class CloudflareWorkersActorDriver implements ActorDriver {
 	async setAlarm(actor: AnyActorInstance, timestamp: number): Promise<void> {
 		await this.#getDOCtx(actor.id).storage.setAlarm(timestamp);
 	}
+
+	async getAlarm(actor: AnyActorInstance): Promise<number | null> {
+		return await this.#getDOCtx(actor.id).storage.getAlarm();
+	}
+
+	async deleteAlarm(actor: AnyActorInstance): Promise<void> {
+		await this.#getDOCtx(actor.id).storage.deleteAlarm();
+	}
 }

packages/platforms/rivet/src/actor_driver.ts

@@ -7,9 +7,11 @@ export interface ActorDriverContext {
 
 export class RivetActorDriver implements ActorDriver {
 	#ctx: ActorContext;
+	#alarms: Map<string, { timeout: NodeJS.Timeout, timestamp: number }>;
 
 	constructor(ctx: ActorContext) {
 		this.#ctx = ctx;
+		this.#alarms = new Map();
 	}
 
 	getContext(_actorId: string): ActorDriverContext {
@@ -27,9 +29,24 @@ export class RivetActorDriver implements ActorDriver {
 	}
 
 	async setAlarm(actor: AnyActorInstance, timestamp: number): Promise<void> {
-		const timeout = Math.max(0, timestamp - Date.now());
-		setTimeout(() => {
+		const delay = Math.max(timestamp - Date.now(), 0);
+		const timeout = setTimeout(() => {
+			this.#alarms.delete(actor.id);
 			actor.onAlarm();
-		}, timeout);
+		}, delay);
+		this.#alarms.set(actor.id, { timeout, timestamp });
+	}
+
+	async getAlarm(actor: AnyActorInstance): Promise<number | null> {
+		const alarm = this.#alarms.get(actor.id);
+		return alarm ? alarm.timestamp : null;
+	}
+
+	async deleteAlarm(actor: AnyActorInstance): Promise<void> {
+		const alarm = this.#alarms.get(actor.id);
+		if (alarm) {
+			clearTimeout(alarm.timeout);
+			this.#alarms.delete(actor.id);
+		}
 	}
 }