cojson 0.19.14 → 0.19.16

package/src/coValueCore/coValueCore.ts

@@ -315,6 +315,14 @@ export class CoValueCore {
     return this.getLoadingStateForPeer(peerId) === "errored";
   }
 
+  getErroredInPeerError(peerId: PeerID) {
+    const loadingState = this.loadingStatuses.get(peerId);
+    if (loadingState?.type === "errored") {
+      return loadingState.error;
+    }
+    return undefined;
+  }
+
   waitFor(opts: {
     predicate: (value: CoValueCore) => boolean;
     onSuccess: (value: CoValueCore) => void;
@@ -575,6 +583,9 @@ export class CoValueCore {
     }
   }
 
+  /**
+   * Apply new transactions that were not generated by the current node to the CoValue
+   */
   tryAddTransactions(
     sessionID: SessionID,
     newTransactions: Transaction[],
@@ -722,6 +733,9 @@ export class CoValueCore {
     };
   }
 
+  /**
+   * Creates a new transaction with local changes and syncs it to all peers
+   */
   makeTransaction(
     changes: JsonValue[],
     privacy: "private" | "trusting",
@@ -1507,7 +1521,7 @@ export class CoValueCore {
     }
   }
 
-  internalLoadFromPeer(peer: PeerState) {
+  private internalLoadFromPeer(peer: PeerState) {
     if (peer.closed && !peer.persistent) {
       this.markNotFoundInPeer(peer.id);
       return;

package/src/coValues/group.ts

@@ -1249,7 +1249,10 @@ export class RawGroup<
           group: this.id,
         },
         meta: meta || null,
-        ...uniqueness,
+        ...(uniqueness.createdAt !== undefined
+          ? { createdAt: uniqueness.createdAt }
+          : {}),
+        uniqueness: uniqueness.uniqueness,
       })
       .getCurrentContent() as M;
 
@@ -1283,7 +1286,10 @@ export class RawGroup<
           group: this.id,
         },
         meta: meta || null,
-        ...uniqueness,
+        ...(uniqueness.createdAt !== undefined
+          ? { createdAt: uniqueness.createdAt }
+          : {}),
+        uniqueness: uniqueness.uniqueness,
       })
       .getCurrentContent() as L;
 
@@ -1340,7 +1346,10 @@ export class RawGroup<
           group: this.id,
         },
         meta: meta || null,
-        ...uniqueness,
+        ...(uniqueness.createdAt !== undefined
+          ? { createdAt: uniqueness.createdAt }
+          : {}),
+        uniqueness: uniqueness.uniqueness,
       })
       .getCurrentContent() as C;
 
@@ -1365,7 +1374,10 @@ export class RawGroup<
           group: this.id,
         },
         meta: meta,
-        ...uniqueness,
+        ...(uniqueness.createdAt !== undefined
+          ? { createdAt: uniqueness.createdAt }
+          : {}),
+        uniqueness: uniqueness.uniqueness,
       })
       .getCurrentContent() as C;
   }

package/src/localNode.ts

@@ -395,10 +395,6 @@ export class LocalNode {
     return coValue;
   }
 
-  hasLoadingSources(id: RawCoID) {
-    return this.storage || this.syncManager.getServerPeers(id).length > 0;
-  }
-
   /** @internal */
   async loadCoValueCore(
     id: RawCoID,
@@ -742,7 +738,10 @@ export class LocalNode {
       type: "comap",
       ruleset: { type: "group", initialAdmin: account.id },
       meta: null,
-      ...uniqueness,
+      ...(uniqueness.createdAt !== undefined
+        ? { createdAt: uniqueness.createdAt }
+        : {}),
+      uniqueness: uniqueness.uniqueness,
     });
 
     const group = expectGroup(groupCoValue.getCurrentContent());

package/src/queue/LocalTransactionsSyncQueue.ts

