lopata 0.7.0 → 0.8.2

package/dist/dashboard/{chunk-pqnphvm2.css → chunk-csyd2tq2.css}

@@ -42,6 +42,7 @@
     --color-rose-400: oklch(71.2% .194 13.428);
     --color-rose-500: oklch(64.5% .246 16.439);
     --color-gray-400: oklch(70.7% .022 261.325);
+    --color-gray-500: oklch(55.1% .027 264.364);
     --color-gray-900: oklch(21% .034 264.665);
     --color-neutral-400: oklch(70.8% 0 0);
     --color-neutral-500: oklch(55.6% 0 0);
@@ -1438,6 +1439,16 @@
     background-color: var(--color-gray-400);
   }
 
+  .bg-gray-500\/15 {
+    background-color: #6a728226;
+  }
+
+  @supports (color: color-mix(in lab, red, red)) {
+    .bg-gray-500\/15 {
+      background-color: color-mix(in oklab, var(--color-gray-500) 15%, transparent);
+    }
+  }
+
   .bg-gray-900 {
     background-color: var(--color-gray-900);
   }
@@ -1964,6 +1975,10 @@
     color: var(--color-emerald-600);
   }
 
+  .text-gray-400 {
+    color: var(--color-gray-400);
+  }
+
   .text-indigo-400 {
     color: var(--color-indigo-400);
   }
@@ -2304,6 +2319,18 @@
     }
   }
 
