Send content from storage peers in one message instead of streaming it

garden-co · Dec 14, 2024 · b4a28c8 · b4a28c8
1 parent 507a00f
commit b4a28c8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 28 deletions.
diff --git a/.changeset/gorgeous-fans-share.md b/.changeset/gorgeous-fans-share.md
@@ -0,0 +1,5 @@
+---
+"cojson-storage": patch
+---
+
+Stop the use of incremental streaming of large CoValue content from local storage peers that triggers sync protocol bug leading to redundant syncing from server peers.
diff --git a/packages/cojson-storage/src/syncManager.ts b/packages/cojson-storage/src/syncManager.ts
@@ -60,11 +60,6 @@ export class SyncManager {
 
     const firstNewTxIdx = peerKnownState.sessions[sessionRow.sessionID] || 0;
 
-    const signaturesAndIdxs = await this.dbClient.getSignatures(
-      sessionRow.rowID,
-      firstNewTxIdx,
-    );
-
     const newTxsInSession = await this.dbClient.getNewTransactionInSession(
       sessionRow.rowID,
       firstNewTxIdx,
@@ -74,8 +69,6 @@ export class SyncManager {
       newTxsInSession,
       newContentMessages,
       sessionRow,
-      signaturesAndIdxs,
-      peerKnownState,
       firstNewTxIdx,
     });
   }

diff --git a/packages/cojson-storage/src/syncUtils.ts b/packages/cojson-storage/src/syncUtils.ts
@@ -16,27 +16,21 @@ export function collectNewTxs({
   newTxsInSession,
   newContentMessages,
   sessionRow,
-  signaturesAndIdxs,
-  peerKnownState,
   firstNewTxIdx,
 }: {
   newTxsInSession: TransactionRow[];
   newContentMessages: CojsonInternalTypes.NewContentMessage[];
   sessionRow: StoredSessionRow;
-  signaturesAndIdxs: SignatureAfterRow[];
-  peerKnownState: CojsonInternalTypes.CoValueKnownState;
   firstNewTxIdx: number;
 }) {
-  let idx = firstNewTxIdx;
-
   for (const tx of newTxsInSession) {
     let sessionEntry =
       newContentMessages[newContentMessages.length - 1]!.new[
         sessionRow.sessionID
       ];
     if (!sessionEntry) {
       sessionEntry = {
-        after: idx,
+        after: firstNewTxIdx,
         lastSignature: "WILL_BE_REPLACED" as CojsonInternalTypes.Signature,
         newTransactions: [],
       };
@@ -46,20 +40,7 @@ export function collectNewTxs({
     }
 
     sessionEntry.newTransactions.push(tx.tx);
-
-    if (signaturesAndIdxs[0] && idx === signaturesAndIdxs[0].idx) {
-      sessionEntry.lastSignature = signaturesAndIdxs[0].signature;
-      signaturesAndIdxs.shift();
-      newContentMessages.push({
-        action: "content",
-        id: peerKnownState.id,
-        new: {},
-        priority: cojsonInternals.getPriorityFromHeader(undefined),
-      });
-    } else if (idx === firstNewTxIdx + newTxsInSession.length - 1) {
-      sessionEntry.lastSignature = sessionRow.lastSignature;
-    }
-    idx += 1;
+    sessionEntry.lastSignature = sessionRow.lastSignature;
   }
 }