cojson 0.18.36 → 0.18.38

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

@@ -7,6 +7,7 @@ import {
   createThreeConnectedNodes,
   createTwoConnectedNodes,
   loadCoValueOrFail,
+  setupTestAccount,
   setupTestNode,
 } from "./testUtils";
 import { expectMap } from "../coValue.js";
@@ -1161,4 +1162,64 @@ describe("extend with role mapping", () => {
     expect(map.get("test")).toEqual("Written from the admin");
     expect(mapOnNode2.get("test")).toEqual("Written from the admin");
   });
+
+  test("if an account is revoked on the child but still a member of the parent, transactions should be considered valid", async () => {
+    const alice = await setupTestAccount({
+      connected: true,
+    });
+    const bob = await setupTestAccount({
+      connected: true,
+    });
+    const charlie = await setupTestAccount({
+      connected: true,
+    });
+
+    const group = alice.node.createGroup();
+    const parentGroup = alice.node.createGroup();
+
+    const bobInAlice = await loadCoValueOrFail(alice.node, bob.accountID);
+    group.addMember(bobInAlice, "admin");
+    group.extend(parentGroup, "admin");
+    parentGroup.addMember(bobInAlice, "admin");
+
+    const groupInBob = await loadCoValueOrFail(bob.node, group.id);
+    groupInBob.removeMember(bob.node.getCurrentAgent());
+
+    const charlieInBob = await loadCoValueOrFail(bob.node, charlie.accountID);
+    groupInBob.addMember(charlieInBob, "reader");
+
+    expect(groupInBob.roleOf(charlie.accountID)).toBe("reader");
+  });
+
+  test("if an account is revoked on the parent, their old transactions on the child should stay valid", async () => {
+    const alice = await setupTestAccount({
+      connected: true,
+    });
+    const bob = await setupTestAccount({
+      connected: true,
+    });
+    const charlie = await setupTestAccount({
+      connected: true,
+    });
+
+    const group = alice.node.createGroup();
+    const parentGroup = alice.node.createGroup();
+
+    const bobInAlice = await loadCoValueOrFail(alice.node, bob.accountID);
+    group.extend(parentGroup, "admin");
+    parentGroup.addMember(bobInAlice, "admin");
+
+    const groupInBob = await loadCoValueOrFail(bob.node, group.id);
+    const parentGroupInBob = await loadCoValueOrFail(bob.node, parentGroup.id);
+    const charlieInBob = await loadCoValueOrFail(bob.node, charlie.accountID);
+    groupInBob.addMember(charlieInBob, "reader");
+
+    await new Promise((r) => setTimeout(r, 10));
+
+    parentGroupInBob.removeMember(bob.node.getCurrentAgent());
+
+    const groupInCharlie = await loadCoValueOrFail(charlie.node, group.id);
+
+    expect(groupInCharlie.roleOf(charlie.accountID)).toBe("reader");
+  });
 });

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

@@ -346,15 +346,9 @@ describe("Group invites", () => {
     });
 
     const group = admin.node.createGroup();
-    const person = group.createMap({
-      name: "John Doe",
-    });
 
     // First add member as admin
-    const memberAccount = await loadCoValueOrFail(
-      member.node,
-      member.accountID,
-    );
+    const memberAccount = await loadCoValueOrFail(admin.node, member.accountID);
     group.addMember(memberAccount, "admin");
 
     // Create a reader invite
@@ -367,8 +361,6 @@ describe("Group invites", () => {
     expect(groupOnMemberNode.roleOf(member.accountID)).toEqual("admin");
   });
 
