From 2082a908fac4f0c6b96a97e9113b56c4d33c0c98 Mon Sep 17 00:00:00 2001
From: Jared Miller <jared@smell.flowers>
Date: Tue, 27 Jan 2026 21:22:52 -0500
Subject: [PATCH] Hook persistence into session lifecycle

---
 adapters/vim/bridge.test.ts |  8 +++++++-
 src/awareness.test.ts       |  4 ++++
 src/integration.test.ts     |  4 ++++
 src/session.test.ts         | 11 ++++++++++-
 src/session.ts              |  8 ++++++++
 5 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/adapters/vim/bridge.test.ts b/adapters/vim/bridge.test.ts
index bf1956b..3f1b36d 100644
--- a/adapters/vim/bridge.test.ts
+++ b/adapters/vim/bridge.test.ts
@@ -6,11 +6,15 @@ describe("Bridge lifecycle", () => {
   const DAEMON_PORT = 4042;
 
   beforeEach(async () => {
+    const { initDb } = await import("../../src/db");
     const { decode } = await import("../../src/protocol");
     const { getOrCreateSession, getSession, removeSession } = await import(
       "../../src/session"
     );
 
+    // Initialize database
+    initDb(":memory:");
+
     // start daemon for bridge to connect to
     daemon = Bun.serve({
       port: DAEMON_PORT,
@@ -75,8 +79,10 @@ describe("Bridge lifecycle", () => {
     });
   });
 
-  afterEach(() => {
+  afterEach(async () => {
     daemon.stop();
+    const { close: closeDb } = await import("../../src/db");
+    closeDb();
   });
 
   test("bridge starts and signals ready", async () => {
diff --git a/src/awareness.test.ts b/src/awareness.test.ts
index b51f016..21031e6 100644
--- a/src/awareness.test.ts
+++ b/src/awareness.test.ts
@@ -1,5 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Server } from "bun";
+import { close as closeDb, initDb } from "./db";
 import type { ServerMessage } from "./protocol";
 
 describe("awareness routing", () => {
@@ -7,6 +8,8 @@ describe("awareness routing", () => {
   const PORT = 4042;
 
   beforeAll(async () => {
+    // Initialize database before starting server
+    initDb(":memory:");
     // Import and start server on test port
     process.env.PORT = String(PORT);
     const mod = await import("./index");
@@ -15,6 +18,7 @@ describe("awareness routing", () => {
 
   afterAll(() => {
     server?.stop();
+    closeDb();
   });
 
   test("awareness message routes to other peers in same room", async () => {
diff --git a/src/integration.test.ts b/src/integration.test.ts
index 44049a5..43694bb 100644
--- a/src/integration.test.ts
+++ b/src/integration.test.ts
@@ -1,4 +1,5 @@
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+import { close as closeDb, initDb } from "./db";
 import type { ServerMessage } from "./protocol";
 import { decode } from "./protocol";
 import {
@@ -13,6 +14,8 @@ describe("WebSocket concurrent edits integration", () => {
   const PORT = 4041; // use different port for tests
 
   beforeEach(() => {
+    // initialize database for each test
+    initDb(":memory:");
     // start server for each test
     server = Bun.serve<WsData>({
       port: PORT,
@@ -79,6 +82,7 @@ describe("WebSocket concurrent edits integration", () => {
 
   afterEach(() => {
     server.stop();
+    closeDb();
   });
 
   test("two clients concurrent edits converge to same state", async () => {
diff --git a/src/session.test.ts b/src/session.test.ts
index b57deac..881aae8 100644
--- a/src/session.test.ts
+++ b/src/session.test.ts
@@ -1,5 +1,6 @@
-import { describe, expect, test } from "bun:test";
+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 import * as Y from "yjs";
+import { close as closeDb, initDb } from "./db";
 import type { ServerMessage } from "./protocol";
 import {
   type Client,
@@ -8,6 +9,14 @@ import {
   type WsData,
 } from "./session";
 
+beforeEach(() => {
+  initDb(":memory:");
+});
+
+afterEach(() => {
+  closeDb();
+});
+
 describe("Session", () => {
   test("creates yjs doc on init", () => {
     const session = new Session("test-room");
diff --git a/src/session.ts b/src/session.ts
index 088fbe7..5e710f9 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -1,6 +1,7 @@
 import type { ServerWebSocket } from "bun";
 import * as Y from "yjs";
 import { type AwarenessState, encode } from "./protocol";
+import { saveUpdate, getUpdates } from "./db";
 
 export interface WsData {
   room: string | null;
@@ -49,6 +50,8 @@ export class Session {
   applyUpdate(update: Uint8Array, from: Client) {
     try {
       Y.applyUpdate(this.doc, update);
+      // Persist the update
+      saveUpdate(this.name, update);
       // broadcast to others
       for (const client of this.clients) {
         if (client !== from) {
@@ -106,6 +109,11 @@ export function getOrCreateSession(name: string): Session {
   let session = sessions.get(name);
   if (!session) {
     session = new Session(name);
+    // Load persisted updates
+    const updates = getUpdates(name);
+    for (const update of updates) {
+      Y.applyUpdate(session.doc, update);
+    }
     sessions.set(name, session);
     console.debug(`session created: ${name}`);
   }