cojson 0.18.26 → 0.18.28

package/src/sync.ts

@@ -16,20 +16,11 @@ import { logger } from "./logger.js";
 import { CoValuePriority } from "./priority.js";
 import { IncomingMessagesQueue } from "./queue/IncomingMessagesQueue.js";
 import { LocalTransactionsSyncQueue } from "./queue/LocalTransactionsSyncQueue.js";
-
-export type CoValueKnownState = {
-  id: RawCoID;
-  header: boolean;
-  sessions: { [sessionID: SessionID]: number };
-};
-
-export function emptyKnownState(id: RawCoID): CoValueKnownState {
-  return {
-    id,
-    header: false,
-    sessions: {},
-  };
-}
+import {
+  CoValueKnownState,
+  knownStateFrom,
+  KnownStateSessions,
+} from "./knownState.js";
 
 export type SyncMessage =
   | LoadMessage
@@ -55,9 +46,7 @@ export type NewContentMessage = {
   new: {
     [sessionID: SessionID]: SessionNewContent;
   };
-  expectContentUntil?: {
-    [sessionID: SessionID]: number;
-  };
+  expectContentUntil?: KnownStateSessions;
 };
 
 export type SessionNewContent = {
@@ -97,31 +86,6 @@ export interface Peer {
   persistent?: boolean;
 }
 
-export function combinedKnownStates(
-  stateA: CoValueKnownState,
-  stateB: CoValueKnownState,
-): CoValueKnownState {
-  const sessionStates: CoValueKnownState["sessions"] = {};
-
-  const allSessions = new Set([
-    ...Object.keys(stateA.sessions),
-    ...Object.keys(stateB.sessions),
-  ] as SessionID[]);
-
-  for (const sessionID of allSessions) {
-    const stateAValue = stateA.sessions[sessionID];
-    const stateBValue = stateB.sessions[sessionID];
-
-    sessionStates[sessionID] = Math.max(stateAValue || 0, stateBValue || 0);
-  }
-
-  return {
-    id: stateA.id,
-    header: stateA.header || stateB.header,
-    sessions: sessionStates,
-  };
-}
-
 export type ServerPeerSelector = (
   id: RawCoID,
   serverPeers: PeerState[],
@@ -446,7 +410,7 @@ export class SyncManager {
      * This way we can track part of the data loss that may occur when the other peer is restarted
      *
      */
-    peer.setKnownState(msg.id, knownStateIn(msg));
+    peer.setKnownState(msg.id, knownStateFrom(msg));
     const coValue = this.local.getCoValue(msg.id);
 
     if (coValue.isAvailable()) {
@@ -482,7 +446,7 @@ export class SyncManager {
   handleKnownState(msg: KnownStateMessage, peer: PeerState) {
     const coValue = this.local.getCoValue(msg.id);
 
-    peer.combineWith(msg.id, knownStateIn(msg));
+    peer.combineWith(msg.id, knownStateFrom(msg));
 
     // The header is a boolean value that tells us if the other peer do have information about the header.
     // If it's false in this point it means that the coValue is unavailable on the other peer.
@@ -706,12 +670,10 @@ export class SyncManager {
         contentToStore.new[sessionID] = newContentForSession;
       }
 
-      peer?.updateSessionCounter(
-        msg.id,
-        sessionID,
+      const transactionsCount =
         newContentForSession.after +
-          newContentForSession.newTransactions.length,
-      );
+        newContentForSession.newTransactions.length;
+      peer?.updateSessionCounter(msg.id, sessionID, transactionsCount);
     }
 
     /**
@@ -778,11 +740,11 @@ export class SyncManager {
         peer.role === "server" &&
         !peer.loadRequestSent.has(coValue.id)
       ) {
-        const state = coValue.getStateForPeer(peer.id)?.type;
+        const state = coValue.getLoadingStateForPeer(peer.id);
 
         // Check if there is a inflight load operation and we
         // are waiting for other peers to send the load request
-        if (state === "unknown" || state === undefined) {
+        if (state === "unknown") {
           // Sending a load message to the peer to get to know how much content is missing
           // before sending the new content
           this.trySendToPeer(peer, {
@@ -804,7 +766,7 @@ export class SyncManager {
   }
 
   handleCorrection(msg: KnownStateMessage, peer: PeerState) {
-    peer.setKnownState(msg.id, knownStateIn(msg));
+    peer.setKnownState(msg.id, knownStateFrom(msg));
 
     return this.sendNewContent(msg.id, peer);
   }
@@ -952,14 +914,6 @@ export class SyncManager {
   }
 }
 
-function knownStateIn(msg: LoadMessage | KnownStateMessage) {
-  return {
-    id: msg.id,
-    header: msg.header,
-    sessions: msg.sessions,
-  };
-}
-
 /**
  * Returns a ServerPeerSelector that implements the Highest Weighted Random (HWR) algorithm.
  *

package/src/tests/PeerKnownStates.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test, vi } from "vitest";
 import { PeerKnownStates } from "../PeerKnownStates.js";
 import { RawCoID, SessionID } from "../ids.js";
-import { CoValueKnownState, emptyKnownState } from "../sync.js";
+import { CoValueKnownState, emptyKnownState } from "../knownState.js";
 
 describe("PeerKnownStates", () => {
   test("should set and get a known state", () => {

package/src/tests/PeerState.test.ts

@@ -1,9 +1,8 @@
 import { describe, expect, test, vi } from "vitest";
 import { PeerState } from "../PeerState.js";
-import { CO_VALUE_PRIORITY } from "../priority.js";
 import { ConnectedPeerChannel } from "../streamUtils.js";
-import { CoValueKnownState, Peer, SyncMessage } from "../sync.js";
-import { waitFor } from "./testUtils.js";
+import { Peer, SyncMessage } from "../sync.js";
+import { CoValueKnownState, KnownStateSessions } from "../knownState.js";
 
 function setup() {
   const mockPeer: Peer = {
@@ -80,6 +79,33 @@ describe("PeerState", () => {
     expect(optimisticKnownStatesSpy).toHaveBeenCalledWith("co_z1", state);
   });
 
+  test("dispatching an optimistic update should not affect the known states", () => {
+    const { peerState } = setup();
+
+    const state: CoValueKnownState = {
+      id: "co_z1",
+      header: false,
+      sessions: {},
+    };
+
+    peerState.setKnownState("co_z1", state);
+
+    const optimisticState: CoValueKnownState = {
+      id: "co_z1",
+      header: false,
+      sessions: {
+        "session-1": 1,
+      } as KnownStateSessions,
+    };
+
+    peerState.combineOptimisticWith("co_z1", optimisticState);
+
+    expect(peerState.knownStates.get("co_z1")).not.toEqual(optimisticState);
+    expect(peerState.optimisticKnownStates.get("co_z1")).toEqual(
+      optimisticState,
+    );
+  });
+
   test("should use separate references for knownStates and optimisticKnownStates for non-storage peers", () => {
     const { peerState } = setup(); // Uses a regular peer
 

package/src/tests/PureJSCrypto.test.ts

@@ -4,7 +4,6 @@ import {
   setCurrentTestCryptoProvider,
   setupTestNode,
   setupTestAccount,
-  randomAgentAndSessionID,
 } from "./testUtils";
 import { PureJSCrypto } from "../crypto/PureJSCrypto";
 import { stableStringify } from "../jsonStringify";

package/src/tests/StorageApiAsync.test.ts

@@ -4,13 +4,9 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, describe, expect, onTestFinished, test, vi } from "vitest";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
-import { CoID, LocalNode, RawCoID, RawCoMap, logger } from "../exports.js";
+import { CoID, LocalNode, RawCoMap, logger } from "../exports.js";
 import { CoValueCore } from "../exports.js";
-import {
-  CoValueKnownState,
-  NewContentMessage,
-  emptyKnownState,
-} from "../sync.js";
+import { NewContentMessage } from "../sync.js";
 import { createAsyncStorage } from "./testStorage.js";
 import {
   SyncMessagesLog,
@@ -18,6 +14,7 @@ import {
   randomAgentAndSessionID,
   waitFor,
 } from "./testUtils.js";
+import { CoValueKnownState, emptyKnownState } from "../knownState.js";
 
 const crypto = await WasmCrypto.create();
 

package/src/tests/StorageApiSync.test.ts

@@ -6,11 +6,8 @@ import { describe, expect, onTestFinished, test, vi } from "vitest";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
 import { CoID, LocalNode, RawCoID, RawCoMap, logger } from "../exports.js";
 import { CoValueCore } from "../exports.js";
-import {
-  CoValueKnownState,
-  NewContentMessage,
-  emptyKnownState,
-} from "../sync.js";
+import { NewContentMessage } from "../sync.js";
+import { CoValueKnownState, emptyKnownState } from "../knownState.js";
 import { createSyncStorage } from "./testStorage.js";
 import { loadCoValueOrFail, randomAgentAndSessionID } from "./testUtils.js";
 
@@ -240,7 +237,6 @@ describe("StorageApiSync", () => {
 
       // Create a real group and add a member to create transactions
       const group = fixturesNode.createGroup();
-      const knownState = group.core.verified.knownState();
 
       group.addMember("everyone", "reader");
 

package/src/tests/StoreQueue.test.ts

@@ -1,6 +1,7 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 import { StoreQueue } from "../queue/StoreQueue.js";
-import type { CoValueKnownState, NewContentMessage } from "../sync.js";
+import { NewContentMessage } from "../sync.js";
+import { CoValueKnownState } from "../knownState.js";
 
 function createMockNewContentMessage(id: string): NewContentMessage {
   return {

package/src/tests/SyncStateManager.test.ts

@@ -4,7 +4,7 @@ import {
   PeerSyncStateListenerCallback,
 } from "../SyncStateManager.js";
 import { connectedPeers } from "../streamUtils.js";
-import { emptyKnownState } from "../sync.js";
+import { emptyKnownState } from "../exports.js";
 import {
   SyncMessagesLog,
   loadCoValueOrFail,