@chaos-overlords/worker 0.8.2 → 0.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaos-overlords/worker",
-  "version": "0.8.2",
+  "version": "0.9.1",
   "description": "Cloudflare Workers runtime facade: the shared Hono app over D1, with one Durable Object per match for SSE fan-out and turn-deadline alarms.",
   "keywords": [
     "chaos-overlords",
@@ -47,17 +47,17 @@
     "provenance": true
   },
   "dependencies": {
-    "@chaos-overlords/bug-reports": "0.8.2",
-    "@chaos-overlords/contracts": "0.8.2",
-    "@chaos-overlords/kernel": "0.8.2",
-    "@chaos-overlords/server": "0.8.2",
-    "@chaos-overlords/storage": "0.8.2",
+    "@chaos-overlords/bug-reports": "0.9.1",
+    "@chaos-overlords/contracts": "0.9.1",
+    "@chaos-overlords/kernel": "0.9.1",
+    "@chaos-overlords/server": "0.9.1",
+    "@chaos-overlords/storage": "0.9.1",
     "drizzle-orm": "^0.45.2",
     "hono": "^4.13.8"
   },
   "devDependencies": {
-    "@chaos-overlords/client": "0.8.2",
-    "@chaos-overlords/conformance": "0.8.2",
+    "@chaos-overlords/client": "0.9.1",
+    "@chaos-overlords/conformance": "0.9.1",
     "@cloudflare/vitest-pool-workers": "^0.22.0",
     "@cloudflare/workers-types": "^5.20260920.1",
     "typescript": "^7.0.2",

package/src/MatchHub.ts

@@ -1,5 +1,13 @@
-import { isDomainError, type PersistedEvent } from '@chaos-overlords/kernel'
-import { DEFAULT_SERVER_CONFIG, LocalEventHub } from '@chaos-overlords/server'
+import {
+  isDomainError,
+  type MultiplayerStorage,
+  type PersistedEvent,
+} from '@chaos-overlords/kernel'
+import {
+  DEFAULT_EVENT_HUB_LIMITS,
+  DEFAULT_SERVER_CONFIG,
+  LocalEventHub,
+} from '@chaos-overlords/server'
 import { createSqliteStorage, sqliteSchema } from '@chaos-overlords/storage/sqlite'
 import type { DurableObjectState } from '@cloudflare/workers-types'
 import { drizzle } from 'drizzle-orm/d1'
@@ -20,13 +28,24 @@ const DEADLINE_KEY = 'deadline'
  */
 export class MatchHub {
   private readonly hub: LocalEventHub
+  private readonly repositories: MultiplayerStorage
 
   constructor(
     private readonly state: DurableObjectState,
     private readonly env: Env,
   ) {
-    const storage = createSqliteStorage(drizzle(env.DB, { schema: sqliteSchema }))
-    this.hub = new LocalEventHub(storage.events, DEFAULT_SERVER_CONFIG.sseHeartbeatMs)
+    this.repositories = createSqliteStorage(drizzle(env.DB, { schema: sqliteSchema }))
+    this.hub = new LocalEventHub(
+      this.repositories.events,
+      DEFAULT_SERVER_CONFIG.sseHeartbeatMs,
+      DEFAULT_EVENT_HUB_LIMITS,
+      {
+        // The request signal here is the Worker's fetch into this object, not the client's own,
+        // so a run of these is where a signal that only looks aborted would show up.
+        abandoned: (matchId, playerId) =>
+          workerLogger.info('answered an already abandoned event stream', { matchId, playerId }),
+      },
+    )
   }
 
   async fetch(request: Request): Promise<Response> {
@@ -42,11 +61,7 @@ export class MatchHub {
       }
       case HUB_PATHS.schedule: {
         const body = (await request.json()) as PendingDeadline & { dueAt: string }
-        await this.state.storage.put<PendingDeadline>(DEADLINE_KEY, {
-          matchId: body.matchId,
-          turn: body.turn,
-        })
-        await this.state.storage.setAlarm(new Date(body.dueAt).getTime())
+        await this.arm(body.matchId, body.turn, new Date(body.dueAt).getTime())
         return new Response(null, { status: 204 })
       }
       case HUB_PATHS.subscribe: {
@@ -84,13 +99,7 @@ export class MatchHub {
       notifier: { notify: async (event) => this.hub.notify(event) },
       streams: this.hub,
       scheduler: {
-        schedule: async (input) => {
-          await this.state.storage.put<PendingDeadline>(DEADLINE_KEY, {
-            matchId: input.matchId,
-            turn: input.turn,
-          })
-          await this.state.storage.setAlarm(input.dueAt.getTime())
-        },
+        schedule: async (input) => this.arm(input.matchId, input.turn, input.dueAt.getTime()),
       },
     })
     const sealed = await kernel.turns.trySeal(pending.matchId, pending.turn, 'deadline')
@@ -98,6 +107,12 @@ export class MatchHub {
     await this.forgetSpentDeadline(pending)
   }
 
+  /** Record which turn the alarm is for, then set the alarm. One deadline is pending at a time. */
+  private async arm(matchId: string, turn: number, dueAtMs: number): Promise<void> {
+    await this.state.storage.put<PendingDeadline>(DEADLINE_KEY, { matchId, turn })
+    await this.state.storage.setAlarm(dueAtMs)
+  }
+
   /**
    * Drop the pending deadline once nothing is left to fire for. A seal on readiness, a finished
    * match and a match retention deleted all leave the alarm armed for a turn that is no longer
@@ -108,10 +123,9 @@ export class MatchHub {
   private async forgetSpentDeadline(fired: PendingDeadline): Promise<void> {
     const current = await this.state.storage.get<PendingDeadline>(DEADLINE_KEY)
     if (!current || current.matchId !== fired.matchId || current.turn !== fired.turn) return
-    const storage = createSqliteStorage(drizzle(this.env.DB, { schema: sqliteSchema }))
     const [match, turn] = await Promise.all([
-      storage.matches.get(fired.matchId),
-      storage.turns.get(fired.matchId, fired.turn),
+      this.repositories.matches.get(fired.matchId),
+      this.repositories.turns.get(fired.matchId, fired.turn),
     ])
     const stillDue =
       match?.status === 'running' && turn?.status === 'open' && turn.deadlineAt !== null

package/src/kernel.ts

@@ -30,6 +30,12 @@ const DAY_MS = 24 * 60 * 60 * 1000
 const DEFAULT_RETENTION_DAYS = 30
 const DEFAULT_ABANDONED_RETENTION_DAYS = 90
 
+/** A non-negative whole number from an environment variable; anything else reads as `fallback`. */
+function wholeNumber(raw: string | undefined, fallback: number): number {
+  const value = Number(raw ?? fallback)
+  return Number.isInteger(value) && value >= 0 ? value : fallback
+}
+
 export const HUB_PATHS = {
   notify: '/notify',
   schedule: '/schedule',
@@ -110,10 +116,6 @@ export function buildKernel(
         body: { ...input, dueAt: input.dueAt.toISOString() },
       }),
   }
-  const days = (raw: string | undefined, fallback: number): number => {
-    const value = Number(raw ?? fallback)
-    return Number.isInteger(value) && value >= 0 ? value : fallback
-  }
   return createKernel(
     {
       storage,
@@ -125,13 +127,13 @@ export function buildKernel(
     },
     {
       retention: {
-        maxAgeMs: days(env.RETENTION_DAYS, DEFAULT_RETENTION_DAYS) * DAY_MS,
+        maxAgeMs: wholeNumber(env.RETENTION_DAYS, DEFAULT_RETENTION_DAYS) * DAY_MS,
         abandonedLiveMaxAgeMs:
-          days(env.ABANDONED_RETENTION_DAYS, DEFAULT_ABANDONED_RETENTION_DAYS) * DAY_MS,
+          wholeNumber(env.ABANDONED_RETENTION_DAYS, DEFAULT_ABANDONED_RETENTION_DAYS) * DAY_MS,
         // Twice the abandoned window, and without its roster test, which never collects an untimed
         // match whose players' clients died without a `leave`.
         silentLiveMaxAgeMs:
-          days(env.ABANDONED_RETENTION_DAYS, DEFAULT_ABANDONED_RETENTION_DAYS) * 2 * DAY_MS,
+          wholeNumber(env.ABANDONED_RETENTION_DAYS, DEFAULT_ABANDONED_RETENTION_DAYS) * 2 * DAY_MS,
         batchSize: 50,
       },
     },
@@ -153,10 +155,6 @@ export function buildBugReports(env: Env): BugReportService | undefined {
   if (!env.BUG_DB) return undefined
   const repository = createBugReportRepository(drizzle(env.BUG_DB, { schema: bugReportSchema }))
   const blobs = env.BUG_BLOBS ? createR2BlobStore(env.BUG_BLOBS) : undefined
-  const number = (raw: string | undefined, fallback: number): number => {
-    const value = Number(raw ?? fallback)
-    return Number.isInteger(value) && value >= 0 ? value : fallback
-  }
   return createBugReportService({
     repository,
     clock: { now: () => new Date() },
@@ -164,14 +162,14 @@ export function buildBugReports(env: Env): BugReportService | undefined {
     retention: {
       ...DEFAULT_BUG_REPORT_RETENTION,
       dailyStateBytes:
-        number(
+        wholeNumber(
           env.BUG_REPORT_DAILY_STATE_MB,
           DEFAULT_BUG_REPORT_RETENTION.dailyStateBytes / (1024 * 1024),
         ) *
         1024 *
         1024,
       maxAgeMs:
-        number(env.BUG_REPORT_RETENTION_DAYS, DEFAULT_BUG_REPORT_RETENTION.maxAgeMs / DAY_MS) *
+        wholeNumber(env.BUG_REPORT_RETENTION_DAYS, DEFAULT_BUG_REPORT_RETENTION.maxAgeMs / DAY_MS) *
         DAY_MS,
     },
     ...(blobs ? { blobs } : {}),