@chaos-overlords/worker 0.1.0 → 0.4.0

package/README.md

@@ -19,7 +19,8 @@ The D1 migration lineages ship in `@chaos-overlords/storage` and `@chaos-overlor
 `wrangler d1 migrations apply` at them rather than copying them.
 
 `PUBLIC_LISTING`, `RATE_LIMIT_PER_MINUTE`, `MEMBER_RATE_LIMIT_PER_MINUTE`,
-`UPLOAD_RATE_LIMIT_PER_MINUTE`, `BUG_REPORT_RATE_LIMIT_PER_MINUTE` and `RETENTION_DAYS` are vars. The
+`UPLOAD_RATE_LIMIT_PER_MINUTE`, `BUG_REPORT_RATE_LIMIT_PER_MINUTE`, `RETENTION_DAYS`,
+`ABANDONED_RETENTION_DAYS`, `BUG_REPORT_RETENTION_DAYS` and `BUG_REPORT_DAILY_STATE_MB` are vars. The
 `scheduled` handler expects a cron trigger; five minutes is the interval its sweeper is written for.
 
 ## Install

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaos-overlords/worker",
-  "version": "0.1.0",
+  "version": "0.4.0",
   "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.1.0",
-    "@chaos-overlords/contracts": "0.1.0",
-    "@chaos-overlords/kernel": "0.1.0",
-    "@chaos-overlords/server": "0.1.0",
-    "@chaos-overlords/storage": "0.1.0",
+    "@chaos-overlords/bug-reports": "0.4.0",
+    "@chaos-overlords/contracts": "0.4.0",
+    "@chaos-overlords/kernel": "0.4.0",
+    "@chaos-overlords/server": "0.4.0",
+    "@chaos-overlords/storage": "0.4.0",
     "drizzle-orm": "^0.45.2",
     "hono": "^4.13.7"
   },
   "devDependencies": {
-    "@chaos-overlords/client": "0.1.0",
-    "@chaos-overlords/conformance": "0.1.0",
+    "@chaos-overlords/client": "0.4.0",
+    "@chaos-overlords/conformance": "0.4.0",
     "@cloudflare/vitest-pool-workers": "^0.22.0",
     "@cloudflare/workers-types": "^5.20260910.1",
     "typescript": "^5.9.3",

package/src/MatchHub.ts

@@ -1,3 +1,4 @@
+import { isDomainError } from '@chaos-overlords/kernel'
 import { DEFAULT_SERVER_CONFIG, LocalEventHub } from '@chaos-overlords/server'
 import { createSqliteStorage, sqliteSchema } from '@chaos-overlords/storage/sqlite'
 import type { DurableObjectState } from '@cloudflare/workers-types'
@@ -47,8 +48,22 @@ export class MatchHub {
       }
       case HUB_PATHS.subscribe: {
         const matchId = url.searchParams.get('matchId') ?? ''
+        const playerId = url.searchParams.get('playerId') ?? ''
         const afterSeq = Number(url.searchParams.get('after') ?? '0')
-        return this.hub.open({ matchId, afterSeq, signal: request.signal })
+        try {
+          return await this.hub.open({ matchId, playerId, afterSeq, signal: request.signal })
+        } catch (error) {
+          // The stream caps refuse here, inside the object, where the app's error handler cannot
+          // reach. A bare status crosses back instead and the Worker rethrows it as the domain
+          // error, so the envelope still has exactly one producer.
+          if (!isDomainError(error)) throw error
+          return new Response(null, { status: 429, headers: { 'X-Stream-Refusal': error.code } })
+        }
+      }
+      case HUB_PATHS.disconnect: {
+        const body = (await request.json()) as { matchId: string; playerId: string }
+        await this.hub.close(body)
+        return new Response(null, { status: 204 })
       }
       default:
         return new Response('not found', { status: 404 })
@@ -61,6 +76,7 @@ export class MatchHub {
     const kernel = buildKernel(this.env, {
       // Already inside the hub: wake local streams directly instead of calling ourselves.
       notifier: { notify: async (event) => this.hub.wake(event.matchId) },
+      streams: this.hub,
       scheduler: {
         schedule: async (input) => {
           await this.state.storage.put<PendingDeadline>(DEADLINE_KEY, {

package/src/env.ts

@@ -28,4 +28,15 @@ export interface Env {
   BUG_REPORT_RATE_LIMIT_PER_MINUTE?: string
   /** Days before a finished, abandoned or never-started match is deleted. 0 keeps everything. */
   RETENTION_DAYS?: string
+  /**
+   * Days before a RUNNING match with nobody active in it is deleted. 0 keeps them forever.
+   *
+   * The ordinary end of a public match is everyone walking away from one that is still running, and
+   * nothing else ever collects one of those.
+   */
+  ABANDONED_RETENTION_DAYS?: string
+  /** Days a bug report and its R2 object are kept. 0 keeps them forever. */
+  BUG_REPORT_RETENTION_DAYS?: string
+  /** Attached journal megabytes accepted per rolling day across every reporter. 0 lifts the cap. */
+  BUG_REPORT_DAILY_STATE_MB?: string
 }

package/src/index.ts

@@ -1,9 +1,10 @@
-import { RateLimiter } from '@chaos-overlords/kernel'
+import { RateLimitedError, RateLimiter } from '@chaos-overlords/kernel'
 import {
   type AppEnv,
   createApp,
   DEFAULT_RATE_LIMITS,
   DEFAULT_SERVER_CONFIG,
+  defaultClientAddress,
   type ServerContainer,
 } from '@chaos-overlords/server'
 import type { ExecutionContext, ScheduledController } from '@cloudflare/workers-types'
@@ -57,9 +58,17 @@ export function buildContainer(env: Env): ServerContainer {
     kernel: buildKernel(env),
     ...(bugReports ? { bugReports } : {}),
     eventStream: {
-      open: async ({ matchId, afterSeq, signal }) => {
-        const url = `https://hub${HUB_PATHS.subscribe}?matchId=${encodeURIComponent(matchId)}&after=${afterSeq}`
+      open: async ({ matchId, playerId, afterSeq, signal }) => {
+        const query = new URLSearchParams({ matchId, playerId, after: String(afterSeq) })
+        const url = `https://hub${HUB_PATHS.subscribe}?${query}`
         const response = await hubFor(env, matchId).fetch(url, { signal })
+        // The object refuses an over-cap stream with a bare 429; turning it back into the domain
+        // error here is what gets the caller the same envelope every other refusal has.
+        if (response.status === 429) {
+          throw new RateLimitedError('This match is holding as many event streams as it can', {
+            reason: 'too_many_streams',
+          })
+        }
         return new Response(response.body as ReadableStream<Uint8Array> | null, {
           status: response.status,
           headers: response.headers as unknown as HeadersInit,
@@ -76,6 +85,10 @@ export function buildContainer(env: Env): ServerContainer {
       ),
     },
     config: { ...DEFAULT_SERVER_CONFIG, publicListing: env.PUBLIC_LISTING === 'true' },
+    // `CF-Connecting-IP` is authoritative here and only here: Cloudflare sets it on every request
+    // that reaches a Worker and a client cannot forge it through the edge. Off Cloudflare it is a
+    // header anyone can write, which is why the default resolver ignores it unless told otherwise.
+    clientAddress: (c) => defaultClientAddress(c, { cloudflare: true }),
   }
 }
 
