cojson-storage-indexeddb 0.8.35 → 0.8.37

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # cojson-storage-indexeddb
 
+## 0.8.37
+
+### Patch Changes
+
+- Updated dependencies [3d9f12e]
+  - cojson@0.8.37
+  - cojson-storage@0.8.37
+
+## 0.8.36
+
+### Patch Changes
+
+- 1afbd2c: Refactor the SQLite and IndexedDB storage packages to extract common synchronization functionality into newly created cojson-storage package.
+- Updated dependencies [441fe27]
+- Updated dependencies [1afbd2c]
+  - cojson@0.8.36
+  - cojson-storage@0.8.36
+
 ## 0.8.35
 
 ### Patch Changes

package/dist/idbClient.js

@@ -57,11 +57,11 @@ export class IDBClient {
     async getCoValueSessions(coValueRowId) {
         return this.makeRequest(({ sessions }) => sessions.index("sessionsByCoValue").getAll(coValueRowId));
     }
-    async getNewTransactionInSession(sessionRow, firstNewTxIdx) {
-        return this.makeRequest(({ transactions }) => transactions.getAll(IDBKeyRange.bound([sessionRow.rowID, firstNewTxIdx], [sessionRow.rowID, Infinity])));
+    async getNewTransactionInSession(sessionRowId, firstNewTxIdx) {
+        return this.makeRequest(({ transactions }) => transactions.getAll(IDBKeyRange.bound([sessionRowId, firstNewTxIdx], [sessionRowId, Infinity])));
     }
-    async getSignatures(sessionRow, firstNewTxIdx) {
-        return this.makeRequest(({ signatureAfter }) => signatureAfter.getAll(IDBKeyRange.bound([sessionRow.rowID, firstNewTxIdx], [sessionRow.rowID, Infinity])));
+    async getSignatures(sessionRowId, firstNewTxIdx) {
+        return this.makeRequest(({ signatureAfter }) => signatureAfter.getAll(IDBKeyRange.bound([sessionRowId, firstNewTxIdx], [sessionRowId, Infinity])));
     }
     async addCoValue(msg) {
         if (!msg.header) {
@@ -72,7 +72,7 @@ export class IDBClient {
             header: msg.header,
         })));
     }
-    async addSessionUpdate(sessionRow, sessionUpdate) {
+    async addSessionUpdate({ sessionUpdate, sessionRow, }) {
         return this.makeRequest(({ sessions }) => sessions.put(sessionRow?.rowID
             ? {
                 rowID: sessionRow.rowID,
@@ -87,12 +87,15 @@ export class IDBClient {
             tx: newTransaction,
         }));
     }
-    addSignatureAfter({ sessionRowID, idx, signature, }) {
+    async addSignatureAfter({ sessionRowID, idx, signature, }) {
         return this.makeRequest(({ signatureAfter }) => signatureAfter.put({
             ses: sessionRowID,
             idx,
             signature,
         }));
     }
+    async unitOfWork(operationsCallback) {
+        return Promise.all(operationsCallback());
+    }
 }
 //# sourceMappingURL=idbClient.js.map

package/dist/idbClient.js.map

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

package/dist/idbNode.js

@@ -1,6 +1,6 @@
 import { cojsonInternals, } from "cojson";
-import { IDBClient } from "./idbClient";
-import { SyncManager } from "./syncManager";
+import { SyncManager } from "cojson-storage";
+import { IDBClient } from "./idbClient.js";
 export class IDBNode {
     constructor(db, fromLocalNode, toLocalNode) {
         this.dbClient = new IDBClient(db);

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":"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"}

package/dist/index.js

@@ -1,2 +1,2 @@
-export { IDBNode, IDBNode as IDBStorage } from "./idbNode";
+export { IDBNode, IDBNode as IDBStorage } 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,EAAE,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC"}

package/package.json

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

package/src/idbClient.ts

@@ -1,39 +1,19 @@
-import { CojsonInternalTypes, SessionID } from "cojson";
+import { CojsonInternalTypes } 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 {
+import {
+  CoValueRow,
+  DBClientInterface,
+  SessionRow,
+  SignatureAfterRow,
+  StoredCoValueRow,
+  StoredSessionRow,
+  TransactionRow,
+} from "cojson-storage";
+
+export class IDBClient implements DBClientInterface {
   private db;
 
   currentTx:
@@ -148,29 +128,29 @@ export class IDBClient {
   }
 
   async getNewTransactionInSession(
-    sessionRow: StoredSessionRow,
+    sessionRowId: number,
     firstNewTxIdx: number,
   ): Promise<TransactionRow[]> {
     return this.makeRequest<TransactionRow[]>(({ transactions }) =>
       transactions.getAll(
         IDBKeyRange.bound(
-          [sessionRow.rowID, firstNewTxIdx],
-          [sessionRow.rowID, Infinity],
+          [sessionRowId, firstNewTxIdx],
+          [sessionRowId, Infinity],
         ),
       ),
     );
   }
 
   async getSignatures(
-    sessionRow: StoredSessionRow,
+    sessionRowId: number,
     firstNewTxIdx: number,
   ): Promise<SignatureAfterRow[]> {
     return this.makeRequest<SignatureAfterRow[]>(
       ({ signatureAfter }: { signatureAfter: IDBObjectStore }) =>
         signatureAfter.getAll(
           IDBKeyRange.bound(
-            [sessionRow.rowID, firstNewTxIdx],
-            [sessionRow.rowID, Infinity],
+            [sessionRowId, firstNewTxIdx],
+            [sessionRowId, Infinity],
           ),
         ),
     );
@@ -191,10 +171,13 @@ export class IDBClient {
     )) as number;
   }
 
-  async addSessionUpdate(
-    sessionRow: StoredSessionRow | undefined,
-    sessionUpdate: SessionRow,
-  ): Promise<number> {
+  async addSessionUpdate({
+    sessionUpdate,
+    sessionRow,
+  }: {
+    sessionUpdate: SessionRow;
+    sessionRow?: StoredSessionRow;
+  }): Promise<number> {
     return this.makeRequest<number>(({ sessions }) =>
       sessions.put(
         sessionRow?.rowID
@@ -221,7 +204,7 @@ export class IDBClient {
     );
   }
 
-  addSignatureAfter({
+  async addSignatureAfter({
     sessionRowID,
     idx,
     signature,
@@ -234,4 +217,8 @@ export class IDBClient {
       } satisfies SignatureAfterRow),
     );
   }
+
+  async unitOfWork(operationsCallback: () => unknown[]) {
+    return Promise.all(operationsCallback());
+  }
 }

package/src/idbNode.ts

@@ -4,12 +4,12 @@ import {
   Peer,
   cojsonInternals,
 } from "cojson";
-import { IDBClient } from "./idbClient";
-import { SyncManager } from "./syncManager";
+import { SyncManager } from "cojson-storage";
+import { IDBClient } from "./idbClient.js";
 
 export class IDBNode {
-  private dbClient: IDBClient;
-  private syncManager: SyncManager;
+  private readonly dbClient: IDBClient;
+  private readonly syncManager: SyncManager;
 
   constructor(
     db: IDBDatabase,

package/src/index.ts

@@ -1 +1 @@
-export { IDBNode, IDBNode as IDBStorage } from "./idbNode";
+export { IDBNode, IDBNode as IDBStorage } from "./idbNode.js";

package/dist/syncManager.js

@@ -1,198 +0,0 @@
-import { MAX_RECOMMENDED_TX_SIZE, cojsonInternals, emptyKnownState, } from "cojson";
-import { SyncPromise } from "./syncPromises.js";
-import { collectNewTxs, getDependedOnCoValues } from "./syncUtils";
-export class SyncManager {
-    constructor(idbClient, toLocalNode) {
-        this.toLocalNode = toLocalNode;
-        this.idbClient = idbClient;
-    }
-    async handleSyncMessage(msg) {
-        switch (msg.action) {
-            case "load":
-                await this.handleLoad(msg);
-                break;
-            case "content":
-                await this.handleContent(msg);
-                break;
-            case "known":
-                await this.handleKnown(msg);
-                break;
-            case "done":
-                await this.handleDone(msg);
-                break;
-        }
-    }
-    async handleSessionUpdate({ sessionRow, peerKnownState, newContentMessages, }) {
-        if (sessionRow.lastIdx <= (peerKnownState.sessions[sessionRow.sessionID] || 0))
-            return;
-        const firstNewTxIdx = peerKnownState.sessions[sessionRow.sessionID] || 0;
-        const signaturesAndIdxs = await this.idbClient.getSignatures(sessionRow, firstNewTxIdx);
-        const newTxsInSession = await this.idbClient.getNewTransactionInSession(sessionRow, firstNewTxIdx);
-        collectNewTxs(newTxsInSession, newContentMessages, sessionRow, signaturesAndIdxs, peerKnownState, firstNewTxIdx);
-    }
-    async sendNewContent(coValueKnownState) {
-        const outputMessages = await this.collectCoValueData(coValueKnownState);
-        // reverse it to send the top level id the last in the order
-        const collectedMessages = Object.values(outputMessages).reverse();
-        collectedMessages.forEach(({ knownMessage, contentMessages }) => {
-            this.sendStateMessage(knownMessage);
-            contentMessages?.length &&
-                contentMessages.forEach((msg) => this.sendStateMessage(msg));
-        });
-    }
-    async collectCoValueData(peerKnownState, messageMap = {}, asDependencyOf) {
-        if (messageMap[peerKnownState.id]) {
-            return messageMap;
-        }
-        const coValueRow = await this.idbClient.getCoValue(peerKnownState.id);
-        if (!coValueRow) {
-            const emptyKnownMessage = {
-                action: "known",
-                ...emptyKnownState(peerKnownState.id),
-            };
-            asDependencyOf && (emptyKnownMessage.asDependencyOf = asDependencyOf);
-            messageMap[peerKnownState.id] = { knownMessage: emptyKnownMessage };
-            return messageMap;
-        }
-        const allCoValueSessions = await this.idbClient.getCoValueSessions(coValueRow.rowID);
-        const newCoValueKnownState = {
-            id: coValueRow.id,
-            header: true,
-            sessions: {},
-        };
-        const newContentMessages = [
-            {
-                action: "content",
-                id: coValueRow.id,
-                header: coValueRow.header,
-                new: {},
-                priority: cojsonInternals.getPriorityFromHeader(coValueRow.header),
-            },
-        ];
-        await Promise.all(allCoValueSessions.map((sessionRow) => {
-            newCoValueKnownState.sessions[sessionRow.sessionID] =
-                sessionRow.lastIdx;
-            // Collect new sessions data into newContentMessages
-            return this.handleSessionUpdate({
-                sessionRow,
-                peerKnownState,
-                newContentMessages,
-            });
-        }));
-        const dependedOnCoValuesList = getDependedOnCoValues({
-            coValueRow,
-            newContentMessages,
-        });
-        const knownMessage = {
-            action: "known",
-            ...newCoValueKnownState,
-        };
-        asDependencyOf && (knownMessage.asDependencyOf = asDependencyOf);
-        messageMap[newCoValueKnownState.id] = {
-            knownMessage: knownMessage,
-            contentMessages: newContentMessages,
-        };
-        await Promise.all(dependedOnCoValuesList.map((dependedOnCoValue) => this.collectCoValueData({
-            id: dependedOnCoValue,
-            header: false,
-            sessions: {},
-        }, messageMap, asDependencyOf || coValueRow.id)));
-        return messageMap;
-    }
-    handleLoad(msg) {
-        return this.sendNewContent(msg);
-    }
-    async handleContent(msg) {
-        const coValueRow = await this.idbClient.getCoValue(msg.id);
-        // We have no info about coValue header
-        const invalidAssumptionOnHeaderPresence = !msg.header && !coValueRow;
-        if (invalidAssumptionOnHeaderPresence) {
-            return this.sendStateMessage({
-                action: "known",
-                id: msg.id,
-                header: false,
-                sessions: {},
-                isCorrection: true,
-            });
-        }
-        const storedCoValueRowID = coValueRow
-            ? coValueRow.rowID
-            : await this.idbClient.addCoValue(msg);
-        const allOurSessionsEntries = await this.idbClient.getCoValueSessions(storedCoValueRowID);
-        const allOurSessions = Object.fromEntries(allOurSessionsEntries.map((row) => [row.sessionID, row]));
-        const ourKnown = {
-            id: msg.id,
-            header: true,
-            sessions: {},
-        };
-        let invalidAssumptions = false;
-        await Promise.all(Object.keys(msg.new).map((sessionID) => {
-            const sessionRow = allOurSessions[sessionID];
-            if (sessionRow) {
-                ourKnown.sessions[sessionRow.sessionID] = sessionRow.lastIdx;
-            }
-            if ((sessionRow?.lastIdx || 0) < (msg.new[sessionID]?.after || 0)) {
-                invalidAssumptions = true;
-            }
-            else {
-                return this.putNewTxs(msg, sessionID, sessionRow, storedCoValueRowID);
-            }
-        }));
-        if (invalidAssumptions) {
-            this.sendStateMessage({
-                action: "known",
-                ...ourKnown,
-                isCorrection: invalidAssumptions,
-            });
-        }
-    }
-    async putNewTxs(msg, sessionID, sessionRow, storedCoValueRowID) {
-        const newTransactions = msg.new[sessionID]?.newTransactions || [];
-        const actuallyNewOffset = (sessionRow?.lastIdx || 0) - (msg.new[sessionID]?.after || 0);
-        const actuallyNewTransactions = newTransactions.slice(actuallyNewOffset);
-        let newBytesSinceLastSignature = (sessionRow?.bytesSinceLastSignature || 0) +
-            actuallyNewTransactions.reduce((sum, tx) => sum +
-                (tx.privacy === "private"
-                    ? tx.encryptedChanges.length
-                    : tx.changes.length), 0);
-        const newLastIdx = (sessionRow?.lastIdx || 0) + actuallyNewTransactions.length;
-        let shouldWriteSignature = false;
-        if (newBytesSinceLastSignature > MAX_RECOMMENDED_TX_SIZE) {
-            shouldWriteSignature = true;
-            newBytesSinceLastSignature = 0;
-        }
-        const nextIdx = sessionRow?.lastIdx || 0;
-        const sessionUpdate = {
-            coValue: storedCoValueRowID,
-            sessionID: sessionID,
-            lastIdx: newLastIdx,
-            lastSignature: msg.new[sessionID].lastSignature,
-            bytesSinceLastSignature: newBytesSinceLastSignature,
-        };
-        const sessionRowID = await this.idbClient.addSessionUpdate(sessionRow, sessionUpdate);
-        let maybePutRequest;
-        if (shouldWriteSignature) {
-            maybePutRequest = this.idbClient.addSignatureAfter({
-                sessionRowID,
-                idx: newLastIdx - 1,
-                signature: msg.new[sessionID].lastSignature,
-            });
-        }
-        else {
-            maybePutRequest = SyncPromise.resolve();
-        }
-        return maybePutRequest.then(() => Promise.all(actuallyNewTransactions.map((newTransaction, i) => {
-            return this.idbClient.addTransaction(sessionRowID, nextIdx + i, newTransaction);
-        })));
-    }
-    handleKnown(_msg) {
-        // We don't intend to use IndexedDB itself as a synchronisation mechanism, so we can ignore the known messages
-    }
-    async sendStateMessage(msg) {
-        return this.toLocalNode
-            .push(msg)
-            .catch((e) => console.error(`Error sending ${msg.action} state, id ${msg.id}`, e));
-    }
-    handleDone(_msg) { }
-}
-//# sourceMappingURL=syncManager.js.map

package/dist/syncManager.js.map

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

package/dist/syncUtils.js

@@ -1,95 +0,0 @@
-import { cojsonInternals, } from "cojson";
-export function collectNewTxs(newTxsInSession, newContentMessages, sessionRow, signaturesAndIdxs, theirKnown, firstNewTxIdx) {
-    let idx = firstNewTxIdx;
-    for (const tx of newTxsInSession) {
-        let sessionEntry = newContentMessages[newContentMessages.length - 1].new[sessionRow.sessionID];
-        if (!sessionEntry) {
-            sessionEntry = {
-                after: idx,
-                lastSignature: "WILL_BE_REPLACED",
-                newTransactions: [],
-            };
-            newContentMessages[newContentMessages.length - 1].new[sessionRow.sessionID] = sessionEntry;
-        }
-        sessionEntry.newTransactions.push(tx.tx);
-        if (signaturesAndIdxs[0] && idx === signaturesAndIdxs[0].idx) {
-            sessionEntry.lastSignature = signaturesAndIdxs[0].signature;
-            signaturesAndIdxs.shift();
-            newContentMessages.push({
-                action: "content",
-                id: theirKnown.id,
-                new: {},
-                priority: cojsonInternals.getPriorityFromHeader(undefined),
-            });
-        }
-        else if (idx === firstNewTxIdx + newTxsInSession.length - 1) {
-            sessionEntry.lastSignature = sessionRow.lastSignature;
-        }
-        idx += 1;
-    }
-}
-export function getDependedOnCoValues({ coValueRow, newContentMessages, }) {
-    return coValueRow.header.ruleset.type === "group"
-        ? getGroupDependedOnCoValues(newContentMessages)
-        : coValueRow.header.ruleset.type === "ownedByGroup"
-            ? getOwnedByGroupDependedOnCoValues(coValueRow, newContentMessages)
-            : [];
-}
-function getGroupDependedOnCoValues(newContentMessages) {
-    const keys = [];
-    /**
-     * Collect all the signing keys inside the transactions to list all the
-     * dependencies required to correctly access the CoValue.
-     */
-    for (const piece of newContentMessages) {
-        for (const sessionEntry of Object.values(piece.new)) {
-            for (const tx of sessionEntry.newTransactions) {
-                if (tx.privacy !== "trusting")
-                    continue;
-                const changes = safeParseChanges(tx.changes);
-                for (const change of changes) {
-                    if (change &&
-                        typeof change === "object" &&
-                        "op" in change &&
-                        change.op === "set" &&
-                        "key" in change &&
-                        change.key) {
-                        const key = cojsonInternals.getGroupDependentKey(change.key);
-                        if (key) {
-                            keys.push(key);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return keys;
-}
-function getOwnedByGroupDependedOnCoValues(coValueRow, newContentMessages) {
-    if (coValueRow.header.ruleset.type !== "ownedByGroup")
-        return [];
-    const keys = [coValueRow.header.ruleset.group];
-    /**
-     * Collect all the signing keys inside the transactions to list all the
-     * dependencies required to correctly access the CoValue.
-     */
-    for (const piece of newContentMessages) {
-        for (const sessionID of Object.keys(piece.new)) {
-            const accountId = cojsonInternals.accountOrAgentIDfromSessionID(sessionID);
-            if (cojsonInternals.isAccountID(accountId) &&
-                accountId !== coValueRow.id) {
-                keys.push(accountId);
-            }
-        }
-    }
-    return keys;
-}
-function safeParseChanges(changes) {
-    try {
-        return cojsonInternals.parseJSON(changes);
-    }
-    catch (e) {
-        return [];
-    }
-}
-//# sourceMappingURL=syncUtils.js.map

package/dist/syncUtils.js.map

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