cojson 0.18.38 → 0.19.1

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

@@ -99,9 +99,7 @@ describe("Group invites", () => {
     await newMember.node.acceptInvite(group.id, inviteSecret);
 
     await waitFor(() => {
-      expect(
-        expectMap(personOnNewMemberNode.core.getCurrentContent()).get("name"),
-      ).toEqual("John Doe");
+      expect(personOnNewMemberNode.get("name")).toEqual("John Doe");
     });
 
     const groupOnNewMemberNode = await loadCoValueOrFail(
@@ -137,9 +135,7 @@ describe("Group invites", () => {
     await newMember.node.acceptInvite(group.id, inviteSecret);
 
     await waitFor(() => {
-      expect(
-        expectMap(personOnNewMemberNode.core.getCurrentContent()).get("name"),
-      ).toEqual("John Doe");
+      expect(personOnNewMemberNode.get("name")).toEqual("John Doe");
     });
 
     const groupOnNewMemberNode = await loadCoValueOrFail(
@@ -220,9 +216,7 @@ describe("Group invites", () => {
     await newMember.node.acceptInvite(group.id, inviteSecret);
 
     await waitFor(() => {
-      expect(
-        expectMap(personOnNewMemberNode.core.getCurrentContent()).get("name"),
-      ).toEqual("John Doe");
+      expect(personOnNewMemberNode.get("name")).toEqual("John Doe");
     });
 
     const groupOnNewMemberNode = await loadCoValueOrFail(
@@ -246,9 +240,7 @@ describe("Group invites", () => {
     const personOnReaderNode = await loadCoValueOrFail(reader.node, person.id);
 
     await waitFor(() => {
-      expect(
-        expectMap(personOnReaderNode.core.getCurrentContent()).get("name"),
-      ).toEqual("John Doe");
+      expect(personOnReaderNode.get("name")).toEqual("John Doe");
     });
   });
 
@@ -278,9 +270,7 @@ describe("Group invites", () => {
     await newMember.node.acceptInvite(group.id, inviteSecret);
 
     await waitFor(() => {
-      expect(
-        expectMap(personOnNewMemberNode.core.getCurrentContent()).get("name"),
-      ).toEqual("John Doe");
+      expect(personOnNewMemberNode.get("name")).toEqual("John Doe");
     });
 
     const groupOnNewMemberNode = await loadCoValueOrFail(
@@ -304,9 +294,7 @@ describe("Group invites", () => {
     const personOnReaderNode = await loadCoValueOrFail(reader.node, person.id);
 
     await waitFor(() => {
-      expect(
-        expectMap(personOnReaderNode.core.getCurrentContent()).get("name"),
-      ).toEqual("John Doe");
+      expect(personOnReaderNode.get("name")).toEqual("John Doe");
     });
   });
 
@@ -411,7 +399,7 @@ describe("Group invites", () => {
     // First add member as reader
     const memberAccount = await loadCoValueOrFail(admin.node, member.accountID);
     group.addMember(memberAccount, "reader");
-    await group.removeMember(memberAccount);
+    group.removeMember(memberAccount);
 
     // Create a new reader invite
     const inviteSecret = group.createInvite("reader");

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

@@ -329,8 +329,7 @@ describe("roleOf", () => {
       expect(mapOnNode2.get("test")).toEqual("Written from everyone");
 
       await waitFor(async () => {
-        const updatedMap = expectMap(mapOnNode2.core.getCurrentContent());
-        expect(updatedMap.get("fromAdmin")).toEqual("Written from admin");
+        expect(mapOnNode2.get("fromAdmin")).toEqual("Written from admin");
       });
     });
 
@@ -374,9 +373,8 @@ describe("roleOf", () => {
       expect(mapOnNode2.get("test")).toEqual("Updated after the upgrade");
 
       await waitFor(async () => {
-        const updatedMap = expectMap(mapOnNode2.core.getCurrentContent());
         // Get the new content after the invalidation caused by group update
-        expect(updatedMap.get("fromAdmin")).toEqual("Written from admin");
+        expect(mapOnNode2.get("fromAdmin")).toEqual("Written from admin");
       });
     });
 

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

@@ -481,10 +481,7 @@ describe("loading coValues from server", () => {
     map.set("fromServer", "updated", "trusting");
 
     await waitFor(() => {
-      const coValue = expectMap(
-        client.node.expectCoValueLoaded(map.id).getCurrentContent(),
-      );
-      expect(coValue.get("fromServer")).toEqual("updated");
+      expect(map.get("fromServer")).toEqual("updated");
     });
 
     expect(
@@ -1257,10 +1254,7 @@ describe("loading coValues from server", () => {
 
     // Wait for the update to arrive on the initial client
     await waitFor(() => {
-      const mapOnClient = expectMap(
-        client.node.getCoValue(map.core.id).getCurrentContent(),
-      );
-      expect(mapOnClient.get("newAccountClient")).toBe(true);
+      expect(map.get("newAccountClient")).toBe(true);
     });
 
     // The edge server should wait for the new Account to be available before sending the Map update

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

@@ -733,4 +733,113 @@ describe("client syncs with a server with storage", () => {
       ]
     `);
   });
+
+  test("large parent group streaming from storage", async () => {
+    const syncServer = setupTestNode({
+      isSyncServer: true,
+    });
+    const { storage } = syncServer.addStorage({
+      ourName: "syncServer",
+    });
+
+    const alice = setupTestNode();
+    alice.connectToSyncServer({
+      syncServer: syncServer.node,
+    });
+
+    const parentGroup = alice.node.createGroup();
+    const group = alice.node.createGroup();
+    group.extend(parentGroup);
+
+    const map = group.createMap();
+
+    fillCoMapWithLargeData(parentGroup);
+
+    parentGroup.addMember("everyone", "reader");
+
+    map.set("hello", "world");
+
+    await map.core.waitForSync();
+    await parentGroup.core.waitForSync();
+
+    expect(
+      SyncMessagesLog.getMessages({
+        Group: group.core,
+        ParentGroup: parentGroup.core,
+        Map: map.core,
+      }),
+    ).toMatchInlineSnapshot(`
+      [
+        "client -> server | CONTENT ParentGroup header: true new: After: 0 New: 3",
+        "client -> server | CONTENT Group header: true new: After: 0 New: 5",
+        "client -> server | CONTENT Map header: true new: ",
+        "client -> server | CONTENT ParentGroup header: false new: After: 3 New: 73 expectContentUntil: header/205",
+        "client -> server | CONTENT ParentGroup header: false new: After: 76 New: 73",
+        "client -> server | CONTENT ParentGroup header: false new: After: 149 New: 56",
+        "client -> server | CONTENT Map header: false new: After: 0 New: 1",
+        "server -> client | KNOWN ParentGroup sessions: header/3",
+        "syncServer -> storage | CONTENT ParentGroup header: true new: After: 0 New: 3",
+        "server -> client | KNOWN Group sessions: header/5",
+        "syncServer -> storage | CONTENT Group header: true new: After: 0 New: 5",
+        "server -> client | KNOWN Map sessions: header/0",
+        "syncServer -> storage | CONTENT Map header: true new: ",
+        "server -> client | KNOWN ParentGroup sessions: header/76",
+        "syncServer -> storage | CONTENT ParentGroup header: false new: After: 3 New: 73",
+        "server -> client | KNOWN ParentGroup sessions: header/149",
+        "syncServer -> storage | CONTENT ParentGroup header: false new: After: 76 New: 73",
+        "server -> client | KNOWN ParentGroup sessions: header/205",
+        "syncServer -> storage | CONTENT ParentGroup header: false new: After: 149 New: 56",
+        "server -> client | KNOWN Map sessions: header/1",
+        "syncServer -> storage | CONTENT Map header: false new: After: 0 New: 1",
+      ]
+    `);
+
+    SyncMessagesLog.clear();
+
+    syncServer.restart();
+    syncServer.addStorage({
+      ourName: "syncServer",
+      storage,
+    });
+
+    const bob = setupTestNode();
+    bob.connectToSyncServer({
+      syncServer: syncServer.node,
+      ourName: "bob",
+    });
+
+    let mapOnBob = await loadCoValueOrFail(bob.node, map.id);
+
+    await mapOnBob.core.waitForAsync((value) => value.isCompletelyDownloaded());
+
+    expect(
+      SyncMessagesLog.getMessages({
+        ParentGroup: parentGroup.core,
+        Group: group.core,
+        Map: map.core,
+      }),
+    ).toMatchInlineSnapshot(`
+      [
+        "bob -> server | LOAD Map sessions: empty",
+        "syncServer -> storage | LOAD Map sessions: empty",
+        "storage -> syncServer | CONTENT ParentGroup header: true new: After: 0 New: 76 expectContentUntil: header/205",
+        "storage -> syncServer | CONTENT Group header: true new: After: 0 New: 5",
+        "storage -> syncServer | CONTENT Map header: true new: After: 0 New: 1",
+        "server -> bob | CONTENT ParentGroup header: true new: After: 0 New: 76 expectContentUntil: header/205",
+        "server -> bob | CONTENT Group header: true new: After: 0 New: 5",
+        "server -> bob | CONTENT Map header: true new: After: 0 New: 1",
+        "storage -> syncServer | CONTENT ParentGroup header: true new: After: 76 New: 73",
+        "server -> bob | CONTENT ParentGroup header: false new: After: 76 New: 73 expectContentUntil: header/205",
+        "bob -> server | KNOWN ParentGroup sessions: header/76",
+        "bob -> server | KNOWN Group sessions: header/5",
+        "bob -> server | KNOWN Map sessions: header/1",
+        "bob -> server | KNOWN ParentGroup sessions: header/149",
+        "storage -> syncServer | CONTENT ParentGroup header: true new: After: 149 New: 56",
+        "server -> bob | CONTENT ParentGroup header: false new: After: 149 New: 56",
+        "bob -> server | KNOWN ParentGroup sessions: header/205",
+      ]
+    `);
+
+    expect(mapOnBob.get("hello")).toEqual("world");
+  });
 });

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

@@ -640,4 +640,111 @@ describe("client syncs with a server with storage", () => {
     await client.node.syncManager.waitForAllCoValuesSync();
     await client2.node.syncManager.waitForAllCoValuesSync();
   });
+
+  test("large parent group streaming from storage", async () => {
+    const syncServer = setupTestNode({
+      isSyncServer: true,
+    });
+    const { storage } = await syncServer.addAsyncStorage({
+      ourName: "syncServer",
+    });
+
+    const alice = setupTestNode();
+    alice.connectToSyncServer({
+      syncServer: syncServer.node,
+    });
+
+    const parentGroup = alice.node.createGroup();
+    const group = alice.node.createGroup();
+    group.extend(parentGroup);
+
+    const map = group.createMap();
+
+    fillCoMapWithLargeData(parentGroup);
+
+    parentGroup.addMember("everyone", "reader");
+
+    map.set("hello", "world");
+
+    await map.core.waitForSync();
+    await parentGroup.core.waitForSync();
+
+    expect(
+      SyncMessagesLog.getMessages({
+        Group: group.core,
+        ParentGroup: parentGroup.core,
+        Map: map.core,
+      }),
+    ).toMatchInlineSnapshot(`
+      [
+        "client -> server | CONTENT ParentGroup header: true new: After: 0 New: 3",
+        "client -> server | CONTENT Group header: true new: After: 0 New: 5",
+        "client -> server | CONTENT Map header: true new: ",
+        "client -> server | CONTENT ParentGroup header: false new: After: 3 New: 73 expectContentUntil: header/205",
+        "client -> server | CONTENT ParentGroup header: false new: After: 76 New: 73",
+        "client -> server | CONTENT ParentGroup header: false new: After: 149 New: 56",
+        "client -> server | CONTENT Map header: false new: After: 0 New: 1",
+        "server -> client | KNOWN ParentGroup sessions: header/3",
+        "syncServer -> storage | CONTENT ParentGroup header: true new: After: 0 New: 3",
+        "server -> client | KNOWN Group sessions: header/5",
+        "syncServer -> storage | CONTENT Group header: true new: After: 0 New: 5",
+        "server -> client | KNOWN Map sessions: header/0",
+        "syncServer -> storage | CONTENT Map header: true new: ",
+        "server -> client | KNOWN ParentGroup sessions: header/76",
+        "syncServer -> storage | CONTENT ParentGroup header: false new: After: 3 New: 73",
+        "server -> client | KNOWN ParentGroup sessions: header/149",
+        "syncServer -> storage | CONTENT ParentGroup header: false new: After: 76 New: 73",
+        "server -> client | KNOWN ParentGroup sessions: header/205",
+        "syncServer -> storage | CONTENT ParentGroup header: false new: After: 149 New: 56",
+        "server -> client | KNOWN Map sessions: header/1",
+        "syncServer -> storage | CONTENT Map header: false new: After: 0 New: 1",
+      ]
+    `);
+
+    SyncMessagesLog.clear();
+
+    syncServer.restart();
+    syncServer.addStorage({
+      ourName: "syncServer",
+      storage,
+    });
+
+    const bob = setupTestNode();
+    bob.connectToSyncServer({
+      syncServer: syncServer.node,
+      ourName: "bob",
+    });
+
+    const mapOnBob = await loadCoValueOrFail(bob.node, map.id);
+
+    expect(mapOnBob.get("hello")).toEqual("world");
+
+    expect(
+      SyncMessagesLog.getMessages({
+        ParentGroup: parentGroup.core,
+        Group: group.core,
+        Map: map.core,
+      }),
+    ).toMatchInlineSnapshot(`
+      [
+        "bob -> server | LOAD Map sessions: empty",
+        "syncServer -> storage | LOAD Map sessions: empty",
+        "storage -> syncServer | CONTENT ParentGroup header: true new: After: 0 New: 76 expectContentUntil: header/205",
+        "storage -> syncServer | CONTENT ParentGroup header: true new: After: 76 New: 73",
+        "storage -> syncServer | CONTENT ParentGroup header: true new: After: 149 New: 56",
+        "storage -> syncServer | CONTENT Group header: true new: After: 0 New: 5",
+        "storage -> syncServer | CONTENT Map header: true new: After: 0 New: 1",
+        "server -> bob | CONTENT ParentGroup header: true new: After: 0 New: 76 expectContentUntil: header/205",
+        "server -> bob | CONTENT ParentGroup header: false new: After: 76 New: 73",
+        "server -> bob | CONTENT ParentGroup header: false new: After: 149 New: 56",
+        "server -> bob | CONTENT Group header: true new: After: 0 New: 5",
+        "server -> bob | CONTENT Map header: true new: After: 0 New: 1",
+        "bob -> server | KNOWN ParentGroup sessions: header/76",
+        "bob -> server | KNOWN ParentGroup sessions: header/149",
+        "bob -> server | KNOWN ParentGroup sessions: header/205",
+        "bob -> server | KNOWN Group sessions: header/5",
+        "bob -> server | KNOWN Map sessions: header/1",
+      ]
+    `);
+  });
 });