@@ -98,6 +111,9 @@ export default {
           workerLogger.info('cron advanced turns', { sealed, repaired })
         }
         await kernel.retention.collect()
+        // A separate database with a separate window; nothing about a match's retention decides
+        // when a bug report and its R2 object go.
+        await container.bugReports?.collect()
       })().catch((error: unknown) => {
         workerLogger.error('cron sweep failed', { error: String(error) })
       }),

package/src/kernel.ts

@@ -4,6 +4,7 @@ import {
   createBugReportRepository,
   createBugReportService,
   createR2BlobStore,
+  DEFAULT_BUG_REPORT_RETENTION,
 } from '@chaos-overlords/bug-reports'
 import {
   createKernel,
@@ -11,6 +12,7 @@ import {
   type EventNotifier,
   type Kernel,
   type Logger,
+  type StreamCloser,
 } from '@chaos-overlords/kernel'
 import { createSqliteStorage, sqliteSchema } from '@chaos-overlords/storage/sqlite'
 import { drizzle } from 'drizzle-orm/d1'
@@ -26,11 +28,14 @@ export const workerLogger: Logger = {
 
 const DAY_MS = 24 * 60 * 60 * 1000
 const DEFAULT_RETENTION_DAYS = 30
+const DEFAULT_ABANDONED_RETENTION_DAYS = 90
 
 export const HUB_PATHS = {
   notify: '/notify',
   schedule: '/schedule',
   subscribe: '/subscribe',
+  /** Hangs up the streams of a membership that has just been revoked. */
+  disconnect: '/disconnect',
 } as const
 
 /** The per-match Durable Object, addressed by match id. */
@@ -44,7 +49,11 @@ export function hubFor(env: Env, matchId: string) {
  */
 export function buildKernel(
   env: Env,
-  overrides: Partial<{ notifier: EventNotifier; scheduler: DeadlineScheduler }> = {},
+  overrides: Partial<{
+    notifier: EventNotifier
+    scheduler: DeadlineScheduler
+    streams: StreamCloser
+  }> = {},
 ): Kernel {
   const storage = createSqliteStorage(drizzle(env.DB, { schema: sqliteSchema }))
   const notifier: EventNotifier = overrides.notifier ?? {
@@ -55,6 +64,14 @@ export function buildKernel(
       })
     },
   }
+  const streams: StreamCloser = overrides.streams ?? {
+    close: async (input) => {
+      await hubFor(env, input.matchId).fetch(`https://hub${HUB_PATHS.disconnect}`, {
+        method: 'POST',
+        body: JSON.stringify(input),
+      })
+    },
+  }
   const scheduler: DeadlineScheduler = overrides.scheduler ?? {
     schedule: async (input) => {
       await hubFor(env, input.matchId).fetch(`https://hub${HUB_PATHS.schedule}`, {
@@ -63,21 +80,24 @@ export function buildKernel(
       })
     },
   }
-  const retentionDays = Number(env.RETENTION_DAYS ?? DEFAULT_RETENTION_DAYS)
+  const days = (raw: string | undefined, fallback: number): number => {
+    const value = Number(raw ?? fallback)
+    return Number.isInteger(value) && value >= 0 ? value : fallback
+  }
   return createKernel(
     {
       storage,
       notifier,
       scheduler,
+      streams,
       clock: { now: () => new Date() },
       logger: workerLogger,
     },
     {
       retention: {
-        maxAgeMs:
-          (Number.isInteger(retentionDays) && retentionDays >= 0
-            ? retentionDays
-            : DEFAULT_RETENTION_DAYS) * DAY_MS,
+        maxAgeMs: days(env.RETENTION_DAYS, DEFAULT_RETENTION_DAYS) * DAY_MS,
+        abandonedLiveMaxAgeMs:
+          days(env.ABANDONED_RETENTION_DAYS, DEFAULT_ABANDONED_RETENTION_DAYS) * DAY_MS,
         batchSize: 50,
       },
     },
@@ -99,10 +119,27 @@ 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() },
     logger: workerLogger,
+    retention: {
+      ...DEFAULT_BUG_REPORT_RETENTION,
+      dailyStateBytes:
+        number(
+          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) *
+        DAY_MS,
+    },
     ...(blobs ? { blobs } : {}),
   })
 }