Fixed retries never being sent.

Queue/Storage/Context.ts

@@ -7,10 +7,7 @@ import { Types } from "../../Types"
 export class Context {
 	readonly alarm = new storage.DurableObject.Alarm(this.state.storage)
 	private nextAlarm: number | undefined
-	private readonly epochNow: number
-	private constructor(private readonly state: cloudflare.DurableObjectState, private readonly now: isoly.DateTime) {
-		this.epochNow = isoly.DateTime.epoch(this.now)
-	}
+	private constructor(private readonly state: cloudflare.DurableObjectState, private readonly now: isoly.DateTime) {}
 
 	async trigger(events: Types.EventBase[]): Promise<void> {
 		await Promise.all(events.map(event => this.sendOrSnooze(event)))
@@ -19,10 +16,10 @@ export class Context {
 	private async sendOrSnooze(event: Types.EventBase): Promise<void> {
 		if (event.retries < event.options.maxRetries && !(await this.send(event))) {
 			event.alarm = isoly.DateTime.epoch(
-				isoly.DateTime.nextSecond(this.now, event.options.timeFactor * event.retries),
+				isoly.DateTime.nextSecond(this.now, event.options.timeFactor * ++event.retries),
 				"milliseconds"
 			)
-			await this.state.storage.put(`hook|${event.index}`, { ...event, retries: ++event.retries })
+			await this.state.storage.put(`hook|${event.index}`, { ...event, retries: event.retries })
 			this.nextAlarm = this.nextAlarm && this.nextAlarm <= event.alarm ? this.nextAlarm : event.alarm
 		} else
 			await this.state.storage.delete(`hook|${event.index}`)
@@ -31,10 +28,7 @@ export class Context {
 		await this.trigger([...(await this.state.storage.list<Types.EventBase>({ prefix: `hook|` })).values()])
 	}
 	async send(event: Types.EventBase): Promise<boolean> {
-		return (
-			(!event.alarm || event.alarm <= this.epochNow) &&
-			(await http.fetch(Types.EventBase.toRequest(event)).then(r => r.status >= 200 && r.status < 300))
-		)
+		return await http.fetch(Types.EventBase.toRequest(event)).then(r => r.status >= 200 && r.status < 300)
 	}
 	static open(state: cloudflare.DurableObjectState): Context {
 		return new Context(state, isoly.DateTime.now())

test-worker/wrangler.toml

@@ -1,19 +1,13 @@
 compatibility_date = "2023-05-18"
 name = "worker-template"
 workers_dev = true
+main = "./index.ts"
 routes = []
 vars = {}
 
 [durable_objects]
 bindings = [{ name = "hookNamespace", class_name = "HookStorage" }]
 
-[build]
-command = "npm install && npm run build"
-
-[build.upload]
-format = "modules"
-main = "./_worker.js"
-
 [env.production]
 workers_dev = false
 vars = {}
@@ -29,10 +23,4 @@ r2_buckets = []
 
 [dev]
 host = "example.com"
-
-port = 8787
-
-[miniflare]
-durable_objects_persist = "./.miniflare/durable-objects/"
-kv_persist = "./.miniflare/kv/"
 port = 8787