cojson 0.18.25 → 0.18.27

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,

package/src/tests/coValueContentMessage.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "vitest";
 import { knownStateFromContent } from "../coValueContentMessage.js";
-import { emptyKnownState } from "../sync.js";
-import type { NewContentMessage } from "../sync.js";
+import { emptyKnownState } from "../knownState.js";
+import { NewContentMessage } from "../sync.js";
 import type { RawCoID, SessionID } from "../ids.js";
 import { stableStringify } from "../jsonStringify.js";
 import { CO_VALUE_PRIORITY } from "../priority.js";

package/src/tests/coValueCore.test.ts

@@ -716,3 +716,41 @@ describe("markErrored and isErroredInPeer", () => {
     expect(notificationCount).toBeGreaterThan(0);
   });
 });
+
+test("knownState should return the same object until the CoValue is modified", () => {
+  const [agent, sessionID] = randomAgentAndSessionID();
+  const node = new LocalNode(agent.agentSecret, sessionID, Crypto);
+
+  const group = node.createGroup();
+  const map = group.createMap();
+
+  // Get the knownState for the first time
+  const knownState1 = map.core.knownState();
+
+  // Get the knownState again - should be the same object
+  const knownState2 = map.core.knownState();
+  expect(knownState2).toBe(knownState1);
+
+  // Call it multiple times to ensure it's always the same object
+  const knownState3 = map.core.knownState();
+  expect(knownState3).toBe(knownState1);
+
+  // Now modify the CoValue by making a transaction
+  map.set("hello", "world");
+
+  // Get the knownState after modification - should be a different object
+  const knownState4 = map.core.knownState();
+  expect(knownState4).not.toBe(knownState1);
+
+  // Verify that subsequent calls still return the same (new) object
+  const knownState5 = map.core.knownState();
+  expect(knownState5).toBe(knownState4);
+
+  // Make another modification
+  map.set("foo", "bar");
+
+  // Get the knownState after second modification - should be yet another different object
+  const knownState6 = map.core.knownState();
+  expect(knownState6).not.toBe(knownState4);
+  expect(knownState6).not.toBe(knownState1);
+});

package/src/tests/group.removeMember.test.ts

@@ -6,6 +6,7 @@ import {
   loadCoValueOrFail,
   setupTestAccount,
   setupTestNode,
+  waitFor,
 } from "./testUtils.js";
 
 setCoValueLoadingRetryDelay(10);
@@ -98,9 +99,14 @@ describe("Group.removeMember", () => {
       const loadedGroup = await loadCoValueOrFail(client.node, group.id);
       expect(loadedGroup.myRole()).toEqual(member);
 
-      await loadedGroup.removeMember(client.node.expectCurrentAccount(member));
+      loadedGroup.removeMember(client.node.expectCurrentAccount(member));
 
       expect(loadedGroup.myRole()).toEqual(undefined);
+
+      await loadedGroup.core.waitForSync();
+      await waitFor(() => {
+        expect(group.roleOf(client.accountID)).toEqual(undefined);
+      });
     });
   }