cojson-storage-indexeddb 0.8.32 → 0.8.35

package/dist/tests/syncManager.test.js

@@ -0,0 +1,251 @@
+import { afterEach, beforeEach, describe, expect, test, vi, } from "vitest";
+import { SyncManager } from "../syncManager";
+import { getDependedOnCoValues } from "../syncUtils";
+import { fixtures } from "./fixtureMessages";
+vi.mock("../syncUtils");
+const coValueIdToLoad = "co_zKwG8NyfZ8GXqcjDHY4NS3SbU2m";
+const createEmptyLoadMsg = (id) => ({
+    action: "load",
+    id,
+    header: false,
+    sessions: {},
+});
+const sessionsData = fixtures[coValueIdToLoad].sessionRecords;
+const coValueHeader = fixtures[coValueIdToLoad].getContent({ after: 0 }).header;
+const incomingContentMessage = fixtures[coValueIdToLoad].getContent({
+    after: 0,
+});
+describe("IDB sync manager", () => {
+    let syncManager;
+    let queue = {};
+    const IDBClient = vi.fn();
+    IDBClient.prototype.getCoValue = vi.fn();
+    IDBClient.prototype.getCoValueSessions = vi.fn();
+    IDBClient.prototype.addSessionUpdate = vi.fn();
+    IDBClient.prototype.addTransaction = vi.fn();
+    beforeEach(async () => {
+        const idbClient = new IDBClient();
+        syncManager = new SyncManager(idbClient, queue);
+        syncManager.sendStateMessage = vi.fn();
+        // No dependencies found
+        vi.mocked(getDependedOnCoValues).mockReturnValue([]);
+    });
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+    test("Incoming known messages are not processed", async () => {
+        await syncManager.handleSyncMessage({ action: "known" });
+        expect(syncManager.sendStateMessage).not.toBeCalled();
+    });
+    describe("Handle load incoming message", () => {
+        test("sends empty known message for unknown coValue", async () => {
+            const loadMsg = createEmptyLoadMsg(coValueIdToLoad);
+            IDBClient.prototype.getCoValue.mockResolvedValueOnce(undefined);
+            await syncManager.handleSyncMessage(loadMsg);
+            expect(syncManager.sendStateMessage).toBeCalledWith({
+                action: "known",
+                header: false,
+                id: coValueIdToLoad,
+                sessions: {},
+            });
+        });
+        test("Sends known and content message for known coValue with no sessions", async () => {
+            const loadMsg = createEmptyLoadMsg(coValueIdToLoad);
+            IDBClient.prototype.getCoValue.mockResolvedValueOnce({
+                id: coValueIdToLoad,
+                header: coValueHeader,
+                rowID: 3,
+            });
+            IDBClient.prototype.getCoValueSessions.mockResolvedValueOnce([]);
+            await syncManager.handleSyncMessage(loadMsg);
+            expect(syncManager.sendStateMessage).toBeCalledTimes(2);
+            expect(syncManager.sendStateMessage).toBeCalledWith({
+                action: "known",
+                header: true,
+                id: coValueIdToLoad,
+                sessions: {},
+            });
+            expect(syncManager.sendStateMessage).toBeCalledWith({
+                action: "content",
+                header: expect.objectContaining({
+                    type: expect.any(String),
+                    ruleset: expect.any(Object),
+                }),
+                id: coValueIdToLoad,
+                new: {},
+                priority: 0,
+            });
+        });
+        test("Sends both known and content messages when we have new sessions info for the requested coValue ", async () => {
+            const loadMsg = createEmptyLoadMsg(coValueIdToLoad);
+            IDBClient.prototype.getCoValue.mockResolvedValueOnce({
+                id: coValueIdToLoad,
+                header: coValueHeader,
+                rowID: 3,
+            });
+            IDBClient.prototype.getCoValueSessions.mockResolvedValueOnce(sessionsData);
+            const newTxData = {
+                newTransactions: [
+                    {
+                        privacy: "trusting",
+                        madeAt: 1732368535089,
+                        changes: "",
+                    },
+                ],
+                after: 0,
+                lastSignature: "signature_z111",
+            };
+            // mock content data combined with session updates
+            syncManager.handleSessionUpdate = vi.fn(async ({ sessionRow, newContentMessages }) => {
+                newContentMessages[0].new[sessionRow.sessionID] = newTxData;
+            });
+            await syncManager.handleSyncMessage(loadMsg);
+            expect(syncManager.sendStateMessage).toBeCalledTimes(2);
+            expect(syncManager.sendStateMessage).toHaveBeenNthCalledWith(1, {
+                action: "known",
+                header: true,
+                id: coValueIdToLoad,
+                sessions: sessionsData.reduce((acc, sessionRow) => ({
+                    ...acc,
+                    [sessionRow.sessionID]: sessionRow.lastIdx,
+                }), {}),
+            });
+            expect(syncManager.sendStateMessage).toHaveBeenNthCalledWith(2, {
+                action: "content",
+                header: coValueHeader,
+                id: coValueIdToLoad,
+                new: sessionsData.reduce((acc, sessionRow) => ({
+                    ...acc,
+                    [sessionRow.sessionID]: {
+                        after: expect.any(Number),
+                        lastSignature: expect.any(String),
+                        newTransactions: expect.any(Array),
+                    },
+                }), {}),
+                priority: 0,
+            });
+        });
+        test("Sends messages for unique coValue dependencies only, leaving out circular dependencies", async () => {
+            const loadMsg = createEmptyLoadMsg(coValueIdToLoad);
+            const dependency1 = "co_zMKhQJs5rAeGjta3JX2qEdBS6hS";
+            const dependency2 = "co_zP51HdyAVCuRY9ptq5iu8DhMyAb";
+            const dependency3 = "co_zGyBniuJmKkcirCKYrccWpjQEFY";
+            const dependenciesTreeWithLoop = {
+                [coValueIdToLoad]: [dependency1, dependency2],
+                [dependency1]: [],
+                [dependency2]: [coValueIdToLoad, dependency3],
+                [dependency3]: [dependency1],
+            };
+            IDBClient.prototype.getCoValue.mockImplementation((coValueId) => ({
+                id: coValueId,
+                header: coValueHeader,
+                rowID: 3,
+            }));
+            IDBClient.prototype.getCoValueSessions.mockResolvedValue([]);
+            // Fetch dependencies of the current dependency for the future recursion iterations
+            vi.mocked(getDependedOnCoValues).mockImplementation(({ coValueRow }) => dependenciesTreeWithLoop[coValueRow.id] || []);
+            await syncManager.handleSyncMessage(loadMsg);
+            // We send out pairs (known + content) messages only FOUR times - as many as the coValues number
+            // and less than amount of interconnected dependencies to loop through in dependenciesTreeWithLoop
+            expect(syncManager.sendStateMessage).toBeCalledTimes(4 * 2);
+            const knownExpected = {
+                action: "known",
+                header: true,
+                sessions: {},
+            };
+            const contentExpected = {
+                action: "content",
+                header: expect.any(Object),
+                new: {},
+                priority: 0,
+            };
+            expect(syncManager.sendStateMessage).toHaveBeenNthCalledWith(1, {
+                ...knownExpected,
+                id: dependency3,
+                asDependencyOf: coValueIdToLoad,
+            });
+            expect(syncManager.sendStateMessage).toHaveBeenNthCalledWith(2, {
+                ...contentExpected,
+                id: dependency3,
+            });
+            expect(syncManager.sendStateMessage).toHaveBeenNthCalledWith(3, {
+                ...knownExpected,
+                id: dependency2,
+                asDependencyOf: coValueIdToLoad,
+            });
+            expect(syncManager.sendStateMessage).toHaveBeenNthCalledWith(4, {
+                ...contentExpected,
+                id: dependency2,
+            });
+            expect(syncManager.sendStateMessage).toHaveBeenNthCalledWith(5, {
+                ...knownExpected,
+                id: dependency1,
+                asDependencyOf: coValueIdToLoad,
+            });
+            expect(syncManager.sendStateMessage).toHaveBeenNthCalledWith(6, {
+                ...contentExpected,
+                id: dependency1,
+            });
+            expect(syncManager.sendStateMessage).toHaveBeenNthCalledWith(7, {
+                ...knownExpected,
+                id: coValueIdToLoad,
+            });
+            expect(syncManager.sendStateMessage).toHaveBeenNthCalledWith(8, {
+                ...contentExpected,
+                id: coValueIdToLoad,
+            });
+        });
+    });
+    describe("Handle content incoming message", () => {
+        test("Sends correction message for unknown coValue", async () => {
+            IDBClient.prototype.getCoValue.mockResolvedValueOnce(undefined);
+            await syncManager.handleSyncMessage({
+                ...incomingContentMessage,
+                header: undefined,
+            });
+            expect(syncManager.sendStateMessage).toBeCalledWith({
+                action: "known",
+                header: false,
+                id: coValueIdToLoad,
+                isCorrection: true,
+                sessions: {},
+            });
+        });
+        test("Saves new transaction without sending message when IDB has fewer transactions", async () => {
+            IDBClient.prototype.getCoValue.mockResolvedValueOnce({
+                id: coValueIdToLoad,
+                header: coValueHeader,
+                rowID: 3,
+            });
+            IDBClient.prototype.getCoValueSessions.mockResolvedValueOnce([]);
+            const msg = {
+                ...incomingContentMessage,
+                header: undefined,
+            };
+            await syncManager.handleSyncMessage(msg);
+            const incomingTxCount = Object.keys(msg.new).reduce((acc, sessionID) => acc + msg.new[sessionID].newTransactions.length, 0);
+            expect(IDBClient.prototype.addTransaction).toBeCalledTimes(incomingTxCount);
+            expect(syncManager.sendStateMessage).not.toBeCalled();
+        });
+        test("Sends correction message when peer sends a message far ahead of our state due to invalid assumption", async () => {
+            IDBClient.prototype.getCoValue.mockResolvedValueOnce({
+                id: coValueIdToLoad,
+                header: coValueHeader,
+                rowID: 3,
+            });
+            IDBClient.prototype.getCoValueSessions.mockResolvedValueOnce(sessionsData);
+            const farAheadContentMessage = fixtures[coValueIdToLoad].getContent({
+                after: 10000,
+            });
+            await syncManager.handleSyncMessage(farAheadContentMessage);
+            expect(syncManager.sendStateMessage).toBeCalledWith({
+                action: "known",
+                header: true,
+                id: coValueIdToLoad,
+                isCorrection: true,
+                sessions: expect.any(Object),
+            });
+        });
+    });
+});
+//# sourceMappingURL=syncManager.test.js.map

