cojson-storage-indexeddb 0.15.8 → 0.15.10

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> cojson-storage-indexeddb@0.15.8 build /home/runner/_work/jazz/jazz/packages/cojson-storage-indexeddb
+> cojson-storage-indexeddb@0.15.10 build /home/runner/_work/jazz/jazz/packages/cojson-storage-indexeddb
 > rm -rf ./dist && tsc --sourceMap --outDir dist
 

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # cojson-storage-indexeddb
 
+## 0.15.10
+
+### Patch Changes
+
+- cojson@0.15.10
+
+## 0.15.9
+
+### Patch Changes
+
+- Updated dependencies [27b4837]
+- Updated dependencies [2776263]
+  - cojson@0.15.9
+
 ## 0.15.8
 
 ### Patch Changes

package/dist/idbClient.d.ts

@@ -1,5 +1,5 @@
 import type { CojsonInternalTypes, RawCoID, SessionID } from "cojson";
-import type { DBClientInterfaceAsync, SessionRow, SignatureAfterRow, StoredCoValueRow, StoredSessionRow, TransactionRow } from "cojson-storage";
+import type { DBClientInterfaceAsync, SessionRow, SignatureAfterRow, StoredCoValueRow, StoredSessionRow, TransactionRow } from "cojson";
 import { CoJsonIDBTransaction } from "./CoJsonIDBTransaction.js";
 export declare class IDBClient implements DBClientInterfaceAsync {
     private db;

package/dist/idbClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"idbClient.d.ts","sourceRoot":"","sources":["../src/idbClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACtE,OAAO,KAAK,EAEV,sBAAsB,EACtB,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,qBAAa,SAAU,YAAW,sBAAsB;IACtD,OAAO,CAAC,EAAE,CAAC;IAEX,iBAAiB,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACpD,uBAAuB,EAAE,oBAAoB,GAAG,SAAS,CAAC;gBAE9C,EAAE,EAAE,WAAW;IAI3B,WAAW,CAAC,CAAC,EACX,OAAO,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,UAAU,CAAC,CAAC,CAAC,GACxD,OAAO,CAAC,CAAC,CAAC;IAgBP,UAAU,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAMrE,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IASrE,uBAAuB,CAC3B,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IASlC,0BAA0B,CAC9B,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,EAAE,CAAC;IAUtB,aAAa,CACjB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAazB,UAAU,CACd,GAAG,EAAE,mBAAmB,CAAC,iBAAiB,GACzC,OAAO,CAAC,MAAM,CAAC;IAcZ,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,UAAU,CAAC;QAC1B,UAAU,CAAC,EAAE,gBAAgB,CAAC;KAC/B,GAAG,OAAO,CAAC,MAAM,CAAC;IAcb,cAAc,CAClB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,mBAAmB,CAAC,WAAW;IAW3C,iBAAiB,CAAC,EACtB,YAAY,EACZ,GAAG,EACH,SAAS,GACV,EAAE;QACD,YAAY,EAAE,MAAM,CAAC;QACrB,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,EAAE,mBAAmB,CAAC,SAAS,CAAC;KAC1C;IAUD,gBAAgB,CAAC,EAAE,EAAE,oBAAoB;IAQnC,WAAW,CAAC,kBAAkB,EAAE,MAAM,OAAO;CAYpD"}
+{"version":3,"file":"idbClient.d.ts","sourceRoot":"","sources":["../src/idbClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACtE,OAAO,KAAK,EAEV,sBAAsB,EACtB,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACf,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,qBAAa,SAAU,YAAW,sBAAsB;IACtD,OAAO,CAAC,EAAE,CAAC;IAEX,iBAAiB,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACpD,uBAAuB,EAAE,oBAAoB,GAAG,SAAS,CAAC;gBAE9C,EAAE,EAAE,WAAW;IAI3B,WAAW,CAAC,CAAC,EACX,OAAO,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,UAAU,CAAC,CAAC,CAAC,GACxD,OAAO,CAAC,CAAC,CAAC;IAgBP,UAAU,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAMrE,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IASrE,uBAAuB,CAC3B,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IASlC,0BAA0B,CAC9B,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,EAAE,CAAC;IAUtB,aAAa,CACjB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAazB,UAAU,CACd,GAAG,EAAE,mBAAmB,CAAC,iBAAiB,GACzC,OAAO,CAAC,MAAM,CAAC;IAcZ,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,UAAU,CAAC;QAC1B,UAAU,CAAC,EAAE,gBAAgB,CAAC;KAC/B,GAAG,OAAO,CAAC,MAAM,CAAC;IAcb,cAAc,CAClB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,mBAAmB,CAAC,WAAW;IAW3C,iBAAiB,CAAC,EACtB,YAAY,EACZ,GAAG,EACH,SAAS,GACV,EAAE;QACD,YAAY,EAAE,MAAM,CAAC;QACrB,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,EAAE,mBAAmB,CAAC,SAAS,CAAC;KAC1C;IAUD,gBAAgB,CAAC,EAAE,EAAE,oBAAoB;IAQnC,WAAW,CAAC,kBAAkB,EAAE,MAAM,OAAO;CAYpD"}

package/dist/idbNode.d.ts

@@ -1,12 +1,4 @@
-import { type IncomingSyncStream, type OutgoingSyncQueue, type Peer } from "cojson";
+import { StorageApiAsync } from "cojson";
 export declare function internal_setDatabaseName(name: string): void;
-export declare class IDBNode {
-    private readonly dbClient;
-    private readonly syncManager;
-    constructor(db: IDBDatabase, fromLocalNode: IncomingSyncStream, toLocalNode: OutgoingSyncQueue);
-    static asPeer({ localNodeName }?: {
-        localNodeName?: string;
-    } | undefined): Promise<Peer>;
-    static open(fromLocalNode: IncomingSyncStream, toLocalNode: OutgoingSyncQueue): Promise<IDBNode>;
-}
+export declare function getIndexedDBStorage(name?: string): Promise<StorageApiAsync>;
 //# sourceMappingURL=idbNode.d.ts.map

package/dist/idbNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"idbNode.d.ts","sourceRoot":"","sources":["../src/idbNode.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,IAAI,EAEV,MAAM,QAAQ,CAAC;AAMhB,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,QAEpD;AAqBD,qBAAa,OAAO;IAClB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAY;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsB;gBAGhD,EAAE,EAAE,WAAW,EACf,aAAa,EAAE,kBAAkB,EACjC,WAAW,EAAE,iBAAiB;WAkCnB,MAAM,CACjB,EAAE,aAAuB,EAAE,GAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAEzD,GACA,OAAO,CAAC,IAAI,CAAC;WAgBH,IAAI,CACf,aAAa,EAAE,kBAAkB,EACjC,WAAW,EAAE,iBAAiB;CA8CjC"}
+{"version":3,"file":"idbNode.d.ts","sourceRoot":"","sources":["../src/idbNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AAKzC,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,QAEpD;AAED,wBAAsB,mBAAmB,CAAC,IAAI,SAAgB,4BA8C7D"}

package/dist/idbNode.js

@@ -1,105 +1,48 @@
-import { cojsonInternals, } from "cojson";
-import { StorageManagerAsync } from "cojson-storage";
+import { StorageApiAsync } from "cojson";
 import { IDBClient } from "./idbClient.js";
 let DATABASE_NAME = "jazz-storage";
 export function internal_setDatabaseName(name) {
     DATABASE_NAME = name;
 }
-function createParallelOpsRunner() {
-    const ops = new Set();
-    return {
-        add: (op) => {
-            ops.add(op);
-            op.finally(() => {
-                ops.delete(op);
-            });
-        },
-        wait() {
-            return Promise.race(ops);
-        },
-        get size() {
-            return ops.size;
-        },
-    };
-}
-export class IDBNode {
-    constructor(db, fromLocalNode, toLocalNode) {
-        this.dbClient = new IDBClient(db);
-        this.syncManager = new StorageManagerAsync(this.dbClient, toLocalNode);
-        const processMessages = async () => {
-            const batch = createParallelOpsRunner();
-            for await (const msg of fromLocalNode) {
-                try {
-                    if (msg === "Disconnected" || msg === "PingTimeout") {
-                        throw new Error("Unexpected Disconnected message");
-                    }
-                    if (msg.action === "content") {
-                        await this.syncManager.handleSyncMessage(msg);
-                    }
-                    else {
-                        batch.add(this.syncManager.handleSyncMessage(msg));
-                    }
-                    if (batch.size > 10) {
-                        await batch.wait();
-                    }
-                }
-                catch (e) {
-                    console.error(e);
-                }
+export async function getIndexedDBStorage(name = DATABASE_NAME) {
+    const dbPromise = new Promise((resolve, reject) => {
+        const request = indexedDB.open(name, 4);
+        request.onerror = () => {
+            reject(request.error);
+        };
+        request.onsuccess = () => {
+            resolve(request.result);
+        };
+        request.onupgradeneeded = async (ev) => {
+            const db = request.result;
+            if (ev.oldVersion === 0) {
+                const coValues = db.createObjectStore("coValues", {
+                    autoIncrement: true,
+                    keyPath: "rowID",
+                });
+                coValues.createIndex("coValuesById", "id", {
+                    unique: true,
+                });
+                const sessions = db.createObjectStore("sessions", {
+                    autoIncrement: true,
+                    keyPath: "rowID",
+                });
+                sessions.createIndex("sessionsByCoValue", "coValue");
+                sessions.createIndex("uniqueSessions", ["coValue", "sessionID"], {
+                    unique: true,
+                });
+                db.createObjectStore("transactions", {
+                    keyPath: ["ses", "idx"],
+                });
+            }
+            if (ev.oldVersion <= 1) {
+                db.createObjectStore("signatureAfter", {
+                    keyPath: ["ses", "idx"],
+                });
             }
         };
-        processMessages().catch((e) => console.error("Error in processMessages in IndexedDB", e));
-    }
-    static async asPeer({ localNodeName = "local" } = {
-        localNodeName: "local",
-    }) {
-        const [localNodeAsPeer, storageAsPeer] = cojsonInternals.connectedPeers(localNodeName, "indexedDB", {
-            peer1role: "client",
-            peer2role: "storage",
-            crashOnClose: true,
-        });
-        await IDBNode.open(localNodeAsPeer.incoming, localNodeAsPeer.outgoing);
-        return { ...storageAsPeer, priority: 100 };
-    }
-    static async open(fromLocalNode, toLocalNode) {
-        const dbPromise = new Promise((resolve, reject) => {
-            const request = indexedDB.open(DATABASE_NAME, 4);
-            request.onerror = () => {
-                reject(request.error);
-            };
-            request.onsuccess = () => {
-                resolve(request.result);
-            };
-            request.onupgradeneeded = async (ev) => {
-                const db = request.result;
-                if (ev.oldVersion === 0) {
-                    const coValues = db.createObjectStore("coValues", {
-                        autoIncrement: true,
-                        keyPath: "rowID",
-                    });
-                    coValues.createIndex("coValuesById", "id", {
-                        unique: true,
-                    });
-                    const sessions = db.createObjectStore("sessions", {
-                        autoIncrement: true,
-                        keyPath: "rowID",
-                    });
-                    sessions.createIndex("sessionsByCoValue", "coValue");
-                    sessions.createIndex("uniqueSessions", ["coValue", "sessionID"], {
-                        unique: true,
-                    });
-                    db.createObjectStore("transactions", {
-                        keyPath: ["ses", "idx"],
-                    });
-                }
-                if (ev.oldVersion <= 1) {
-                    db.createObjectStore("signatureAfter", {
-                        keyPath: ["ses", "idx"],
-                    });
-                }
-            };
-        });
-        return new IDBNode(await dbPromise, fromLocalNode, toLocalNode);
-    }
+    });
+    const db = await dbPromise;
+    return new StorageApiAsync(new IDBClient(db));
 }
 //# sourceMappingURL=idbNode.js.map

package/dist/idbNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"idbNode.js","sourceRoot":"","sources":["../src/idbNode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"idbNode.js","sourceRoot":"","sources":["../src/idbNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,IAAI,aAAa,GAAG,cAAc,CAAC;AAEnC,MAAM,UAAU,wBAAwB,CAAC,IAAY;IACnD,aAAa,GAAG,IAAI,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,IAAI,GAAG,aAAa;IAC5D,MAAM,SAAS,GAAG,IAAI,OAAO,CAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7D,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACxC,OAAO,CAAC,OAAO,GAAG,GAAG,EAAE;YACrB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC,CAAC;QACF,OAAO,CAAC,SAAS,GAAG,GAAG,EAAE;YACvB,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC,CAAC;QACF,OAAO,CAAC,eAAe,GAAG,KAAK,EAAE,EAAE,EAAE,EAAE;YACrC,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;YAC1B,IAAI,EAAE,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;gBACxB,MAAM,QAAQ,GAAG,EAAE,CAAC,iBAAiB,CAAC,UAAU,EAAE;oBAChD,aAAa,EAAE,IAAI;oBACnB,OAAO,EAAE,OAAO;iBACjB,CAAC,CAAC;gBAEH,QAAQ,CAAC,WAAW,CAAC,cAAc,EAAE,IAAI,EAAE;oBACzC,MAAM,EAAE,IAAI;iBACb,CAAC,CAAC;gBAEH,MAAM,QAAQ,GAAG,EAAE,CAAC,iBAAiB,CAAC,UAAU,EAAE;oBAChD,aAAa,EAAE,IAAI;oBACnB,OAAO,EAAE,OAAO;iBACjB,CAAC,CAAC;gBAEH,QAAQ,CAAC,WAAW,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;gBACrD,QAAQ,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE;oBAC/D,MAAM,EAAE,IAAI;iBACb,CAAC,CAAC;gBAEH,EAAE,CAAC,iBAAiB,CAAC,cAAc,EAAE;oBACnC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC;iBACxB,CAAC,CAAC;YACL,CAAC;YACD,IAAI,EAAE,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC;gBACvB,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,EAAE;oBACrC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC;iBACxB,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC;IAE3B,OAAO,IAAI,eAAe,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;AAChD,CAAC"}

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export { IDBNode, IDBNode as IDBStorage, internal_setDatabaseName, } from "./idbNode.js";
+export { internal_setDatabaseName, getIndexedDBStorage, } from "./idbNode.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,OAAO,IAAI,UAAU,EACrB,wBAAwB,GACzB,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,cAAc,CAAC"}

package/dist/index.js

@@ -1,2 +1,2 @@
-export { IDBNode, IDBNode as IDBStorage, internal_setDatabaseName, } from "./idbNode.js";
+export { internal_setDatabaseName, getIndexedDBStorage, } from "./idbNode.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,OAAO,IAAI,UAAU,EACrB,wBAAwB,GACzB,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,cAAc,CAAC"}

package/dist/tests/storage.indexeddb.test.js

@@ -1,8 +1,7 @@
-import { LocalNode } from "cojson";
-import { StorageManagerAsync } from "cojson-storage";
+import { LocalNode, StorageApiAsync } from "cojson";
 import { WasmCrypto } from "cojson/crypto/WasmCrypto";
 import { afterEach, beforeEach, expect, test, vi } from "vitest";
-import { IDBStorage } from "../index.js";
+import { getIndexedDBStorage } from "../index.js";
 import { toSimplifiedMessages } from "./messagesTestUtils.js";
 import { trackMessages, waitFor } from "./testUtils.js";
 const Crypto = await WasmCrypto.create();
@@ -13,38 +12,27 @@ beforeEach(() => {
 afterEach(() => {
     syncMessages.restore();
 });
-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 IDBStorage.asPeer());
-    await new Promise((resolve) => setTimeout(resolve, 200));
-    expect(node.syncManager.peers.indexedDB).toBeDefined();
-});
 test("should sync and load data from storage", async () => {
     const agentSecret = Crypto.newRandomAgentSecret();
     const node1 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
-    const peer = await IDBStorage.asPeer();
-    node1.syncManager.addPeer(peer);
+    node1.setStorage(await getIndexedDBStorage());
     const group = node1.createGroup();
     const map = group.createMap();
     map.set("hello", "world");
-    await new Promise((resolve) => setTimeout(resolve, 200));
+    await map.core.waitForSync();
     expect(toSimplifiedMessages({
         Map: map.core,
         Group: group.core,
     }, syncMessages.messages)).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",
     ]
   `);
     node1.gracefulShutdown();
     syncMessages.clear();
     const node2 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
-    const peer2 = await IDBStorage.asPeer();
-    node2.syncManager.addPeer(peer2);
+    node2.setStorage(await getIndexedDBStorage());
     const map2 = await node2.load(map.id);
     if (map2 === "unavailable") {
         throw new Error("Map is unavailable");
@@ -57,36 +45,30 @@ 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",
     ]
   `);
 });
 test("should send an empty content message if there is no content", async () => {
     const agentSecret = Crypto.newRandomAgentSecret();
     const node1 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
-    const peer = await IDBStorage.asPeer();
-    node1.syncManager.addPeer(peer);
+    node1.setStorage(await getIndexedDBStorage());
     const group = node1.createGroup();
     const map = group.createMap();
-    await new Promise((resolve) => setTimeout(resolve, 200));
+    await map.core.waitForSync();
     expect(toSimplifiedMessages({
         Map: map.core,
         Group: group.core,
     }, syncMessages.messages)).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",
     ]
   `);
     syncMessages.clear();
     node1.gracefulShutdown();
     const node2 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
-    const peer2 = await IDBStorage.asPeer();
-    node2.syncManager.addPeer(peer2);
+    node2.setStorage(await getIndexedDBStorage());
     const map2 = await node2.load(map.id);
     if (map2 === "unavailable") {
         throw new Error("Map is unavailable");
@@ -98,42 +80,35 @@ 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",
     ]
   `);
 });
 test("should load dependencies correctly (group inheritance)", async () => {
     const agentSecret = Crypto.newRandomAgentSecret();
     const node1 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
-    const peer = await IDBStorage.asPeer();
-    node1.syncManager.addPeer(peer);
+    node1.setStorage(await getIndexedDBStorage());
     const group = node1.createGroup();
     const parentGroup = node1.createGroup();
     group.extend(parentGroup);
     const map = group.createMap();
     map.set("hello", "world");
-    await new Promise((resolve) => setTimeout(resolve, 200));
+    await map.core.waitForSync();
     expect(toSimplifiedMessages({
         Map: map.core,
         Group: group.core,
         ParentGroup: parentGroup.core,
     }, syncMessages.messages)).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",
     ]
   `);
     syncMessages.clear();
     node1.gracefulShutdown();
     const node2 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
-    const peer2 = await IDBStorage.asPeer();
-    node2.syncManager.addPeer(peer2);
+    node2.setStorage(await getIndexedDBStorage());
     await node2.load(map.id);
     expect(node2.expectCoValueLoaded(map.id)).toBeTruthy();
     expect(node2.expectCoValueLoaded(group.id)).toBeTruthy();
@@ -146,19 +121,15 @@ 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",
     ]
   `);
 });
 test("should not send the same dependency value twice", async () => {
     const agentSecret = Crypto.newRandomAgentSecret();
     const node1 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
-    const peer = await IDBStorage.asPeer();
-    node1.syncManager.addPeer(peer);
+    node1.setStorage(await getIndexedDBStorage());
     const group = node1.createGroup();
     const parentGroup = node1.createGroup();
     group.extend(parentGroup);
@@ -166,12 +137,12 @@ test("should not send the same dependency value twice", async () => {
     const map = group.createMap();
     map.set("hello", "world");
     mapFromParent.set("hello", "world");
-    await new Promise((resolve) => setTimeout(resolve, 200));
+    await map.core.waitForSync();
+    await mapFromParent.core.waitForSync();
     syncMessages.clear();
     node1.gracefulShutdown();
     const node2 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
-    const peer2 = await IDBStorage.asPeer();
-    node2.syncManager.addPeer(peer2);
+    node2.setStorage(await getIndexedDBStorage());
     await node2.load(map.id);
     await node2.load(mapFromParent.id);
     expect(node2.expectCoValueLoaded(map.id)).toBeTruthy();
@@ -187,55 +158,49 @@ 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",
     ]
   `);
 });
 test("should recover from data loss", async () => {
     const agentSecret = Crypto.newRandomAgentSecret();
     const node1 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
-    const peer = await IDBStorage.asPeer();
-    node1.syncManager.addPeer(peer);
+    const storage = await getIndexedDBStorage();
+    node1.setStorage(storage);
     const group = node1.createGroup();
     const map = group.createMap();
     map.set("0", 0);
-    await new Promise((resolve) => setTimeout(resolve, 200));
+    await map.core.waitForSync();
     const mock = vi
-        .spyOn(StorageManagerAsync.prototype, "handleSyncMessage")
-        .mockImplementation(() => Promise.resolve());
+        .spyOn(StorageApiAsync.prototype, "store")
+        .mockImplementation(() => Promise.resolve(undefined));
     map.set("1", 1);
     map.set("2", 2);
     await new Promise((resolve) => setTimeout(resolve, 200));
+    const knownState = storage.getKnownState(map.id);
+    Object.assign(knownState, map.core.knownState());
     mock.mockReset();
     map.set("3", 3);
-    await new Promise((resolve) => setTimeout(resolve, 200));
+    await map.core.waitForSync();
     expect(toSimplifiedMessages({
         Map: map.core,
         Group: group.core,
     }, syncMessages.messages)).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",
+      "storage -> KNOWN CORRECTION Map sessions: header/4",
       "client -> CONTENT Map header: false new: After: 1 New: 3",
-      "storage -> KNOWN Map sessions: header/4",
     ]
   `);
     syncMessages.clear();
     node1.gracefulShutdown();
     const node2 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
-    const peer2 = await IDBStorage.asPeer();
-    node2.syncManager.addPeer(peer2);
+    node2.setStorage(await getIndexedDBStorage());
     const map2 = await node2.load(map.id);
     if (map2 === "unavailable") {
         throw new Error("Map is unavailable");
@@ -253,23 +218,21 @@ 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",
     ]
   `);
 });
 test("should sync multiple sessions in a single content message", async () => {
     const agentSecret = Crypto.newRandomAgentSecret();
     const node1 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
-    node1.syncManager.addPeer(await IDBStorage.asPeer());
+    node1.setStorage(await getIndexedDBStorage());
     const group = node1.createGroup();
     const map = group.createMap();
     map.set("hello", "world");
-    await new Promise((resolve) => setTimeout(resolve, 200));
+    await map.core.waitForSync();
     node1.gracefulShutdown();
     const node2 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
-    node2.syncManager.addPeer(await IDBStorage.asPeer());
+    node2.setStorage(await getIndexedDBStorage());
     const map2 = await node2.load(map.id);
     if (map2 === "unavailable") {
         throw new Error("Map is unavailable");
@@ -280,7 +243,7 @@ test("should sync multiple sessions in a single content message", async () => {
     node2.gracefulShutdown();
     const node3 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
     syncMessages.clear();
-    node3.syncManager.addPeer(await IDBStorage.asPeer());
+    node3.setStorage(await getIndexedDBStorage());
     const map3 = await node3.load(map.id);
     if (map3 === "unavailable") {
         throw new Error("Map is unavailable");
@@ -293,16 +256,14 @@ 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",
     ]
   `);
 });
 test("large coValue upload streaming", async () => {
     const agentSecret = Crypto.newRandomAgentSecret();
     const node1 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
-    node1.syncManager.addPeer(await IDBStorage.asPeer());
+    node1.setStorage(await getIndexedDBStorage());
     const group = node1.createGroup();
     const largeMap = group.createMap();
     // Generate a large amount of data (about 100MB)
@@ -314,12 +275,13 @@ test("large coValue upload streaming", async () => {
         const key = `key${i}`;
         largeMap.set(key, value, "trusting");
     }
+    // TODO: Wait for storage to be updated
     await largeMap.core.waitForSync();
     const knownState = largeMap.core.knownState();
     node1.gracefulShutdown();
     const node2 = new LocalNode(agentSecret, Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)), Crypto);
     syncMessages.clear();
-    node2.syncManager.addPeer(await IDBStorage.asPeer());
+    node2.setStorage(await getIndexedDBStorage());
     const largeMapOnNode2 = await node2.load(largeMap.id);
     if (largeMapOnNode2 === "unavailable") {
         throw new Error("Map is unavailable");
@@ -334,15 +296,10 @@ test("large coValue upload streaming", async () => {
     }, syncMessages.messages)).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",
     ]
   `);
 });
@@ -351,7 +308,7 @@ test("should sync and load accounts from storage", async () => {
     const { node: node1, accountID } = await LocalNode.withNewlyCreatedAccount({
         crypto: Crypto,
         initialAgentSecret: agentSecret,
-        peersToLoadFrom: [await IDBStorage.asPeer()],
+        storage: await getIndexedDBStorage(),
         creationProps: {
             name: "test",
         },
@@ -359,7 +316,6 @@ test("should sync and load accounts from storage", async () => {
     const account1 = node1.getCoValue(accountID);
     const profile = node1.expectProfileLoaded(accountID);
     const profileGroup = profile.group;
-    await new Promise((resolve) => setTimeout(resolve, 200));
     expect(toSimplifiedMessages({
         Account: account1,
         Profile: profile.core,
@@ -367,11 +323,8 @@ test("should sync and load accounts from storage", async () => {
     }, syncMessages.messages)).toMatchInlineSnapshot(`
     [
       "client -> CONTENT Account header: true new: After: 0 New: 4",
-      "storage -> KNOWN Account sessions: header/4",
       "client -> CONTENT ProfileGroup header: true new: After: 0 New: 5",
-      "storage -> KNOWN ProfileGroup sessions: header/5",
       "client -> CONTENT Profile header: true new: After: 0 New: 1",
-      "storage -> KNOWN Profile sessions: header/1",
     ]
   `);
     node1.gracefulShutdown();
@@ -381,10 +334,10 @@ test("should sync and load accounts from storage", async () => {
         crypto: Crypto,
         accountSecret: agentSecret,
         accountID,
-        peersToLoadFrom: [await IDBStorage.asPeer()],
+        peersToLoadFrom: [],
+        storage: await getIndexedDBStorage(),
         sessionID: Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret)),
     });
-    await new Promise((resolve) => setTimeout(resolve, 200));
     expect(toSimplifiedMessages({
         Account: account1,
         Profile: profile.core,
@@ -393,12 +346,9 @@ test("should sync and load accounts from storage", async () => {
     [
       "client -> LOAD Account sessions: empty",
       "storage -> CONTENT Account header: true new: After: 0 New: 4",
-      "client -> KNOWN Account sessions: header/4",
       "client -> LOAD Profile sessions: empty",
       "storage -> CONTENT ProfileGroup header: true new: After: 0 New: 5",
-      "client -> KNOWN ProfileGroup sessions: header/5",
       "storage -> CONTENT Profile header: true new: After: 0 New: 1",
-      "client -> KNOWN Profile sessions: header/1",
     ]
   `);
     expect(node2.getCoValue(accountID).isAvailable()).toBeTruthy();