-  logger.setLevel(LogLevel.DEBUG);
-
   test("invites should be able to upgrade the role of an existing member", async () => {
     const admin = await setupTestAccount({
       connected: true,
@@ -381,10 +373,7 @@ describe("Group invites", () => {
     const group = admin.node.createGroup();
 
     // First add member as reader
-    const memberAccount = await loadCoValueOrFail(
-      member.node,
-      member.accountID,
-    );
+    const memberAccount = await loadCoValueOrFail(admin.node, member.accountID);
     group.addMember(memberAccount, "reader");
 
     // Create an admin invite
@@ -401,10 +390,7 @@ describe("Group invites", () => {
     const reader = await setupTestAccount({
       connected: true,
     });
-    const readerAccount = await loadCoValueOrFail(
-      member.node,
-      reader.accountID,
-    );
+    const readerAccount = await loadCoValueOrFail(admin.node, reader.accountID);
     groupOnMemberNode.addMember(readerAccount, "reader");
   });
 
@@ -423,10 +409,7 @@ describe("Group invites", () => {
     });
 
     // First add member as reader
-    const memberAccount = await loadCoValueOrFail(
-      member.node,
-      member.accountID,
-    );
+    const memberAccount = await loadCoValueOrFail(admin.node, member.accountID);
     group.addMember(memberAccount, "reader");
     await group.removeMember(memberAccount);
 

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

@@ -53,7 +53,7 @@ describe("LocalNode auth sync", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "client -> server | CONTENT Account header: true new: After: 0 New: 3 expectContentUntil: header/4",
+        "client -> server | CONTENT Account header: true new: After: 0 New: 3",
         "client -> server | CONTENT ProfileGroup header: true new: After: 0 New: 5",
         "client -> server | CONTENT Profile header: true new: After: 0 New: 1",
         "client -> server | CONTENT Account header: false new: After: 3 New: 1",
@@ -116,9 +116,9 @@ describe("LocalNode auth sync", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "client -> server | CONTENT Account header: true new: After: 0 New: 3 expectContentUntil: header/5",
-        "client -> server | CONTENT Root header: true new:  expectContentUntil: header/1",
-        "client -> server | CONTENT Profile header: true new:  expectContentUntil: header/1",
+        "client -> server | CONTENT Account header: true new: After: 0 New: 3",
+        "client -> server | CONTENT Root header: true new: ",
+        "client -> server | CONTENT Profile header: true new: ",
         "client -> server | CONTENT Root header: false new: After: 0 New: 1",
         "client -> server | CONTENT Profile header: false new: After: 0 New: 1",
         "client -> server | CONTENT Account header: false new: After: 3 New: 2",
@@ -176,7 +176,7 @@ describe("LocalNode auth sync", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "creation-node -> server | CONTENT Account header: true new: After: 0 New: 3 expectContentUntil: header/4",
+        "creation-node -> server | CONTENT Account header: true new: After: 0 New: 3",
         "creation-node -> server | CONTENT ProfileGroup header: true new: After: 0 New: 5",
         "creation-node -> server | CONTENT Profile header: true new: After: 0 New: 1",
         "creation-node -> server | CONTENT Account header: false new: After: 3 New: 1",
@@ -246,7 +246,7 @@ describe("LocalNode auth sync", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "creation-node -> server | CONTENT Account header: true new: After: 0 New: 3 expectContentUntil: header/4",
+        "creation-node -> server | CONTENT Account header: true new: After: 0 New: 3",
         "creation-node -> server | CONTENT ProfileGroup header: true new: After: 0 New: 5",
         "creation-node -> server | CONTENT Profile header: true new: After: 0 New: 1",
         "creation-node -> server | CONTENT Account header: false new: After: 3 New: 1",

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

@@ -9,6 +9,7 @@ import {
   SyncMessagesLog,
   TEST_NODE_CONFIG,
   blockMessageTypeOnOutgoingPeer,
+  fillCoMapWithLargeData,
   getSyncServerConnectedPeer,
   loadCoValueOrFail,
   setupTestAccount,
@@ -547,17 +548,7 @@ describe("loading coValues from server", () => {
 
     const largeMap = group.createMap();
 
-    // Generate a large amount of data (about 100MB)
-    const dataSize = 1 * 1024 * 1024;
-    const chunkSize = 1024; // 1KB chunks
-    const chunks = dataSize / chunkSize;
-
-    const value = Buffer.alloc(chunkSize, `value$`).toString("base64");
-
-    for (let i = 0; i < chunks; i++) {
-      const key = `key${i}`;
-      largeMap.set(key, value, "trusting");
-    }
+    fillCoMapWithLargeData(largeMap);
 
     const client = setupTestNode({
       connected: true,
@@ -576,37 +567,13 @@ describe("loading coValues from server", () => {
       [
         "client -> server | LOAD Map sessions: empty",
         "server -> client | CONTENT Group header: true new: After: 0 New: 5",
-        "server -> client | CONTENT Map header: true new: After: 0 New: 73 expectContentUntil: header/1024",
+        "server -> client | CONTENT Map header: true new: After: 0 New: 73 expectContentUntil: header/200",
         "server -> client | CONTENT Map header: false new: After: 73 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 146 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 219 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 292 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 365 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 438 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 511 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 584 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 657 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 730 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 803 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 876 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 949 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 1022 New: 2",
+        "server -> client | CONTENT Map header: false new: After: 146 New: 54",
         "client -> server | KNOWN Group sessions: header/5",
         "client -> server | KNOWN Map sessions: header/73",
         "client -> server | KNOWN Map sessions: header/146",
-        "client -> server | KNOWN Map sessions: header/219",
-        "client -> server | KNOWN Map sessions: header/292",
-        "client -> server | KNOWN Map sessions: header/365",
-        "client -> server | KNOWN Map sessions: header/438",
-        "client -> server | KNOWN Map sessions: header/511",
-        "client -> server | KNOWN Map sessions: header/584",
-        "client -> server | KNOWN Map sessions: header/657",
-        "client -> server | KNOWN Map sessions: header/730",
-        "client -> server | KNOWN Map sessions: header/803",
-        "client -> server | KNOWN Map sessions: header/876",
-        "client -> server | KNOWN Map sessions: header/949",
-        "client -> server | KNOWN Map sessions: header/1022",
-        "client -> server | KNOWN Map sessions: header/1024",
+        "client -> server | KNOWN Map sessions: header/200",
       ]
     `);
   });
@@ -625,23 +592,12 @@ describe("loading coValues from server", () => {
     const mapOnClient = await loadCoValueOrFail(client.node, largeMap.id);
 
     // Generate a large amount of data (about 100MB)
-    const dataSize = 1 * 1024 * 1024;
-    const chunkSize = 1024; // 1KB chunks
-    const chunks = dataSize / chunkSize;
-
-    const value = Buffer.alloc(chunkSize, `value$`).toString("base64");
-
-    for (let i = 0; i < chunks; i++) {
-      const key = `key${i}`;
-      largeMap.set(key, value, "trusting");
-    }
+    fillCoMapWithLargeData(largeMap);
 
     await waitFor(() => {
       expect(mapOnClient.core.knownState()).toEqual(largeMap.core.knownState());
     });
 
-    expect(mapOnClient.get(`key${chunks - 1}`)).toEqual(value);
-
     expect(
       SyncMessagesLog.getMessages({
         Group: group.core,
@@ -654,36 +610,12 @@ describe("loading coValues from server", () => {
         "server -> client | CONTENT Map header: true new: ",
         "client -> server | KNOWN Group sessions: header/5",
         "client -> server | KNOWN Map sessions: header/0",
-        "server -> client | CONTENT Map header: false new: After: 0 New: 73 expectContentUntil: header/1024",
+        "server -> client | CONTENT Map header: false new: After: 0 New: 73 expectContentUntil: header/200",
         "server -> client | CONTENT Map header: false new: After: 73 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 146 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 219 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 292 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 365 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 438 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 511 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 584 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 657 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 730 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 803 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 876 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 949 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 1022 New: 2",
+        "server -> client | CONTENT Map header: false new: After: 146 New: 54",
         "client -> server | KNOWN Map sessions: header/73",
         "client -> server | KNOWN Map sessions: header/146",
-        "client -> server | KNOWN Map sessions: header/219",
-        "client -> server | KNOWN Map sessions: header/292",
-        "client -> server | KNOWN Map sessions: header/365",
-        "client -> server | KNOWN Map sessions: header/438",
-        "client -> server | KNOWN Map sessions: header/511",
-        "client -> server | KNOWN Map sessions: header/584",
-        "client -> server | KNOWN Map sessions: header/657",
-        "client -> server | KNOWN Map sessions: header/730",
-        "client -> server | KNOWN Map sessions: header/803",
-        "client -> server | KNOWN Map sessions: header/876",
-        "client -> server | KNOWN Map sessions: header/949",
-        "client -> server | KNOWN Map sessions: header/1022",
-        "client -> server | KNOWN Map sessions: header/1024",
+        "client -> server | KNOWN Map sessions: header/200",
       ]
     `);
   });
@@ -1386,8 +1318,8 @@ describe("loading coValues from server", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "client -> server | CONTENT Group header: true new: After: 0 New: 3 expectContentUntil: header/5",
-        "client -> server | CONTENT ParentGroup header: true new: After: 0 New: 5 expectContentUntil: header/7",
+        "client -> server | CONTENT Group header: true new: After: 0 New: 3",
+        "client -> server | CONTENT ParentGroup header: true new: After: 0 New: 5",
         "client -> server | CONTENT Group header: false new: After: 3 New: 2",
         "client -> server | CONTENT ParentGroup header: false new: After: 5 New: 2",
         "client -> server | CONTENT Map header: true new: After: 0 New: 1",

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

@@ -152,8 +152,8 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "edge-france -> storage | CONTENT Group header: true new: After: 0 New: 3 expectContentUntil: header/5",
-        "edge-france -> core | CONTENT Group header: true new: After: 0 New: 3 expectContentUntil: header/5",
+        "edge-france -> storage | CONTENT Group header: true new: After: 0 New: 3",
+        "edge-france -> core | CONTENT Group header: true new: After: 0 New: 3",
         "edge-france -> storage | CONTENT ParentGroup header: true new: After: 0 New: 5",
         "edge-france -> core | CONTENT ParentGroup header: true new: After: 0 New: 5",
         "edge-france -> storage | CONTENT Group header: false new: After: 3 New: 2",

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

@@ -8,12 +8,12 @@ import {
   vi,
 } from "vitest";
 
-import { setMaxRecommendedTxSize } from "../config";
 import { emptyKnownState } from "../exports";
 import {
   SyncMessagesLog,
   TEST_NODE_CONFIG,
   createTestMetricReader,
+  fillCoMapWithLargeData,
   loadCoValueOrFail,
   setupTestNode,
   tearDownTestMetricReader,
@@ -29,7 +29,6 @@ describe("client with storage syncs with server", () => {
 
   beforeEach(async () => {
     SyncMessagesLog.clear();
-    setMaxRecommendedTxSize(100 * 1024);
     jazzCloud = setupTestNode({
       isSyncServer: true,
     });
@@ -338,7 +337,6 @@ describe("client syncs with a server with storage", () => {
   });
 
   test("loading a large coValue from storage", async () => {
-    setMaxRecommendedTxSize(1000);
     const client = setupTestNode();
 
     client.connectToSyncServer({
@@ -354,15 +352,7 @@ describe("client syncs with a server with storage", () => {
 
     const largeMap = group.createMap();
 
-    // Generate a large amount of data (about 100MB)
-    const chunks = 100;
-
-    const value = "1".repeat(10);
-
-    for (let i = 0; i < chunks; i++) {
-      const key = `key${i}`;
-      largeMap.set(key, value, "trusting");
-    }
+    fillCoMapWithLargeData(largeMap);
 
     await largeMap.core.waitForSync();
 
@@ -382,28 +372,20 @@ describe("client syncs with a server with storage", () => {
       [
         "client -> storage | CONTENT Group header: true new: After: 0 New: 5",
         "client -> server | CONTENT Group header: true new: After: 0 New: 5",
-        "client -> storage | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
-        "client -> server | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
-        "client -> storage | CONTENT Map header: false new: After: 21 New: 21",
-        "client -> server | CONTENT Map header: false new: After: 21 New: 21",
-        "client -> storage | CONTENT Map header: false new: After: 42 New: 21",
-        "client -> server | CONTENT Map header: false new: After: 42 New: 21",
-        "client -> storage | CONTENT Map header: false new: After: 63 New: 21",
-        "client -> server | CONTENT Map header: false new: After: 63 New: 21",
-        "client -> storage | CONTENT Map header: false new: After: 84 New: 16",
-        "client -> server | CONTENT Map header: false new: After: 84 New: 16",
+        "client -> storage | CONTENT Map header: true new: After: 0 New: 73 expectContentUntil: header/200",
+        "client -> server | CONTENT Map header: true new: After: 0 New: 73 expectContentUntil: header/200",
+        "client -> storage | CONTENT Map header: false new: After: 73 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 73 New: 73",
+        "client -> storage | CONTENT Map header: false new: After: 146 New: 54",
+        "client -> server | CONTENT Map header: false new: After: 146 New: 54",
         "server -> client | KNOWN Group sessions: header/5",
         "server -> storage | CONTENT Group header: true new: After: 0 New: 5",
-        "server -> client | KNOWN Map sessions: header/21",
-        "server -> storage | CONTENT Map header: true new: After: 0 New: 21",
-        "server -> client | KNOWN Map sessions: header/42",
-        "server -> storage | CONTENT Map header: false new: After: 21 New: 21",
-        "server -> client | KNOWN Map sessions: header/63",
-        "server -> storage | CONTENT Map header: false new: After: 42 New: 21",
-        "server -> client | KNOWN Map sessions: header/84",
-        "server -> storage | CONTENT Map header: false new: After: 63 New: 21",
-        "server -> client | KNOWN Map sessions: header/100",
-        "server -> storage | CONTENT Map header: false new: After: 84 New: 16",
+        "server -> client | KNOWN Map sessions: header/73",
+        "server -> storage | CONTENT Map header: true new: After: 0 New: 73",
+        "server -> client | KNOWN Map sessions: header/146",
+        "server -> storage | CONTENT Map header: false new: After: 73 New: 73",
+        "server -> client | KNOWN Map sessions: header/200",
+        "server -> storage | CONTENT Map header: false new: After: 146 New: 54",
       ]
     `);
 
@@ -456,14 +438,12 @@ describe("client syncs with a server with storage", () => {
         "client -> storage | LOAD Map sessions: empty",
         "storage -> client | CONTENT Group header: true new: After: 0 New: 5",
         "client -> server | LOAD Group sessions: header/5",
-        "storage -> client | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
-        "client -> server | LOAD Map sessions: header/100",
+        "storage -> client | CONTENT Map header: true new: After: 0 New: 73 expectContentUntil: header/200",
+        "client -> server | LOAD Map sessions: header/200",
         "server -> client | KNOWN Group sessions: header/5",
-        "server -> client | KNOWN Map sessions: header/100",
-        "storage -> client | CONTENT Map header: true new: After: 21 New: 21",
-        "storage -> client | CONTENT Map header: true new: After: 42 New: 21",
-        "storage -> client | CONTENT Map header: true new: After: 63 New: 21",
-        "storage -> client | CONTENT Map header: true new: After: 84 New: 16",
+        "server -> client | KNOWN Map sessions: header/200",
+        "storage -> client | CONTENT Map header: true new: After: 73 New: 73",
+        "storage -> client | CONTENT Map header: true new: After: 146 New: 54",
       ]
     `);
   });
@@ -485,16 +465,7 @@ describe("client syncs with a server with storage", () => {
     const largeMap = group.createMap();
 
     // Generate a large amount of data (about 100MB)
-    const dataSize = 1 * 200 * 1024;
-    const chunkSize = 1024; // 1KB chunks
-    const chunks = dataSize / chunkSize;
-
-    const value = Buffer.alloc(chunkSize, `value$`).toString("base64");
-
-    for (let i = 0; i < chunks; i++) {
-      const key = `key${i}`;
-      largeMap.set(key, value, "trusting");
-    }
+    fillCoMapWithLargeData(largeMap);
 
     await largeMap.core.waitForSync();
 
@@ -738,8 +709,8 @@ describe("client syncs with a server with storage", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "client -> server | CONTENT Group header: true new: After: 0 New: 3 expectContentUntil: header/5",
-        "client -> server | CONTENT Map header: true new:  expectContentUntil: header/1",
+        "client -> server | CONTENT Group header: true new: After: 0 New: 3",
+        "client -> server | CONTENT Map header: true new: ",
         "client -> server | CONTENT Group header: false new: After: 3 New: 2",
         "client -> server | CONTENT Map header: false new: After: 0 New: 1",
         "server -> client | KNOWN Group sessions: header/3",