package/dist/tests/syncManager.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"syncManager.test.js","sourceRoot":"","sources":["../../src/tests/syncManager.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "cojson-storage-indexeddb",
-  "version": "0.8.32",
+  "version": "0.8.35",
   "main": "dist/index.js",
   "type": "module",
   "types": "src/index.ts",
   "license": "MIT",
   "dependencies": {
-    "cojson": "0.8.32"
+    "cojson": "0.8.35"
   },
   "devDependencies": {
     "@vitest/browser": "^0.34.1",

package/src/idbClient.ts

@@ -0,0 +1,237 @@
+import { CojsonInternalTypes, SessionID } from "cojson";
+import { SyncPromise } from "./syncPromises";
+import RawCoID = CojsonInternalTypes.RawCoID;
+import Transaction = CojsonInternalTypes.Transaction;
+import Signature = CojsonInternalTypes.Signature;
+
+export type CoValueRow = {
+  id: CojsonInternalTypes.RawCoID;
+  header: CojsonInternalTypes.CoValueHeader;
+};
+
+export type StoredCoValueRow = CoValueRow & { rowID: number };
+
+export type TransactionRow = {
+  ses: number;
+  idx: number;
+  tx: CojsonInternalTypes.Transaction;
+};
+
+export type SignatureAfterRow = {
+  ses: number;
+  idx: number;
+  signature: CojsonInternalTypes.Signature;
+};
+
+export type SessionRow = {
+  coValue: number;
+  sessionID: SessionID;
+  lastIdx: number;
+  lastSignature: CojsonInternalTypes.Signature;
+  bytesSinceLastSignature?: number;
+};
+
+export type StoredSessionRow = SessionRow & { rowID: number };
+
+export class IDBClient {
+  private db;
+
+  currentTx:
+    | {
+        id: number;
+        tx: IDBTransaction;
+        stores: {
+          coValues: IDBObjectStore;
+          sessions: IDBObjectStore;
+          transactions: IDBObjectStore;
+          signatureAfter: IDBObjectStore;
+        };
+        startedAt: number;
+        pendingRequests: ((txEntry: {
+          stores: {
+            coValues: IDBObjectStore;
+            sessions: IDBObjectStore;
+            transactions: IDBObjectStore;
+            signatureAfter: IDBObjectStore;
+          };
+        }) => void)[];
+      }
+    | undefined;
+
+  currentTxID = 0;
+
+  constructor(db: IDBDatabase) {
+    this.db = db;
+  }
+
+  makeRequest<T>(
+    handler: (stores: {
+      coValues: IDBObjectStore;
+      sessions: IDBObjectStore;
+      transactions: IDBObjectStore;
+      signatureAfter: IDBObjectStore;
+    }) => IDBRequest,
+  ): SyncPromise<T> {
+    return new SyncPromise((resolve, reject) => {
+      let txEntry = this.currentTx;
+
+      const requestEntry = ({
+        stores,
+      }: {
+        stores: {
+          coValues: IDBObjectStore;
+          sessions: IDBObjectStore;
+          transactions: IDBObjectStore;
+          signatureAfter: IDBObjectStore;
+        };
+      }) => {
+        const request = handler(stores);
+        request.onerror = () => {
+          console.error("Error in request", request.error);
+          this.currentTx = undefined;
+          reject(request.error);
+        };
+        request.onsuccess = () => {
+          const value = request.result as T;
+          resolve(value);
+
+          const next = txEntry!.pendingRequests.shift();
+
+          if (next) {
+            next({ stores });
+          } else {
+            if (this.currentTx === txEntry) {
+              this.currentTx = undefined;
+            }
+          }
+        };
+      };
+
+      // Transaction batching
+      if (!txEntry || performance.now() - txEntry.startedAt > 20) {
+        const tx = this.db.transaction(
+          ["coValues", "sessions", "transactions", "signatureAfter"],
+          "readwrite",
+        );
+        txEntry = {
+          id: this.currentTxID++,
+          tx,
+          stores: {
+            coValues: tx.objectStore("coValues"),
+            sessions: tx.objectStore("sessions"),
+            transactions: tx.objectStore("transactions"),
+            signatureAfter: tx.objectStore("signatureAfter"),
+          },
+          startedAt: performance.now(),
+          pendingRequests: [],
+        };
+
+        this.currentTx = txEntry;
+
+        requestEntry(txEntry);
+      } else {
+        txEntry.pendingRequests.push(requestEntry);
+      }
+    });
+  }
+
+  async getCoValue(coValueId: RawCoID): Promise<StoredCoValueRow | undefined> {
+    return this.makeRequest<StoredCoValueRow | undefined>(({ coValues }) =>
+      coValues.index("coValuesById").get(coValueId),
+    );
+  }
+
+  async getCoValueSessions(coValueRowId: number): Promise<StoredSessionRow[]> {
+    return this.makeRequest<StoredSessionRow[]>(({ sessions }) =>
+      sessions.index("sessionsByCoValue").getAll(coValueRowId),
+    );
+  }
+
+  async getNewTransactionInSession(
+    sessionRow: StoredSessionRow,
+    firstNewTxIdx: number,
+  ): Promise<TransactionRow[]> {
+    return this.makeRequest<TransactionRow[]>(({ transactions }) =>
+      transactions.getAll(
+        IDBKeyRange.bound(
+          [sessionRow.rowID, firstNewTxIdx],
+          [sessionRow.rowID, Infinity],
+        ),
+      ),
+    );
+  }
+
+  async getSignatures(
+    sessionRow: StoredSessionRow,
+    firstNewTxIdx: number,
+  ): Promise<SignatureAfterRow[]> {
+    return this.makeRequest<SignatureAfterRow[]>(
+      ({ signatureAfter }: { signatureAfter: IDBObjectStore }) =>
+        signatureAfter.getAll(
+          IDBKeyRange.bound(
+            [sessionRow.rowID, firstNewTxIdx],
+            [sessionRow.rowID, Infinity],
+          ),
+        ),
+    );
+  }
+
+  async addCoValue(
+    msg: CojsonInternalTypes.NewContentMessage,
+  ): Promise<number> {
+    if (!msg.header) {
+      throw new Error("Header is required, coId: " + msg.id);
+    }
+
+    return (await this.makeRequest<IDBValidKey>(({ coValues }) =>
+      coValues.put({
+        id: msg.id,
+        header: msg.header!,
+      } satisfies CoValueRow),
+    )) as number;
+  }
+
+  async addSessionUpdate(
+    sessionRow: StoredSessionRow | undefined,
+    sessionUpdate: SessionRow,
+  ): Promise<number> {
+    return this.makeRequest<number>(({ sessions }) =>
+      sessions.put(
+        sessionRow?.rowID
+          ? {
+              rowID: sessionRow.rowID,
+              ...sessionUpdate,
+            }
+          : sessionUpdate,
+      ),
+    );
+  }
+
+  addTransaction(
+    sessionRowID: number,
+    idx: number,
+    newTransaction: Transaction,
+  ) {
+    return this.makeRequest(({ transactions }) =>
+      transactions.add({
+        ses: sessionRowID,
+        idx,
+        tx: newTransaction,
+      } satisfies TransactionRow),
+    );
+  }
+
+  addSignatureAfter({
+    sessionRowID,
+    idx,
+    signature,
+  }: { sessionRowID: number; idx: number; signature: Signature }) {
+    return this.makeRequest(({ signatureAfter }) =>
+      signatureAfter.put({
+        ses: sessionRowID,
+        idx,
+        signature,
+      } satisfies SignatureAfterRow),
+    );
+  }
+}

package/src/idbNode.ts

@@ -0,0 +1,123 @@
+import {
+  IncomingSyncStream,
+  OutgoingSyncQueue,
+  Peer,
+  cojsonInternals,
+} from "cojson";
+import { IDBClient } from "./idbClient";
+import { SyncManager } from "./syncManager";
+
+export class IDBNode {
+  private dbClient: IDBClient;
+  private syncManager: SyncManager;
+
+  constructor(
+    db: IDBDatabase,
+    fromLocalNode: IncomingSyncStream,
+    toLocalNode: OutgoingSyncQueue,
+  ) {
+    this.dbClient = new IDBClient(db);
+    this.syncManager = new SyncManager(this.dbClient, toLocalNode);
+
+    const processMessages = async () => {
+      for await (const msg of fromLocalNode) {
+        try {
+          if (msg === "Disconnected" || msg === "PingTimeout") {
+            throw new Error("Unexpected Disconnected message");
+          }
+          await this.syncManager.handleSyncMessage(msg);
+        } catch (e) {
+          console.error(
+            new Error(
+              `Error reading from localNode, handling msg\n\n${JSON.stringify(
+                msg,
+                (k, v) =>
+                  k === "changes" || k === "encryptedChanges"
+                    ? v.slice(0, 20) + "..."
+                    : v,
+              )}`,
+              { cause: e },
+            ),
+          );
+        }
+      }
+    };
+
+    processMessages().catch((e) =>
+      console.error("Error in processMessages in IndexedDB", e),
+    );
+  }
+
+  static async asPeer(
+    {
+      trace,
+      localNodeName = "local",
+    }: { trace?: boolean; localNodeName?: string } | undefined = {
+      localNodeName: "local",
+    },
+  ): Promise<Peer> {
+    const [localNodeAsPeer, storageAsPeer] = cojsonInternals.connectedPeers(
+      localNodeName,
+      "indexedDB",
+      {
+        peer1role: "client",
+        peer2role: "storage",
+        trace,
+        crashOnClose: true,
+      },
+    );
+
+    await IDBNode.open(localNodeAsPeer.incoming, localNodeAsPeer.outgoing);
+
+    return { ...storageAsPeer, priority: 100 };
+  }
+
+  static async open(
+    fromLocalNode: IncomingSyncStream,
+    toLocalNode: OutgoingSyncQueue,
+  ) {
+    const dbPromise = new Promise<IDBDatabase>((resolve, reject) => {
+      const request = indexedDB.open("jazz-storage", 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);
+  }
+}