+  @media (hover: hover) {
+    .hover\:bg-accent-lime\/90:hover {
+      background-color: #f0a030e6;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .hover\:bg-accent-lime\/90:hover {
+        background-color: color-mix(in oklab, var(--color-accent-lime) 90%, transparent);
+      }
+    }
+  }
+
   @media (hover: hover) {
     .hover\:bg-amber-500\/10:hover {
       background-color: #f99c001a;

package/dist/dashboard/{chunk-5nxa3jfc.js → chunk-yxzrcvyh.js}

@@ -6264,6 +6264,325 @@ function truncateUrl(url) {
   }
 }
 
+// src/dashboard/views/generations.tsx
+var STATE_COLORS = {
+  active: "bg-emerald-500/15 text-emerald-500",
+  draining: "bg-yellow-500/15 text-yellow-500",
+  stopped: "bg-gray-500/15 text-gray-400"
+};
+var STATE_DESCRIPTIONS = {
+  active: "Receiving new requests",
+  draining: "Finishing in-flight requests, no new requests accepted",
+  stopped: "All work finished, will be removed shortly"
+};
+function formatRelativeTime(timestamp) {
+  const diff = Date.now() - timestamp;
+  if (diff < 1000)
+    return "just now";
+  if (diff < 60000)
+    return `${Math.floor(diff / 1000)}s ago`;
+  if (diff < 3600000)
+    return `${Math.floor(diff / 60000)}m ago`;
+  return `${Math.floor(diff / 3600000)}h ago`;
+}
+function GenerationCard({ gen, onReload, onStop }) {
+  const [detail, setDetail] = d2(null);
+  const [expanded, setExpanded] = d2(false);
+  y2(() => {
+    if (!expanded)
+      return;
+    rpc("generations.detail", { id: gen.id, workerName: gen.workerName }).then(setDetail).catch(() => {});
+  }, [expanded, gen.id]);
+  return /* @__PURE__ */ u3("div", {
+    class: "bg-panel rounded-lg border border-border p-4",
+    children: [
+      /* @__PURE__ */ u3("div", {
+        class: "flex items-center justify-between",
+        children: [
+          /* @__PURE__ */ u3("div", {
+            class: "flex items-center gap-3",
+            children: [
+              /* @__PURE__ */ u3("span", {
+                class: "text-lg font-bold font-mono text-ink",
+                children: [
+                  "#",
+                  gen.id
+                ]
+              }, undefined, true, undefined, this),
+              /* @__PURE__ */ u3("span", {
+                title: STATE_DESCRIPTIONS[gen.state],
+                children: /* @__PURE__ */ u3(StatusBadge, {
+                  status: gen.state,
+                  colorMap: STATE_COLORS
+                }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this),
+              gen.workerName && /* @__PURE__ */ u3("span", {
+                class: "inline-flex px-2 py-0.5 rounded-md text-xs font-medium bg-panel-hover text-text-secondary",
+                children: gen.workerName
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
+          /* @__PURE__ */ u3("div", {
+            class: "flex items-center gap-2",
+            children: [
+              gen.state === "active" && /* @__PURE__ */ u3("button", {
+                onClick: onReload,
+                class: "rounded-md px-3 py-1.5 text-xs font-medium bg-panel border border-border text-text-secondary hover:bg-panel-hover transition-all",
+                children: "Reload"
+              }, undefined, false, undefined, this),
+              gen.state === "draining" && /* @__PURE__ */ u3("button", {
+                onClick: () => onStop(gen.id),
+                class: "rounded-md px-3 py-1.5 text-xs font-medium bg-panel border border-border text-text-secondary btn-danger transition-all",
+                children: "Force Stop"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
+      /* @__PURE__ */ u3("div", {
+        class: "mt-3 flex items-center gap-4 text-xs text-text-muted",
+        children: [
+          /* @__PURE__ */ u3("span", {
+            title: new Date(gen.createdAt).toLocaleString(),
+            children: [
+              "Loaded ",
+              formatRelativeTime(gen.createdAt)
+            ]
+          }, undefined, true, undefined, this),
+          /* @__PURE__ */ u3("span", {
+            title: "Number of HTTP requests currently being processed by this generation",
+            children: [
+              gen.activeRequests,
+              " in-flight request",
+              gen.activeRequests !== 1 ? "s" : ""
+            ]
+          }, undefined, true, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
+      gen.durableObjects && gen.durableObjects.length > 0 && /* @__PURE__ */ u3("div", {
+        class: "mt-3 flex flex-wrap gap-2",
+        children: gen.durableObjects.map((d3) => /* @__PURE__ */ u3("span", {
+          class: "inline-flex items-center gap-1 px-2 py-0.5 rounded-md text-xs bg-panel-hover text-text-secondary",
+          title: `Durable Object class "${d3.namespace}": ${d3.activeInstances} active instance(s), ${d3.totalWebSockets} WebSocket connection(s)`,
+          children: [
+            d3.namespace,
+            ":",
+            /* @__PURE__ */ u3("span", {
+              class: "font-medium text-ink",
+              children: d3.activeInstances
+            }, undefined, false, undefined, this),
+            " instance",
+            d3.activeInstances !== 1 ? "s" : "",
+            d3.totalWebSockets > 0 && /* @__PURE__ */ u3("span", {
+              class: "text-text-muted",
+              children: [
+                "(",
+                d3.totalWebSockets,
+                " ws)"
+              ]
+            }, undefined, true, undefined, this)
+          ]
+        }, d3.namespace, true, undefined, this))
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ u3("button", {
+        onClick: () => setExpanded(!expanded),
+        class: "mt-2 text-xs text-text-muted hover:text-ink transition-colors",
+        children: expanded ? "Hide DO instances" : "Show DO instances"
+      }, undefined, false, undefined, this),
+      expanded && detail && /* @__PURE__ */ u3("div", {
+        class: "mt-3 border-t border-border pt-3",
+        children: detail.doNamespaces.length === 0 ? /* @__PURE__ */ u3("div", {
+          class: "text-xs text-text-muted",
+          children: "No active Durable Object instances in this generation"
+        }, undefined, false, undefined, this) : detail.doNamespaces.map((ns) => /* @__PURE__ */ u3("div", {
+          class: "mb-3",
+          children: [
+            /* @__PURE__ */ u3("div", {
+              class: "text-xs font-medium text-text-secondary mb-1",
+              children: ns.namespace
+            }, undefined, false, undefined, this),
+            ns.instances.length === 0 ? /* @__PURE__ */ u3("div", {
+              class: "text-xs text-text-muted ml-2",
+              children: "No active instances"
+            }, undefined, false, undefined, this) : /* @__PURE__ */ u3("div", {
+              class: "ml-2 space-y-0.5",
+              children: ns.instances.map((inst) => /* @__PURE__ */ u3("div", {
+                class: "text-xs font-mono text-text-data flex items-center gap-2",
+                children: [
+                  /* @__PURE__ */ u3("span", {
+                    class: "truncate max-w-[200px]",
+                    title: inst.id,
+                    children: inst.id
+                  }, undefined, false, undefined, this),
+                  inst.wsCount > 0 && /* @__PURE__ */ u3("span", {
+                    class: "text-text-muted",
+                    title: "Active WebSocket connections",
+                    children: [
+                      inst.wsCount,
+                      " ws"
+                    ]
+                  }, undefined, true, undefined, this)
+                ]
+              }, inst.id, true, undefined, this))
+            }, undefined, false, undefined, this)
+          ]
+        }, ns.namespace, true, undefined, this))
+      }, undefined, false, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
+function GenerationsView() {
+  const { data, refetch } = useQuery("generations.list");
+  const reload = useMutation("generations.reload");
+  const drain = useMutation("generations.drain");
+  const configMutation = useMutation("generations.config");
+  const [gracePeriod, setGracePeriod] = d2("");
+  y2(() => {
+    if (data?.gracePeriodMs != null && gracePeriod === "") {
+      setGracePeriod(String(data.gracePeriodMs));
+    }
+  }, [data?.gracePeriodMs]);
+  y2(() => {
+    const timer = setInterval(refetch, 2000);
+    return () => clearInterval(timer);
+  }, [refetch]);
+  const handleReload = q2(async (workerName) => {
+    await reload.mutate(workerName ? { workerName } : undefined);
+    refetch();
+  }, [reload, refetch]);
+  const handleStop = q2(async (workerName) => {
+    await drain.mutate(workerName ? { workerName } : undefined);
+    refetch();
+  }, [drain, refetch]);
+  const handleGracePeriodSave = q2(() => {
+    const ms = parseInt(gracePeriod, 10);
+    if (Number.isNaN(ms) || ms < 0)
+      return;
+    configMutation.mutate({ gracePeriodMs: ms });
+  }, [gracePeriod, configMutation]);
+  if (!data) {
+    return /* @__PURE__ */ u3("div", {
+      class: "p-4 sm:p-8",
+      children: [
+        /* @__PURE__ */ u3(PageHeader, {
+          title: "Generations"
+        }, undefined, false, undefined, this),
+        /* @__PURE__ */ u3("div", {
+          class: "text-text-muted text-sm text-center py-12",
+          children: "Loading..."
+        }, undefined, false, undefined, this)
+      ]
+    }, undefined, true, undefined, this);
+  }
+  const generations = data.generations;
+  return /* @__PURE__ */ u3("div", {
+    class: "p-4 sm:p-8",
+    children: [
+      /* @__PURE__ */ u3(PageHeader, {
+        title: "Generations",
+        subtitle: `${generations.length} generation(s)`,
+        actions: /* @__PURE__ */ u3("div", {
+          class: "flex items-center gap-2",
+          children: [
+            /* @__PURE__ */ u3("div", {
+              class: "flex items-center gap-1",
+              title: "How long to wait for in-flight requests to finish before force-stopping an old generation",
+              children: [
+                /* @__PURE__ */ u3("label", {
+                  class: "text-xs text-text-muted",
+                  children: "Grace period (ms):"
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ u3("input", {
+                  type: "number",
+                  value: gracePeriod,
+                  onInput: (e3) => setGracePeriod(e3.target.value),
+                  onBlur: handleGracePeriodSave,
+                  class: "bg-panel border border-border rounded-md px-2 py-1 text-xs w-24 outline-none focus:border-border focus:ring-1 focus:ring-border"
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this),
+            /* @__PURE__ */ u3("button", {
+              onClick: () => handleReload(),
+              disabled: reload.isLoading,
+              class: "rounded-md px-3 py-1.5 text-sm font-medium bg-accent-lime text-surface hover:bg-accent-lime/90 disabled:opacity-50 transition-all",
+              children: reload.isLoading ? "Reloading..." : "Reload"
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this)
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ u3("p", {
+        class: "text-xs text-text-muted mb-6 max-w-xl leading-relaxed",
+        children: [
+          "A generation is a snapshot of your worker code at a point in time. When code changes, a new generation is created and the old one is drained (finishes in-flight work, then stops). Each request and Durable Object is tied to the generation that was active when it started. The",
+          " ",
+          /* @__PURE__ */ u3("span", {
+            class: "font-mono",
+            children: "Gen"
+          }, undefined, false, undefined, this),
+          " column in Traces shows which generation handled each request."
+        ]
+      }, undefined, true, undefined, this),
+      generations.length === 0 ? /* @__PURE__ */ u3(EmptyState, {
+        message: "No generations yet. Start your dev server to see generations here."
+      }, undefined, false, undefined, this) : /* @__PURE__ */ u3("div", {
+        class: "space-y-4",
+        children: generations.map((gen) => /* @__PURE__ */ u3(GenerationCard, {
+          gen,
+          onReload: () => handleReload(),
+          onStop: (id) => handleStop()
+        }, gen.id, false, undefined, this))
+      }, undefined, false, undefined, this),
+      data.workers && data.workers.length > 0 && /* @__PURE__ */ u3("div", {
+        class: "mt-8",
+        children: [
+          /* @__PURE__ */ u3("h2", {
+            class: "text-lg font-bold text-ink mb-1",
+            children: "Per-Worker Generations"
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ u3("p", {
+            class: "text-xs text-text-muted mb-4",
+            children: "In multi-worker mode, each worker has its own independent generation lifecycle."
+          }, undefined, false, undefined, this),
+          data.workers.map((w3) => /* @__PURE__ */ u3("div", {
+            class: "mb-6",
+            children: [
+              /* @__PURE__ */ u3("div", {
+                class: "flex items-center gap-3 mb-3",
+                children: [
+                  /* @__PURE__ */ u3("h3", {
+                    class: "text-sm font-bold text-ink",
+                    children: w3.workerName
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ u3("span", {
+                    class: "text-xs text-text-muted",
+                    children: [
+                      w3.generations.length,
+                      " generation(s)"
+                    ]
+                  }, undefined, true, undefined, this),
+                  /* @__PURE__ */ u3("button", {
+                    onClick: () => handleReload(w3.workerName),
+                    class: "rounded-md px-2 py-1 text-xs font-medium bg-panel border border-border text-text-secondary hover:bg-panel-hover transition-all",
+                    children: "Reload"
+                  }, undefined, false, undefined, this)
+                ]
+              }, undefined, true, undefined, this),
+              /* @__PURE__ */ u3("div", {
+                class: "space-y-3",
+                children: w3.generations.map((gen) => /* @__PURE__ */ u3(GenerationCard, {
+                  gen,
+                  onReload: () => handleReload(w3.workerName),
+                  onStop: () => handleStop(w3.workerName)
+                }, gen.id, false, undefined, this))
+              }, undefined, false, undefined, this)
+            ]
+          }, w3.workerName, true, undefined, this))
+        ]
+      }, undefined, true, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
+
 // src/dashboard/views/home.tsx
 var INVENTORY = [
   { key: "kv", label: "KV", path: "/kv", icon: "kv" },
@@ -7688,7 +8007,8 @@ function useTraceStream() {
                 startTime: s3.startTime,
                 durationMs: s3.durationMs,
                 spanCount: 1,
-                errorCount: 0
+                errorCount: 0,
+                generationId: typeof s3.attributes["lopata.generation_id"] === "number" ? s3.attributes["lopata.generation_id"] : null
               });
             } else if (event.type === "span.end" && event.span.parentSpanId === null) {
               const s3 = event.span;
@@ -7970,6 +8290,10 @@ function TracesListView() {
                           class: "text-left px-4 py-2.5 text-xs text-text-muted font-medium",
                           children: "Worker"
                         }, undefined, false, undefined, this),
+                        /* @__PURE__ */ u3("th", {
+                          class: "text-left px-4 py-2.5 text-xs text-text-muted font-medium",
+                          children: "Gen"
+                        }, undefined, false, undefined, this),
                         /* @__PURE__ */ u3("th", {
                           class: "text-left px-4 py-2.5 text-xs text-text-muted font-medium",
                           style: { minWidth: "140px" },
@@ -8017,6 +8341,16 @@ function TracesListView() {
                             children: trace.workerName
                           }, undefined, false, undefined, this)
                         }, undefined, false, undefined, this),
+                        /* @__PURE__ */ u3("td", {
+                          class: "px-4 py-2.5",
+                          children: trace.generationId != null && /* @__PURE__ */ u3("span", {
+                            class: "inline-flex px-1.5 py-0.5 rounded text-[10px] font-mono font-medium bg-panel-hover text-text-secondary",
+                            children: [
+                              "#",
+                              trace.generationId
+                            ]
+                          }, undefined, true, undefined, this)
+                        }, undefined, false, undefined, this),
                         /* @__PURE__ */ u3("td", {
                           class: "px-4 py-2.5",
                           children: /* @__PURE__ */ u3(DurationBar, {
@@ -8113,6 +8447,13 @@ function TraceDetailPage({ traceId }) {
                     class: "ml-2 inline-flex px-2 py-0.5 rounded-md text-xs font-medium bg-panel-hover text-text-secondary",
                     children: rootSpan.workerName
                   }, undefined, false, undefined, this),
+                  typeof rootSpan?.attributes["lopata.generation_id"] === "number" && /* @__PURE__ */ u3("span", {
+                    class: "ml-2 inline-flex px-1.5 py-0.5 rounded text-[10px] font-mono font-medium bg-panel-hover text-text-secondary",
+                    children: [
+                      "Gen #",
+                      rootSpan.attributes["lopata.generation_id"]
+                    ]
+                  }, undefined, true, undefined, this),
                   rootSpan?.durationMs != null && /* @__PURE__ */ u3("span", {
                     class: "ml-2 text-text-secondary",
                     children: formatDuration(rootSpan.durationMs)
@@ -9539,6 +9880,8 @@ function App() {
       }, undefined, false, undefined, this);
     if (route.startsWith("/workers"))
       return /* @__PURE__ */ u3(WorkersView, {}, undefined, false, undefined, this);
+    if (route.startsWith("/generations"))
+      return /* @__PURE__ */ u3(GenerationsView, {}, undefined, false, undefined, this);
     if (route.startsWith("/kv"))
       return /* @__PURE__ */ u3(KvView, {
         route
@@ -9655,8 +9998,26 @@ function App() {
       }, undefined, true, undefined, this),
       /* @__PURE__ */ u3("div", {
         class: "border-t border-border px-2 py-2",
-        children: /* @__PURE__ */ u3(ThemeSwitcher, {}, undefined, false, undefined, this)
-      }, undefined, false, undefined, this)
+        children: [
+          /* @__PURE__ */ u3("a", {
+            href: "#/generations",
+            class: `flex items-center gap-2 w-full px-3 py-1.5 text-xs font-mono rounded-md transition-colors ${activeSection === "/generations" ? "text-ink bg-panel-hover" : "text-text-muted hover:text-ink hover:bg-panel-hover"}`,
+            children: [
+              /* @__PURE__ */ u3("span", {
+                class: "w-4 text-center opacity-60",
+                children: /* @__PURE__ */ u3(BindingIcon, {
+                  type: "workers",
+                  class: "w-4 text-center opacity-60 flex items-center justify-center"
+                }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ u3("span", {
+                children: "Generations"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
+          /* @__PURE__ */ u3(ThemeSwitcher, {}, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this)
     ]
   }, undefined, true, undefined, this);
   return /* @__PURE__ */ u3("div", {

package/dist/dashboard/index.html

@@ -8,7 +8,7 @@
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
   <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;600&display=swap" rel="stylesheet" />
   
-<link rel="stylesheet" crossorigin href="/__dashboard/assets/chunk-pqnphvm2.css"><script type="module" crossorigin src="/__dashboard/assets/chunk-5nxa3jfc.js"></script></head>
+<link rel="stylesheet" crossorigin href="/__dashboard/assets/chunk-csyd2tq2.css"><script type="module" crossorigin src="/__dashboard/assets/chunk-yxzrcvyh.js"></script></head>
 <body class="h-full bg-surface text-ink" style="font-family: system-ui, -apple-system, sans-serif;">
   <script>
     // Apply saved theme before first paint to prevent flash

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "lopata",
-	"version": "0.7.0",
+	"version": "0.8.2",
 	"type": "module",
 	"license": "MIT",
 	"repository": {
@@ -11,7 +11,9 @@
 		"lopata": "src/cli.ts"
 	},
 	"exports": {
-		"./vite-plugin": "./src/vite-plugin/index.ts"
+		"./vite-plugin": "./src/vite-plugin/index.ts",
+		"./testing": "./src/testing/index.ts",
+		"./testing/setup": "./src/testing/setup.ts"
 	},
 	"files": [
 		"src/",
@@ -22,7 +24,7 @@
 	"scripts": {
 		"dev": "cd examples/playground && bun ../../src/cli.ts dev",
 		"cli": "bun src/cli.ts",
-		"test": "bun test tests/",
+		"test": "bun test tests/ examples/playground/tests/",
 		"lint": "biome lint .",
 		"lint:fix": "biome lint . --write",
 		"format": "dprint fmt",

package/src/api/handlers/generations.ts

@@ -1,12 +1,26 @@
-import type { GenerationInfo, GenerationsData, HandlerContext, OkResponse } from '../types'
+import type { GenerationDetail, GenerationInfo, GenerationsData, HandlerContext, OkResponse } from '../types'
 
 export const handlers = {
-	'generations.list'(_input: {}, ctx: HandlerContext): GenerationsData {
-		if (!ctx.manager) throw new Error('Generation manager not available')
+	'generations.detail'(input: { id: number; workerName?: string }, ctx: HandlerContext): GenerationDetail {
+		let manager = ctx.manager
+		if (input.workerName && ctx.registry) {
+			manager = ctx.registry.getManager(input.workerName) ?? null
+		}
+		if (!manager) throw new Error('Generation manager not available')
+		const gen = manager.get(input.id)
+		if (!gen) throw new Error(`Generation ${input.id} not found`)
+		const info = gen.getInfo()
+		const doNamespaces = gen.registry.durableObjects.map(entry => ({
+			namespace: entry.className,
+			instances: entry.namespace._listActiveExecutors(),
+		}))
+		return { ...info, doNamespaces }
+	},
 
+	'generations.list'(_input: {}, ctx: HandlerContext): GenerationsData {
 		const result: GenerationsData = {
-			generations: ctx.manager.list(),
-			gracePeriodMs: ctx.manager.gracePeriodMs,
+			generations: ctx.manager?.list() ?? [],
+			gracePeriodMs: ctx.manager?.gracePeriodMs ?? 10_000,
 		}
 
 		// Include per-worker data when registry is available (multi-worker mode)

package/src/api/types.ts

@@ -240,6 +240,20 @@ export interface GenerationsData {
 	workers?: WorkerGenerations[]
 }
 
+export interface GenerationDoInstance {
+	id: string
+	wsCount: number
+}
+
+export interface GenerationDoNamespace {
+	namespace: string
+	instances: GenerationDoInstance[]
+}
+
+export interface GenerationDetail extends GenerationInfo {
+	doNamespaces: GenerationDoNamespace[]
+}
+
 // Workers
 export interface WorkerBinding {
 	type: string

package/src/bindings/cache.ts

@@ -1,4 +1,6 @@
 import type { Database } from 'bun:sqlite'
+import type { Clock } from '../testing/clock'
+import { realClock } from '../testing/clock'
 
 export interface CacheLimits {
 	maxBodySize?: number // default 512 MiB (CF limit)
@@ -42,12 +44,12 @@ function parseCacheControlMaxAge(header: string | null): number | null {
  * Compute the expiration timestamp (ms since epoch) from response headers.
  * Returns null if no expiration info is present (cache indefinitely).
  */
-function computeExpiresAt(headers: Headers): number | null {
+function computeExpiresAt(headers: Headers, now: number): number | null {
 	const cacheControl = headers.get('cache-control')
 	const maxAge = parseCacheControlMaxAge(cacheControl)
 
 	if (maxAge === -1) return -1 // signal: no-store
-	if (maxAge !== null) return Date.now() + maxAge * 1000
+	if (maxAge !== null) return now + maxAge * 1000
 
 	// Fallback to Expires header
 	const expires = headers.get('expires')
@@ -63,11 +65,13 @@ export class SqliteCache {
 	private db: Database
 	private cacheName: string
 	private limits: Required<CacheLimits>
+	private clock: Clock
 
-	constructor(db: Database, cacheName: string, limits?: CacheLimits) {
+	constructor(db: Database, cacheName: string, limits?: CacheLimits, clock?: Clock) {
 		this.db = db
 		this.cacheName = cacheName
 		this.limits = { ...CACHE_DEFAULTS, ...limits }
+		this.clock = clock ?? realClock
 	}
 
 	async match(request: Request | string, options?: { ignoreMethod?: boolean }): Promise<Response | undefined> {
@@ -86,7 +90,7 @@ export class SqliteCache {
 		if (!row) return undefined
 
 		// Check expiration — lazily delete expired entries
-		if (row.expires_at !== null && row.expires_at <= Date.now()) {
+		if (row.expires_at !== null && row.expires_at <= this.clock.now()) {
 			this.db.query(
 				'DELETE FROM cache_entries WHERE cache_name = ? AND url = ?',
 			).run(this.cacheName, url)
@@ -123,7 +127,7 @@ export class SqliteCache {
 		}
 
 		// Parse expiration from Cache-Control / Expires
-		const expiresAt = computeExpiresAt(response.headers)
+		const expiresAt = computeExpiresAt(response.headers, this.clock.now())
 
 		// no-store — don't cache at all
 		if (expiresAt === -1) {
@@ -165,15 +169,17 @@ export class SqliteCache {
 export class SqliteCacheStorage {
 	private db: Database
 	private limits?: CacheLimits
+	private clock: Clock
 	public default: SqliteCache
 
-	constructor(db: Database, limits?: CacheLimits) {
+	constructor(db: Database, limits?: CacheLimits, clock?: Clock) {
 		this.db = db
 		this.limits = limits
-		this.default = new SqliteCache(db, 'default', limits)
+		this.clock = clock ?? realClock
+		this.default = new SqliteCache(db, 'default', limits, this.clock)
 	}
 
 	async open(cacheName: string): Promise<SqliteCache> {
-		return new SqliteCache(this.db, cacheName, this.limits)
+		return new SqliteCache(this.db, cacheName, this.limits, this.clock)
 	}
 }