cojson 0.13.17 → 0.13.18

package/src/tests/sync.test.ts

@@ -1,4 +1,12 @@
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import {
+  assert,
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  test,
+  vi,
+} from "vitest";
 import { expectMap } from "../coValue.js";
 import { RawCoMap } from "../coValues/coMap.js";
 import type { RawGroup } from "../coValues/group.js";
@@ -12,7 +20,8 @@ import {
   createTestMetricReader,
   createTestNode,
   loadCoValueOrFail,
-  randomAnonymousAccountAndSessionID,
+  nodeWithRandomAgentAndSessionID,
+  randomAgentAndSessionID,
   setupTestAccount,
   setupTestNode,
   tearDownTestMetricReader,
@@ -32,8 +41,7 @@ beforeEach(async () => {
 });
 
 test("If we add a client peer, but it never subscribes to a coValue, it won't get any messages", async () => {
-  const [admin, session] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(admin, session, Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const group = node.createGroup();
 
@@ -151,11 +159,8 @@ test("should delete the peer state when the peer closes if deletePeerStateOnClos
 describe("sync - extra tests", () => {
   test("Node handles disconnection and reconnection of a peer gracefully", async () => {
     // Create two nodes
-    const [admin1, session1] = randomAnonymousAccountAndSessionID();
-    const node1 = new LocalNode(admin1, session1, Crypto);
-
-    const [admin2, session2] = randomAnonymousAccountAndSessionID();
-    const node2 = new LocalNode(admin2, session2, Crypto);
+    const node1 = nodeWithRandomAgentAndSessionID();
+    const node2 = nodeWithRandomAgentAndSessionID();
 
     // Create a group and a map on node1
     const group = node1.createGroup();
@@ -177,7 +182,7 @@ describe("sync - extra tests", () => {
 
     // Verify that node2 has received the map
     const mapOnNode2 = await node2.loadCoValueCore(map.core.id);
-    if (mapOnNode2 === "unavailable") {
+    if (!mapOnNode2.isAvailable()) {
       throw new Error("Map is unavailable on node2");
     }
 
@@ -211,7 +216,7 @@ describe("sync - extra tests", () => {
 
     // Verify that node2 has received the changes made during disconnection
     const updatedMapOnNode2 = await node2.loadCoValueCore(map.core.id);
-    if (updatedMapOnNode2 === "unavailable") {
+    if (!updatedMapOnNode2.isAvailable()) {
       throw new Error("Updated map is unavailable on node2");
     }
 
@@ -221,7 +226,7 @@ describe("sync - extra tests", () => {
 
     // Make a new change on node2 to verify two-way sync
     const mapOnNode2ForEdit = await node2.loadCoValueCore(map.core.id);
-    if (mapOnNode2ForEdit === "unavailable") {
+    if (!mapOnNode2ForEdit.isAvailable()) {
       throw new Error("Updated map is unavailable on node2");
     }
 
@@ -244,7 +249,7 @@ describe("sync - extra tests", () => {
     await new Promise((resolve) => setTimeout(resolve, 100));
 
     const mapOnNode1 = await node1.loadCoValueCore(map.core.id);
-    if (mapOnNode1 === "unavailable") {
+    if (!mapOnNode1.isAvailable()) {
       throw new Error("Updated map is unavailable on node1");
     }
 
@@ -255,14 +260,9 @@ describe("sync - extra tests", () => {
   });
   test("Concurrent modifications on multiple nodes are resolved correctly", async () => {
     // Create three nodes
-    const [admin1, session1] = randomAnonymousAccountAndSessionID();
-    const node1 = new LocalNode(admin1, session1, Crypto);
-
-    const [admin2, session2] = randomAnonymousAccountAndSessionID();
-    const node2 = new LocalNode(admin2, session2, Crypto);
-
-    const [admin3, session3] = randomAnonymousAccountAndSessionID();
-    const node3 = new LocalNode(admin3, session3, Crypto);
+    const node1 = nodeWithRandomAgentAndSessionID();
+    const node2 = nodeWithRandomAgentAndSessionID();
+    const node3 = nodeWithRandomAgentAndSessionID();
 
     // Create a group and a map on node1
     const group = node1.createGroup();
@@ -316,9 +316,9 @@ describe("sync - extra tests", () => {
     const mapOnNode3 = await node3.loadCoValueCore(map.core.id);
 
     if (
-      mapOnNode1 === "unavailable" ||
-      mapOnNode2 === "unavailable" ||
-      mapOnNode3 === "unavailable"
+      !mapOnNode1.isAvailable() ||
+      !mapOnNode2.isAvailable() ||
+      !mapOnNode3.isAvailable()
     ) {
       throw new Error("Map is unavailable on node2 or node3");
     }
@@ -349,14 +349,9 @@ describe("sync - extra tests", () => {
 
   test("Node correctly handles and recovers from network partitions", async () => {
     // Create three nodes
-    const [admin1, session1] = randomAnonymousAccountAndSessionID();
-    const node1 = new LocalNode(admin1, session1, Crypto);
-
-    const [admin2, session2] = randomAnonymousAccountAndSessionID();
-    const node2 = new LocalNode(admin2, session2, Crypto);
-
-    const [admin3, session3] = randomAnonymousAccountAndSessionID();
-    const node3 = new LocalNode(admin3, session3, Crypto);
+    const node1 = nodeWithRandomAgentAndSessionID();
+    const node2 = nodeWithRandomAgentAndSessionID();
+    const node3 = nodeWithRandomAgentAndSessionID();
 
     // Create a group and a map on node1
     const group = node1.createGroup();
@@ -411,9 +406,9 @@ describe("sync - extra tests", () => {
     const mapOnNode3Core = await node3.loadCoValueCore(map.core.id);
 
     if (
-      mapOnNode1Core === "unavailable" ||
-      mapOnNode2Core === "unavailable" ||
-      mapOnNode3Core === "unavailable"
+      !mapOnNode1Core.isAvailable() ||
+      !mapOnNode2Core.isAvailable() ||
+      !mapOnNode3Core.isAvailable()
     ) {
       throw new Error("Map is unavailable on node2 or node3");
     }
@@ -528,7 +523,7 @@ describe("sync - extra tests", () => {
   });
 });
 
-test("a value created on one node can be loaded on anotehr node even if not directly connected", async () => {
+test("a value created on one node can be loaded on another node even if not directly connected", async () => {
   const userA = createTestNode();
   const userB = createTestNode();
   const serverA = createTestNode();
@@ -548,6 +543,12 @@ test("a value created on one node can be loaded on anotehr node even if not dire
 
   const mapOnUserB = await loadCoValueOrFail(userB, map.id);
   expect(mapOnUserB.get("key1")).toBe("value1");
+
+  map.set("key2", "value2", "trusting");
+
+  await waitFor(() => {
+    expect(mapOnUserB.get("key2")).toBe("value2");
+  });
 });
 
 describe("SyncManager - knownStates vs optimisticKnownStates", () => {
@@ -747,7 +748,7 @@ describe("SyncManager.addPeer", () => {
 
     await map.core.waitForSync();
 
-    expect(jazzCloud.node.coValuesStore.get(map.id).isAvailable()).toBe(true);
+    expect(jazzCloud.node.getCoValue(map.id).isAvailable()).toBe(true);
   });
 });
 
@@ -802,13 +803,13 @@ describe("loadCoValueCore with retry", () => {
     // Start loading before syncing
     const result = await bob.loadCoValueCore(map.id);
 
-    expect(result).toBe("unavailable");
+    expect(result.isAvailable()).toBe(false);
 
     connectTwoPeers(alice, bob, "server", "server");
 
     const result2 = await bob.loadCoValueCore(map.id);
 
-    expect(result2).not.toBe("unavailable");
+    expect(result2.isAvailable()).toBe(true);
   });
 
   test("should successfully mark a coValue as unavailable if the server does not have it", async () => {
@@ -826,7 +827,7 @@ describe("loadCoValueCore with retry", () => {
     // Start loading before syncing
     const result = await bob.loadCoValueCore(map.id);
 
-    expect(result).toBe("unavailable");
+    expect(result.isAvailable()).toBe(false);
   });
 });
 
@@ -910,8 +911,7 @@ describe("metrics", () => {
 
   test("should correctly track the number of connected peers", async () => {
     const metricReader = createTestMetricReader();
-    const [admin, session] = randomAnonymousAccountAndSessionID();
-    const node = new LocalNode(admin, session, Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
 
     let connectedPeers = await metricReader.getMetricValue("jazz.peers", {
       role: "client",
@@ -1059,7 +1059,7 @@ describe("SyncManager.handleSyncMessage", () => {
 
     // Add a coValue to the errored set
     const erroredId = "co_z123" as const;
-    client.node.coValuesStore.get(erroredId).markErrored(peer.id, {
+    client.node.getCoValue(erroredId).markErrored(peer.id, {
       message: "Test error",
     } as any);
 

package/src/tests/sync.upload.test.ts

@@ -1,6 +1,7 @@
 import { beforeEach, describe, expect, test } from "vitest";
 
-import { expectMap } from "../coValue";
+import { expectList, expectMap } from "../coValue";
+import { WasmCrypto } from "../crypto/WasmCrypto";
 import {
   SyncMessagesLog,
   loadCoValueOrFail,
@@ -8,6 +9,7 @@ import {
   waitFor,
 } from "./testUtils";
 
+const Crypto = await WasmCrypto.create();
 let jazzCloud = setupTestNode({ isSyncServer: true });
 
 beforeEach(async () => {
@@ -82,6 +84,44 @@ describe("client to server upload", () => {
     `);
   });
 
+  test("coValue uploading with a missing dependency", async () => {
+    const client = setupTestNode({
+      connected: true,
+    });
+
+    const group = client.node.createGroup();
+    const map = group.createMap();
+    map.set("hello", "world", "trusting");
+
+    await group.core.waitForSync();
+    await map.core.waitForSync();
+
+    map.set("hello", "new world", "trusting");
+    // Testing that with a missing group the sync will not fail
+    client.node.internalDeleteCoValue(group.id);
+
+    await map.core.waitForSync();
+
+    const mapOnServer = await loadCoValueOrFail(jazzCloud.node, map.id);
+    expect(mapOnServer.get("hello")).toEqual("new world");
+
+    expect(
+      SyncMessagesLog.getMessages({
+        Group: group.core,
+        Map: map.core,
+      }),
+    ).toMatchInlineSnapshot(`
+      [
+        "client -> server | CONTENT Group header: true new: After: 0 New: 3",
+        "server -> client | KNOWN Group sessions: header/3",
+        "client -> server | CONTENT Map header: true new: After: 0 New: 1",
+        "server -> client | KNOWN Map sessions: header/1",
+        "client -> server | CONTENT Map header: false new: After: 1 New: 1",
+        "server -> client | KNOWN Map sessions: header/2",
+      ]
+    `);
+  });
+
   test("wrong optimistic known state should be corrected", async () => {
     const client = setupTestNode({
       connected: true,
@@ -99,7 +139,7 @@ describe("client to server upload", () => {
     await map.core.waitForSync();
 
     // Forcefully delete the coValue from the client (simulating some data loss)
-    jazzCloud.node.coValuesStore.coValues.delete(map.id);
+    jazzCloud.node.internalDeleteCoValue(map.id);
 
     map.set("fromClient", "updated", "trusting");
 
@@ -129,12 +169,91 @@ describe("client to server upload", () => {
     `);
   });
 
+  test("syncing changes between two clients with a sync server in the middle", async () => {
+    const client = setupTestNode({
+      connected: true,
+    });
+    const otherClient = setupTestNode({});
+
+    const otherClientConnection = otherClient.connectToSyncServer({
+      ourName: "otherClient",
+    });
+
+    const coValue = client.node.createCoValue({
+      type: "colist",
+      ruleset: { type: "unsafeAllowAll" },
+      meta: null,
+      ...Crypto.createdNowUnique(),
+    });
+
+    const list = expectList(coValue.getCurrentContent());
+
+    list.append(1, undefined, "trusting");
+
+    const listOnOtherClient = await loadCoValueOrFail(
+      otherClient.node,
+      list.id,
+    );
+
+    otherClientConnection.peerState.gracefulShutdown();
+
+    listOnOtherClient.append(1, undefined, "trusting");
+
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    list.append(1, undefined, "trusting");
+
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    listOnOtherClient.append(1, undefined, "trusting");
+
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    list.append(1, undefined, "trusting");
+
+    otherClient.connectToSyncServer({
+      ourName: "otherClient",
+    });
+
+    await waitFor(() => {
+      expect(list.toJSON()).toEqual([1, 1, 1, 1, 1]);
+    });
+
+    expect(
+      SyncMessagesLog.getMessages({
+        Colist: coValue,
+      }),
+    ).toMatchInlineSnapshot(`
+      [
+        "otherClient -> server | LOAD Colist sessions: empty",
+        "client -> server | CONTENT Colist header: true new: After: 0 New: 1",
+        "server -> otherClient | KNOWN Colist sessions: empty",
+        "server -> client | KNOWN Colist sessions: header/1",
+        "server -> otherClient | CONTENT Colist header: true new: After: 0 New: 1",
+        "otherClient -> server | KNOWN Colist sessions: header/1",
+        "client -> server | CONTENT Colist header: false new: After: 1 New: 1",
+        "server -> client | KNOWN Colist sessions: header/2",
+        "otherClient -> server | LOAD Colist sessions: header/3",
+        "client -> server | CONTENT Colist header: false new: After: 2 New: 1",
+        "server -> otherClient | CONTENT Colist header: false new: After: 1 New: 1",
+        "server -> client | KNOWN Colist sessions: header/3",
+        "otherClient -> server | KNOWN Colist sessions: header/4",
+        "server -> otherClient | CONTENT Colist header: false new: After: 2 New: 1",
+        "otherClient -> server | CONTENT Colist header: false new: After: 0 New: 2",
+        "server -> otherClient | KNOWN Colist sessions: header/5",
+        "server -> client | CONTENT Colist header: false new: After: 0 New: 2",
+        "otherClient -> server | KNOWN Colist sessions: header/5",
+        "client -> server | KNOWN Colist sessions: header/5",
+      ]
+    `);
+  });
+
   test("large coValue upload streaming", async () => {
     const client = setupTestNode({
       connected: true,
     });
 
-    const group = client.node.createGroup();
+    const group = jazzCloud.node.createGroup();
     group.addMember("everyone", "writer");
 
     const largeMap = group.createMap();
@@ -162,40 +281,41 @@ describe("client to server upload", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "client -> server | CONTENT Group header: true new: After: 0 New: 5",
-        "server -> client | KNOWN Group sessions: header/5",
-        "client -> server | CONTENT Map header: true new: ",
-        "server -> client | KNOWN Map sessions: header/0",
-        "client -> server | CONTENT Map header: false new: After: 0 New: 73",
-        "server -> client | KNOWN Map sessions: header/73",
-        "client -> server | CONTENT Map header: false new: After: 73 New: 73",
-        "server -> client | KNOWN Map sessions: header/146",
-        "client -> server | CONTENT Map header: false new: After: 146 New: 73",
-        "server -> client | KNOWN Map sessions: header/219",
-        "client -> server | CONTENT Map header: false new: After: 219 New: 73",
-        "server -> client | KNOWN Map sessions: header/292",
-        "client -> server | CONTENT Map header: false new: After: 292 New: 73",
-        "server -> client | KNOWN Map sessions: header/365",
-        "client -> server | CONTENT Map header: false new: After: 365 New: 73",
-        "server -> client | KNOWN Map sessions: header/438",
-        "client -> server | CONTENT Map header: false new: After: 438 New: 73",
-        "server -> client | KNOWN Map sessions: header/511",
-        "client -> server | CONTENT Map header: false new: After: 511 New: 73",
-        "server -> client | KNOWN Map sessions: header/584",
-        "client -> server | CONTENT Map header: false new: After: 584 New: 73",
-        "server -> client | KNOWN Map sessions: header/657",
-        "client -> server | CONTENT Map header: false new: After: 657 New: 73",
-        "server -> client | KNOWN Map sessions: header/730",
-        "client -> server | CONTENT Map header: false new: After: 730 New: 73",
-        "server -> client | KNOWN Map sessions: header/803",
-        "client -> server | CONTENT Map header: false new: After: 803 New: 73",
-        "server -> client | KNOWN Map sessions: header/876",
-        "client -> server | CONTENT Map header: false new: After: 876 New: 73",
-        "server -> client | KNOWN Map sessions: header/949",
-        "client -> server | CONTENT Map header: false new: After: 949 New: 73",
-        "server -> client | KNOWN Map sessions: header/1022",
-        "client -> server | CONTENT Map header: false new: After: 1022 New: 2",
-        "server -> client | KNOWN Map sessions: header/1024",
+        "client -> server | LOAD Map sessions: empty",
+        "server -> client | CONTENT Group header: true new: After: 0 New: 5",
+        "client -> server | KNOWN Group sessions: header/5",
+        "server -> client | CONTENT Map header: true new: ",
+        "client -> server | KNOWN Map sessions: header/0",
+        "server -> client | CONTENT Map header: false new: After: 0 New: 73",
+        "client -> server | KNOWN Map sessions: header/73",
+        "server -> client | CONTENT Map header: false new: After: 73 New: 73",
+        "client -> server | KNOWN Map sessions: header/146",
+        "server -> client | CONTENT Map header: false new: After: 146 New: 73",
+        "client -> server | KNOWN Map sessions: header/219",
+        "server -> client | CONTENT Map header: false new: After: 219 New: 73",
+        "client -> server | KNOWN Map sessions: header/292",
+        "server -> client | CONTENT Map header: false new: After: 292 New: 73",
+        "client -> server | KNOWN Map sessions: header/365",
+        "server -> client | CONTENT Map header: false new: After: 365 New: 73",
+        "client -> server | KNOWN Map sessions: header/438",
+        "server -> client | CONTENT Map header: false new: After: 438 New: 73",
+        "client -> server | KNOWN Map sessions: header/511",
+        "server -> client | CONTENT Map header: false new: After: 511 New: 73",
+        "client -> server | KNOWN Map sessions: header/584",
+        "server -> client | CONTENT Map header: false new: After: 584 New: 73",
+        "client -> server | KNOWN Map sessions: header/657",
+        "server -> client | CONTENT Map header: false new: After: 657 New: 73",
+        "client -> server | KNOWN Map sessions: header/730",
+        "server -> client | CONTENT Map header: false new: After: 730 New: 73",
+        "client -> server | KNOWN Map sessions: header/803",
+        "server -> client | CONTENT Map header: false new: After: 803 New: 73",
+        "client -> server | KNOWN Map sessions: header/876",
+        "server -> client | CONTENT Map header: false new: After: 876 New: 73",
+        "client -> server | KNOWN Map sessions: header/949",
+        "server -> client | CONTENT Map header: false new: After: 949 New: 73",
+        "client -> server | KNOWN Map sessions: header/1022",
+        "server -> client | CONTENT Map header: false new: After: 1022 New: 2",
+        "client -> server | KNOWN Map sessions: header/1024",
       ]
     `);
   });