@@ -15,7 +15,6 @@ import { NewContentMessage } from "../sync.js";
  */
 export class LocalTransactionsSyncQueue {
   private batch: NewContentMessage[] = [];
-  private firstChunks = new Map<RawCoID, NewContentMessage>();
   private lastUpdatedValue: VerifiedState | undefined;
   private lastUpdatedValueKnownState: CoValueKnownState | undefined;
 
@@ -78,7 +77,6 @@ export class LocalTransactionsSyncQueue {
 
       this.lastUpdatedValue = undefined;
       this.lastUpdatedValueKnownState = undefined;
-      this.firstChunks = new Map();
       this.batch = [];
       this.nextBatchScheduled = false;
 

package/src/storage/sqlite/client.ts

@@ -5,7 +5,6 @@ import type {
 import type { Signature } from "../../crypto/crypto.js";
 import type { RawCoID, SessionID } from "../../exports.js";
 import { logger } from "../../logger.js";
-import type { NewContentMessage } from "../../sync.js";
 import type {
   DBClientInterfaceSync,
   DBTransactionInterfaceSync,

package/src/storage/sqliteAsync/client.ts

@@ -5,7 +5,6 @@ import type {
 import type { Signature } from "../../crypto/crypto.js";
 import type { RawCoID, SessionID } from "../../exports.js";
 import { logger } from "../../logger.js";
-import type { NewContentMessage } from "../../sync.js";
 import type {
   DBClientInterfaceAsync,
   DBTransactionInterfaceAsync,

package/src/storage/storageAsync.ts

@@ -40,10 +40,10 @@ export class StorageApiAsync implements StorageAPI {
     this.dbClient = dbClient;
   }
 
-  knwonStates = new StorageKnownState();
+  knownStates = new StorageKnownState();
 
   getKnownState(id: string): CoValueKnownState {
-    return this.knwonStates.getKnownState(id);
+    return this.knownStates.getKnownState(id);
   }
 
   async load(
@@ -91,7 +91,7 @@ export class StorageApiAsync implements StorageAPI {
       }),
     );
 
-    const knownState = this.knwonStates.getKnownState(coValueRow.id);
+    const knownState = this.knownStates.getKnownState(coValueRow.id);
     knownState.header = true;
 
     for (const sessionRow of allCoValueSessions) {
@@ -169,7 +169,7 @@ export class StorageApiAsync implements StorageAPI {
       );
     }
 
-    this.knwonStates.handleUpdate(coValueRow.id, knownState);
+    this.knownStates.handleUpdate(coValueRow.id, knownState);
     done?.(true);
   }
 
@@ -270,12 +270,12 @@ export class StorageApiAsync implements StorageAPI {
 
     if (!storedCoValueRowID) {
       const knownState = emptyKnownState(id as RawCoID);
-      this.knwonStates.setKnownState(id, knownState);
+      this.knownStates.setKnownState(id, knownState);
 
       return this.handleCorrection(knownState, correctionCallback);
     }
 
-    const knownState = this.knwonStates.getKnownState(id);
+    const knownState = this.knownStates.getKnownState(id);
     knownState.header = true;
 
     let invalidAssumptions = false;
@@ -313,7 +313,7 @@ export class StorageApiAsync implements StorageAPI {
       });
     }
 
-    this.knwonStates.handleUpdate(id, knownState);
+    this.knownStates.handleUpdate(id, knownState);
 
     if (invalidAssumptions) {
       return this.handleCorrection(knownState, correctionCallback);
@@ -389,7 +389,7 @@ export class StorageApiAsync implements StorageAPI {
   }
 
   waitForSync(id: string, coValue: CoValueCore) {
-    return this.knwonStates.waitForSync(id, coValue);
+    return this.knownStates.waitForSync(id, coValue);
   }
 
   close() {

package/src/storage/storageSync.ts

@@ -48,10 +48,10 @@ export class StorageApiSync implements StorageAPI {
     this.streamingCounter.add(0);
   }
 
-  knwonStates = new StorageKnownState();
+  knownStates = new StorageKnownState();
 
   getKnownState(id: string): CoValueKnownState {
-    return this.knwonStates.getKnownState(id);
+    return this.knownStates.getKnownState(id);
   }
 
   async load(
@@ -93,7 +93,7 @@ export class StorageApiSync implements StorageAPI {
       }
     }
 
-    const knownState = this.knwonStates.getKnownState(coValueRow.id);
+    const knownState = this.knownStates.getKnownState(coValueRow.id);
     knownState.header = true;
 
     for (const sessionRow of allCoValueSessions) {
@@ -174,7 +174,7 @@ export class StorageApiSync implements StorageAPI {
       this.streamingCounter.add(-1);
     }
 
-    this.knwonStates.handleUpdate(coValueRow.id, knownState);
+    this.knownStates.handleUpdate(coValueRow.id, knownState);
     done?.(true);
   }
 
@@ -247,12 +247,12 @@ export class StorageApiSync implements StorageAPI {
 
     if (!storedCoValueRowID) {
       const knownState = emptyKnownState(id as RawCoID);
-      this.knwonStates.setKnownState(id, knownState);
+      this.knownStates.setKnownState(id, knownState);
 
       return this.handleCorrection(knownState, correctionCallback);
     }
 
-    const knownState = this.knwonStates.getKnownState(id);
+    const knownState = this.knownStates.getKnownState(id);
     knownState.header = true;
 
     let invalidAssumptions = false;
@@ -287,7 +287,7 @@ export class StorageApiSync implements StorageAPI {
       });
     }
 
-    this.knwonStates.handleUpdate(id, knownState);
+    this.knownStates.handleUpdate(id, knownState);
 
     if (invalidAssumptions) {
       return this.handleCorrection(knownState, correctionCallback);
@@ -362,7 +362,7 @@ export class StorageApiSync implements StorageAPI {
   }
 
   waitForSync(id: string, coValue: CoValueCore) {
-    return this.knwonStates.waitForSync(id, coValue);
+    return this.knownStates.waitForSync(id, coValue);
   }
 
   close() {

package/src/sync.ts

@@ -358,7 +358,7 @@ export class SyncManager {
       });
 
     if (!skipReconciliation && peerState.role === "server") {
-      void this.startPeerReconciliation(peerState);
+      this.startPeerReconciliation(peerState);
     }
 
     peerState.incoming.onMessage((msg) => {
@@ -870,7 +870,20 @@ export class SyncManager {
       );
 
       const timeoutId = setTimeout(() => {
-        reject(new Error(`Timeout waiting for sync on ${peerId}/${id}`));
+        const coValue = this.local.getCoValue(id);
+        const erroredInPeer = coValue.getErroredInPeerError(peerId);
+        const knownState = coValue.knownState().sessions;
+        const peerKnownState = peerState.getKnownState(id)?.sessions ?? {};
+        let errorMessage = `Timeout on waiting for sync with peer ${peerId} for coValue ${id}:
+  Known state: ${JSON.stringify(knownState)}
+  Peer state: ${JSON.stringify(peerKnownState)}
+`;
+
+        if (erroredInPeer) {
+          errorMessage += `\nMarked as errored: "${erroredInPeer}"`;
+        }
+
+        reject(new Error(errorMessage));
         unsubscribe?.();
       }, timeout);
     });

package/src/tests/SyncStateManager.test.ts

@@ -7,6 +7,7 @@ import { connectedPeers } from "../streamUtils.js";
 import { emptyKnownState } from "../exports.js";
 import {
   SyncMessagesLog,
+  blockMessageTypeOnOutgoingPeer,
   loadCoValueOrFail,
   setupTestNode,
   waitFor,
@@ -309,4 +310,44 @@ describe("SyncStateManager", () => {
       ]
     `);
   });
+
+  test("should throw if the timeout is reached", async () => {
+    const client = setupTestNode();
+
+    const { peer } = client.connectToSyncServer();
+
+    const group = client.node.createGroup();
+    const map = group.createMap();
+    map.set("key1", "value1", "trusting");
+
+    blockMessageTypeOnOutgoingPeer(peer, "content", {
+      id: map.core.id,
+    });
+
+    await expect(map.core.waitForSync({ timeout: 1 })).rejects.toThrow(
+      new RegExp(
+        `Timeout on waiting for sync with peer ${peer.id} for coValue ${map.core.id}:`,
+      ),
+    );
+  });
+
+  test("should throw if the timeout is reached, reporting the errorInPeer if any", async () => {
+    const client = setupTestNode();
+
+    const { peer } = client.connectToSyncServer();
+
+    const group = client.node.createGroup();
+    const map = group.createMap();
+    map.set("key1", "value1", "trusting");
+
+    map.core.markErrored(peer.id, new Error("test error"));
+
+    blockMessageTypeOnOutgoingPeer(peer, "content", {
+      id: map.core.id,
+    });
+
+    await expect(map.core.waitForSync({ timeout: 1 })).rejects.toThrow(
+      new RegExp(`Marked as errored: "Error: test error"`),
+    );
+  });
 });