cojson-storage-sqlite 0.15.7 → 0.15.9

package/dist/tests/testUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"testUtils.js","sourceRoot":"","sources":["../../src/tests/testUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC,MAAM,UAAU,aAAa,CAAC,IAAe;IAC3C,MAAM,QAAQ,GAGR,EAAE,CAAC;IAET,MAAM,yBAAyB,GAC7B,kBAAkB,CAAC,SAAS,CAAC,iBAAiB,CAAC;IACjD,MAAM,uBAAuB,GAAG,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;IAEnE,kBAAkB,CAAC,SAAS,CAAC,iBAAiB,GAAG,KAAK,WAAW,GAAG;QAClE,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,QAAQ;YACd,GAAG;SACJ,CAAC,CAAC;QACH,OAAO,yBAAyB,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACnD,CAAC,CAAC;IAEF,IAAI,CAAC,WAAW,CAAC,iBAAiB,GAAG,KAAK,WAAW,GAAG,EAAE,IAAI;QAC5D,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,SAAS;YACf,GAAG;SACJ,CAAC,CAAC;QACH,OAAO,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,kBAAkB,CAAC,SAAS,CAAC,iBAAiB,GAAG,yBAAyB,CAAC;QAC3E,IAAI,CAAC,WAAW,CAAC,iBAAiB,GAAG,uBAAuB,CAAC;IAC/D,CAAC,CAAC;IAEF,cAAc,CAAC,GAAG,EAAE;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ;QACR,OAAO;KACR,CAAC;AACJ,CAAC;AACD,MAAM,UAAU,OAAO,CACrB,QAAkE;IAElE,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;YAC7B,IAAI,CAAC;gBACH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;YAC/C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YAC9B,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;YACtC,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,MAAM,WAAW,EAAE,CAAC;YAE1C,IAAI,EAAE,KAAK,KAAK,EAAE,CAAC;gBACjB,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACxB,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,IAAI,EAAE,OAAO,GAAG,EAAE,EAAE,CAAC;gBACnB,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACxB,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC;QACH,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"testUtils.js","sourceRoot":"","sources":["../../src/tests/testUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC,MAAM,UAAU,aAAa;IAC3B,MAAM,QAAQ,GAGR,EAAE,CAAC;IAET,MAAM,YAAY,GAAG,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC;IACnD,MAAM,aAAa,GAAG,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC;IAErD,cAAc,CAAC,SAAS,CAAC,IAAI,GAAG,KAAK,WAAW,EAAE,EAAE,QAAQ,EAAE,IAAI;QAChE,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE;gBACH,MAAM,EAAE,MAAM;gBACd,EAAE,EAAE,EAAa;gBACjB,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,EAAE;aACb;SACF,CAAC,CAAC;QACH,OAAO,YAAY,CAAC,IAAI,CACtB,IAAI,EACJ,EAAE,EACF,CAAC,GAAG,EAAE,EAAE;YACN,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,SAAS;gBACf,GAAG;aACJ,CAAC,CAAC;YACH,QAAQ,CAAC,GAAG,CAAC,CAAC;QAChB,CAAC,EACD,IAAI,CACL,CAAC;IACJ,CAAC,CAAC;IAEF,cAAc,CAAC,SAAS,CAAC,KAAK,GAAG,UAAU,IAAI,EAAE,kBAAkB;QACjE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,QAAQ;gBACd,GAAG;aACJ,CAAC,CAAC;QACL,CAAC;QACD,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;YAC5C,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,SAAS;gBACf,GAAG,EAAE;oBACH,MAAM,EAAE,OAAO;oBACf,YAAY,EAAE,IAAI;oBAClB,GAAG,GAAG;iBACP;aACF,CAAC,CAAC;YACH,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,cAAc,CAAC,SAAS,CAAC,IAAI,GAAG,YAAY,CAAC;QAC7C,cAAc,CAAC,SAAS,CAAC,KAAK,GAAG,aAAa,CAAC;QAC/C,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,cAAc,CAAC,GAAG,EAAE;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ;QACR,OAAO;KACR,CAAC;AACJ,CAAC;AACD,MAAM,UAAU,OAAO,CACrB,QAAkE;IAElE,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;YAC7B,IAAI,CAAC;gBACH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;YAC/C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YAC9B,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;YACtC,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,MAAM,WAAW,EAAE,CAAC;YAE1C,IAAI,EAAE,KAAK,KAAK,EAAE,CAAC;gBACjB,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACxB,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,IAAI,EAAE,OAAO,GAAG,EAAE,EAAE,CAAC;gBACnB,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACxB,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC;QACH,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;AACL,CAAC"}

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "cojson-storage-sqlite",
   "type": "module",
-  "version": "0.15.7",
+  "version": "0.15.9",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
     "better-sqlite3": "^11.7.0",
-    "cojson": "0.15.7",
-    "cojson-storage": "0.15.7"
+    "cojson": "0.15.9"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.12",

package/src/index.ts

@@ -1 +1,39 @@
-export { SQLiteNode, SQLiteNode as SQLiteStorage } from "./sqliteNode.js";
+import Database, { type Database as DatabaseT } from "better-sqlite3";
+import type { SQLiteDatabaseDriver } from "cojson";
+import { getSqliteStorage } from "cojson";
+
+export class BetterSqliteDriver implements SQLiteDatabaseDriver {
+  private readonly db: DatabaseT;
+
+  constructor(filename: string) {
+    const db = new Database(filename);
+    this.db = db;
+    db.pragma("journal_mode = WAL");
+  }
+
+  run(sql: string, params: unknown[]) {
+    this.db.prepare(sql).run(params);
+  }
+
+  query<T>(sql: string, params: unknown[]): T[] {
+    return this.db.prepare(sql).all(params) as T[];
+  }
+
+  get<T>(sql: string, params: unknown[]): T | undefined {
+    return this.db.prepare(sql).get(params) as T | undefined;
+  }
+
+  transaction(callback: () => unknown) {
+    return this.db.transaction(callback)();
+  }
+
+  closeDb() {
+    this.db.close();
+  }
+}
+
+export function getBetterSqliteStorage(filename: string) {
+  const db = new BetterSqliteDriver(filename);
+
+  return getSqliteStorage(db);
+}

package/src/tests/storage.sqlite.test.ts

@@ -2,18 +2,16 @@ import { randomUUID } from "node:crypto";
 import { unlinkSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { LocalNode, cojsonInternals } from "cojson";
-import { SQLiteNodeBase, StorageManagerSync } from "cojson-storage";
+import { LocalNode, StorageApiSync, cojsonInternals } from "cojson";
 import { WasmCrypto } from "cojson/crypto/WasmCrypto";
 import { expect, onTestFinished, test, vi } from "vitest";
-import { BetterSqliteDriver } from "../betterSqliteDriver.js";
-import { SQLiteNode } from "../index.js";
+import { getBetterSqliteStorage } from "../index.js";
 import { toSimplifiedMessages } from "./messagesTestUtils.js";
 import { trackMessages, waitFor } from "./testUtils.js";
 
 const Crypto = await WasmCrypto.create();
 
-async function createSQLiteStorage(defaultDbPath?: string) {
+function createSQLiteStorage(defaultDbPath?: string) {
   const dbPath = defaultDbPath ?? join(tmpdir(), `test-${randomUUID()}.db`);
 
   if (!defaultDbPath) {
@@ -23,29 +21,11 @@ async function createSQLiteStorage(defaultDbPath?: string) {
   }
 
   return {
-    peer: await SQLiteNode.asPeer({
-      filename: dbPath,
-    }),
+    storage: getBetterSqliteStorage(dbPath),
     dbPath,
   };
 }
 
-test("Should be able to initialize and load from empty DB", async () => {
-  const agentSecret = Crypto.newRandomAgentSecret();
-
-  const node = new LocalNode(
-    agentSecret,
-    Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)),
-    Crypto,
-  );
-
-  node.syncManager.addPeer((await createSQLiteStorage()).peer);
-
-  await new Promise((resolve) => setTimeout(resolve, 200));
-
-  expect(node.syncManager.peers.storage).toBeDefined();
-});
-
 test("should sync and load data from storage", async () => {
   const agentSecret = Crypto.newRandomAgentSecret();
 
@@ -55,11 +35,11 @@ test("should sync and load data from storage", async () => {
     Crypto,
   );
 
-  const node1Sync = trackMessages(node1);
+  const node1Sync = trackMessages();
 
-  const { peer, dbPath } = await createSQLiteStorage();
+  const { storage, dbPath } = createSQLiteStorage();
 
-  node1.syncManager.addPeer(peer);
+  node1.setStorage(storage);
 
   const group = node1.createGroup();
 
@@ -80,9 +60,7 @@ test("should sync and load data from storage", async () => {
   ).toMatchInlineSnapshot(`
     [
       "client -> CONTENT Group header: true new: After: 0 New: 3",
-      "storage -> KNOWN Group sessions: header/3",
       "client -> CONTENT Map header: true new: After: 0 New: 1",
-      "storage -> KNOWN Map sessions: header/1",
     ]
   `);
 
@@ -94,11 +72,9 @@ test("should sync and load data from storage", async () => {
     Crypto,
   );
 
-  const node2Sync = trackMessages(node2);
-
-  const { peer: peer2 } = await createSQLiteStorage(dbPath);
+  const node2Sync = trackMessages();
 
-  node2.syncManager.addPeer(peer2);
+  node2.setStorage(createSQLiteStorage(dbPath).storage);
 
   const map2 = await node2.load(map.id);
   if (map2 === "unavailable") {
@@ -119,9 +95,7 @@ test("should sync and load data from storage", async () => {
     [
       "client -> LOAD Map sessions: empty",
       "storage -> CONTENT Group header: true new: After: 0 New: 3",
-      "client -> KNOWN Group sessions: header/3",
       "storage -> CONTENT Map header: true new: After: 0 New: 1",
-      "client -> KNOWN Map sessions: header/1",
     ]
   `);
 
@@ -137,11 +111,11 @@ test("should send an empty content message if there is no content", async () =>
     Crypto,
   );
 
-  const node1Sync = trackMessages(node1);
+  const node1Sync = trackMessages();
 
-  const { peer, dbPath } = await createSQLiteStorage();
+  const { storage, dbPath } = createSQLiteStorage();
 
-  node1.syncManager.addPeer(peer);
+  node1.setStorage(storage);
 
   const group = node1.createGroup();
 
@@ -160,9 +134,7 @@ test("should send an empty content message if there is no content", async () =>
   ).toMatchInlineSnapshot(`
     [
       "client -> CONTENT Group header: true new: After: 0 New: 3",
-      "storage -> KNOWN Group sessions: header/3",
       "client -> CONTENT Map header: true new: ",
-      "storage -> KNOWN Map sessions: header/0",
     ]
   `);
 
@@ -174,11 +146,9 @@ test("should send an empty content message if there is no content", async () =>
     Crypto,
   );
 
-  const node2Sync = trackMessages(node2);
-
-  const { peer: peer2 } = await createSQLiteStorage(dbPath);
+  const node2Sync = trackMessages();
 
-  node2.syncManager.addPeer(peer2);
+  node2.setStorage(createSQLiteStorage(dbPath).storage);
 
   const map2 = await node2.load(map.id);
   if (map2 === "unavailable") {
@@ -197,9 +167,7 @@ test("should send an empty content message if there is no content", async () =>
     [
       "client -> LOAD Map sessions: empty",
       "storage -> CONTENT Group header: true new: After: 0 New: 3",
-      "client -> KNOWN Group sessions: header/3",
       "storage -> CONTENT Map header: true new: ",
-      "client -> KNOWN Map sessions: header/0",
     ]
   `);
 
@@ -215,11 +183,11 @@ test("should load dependencies correctly (group inheritance)", async () => {
     Crypto,
   );
 
-  const node1Sync = trackMessages(node1);
+  const node1Sync = trackMessages();
 
-  const { peer, dbPath } = await createSQLiteStorage();
+  const { storage, dbPath } = createSQLiteStorage();
 
-  node1.syncManager.addPeer(peer);
+  node1.setStorage(storage);
 
   const group = node1.createGroup();
   const parentGroup = node1.createGroup();
@@ -243,12 +211,9 @@ test("should load dependencies correctly (group inheritance)", async () => {
     ),
   ).toMatchInlineSnapshot(`
     [
-      "client -> CONTENT ParentGroup header: true new: After: 0 New: 4",
-      "storage -> KNOWN ParentGroup sessions: header/4",
       "client -> CONTENT Group header: true new: After: 0 New: 5",
-      "storage -> KNOWN Group sessions: header/5",
+      "client -> CONTENT ParentGroup header: true new: After: 0 New: 4",
       "client -> CONTENT Map header: true new: After: 0 New: 1",
-      "storage -> KNOWN Map sessions: header/1",
     ]
   `);
 
@@ -260,11 +225,9 @@ test("should load dependencies correctly (group inheritance)", async () => {
     Crypto,
   );
 
-  const node2Sync = trackMessages(node2);
-
-  const { peer: peer2 } = await createSQLiteStorage(dbPath);
+  const node2Sync = trackMessages();
 
-  node2.syncManager.addPeer(peer2);
+  node2.setStorage(createSQLiteStorage(dbPath).storage);
 
   await node2.load(map.id);
 
@@ -285,11 +248,8 @@ test("should load dependencies correctly (group inheritance)", async () => {
     [
       "client -> LOAD Map sessions: empty",
       "storage -> CONTENT ParentGroup header: true new: After: 0 New: 4",
-      "client -> KNOWN ParentGroup sessions: header/4",
       "storage -> CONTENT Group header: true new: After: 0 New: 5",
-      "client -> KNOWN Group sessions: header/5",
       "storage -> CONTENT Map header: true new: After: 0 New: 1",
-      "client -> KNOWN Map sessions: header/1",
     ]
   `);
 });
@@ -303,11 +263,11 @@ test("should not send the same dependency value twice", async () => {
     Crypto,
   );
 
-  const node1Sync = trackMessages(node1);
+  const node1Sync = trackMessages();
 
-  const { peer, dbPath } = await createSQLiteStorage();
+  const { storage, dbPath } = createSQLiteStorage();
 
-  node1.syncManager.addPeer(peer);
+  node1.setStorage(storage);
 
   const group = node1.createGroup();
   const parentGroup = node1.createGroup();
@@ -330,11 +290,9 @@ test("should not send the same dependency value twice", async () => {
     Crypto,
   );
 
-  const node2Sync = trackMessages(node2);
+  const node2Sync = trackMessages();
 
-  const { peer: peer2 } = await createSQLiteStorage(dbPath);
-
-  node2.syncManager.addPeer(peer2);
+  node2.setStorage(createSQLiteStorage(dbPath).storage);
 
   await node2.load(map.id);
   await node2.load(mapFromParent.id);
@@ -358,14 +316,10 @@ test("should not send the same dependency value twice", async () => {
     [
       "client -> LOAD Map sessions: empty",
       "storage -> CONTENT ParentGroup header: true new: After: 0 New: 4",
-      "client -> KNOWN ParentGroup sessions: header/4",
       "storage -> CONTENT Group header: true new: After: 0 New: 5",
-      "client -> KNOWN Group sessions: header/5",
       "storage -> CONTENT Map header: true new: After: 0 New: 1",
-      "client -> KNOWN Map sessions: header/1",
       "client -> LOAD MapFromParent sessions: empty",
       "storage -> CONTENT MapFromParent header: true new: After: 0 New: 1",
-      "client -> KNOWN MapFromParent sessions: header/1",
     ]
   `);
 });
@@ -379,11 +333,11 @@ test("should recover from data loss", async () => {
     Crypto,
   );
 
-  const node1Sync = trackMessages(node1);
+  const node1Sync = trackMessages();
 
-  const { peer, dbPath } = await createSQLiteStorage();
+  const { storage, dbPath } = createSQLiteStorage();
 
-  node1.syncManager.addPeer(peer);
+  node1.setStorage(storage);
 
   const group = node1.createGroup();
 
@@ -394,8 +348,8 @@ test("should recover from data loss", async () => {
   await new Promise((resolve) => setTimeout(resolve, 200));
 
   const mock = vi
-    .spyOn(StorageManagerSync.prototype, "handleSyncMessage")
-    .mockImplementation(() => Promise.resolve());
+    .spyOn(StorageApiSync.prototype, "store")
+    .mockImplementation(() => false);
 
   map.set("1", 1);
   map.set("2", 2);
@@ -419,13 +373,8 @@ test("should recover from data loss", async () => {
   ).toMatchInlineSnapshot(`
     [
       "client -> CONTENT Group header: true new: After: 0 New: 3",
-      "storage -> KNOWN Group sessions: header/3",
       "client -> CONTENT Map header: true new: After: 0 New: 1",
-      "storage -> KNOWN Map sessions: header/1",
-      "client -> CONTENT Map header: false new: After: 3 New: 1",
-      "storage -> KNOWN CORRECTION Map sessions: header/1",
       "client -> CONTENT Map header: false new: After: 1 New: 3",
-      "storage -> KNOWN Map sessions: header/4",
     ]
   `);
 
@@ -437,11 +386,9 @@ test("should recover from data loss", async () => {
     Crypto,
   );
 
-  const node2Sync = trackMessages(node2);
-
-  const { peer: peer2 } = await createSQLiteStorage(dbPath);
+  const node2Sync = trackMessages();
 
-  node2.syncManager.addPeer(peer2);
+  node2.setStorage(createSQLiteStorage(dbPath).storage);
 
   const map2 = await node2.load(map.id);
 
@@ -468,9 +415,7 @@ test("should recover from data loss", async () => {
     [
       "client -> LOAD Map sessions: empty",
       "storage -> CONTENT Group header: true new: After: 0 New: 3",
-      "client -> KNOWN Group sessions: header/3",
       "storage -> CONTENT Map header: true new: After: 0 New: 4",
-      "client -> KNOWN Map sessions: header/4",
     ]
   `);
 });
@@ -501,24 +446,28 @@ test("should recover missing dependencies from storage", async () => {
   node1.syncManager.addPeer(serverPeer);
   serverNode.syncManager.addPeer(clientPeer);
 
-  const handleSyncMessage = StorageManagerSync.prototype.handleSyncMessage;
+  const store = StorageApiSync.prototype.store;
 
   const mock = vi
-    .spyOn(StorageManagerSync.prototype, "handleSyncMessage")
-    .mockImplementation(function (this: StorageManagerSync, msg) {
+    .spyOn(StorageApiSync.prototype, "store")
+    .mockImplementation(function (
+      this: StorageApiSync,
+      data,
+      correctionCallback,
+    ) {
       if (
-        msg.action === "content" &&
-        [group.core.id, account.core.id].includes(msg.id)
+        data[0]?.id &&
+        [group.core.id, account.core.id as string].includes(data[0].id)
       ) {
-        return Promise.resolve();
+        return false;
       }
 
-      return handleSyncMessage.call(this, msg);
+      return store.call(this, data, correctionCallback);
     });
 
-  const { peer, dbPath } = await createSQLiteStorage();
+  const { storage, dbPath } = createSQLiteStorage();
 
-  node1.syncManager.addPeer(peer);
+  node1.setStorage(storage);
 
   const group = node1.createGroup();
   group.addMember("everyone", "writer");
@@ -549,9 +498,7 @@ test("should recover missing dependencies from storage", async () => {
   node2.syncManager.addPeer(serverPeer2);
   serverNode.syncManager.addPeer(clientPeer2);
 
-  const { peer: peer2 } = await createSQLiteStorage(dbPath);
-
-  node2.syncManager.addPeer(peer2);
+  node2.setStorage(createSQLiteStorage(dbPath).storage);
 
   const map2 = await node2.load(map.id);
 
@@ -573,9 +520,9 @@ test("should sync multiple sessions in a single content message", async () => {
     Crypto,
   );
 
-  const { peer, dbPath } = await createSQLiteStorage();
+  const { storage, dbPath } = createSQLiteStorage();
 
-  node1.syncManager.addPeer(peer);
+  node1.setStorage(storage);
 
   const group = node1.createGroup();
 
@@ -593,7 +540,7 @@ test("should sync multiple sessions in a single content message", async () => {
     Crypto,
   );
 
-  node2.syncManager.addPeer((await createSQLiteStorage(dbPath)).peer);
+  node2.setStorage(createSQLiteStorage(dbPath).storage);
 
   const map2 = await node2.load(map.id);
   if (map2 === "unavailable") {
@@ -614,9 +561,9 @@ test("should sync multiple sessions in a single content message", async () => {
     Crypto,
   );
 
-  const node3Sync = trackMessages(node3);
+  const node3Sync = trackMessages();
 
-  node3.syncManager.addPeer((await createSQLiteStorage(dbPath)).peer);
+  node3.setStorage(createSQLiteStorage(dbPath).storage);
 
   const map3 = await node3.load(map.id);
   if (map3 === "unavailable") {
@@ -637,9 +584,7 @@ test("should sync multiple sessions in a single content message", async () => {
     [
       "client -> LOAD Map sessions: empty",
       "storage -> CONTENT Group header: true new: After: 0 New: 3",
-      "client -> KNOWN Group sessions: header/3",
       "storage -> CONTENT Map header: true new: After: 0 New: 1 | After: 0 New: 1",
-      "client -> KNOWN Map sessions: header/2",
     ]
   `);
 
@@ -655,9 +600,9 @@ test("large coValue upload streaming", async () => {
     Crypto,
   );
 
-  const { peer, dbPath } = await createSQLiteStorage();
+  const { storage, dbPath } = createSQLiteStorage();
 
-  node1.syncManager.addPeer(peer);
+  node1.setStorage(storage);
 
   const group = node1.createGroup();
   const largeMap = group.createMap();
@@ -683,11 +628,9 @@ test("large coValue upload streaming", async () => {
     Crypto,
   );
 
-  const node2Sync = trackMessages(node2);
+  const node2Sync = trackMessages();
 
-  const { peer: peer2 } = await createSQLiteStorage(dbPath);
-
-  node2.syncManager.addPeer(peer2);
+  node2.setStorage(createSQLiteStorage(dbPath).storage);
 
   const largeMapOnNode2 = await node2.load(largeMap.id);
 
@@ -714,51 +657,10 @@ test("large coValue upload streaming", async () => {
   ).toMatchInlineSnapshot(`
     [
       "client -> LOAD Map sessions: empty",
-      "storage -> KNOWN Map sessions: header/200",
       "storage -> CONTENT Group header: true new: After: 0 New: 3",
-      "client -> KNOWN Group sessions: header/3",
       "storage -> CONTENT Map header: true new: After: 0 New: 97",
-      "client -> KNOWN Map sessions: header/97",
       "storage -> CONTENT Map header: true new: After: 97 New: 97",
-      "client -> KNOWN Map sessions: header/194",
       "storage -> CONTENT Map header: true new: After: 194 New: 6",
-      "client -> KNOWN Map sessions: header/200",
     ]
   `);
 });
-
-test("should close the db when the node is closed", async () => {
-  const agentSecret = Crypto.newRandomAgentSecret();
-
-  const node1 = new LocalNode(
-    agentSecret,
-    Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)),
-    Crypto,
-  );
-
-  const dbPath = join(tmpdir(), `test-${randomUUID()}.db`);
-
-  const db = new BetterSqliteDriver(dbPath);
-
-  const peer = SQLiteNodeBase.create({
-    db,
-    localNodeName: "test",
-    maxBlockingTime: 500,
-  });
-
-  const spy = vi.spyOn(db, "closeDb");
-
-  node1.syncManager.addPeer(peer);
-
-  await new Promise((resolve) => setTimeout(resolve, 10));
-
-  expect(spy).not.toHaveBeenCalled();
-
-  node1.gracefulShutdown();
-
-  await new Promise((resolve) => setTimeout(resolve, 10));
-
-  expect(spy).toHaveBeenCalled();
-
-  unlinkSync(dbPath);
-});

package/src/tests/testUtils.ts

@@ -1,36 +1,64 @@
-import type { LocalNode, SyncMessage } from "cojson";
-import { StorageManagerSync } from "cojson-storage";
+import type { LocalNode, RawCoID, SyncMessage } from "cojson";
+import { StorageApiSync } from "cojson";
 import { onTestFinished } from "vitest";
 
-export function trackMessages(node: LocalNode) {
+export function trackMessages() {
   const messages: {
     from: "client" | "server" | "storage";
     msg: SyncMessage;
   }[] = [];
 
-  const originalHandleSyncMessage =
-    StorageManagerSync.prototype.handleSyncMessage;
-  const originalNodeSyncMessage = node.syncManager.handleSyncMessage;
+  const originalLoad = StorageApiSync.prototype.load;
+  const originalStore = StorageApiSync.prototype.store;
 
-  StorageManagerSync.prototype.handleSyncMessage = async function (msg) {
+  StorageApiSync.prototype.load = async function (id, callback, done) {
     messages.push({
       from: "client",
-      msg,
+      msg: {
+        action: "load",
+        id: id as RawCoID,
+        header: false,
+        sessions: {},
+      },
     });
-    return originalHandleSyncMessage.call(this, msg);
+    return originalLoad.call(
+      this,
+      id,
+      (msg) => {
+        messages.push({
+          from: "storage",
+          msg,
+        });
+        callback(msg);
+      },
+      done,
+    );
   };
 
-  node.syncManager.handleSyncMessage = async function (msg, peer) {
-    messages.push({
-      from: "storage",
-      msg,
+  StorageApiSync.prototype.store = function (data, correctionCallback) {
+    for (const msg of data) {
+      messages.push({
+        from: "client",
+        msg,
+      });
+    }
+    return originalStore.call(this, data, (msg) => {
+      messages.push({
+        from: "storage",
+        msg: {
+          action: "known",
+          isCorrection: true,
+          ...msg,
+        },
+      });
+      correctionCallback(msg);
     });
-    return originalNodeSyncMessage.call(this, msg, peer);
   };
 
   const restore = () => {
-    StorageManagerSync.prototype.handleSyncMessage = originalHandleSyncMessage;
-    node.syncManager.handleSyncMessage = originalNodeSyncMessage;
+    StorageApiSync.prototype.load = originalLoad;
+    StorageApiSync.prototype.store = originalStore;
+    messages.length = 0;
   };
 
   onTestFinished(() => {

package/dist/betterSqliteDriver.d.ts

@@ -1,11 +0,0 @@
-import type { SQLiteDatabaseDriver } from "cojson-storage";
-export declare class BetterSqliteDriver implements SQLiteDatabaseDriver {
-    private readonly db;
-    constructor(filename: string);
-    run(sql: string, params: unknown[]): void;
-    query<T>(sql: string, params: unknown[]): T[];
-    get<T>(sql: string, params: unknown[]): T | undefined;
-    transaction(callback: () => unknown): unknown;
-    closeDb(): void;
-}
-//# sourceMappingURL=betterSqliteDriver.d.ts.map

package/dist/betterSqliteDriver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"betterSqliteDriver.d.ts","sourceRoot":"","sources":["../src/betterSqliteDriver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,kBAAmB,YAAW,oBAAoB;IAC7D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAY;gBAEnB,QAAQ,EAAE,MAAM;IAM5B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAIlC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE;IAI7C,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,SAAS;IAIrD,WAAW,CAAC,QAAQ,EAAE,MAAM,OAAO;IAInC,OAAO;CAGR"}

package/dist/betterSqliteDriver.js

@@ -1,24 +0,0 @@
-import Database from "better-sqlite3";
-export class BetterSqliteDriver {
-    constructor(filename) {
-        const db = new Database(filename);
-        this.db = db;
-        db.pragma("journal_mode = WAL");
-    }
-    run(sql, params) {
-        this.db.prepare(sql).run(params);
-    }
-    query(sql, params) {
-        return this.db.prepare(sql).all(params);
-    }
-    get(sql, params) {
-        return this.db.prepare(sql).get(params);
-    }
-    transaction(callback) {
-        return this.db.transaction(callback)();
-    }
-    closeDb() {
-        this.db.close();
-    }
-}
-//# sourceMappingURL=betterSqliteDriver.js.map

package/dist/betterSqliteDriver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"betterSqliteDriver.js","sourceRoot":"","sources":["../src/betterSqliteDriver.ts"],"names":[],"mappings":"AAAA,OAAO,QAAwC,MAAM,gBAAgB,CAAC;AAGtE,MAAM,OAAO,kBAAkB;IAG7B,YAAY,QAAgB;QAC1B,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAClC,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,MAAiB;QAChC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAI,GAAW,EAAE,MAAiB;QACrC,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAQ,CAAC;IACjD,CAAC;IAED,GAAG,CAAI,GAAW,EAAE,MAAiB;QACnC,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAkB,CAAC;IAC3D,CAAC;IAED,WAAW,CAAC,QAAuB;QACjC,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;IACzC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC;CACF"}