cojson 0.18.33 → 0.18.35

package/src/tests/coValueCore.isStreaming.test.ts

@@ -3,9 +3,12 @@ import {
   SyncMessagesLog,
   TEST_NODE_CONFIG,
   loadCoValueOrFail,
+  setupTestAccount,
   setupTestNode,
   waitFor,
 } from "./testUtils";
+import type { RawCoMap } from "../exports";
+import type { CoID } from "../coValue";
 
 let jazzCloud: ReturnType<typeof setupTestNode>;
 
@@ -82,7 +85,7 @@ describe("isStreaming", () => {
     expect(mapInNewSession.core.isStreaming()).toBe(false);
   });
 
-  test("loading a large content update  should be streaming until all chunks are sent", async () => {
+  test("loading a large content update should be streaming until all chunks are sent", async () => {
     const client = setupTestNode({
       connected: true,
     });
@@ -222,7 +225,8 @@ describe("isStreaming", () => {
     await map.core.waitForSync();
     const newSession = client.spawnNewSession();
 
-    await loadCoValueOrFail(newSession.node, map.id);
+    const mapInNewSession1 = await loadCoValueOrFail(newSession.node, map.id);
+    await mapInNewSession1.core.waitForFullStreaming();
 
     const content = map.core.verified.newContentSince(undefined);
     assert(content);
@@ -268,4 +272,82 @@ describe("isStreaming", () => {
 
     expect(mapInNewSession.core.isStreaming()).toBe(false);
   });
+
+  test("mixed updates should not leave isStreaming to true (3 sessions)", async () => {
+    const aliceLaptop = await setupTestAccount({
+      connected: true,
+    });
+
+    const group = aliceLaptop.node.createGroup();
+    const map = group.createMap();
+
+    map.set("count", 0, "trusting");
+    map.set("count", 1, "trusting");
+
+    await map.core.waitForSync();
+
+    const alicePhone = await aliceLaptop.spawnNewSession();
+
+    const mapOnPhone = await loadCoValueOrFail(alicePhone.node, map.id);
+
+    mapOnPhone.set("count", 2, "trusting");
+    mapOnPhone.set("count", 3, "trusting");
+    mapOnPhone.set("count", 4, "trusting");
+
+    await mapOnPhone.core.waitForSync();
+
+    const aliceTablet = await alicePhone.spawnNewSession();
+    const mapOnTablet = await loadCoValueOrFail(aliceTablet.node, map.id);
+
+    mapOnTablet.set("count", 5, "trusting");
+    mapOnTablet.set("count", 6, "trusting");
+    mapOnTablet.set("count", 7, "trusting");
+
+    await mapOnTablet.core.waitForSync();
+
+    map.set("count", 8, "trusting");
+    map.set("count", 9, "trusting");
+    map.set("count", 10, "trusting");
+
+    mapOnPhone.set("count", 11, "trusting");
+    mapOnTablet.set("count", 12, "trusting");
+
+    await map.core.waitForSync();
+    await mapOnPhone.core.waitForSync();
+    await mapOnTablet.core.waitForSync();
+
+    expect(map.core.isStreaming()).toBe(false);
+    expect(mapOnPhone.core.isStreaming()).toBe(false);
+    expect(mapOnTablet.core.isStreaming()).toBe(false);
+
+    const mapBranch = map.core.createBranch("test-branch");
+
+    const aliceTv = await aliceTablet.spawnNewSession();
+
+    const mapBranchOnTv = await loadCoValueOrFail(
+      aliceTv.node,
+      mapBranch.id as unknown as CoID<RawCoMap>,
+    );
+
+    mapBranchOnTv.set("count", 13, "trusting");
+    mapBranchOnTv.set("count", 14, "trusting");
+    mapBranchOnTv.set("count", 15, "trusting");
+
+    await mapBranchOnTv.core.waitForSync();
+
+    group.addMember("everyone", "reader");
+
+    const bob = await setupTestAccount({
+      connected: true,
+    });
+
+    const mapBranchOnBob = await loadCoValueOrFail(bob.node, mapBranchOnTv.id);
+
+    expect(mapBranchOnBob.core.isStreaming()).toBe(false);
+    expect(map.core.isStreaming()).toBe(false);
+    expect(mapOnPhone.core.isStreaming()).toBe(false);
+    expect(mapOnTablet.core.isStreaming()).toBe(false);
+
+    expect(mapBranchOnBob.get("count")).toBe(15);
+  });
 });

package/src/tests/coValueCore.test.ts

@@ -78,14 +78,13 @@ test("transactions with wrong signature are rejected", () => {
 
   const newEntry = node.getCoValue(coValue.id);
 
-  // eslint-disable-next-line neverthrow/must-use-result
-  const result = newEntry.tryAddTransactions(
+  const error = newEntry.tryAddTransactions(
     node.currentSessionID,
     [transaction],
     signature,
   );
 
-  expect(result.isErr()).toBe(true);
+  expect(Boolean(error)).toBe(true);
   expect(newEntry.getValidSortedTransactions().length).toBe(0);
 });
 
@@ -448,13 +447,11 @@ test("getValidTransactions should skip private transactions with invalid JSON",
   map.set("hello", "world");
 
   // This should fail silently, because the encryptedChanges will be outputted as gibberish
-  map.core
-    .tryAddTransactions(
-      fixtures.session,
-      [fixtures.transaction],
-      fixtures.signature,
-    )
-    ._unsafeUnwrap();
+  map.core.tryAddTransactions(
+    fixtures.session,
+    [fixtures.transaction],
+    fixtures.signature,
+  );
 
   // Get valid transactions - should only include the valid one
   const validTransactions = map.core.getValidTransactions();

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

@@ -89,7 +89,7 @@ describe("Group.childKeyRotation", () => {
     const newBobSession = await bob.spawnNewSession();
 
     const childGroupOnNewBobNode = await loadCoValueOrFail(
-      newBobSession,
+      newBobSession.node,
       childGroup.id,
     );
 
@@ -138,15 +138,15 @@ describe("Group.childKeyRotation", () => {
     const newBobSession = await bob.spawnNewSession();
 
     for (const chunk of content) {
-      newBobSession.syncManager.handleNewContent(chunk, "import");
+      newBobSession.node.syncManager.handleNewContent(chunk, "import");
     }
 
     const childGroupOnNewBobNode = await loadCoValueOrFail(
-      newBobSession,
+      newBobSession.node,
       childGroup.id,
     );
 
-    newBobSession.syncManager.handleNewContent(lastChunk, "import");
+    newBobSession.node.syncManager.handleNewContent(lastChunk, "import");
 
     // The migration waits for the group to be completely downloaded
     await childGroupOnNewBobNode.core.waitForAsync((core) =>
@@ -205,15 +205,15 @@ describe("Group.childKeyRotation", () => {
     const newBobSession = await bob.spawnNewSession();
 
     for (const chunk of content) {
-      newBobSession.syncManager.handleNewContent(chunk, "import");
+      newBobSession.node.syncManager.handleNewContent(chunk, "import");
     }
 
     const childGroupOnNewBobNode = await loadCoValueOrFail(
-      newBobSession,
+      newBobSession.node,
       childGroup.id,
     );
 
-    newBobSession.syncManager.handleNewContent(lastChunk, "import");
+    newBobSession.node.syncManager.handleNewContent(lastChunk, "import");
 
     // The migration waits for the group to be completely downloaded, this includes full streaming of the parent group
     await childGroupOnNewBobNode.core.waitForAsync((core) =>
@@ -268,7 +268,7 @@ describe("Group.childKeyRotation", () => {
 
     // Instead Bob is an admin, so when loading the child group he can rotate the readKey
     const newBobSession = await bob.spawnNewSession();
-    const mapOnNewBobNode = await loadCoValueOrFail(newBobSession, map.id);
+    const mapOnNewBobNode = await loadCoValueOrFail(newBobSession.node, map.id);
 
     mapOnNewBobNode.set("test", "Not readable by charlie");
 
@@ -416,7 +416,7 @@ describe("Group.childKeyRotation", () => {
 
     const newBobSession = await bob.spawnNewSession();
     const childGroupOnNewBobNode = await loadCoValueOrFail(
-      newBobSession,
+      newBobSession.node,
       childGroup.id,
     );
 

package/src/tests/knownState.test.ts

@@ -10,6 +10,7 @@ import {
   isKnownStateSubsetOf,
   type CoValueKnownState,
   type KnownStateSessions,
+  areCurrentSessionsInSyncWith,
 } from "../knownState.js";
 import { RawCoID, SessionID } from "../ids.js";
 
@@ -547,14 +548,14 @@ describe("knownState", () => {
     });
   });
 
-  describe("isKnownStateSubsetOf", () => {
+  describe("areCurrentSessionsInSyncWith", () => {
     test("should return true when all counters match", () => {
       const session1 = "session-1" as SessionID;
       const session2 = "session-2" as SessionID;
       const from = { [session1]: 5, [session2]: 10 };
       const to = { [session1]: 5, [session2]: 10 };
 
-      const result = isKnownStateSubsetOf(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(true);
     });
@@ -564,7 +565,7 @@ describe("knownState", () => {
       const from = { [session1]: 5 };
       const to = { [session1]: 3 };
 
-      const result = isKnownStateSubsetOf(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(false);
     });
@@ -574,7 +575,7 @@ describe("knownState", () => {
       const from = { [session1]: 5 };
       const to = {};
 
-      const result = isKnownStateSubsetOf(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(false);
     });
@@ -584,7 +585,7 @@ describe("knownState", () => {
       const from = {};
       const to = { [session1]: 5 };
 
-      const result = isKnownStateSubsetOf(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(true);
     });
@@ -593,7 +594,7 @@ describe("knownState", () => {
       const from = {};
       const to = {};
 
-      const result = isKnownStateSubsetOf(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(true);
     });
@@ -613,7 +614,7 @@ describe("knownState", () => {
         [session3]: 15,
       };
 
-      const result = isKnownStateSubsetOf(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(true);
     });
@@ -633,7 +634,7 @@ describe("knownState", () => {
         [session3]: 15,
       };
 
-      const result = isKnownStateSubsetOf(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(false);
     });
@@ -647,7 +648,7 @@ describe("knownState", () => {
         [session2]: 10,
       };
 
-      const result = isKnownStateSubsetOf(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(true);
     });
@@ -657,9 +658,105 @@ describe("knownState", () => {
       const from = { [session1]: 5 };
       const to = { [session1]: 10 };
 
+      const result = areCurrentSessionsInSyncWith(from, to);
+
+      expect(result).toBe(false);
+    });
+  });
+
+  describe("isKnownStateSubsetOf", () => {
+    test("should return true when all counters match", () => {
+      const session1 = "session-1" as SessionID;
+      const session2 = "session-2" as SessionID;
+      const from = { [session1]: 5, [session2]: 10 };
+      const to = { [session1]: 5, [session2]: 10 };
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(true);
+    });
+
+    test("should return false when the current session counter is higher than the target", () => {
+      const session1 = "session-1" as SessionID;
+      const from = { [session1]: 5 };
+      const to = { [session1]: 3 };
+
       const result = isKnownStateSubsetOf(from, to);
 
       expect(result).toBe(false);
     });
+
+    test("should return true when the target session counter is higher than the target", () => {
+      const session1 = "session-1" as SessionID;
+      const from = { [session1]: 5 };
+      const to = { [session1]: 10 };
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(true);
+    });
+
+    test("should return false when session is missing in to", () => {
+      const session1 = "session-1" as SessionID;
+      const from = { [session1]: 5 };
+      const to = {};
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(false);
+    });
+
+    test("should return true when from is empty", () => {
+      const session1 = "session-1" as SessionID;
+      const from = {};
+      const to = { [session1]: 5 };
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(true);
+    });
+
+    test("should return true when both are empty", () => {
+      const from = {};
+      const to = {};
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(true);
+    });
+
+    test("should handle multiple sessions", () => {
+      const session1 = "session-1" as SessionID;
+      const session2 = "session-2" as SessionID;
+      const session3 = "session-3" as SessionID;
+      const from = {
+        [session1]: 5,
+        [session2]: 10,
+        [session3]: 15,
+      };
+      const to = {
+        [session1]: 5,
+        [session2]: 10,
+        [session3]: 15,
+      };
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(true);
+    });
+
+    test("should not check sessions in to that are not in from", () => {
+      const session1 = "session-1" as SessionID;
+      const session2 = "session-2" as SessionID;
+      const from = { [session1]: 5 };
+      const to = {
+        [session1]: 5,
+        [session2]: 10,
+      };
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(true);
+    });
   });
 });

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

@@ -654,35 +654,35 @@ 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: 72 expectContentUntil: header/1024",
-        "server -> client | CONTENT Map header: false new: After: 72 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 145 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 218 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 291 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 364 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 437 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 510 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 583 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 656 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 729 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 802 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 875 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 948 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 1021 New: 3",
-        "client -> server | KNOWN Map sessions: header/72",
-        "client -> server | KNOWN Map sessions: header/145",
-        "client -> server | KNOWN Map sessions: header/218",
-        "client -> server | KNOWN Map sessions: header/291",
-        "client -> server | KNOWN Map sessions: header/364",
-        "client -> server | KNOWN Map sessions: header/437",
-        "client -> server | KNOWN Map sessions: header/510",
-        "client -> server | KNOWN Map sessions: header/583",
-        "client -> server | KNOWN Map sessions: header/656",
-        "client -> server | KNOWN Map sessions: header/729",
-        "client -> server | KNOWN Map sessions: header/802",
-        "client -> server | KNOWN Map sessions: header/875",
-        "client -> server | KNOWN Map sessions: header/948",
-        "client -> server | KNOWN Map sessions: header/1021",
+        "server -> client | CONTENT Map header: false new: After: 0 New: 73 expectContentUntil: header/1024",
+        "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",
+        "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",
       ]
     `);

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

@@ -498,11 +498,11 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
     ).toMatchInlineSnapshot(`
       [
         "edge -> storage | CONTENT Group header: true new: After: 0 New: 5",
-        "edge -> storage | CONTENT Map header: true new: After: 0 New: 20 expectContentUntil: header/100",
-        "edge -> storage | CONTENT Map header: false new: After: 20 New: 21",
-        "edge -> storage | CONTENT Map header: false new: After: 41 New: 21",
-        "edge -> storage | CONTENT Map header: false new: After: 62 New: 21",
-        "edge -> storage | CONTENT Map header: false new: After: 83 New: 17",
+        "edge -> storage | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
+        "edge -> storage | CONTENT Map header: false new: After: 21 New: 21",
+        "edge -> storage | CONTENT Map header: false new: After: 42 New: 21",
+        "edge -> storage | CONTENT Map header: false new: After: 63 New: 21",
+        "edge -> storage | CONTENT Map header: false new: After: 84 New: 16",
       ]
     `);
 
@@ -549,10 +549,10 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
         "edge -> storage | LOAD Map sessions: empty",
         "storage -> edge | CONTENT Group header: true new: After: 0 New: 5",
         "edge -> core | LOAD Group sessions: header/5",
-        "storage -> edge | CONTENT Map header: true new: After: 0 New: 41 expectContentUntil: header/100",
+        "storage -> edge | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
         "edge -> core | LOAD Map sessions: header/100",
         "edge -> client | CONTENT Group header: true new: After: 0 New: 5",
-        "edge -> client | CONTENT Map header: true new: After: 0 New: 41 expectContentUntil: header/100",
+        "edge -> client | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
         "core -> storage | LOAD Group sessions: empty",
         "storage -> core | KNOWN Group sessions: empty",
         "core -> edge | KNOWN Group sessions: empty",
@@ -561,35 +561,42 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
         "core -> edge | KNOWN Map sessions: empty",
         "client -> edge | KNOWN Group sessions: header/5",
         "client -> storage | CONTENT Group header: true new: After: 0 New: 5",
-        "client -> edge | KNOWN Map sessions: header/41",
-        "client -> storage | CONTENT Map header: true new: After: 0 New: 41",
-        "storage -> edge | CONTENT Map header: true new: After: 41 New: 21",
-        "edge -> client | CONTENT Map header: false new: After: 41 New: 21 expectContentUntil: header/100",
+        "client -> edge | KNOWN Map sessions: header/21",
+        "client -> storage | CONTENT Map header: true new: After: 0 New: 21",
+        "storage -> edge | CONTENT Map header: true new: After: 21 New: 21",
+        "edge -> client | CONTENT Map header: false new: After: 21 New: 21 expectContentUntil: header/100",
         "edge -> core | CONTENT Group header: true new: After: 0 New: 5",
-        "edge -> core | CONTENT Map header: true new: After: 0 New: 41 expectContentUntil: header/100",
-        "edge -> core | CONTENT Map header: false new: After: 41 New: 21",
-        "client -> edge | KNOWN Map sessions: header/62",
-        "client -> storage | CONTENT Map header: false new: After: 41 New: 21",
-        "storage -> edge | CONTENT Map header: true new: After: 62 New: 21",
-        "edge -> core | CONTENT Map header: false new: After: 62 New: 21 expectContentUntil: header/100",
-        "edge -> client | CONTENT Map header: false new: After: 62 New: 21 expectContentUntil: header/100",
+        "edge -> core | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
+        "edge -> core | CONTENT Map header: false new: After: 21 New: 21",
+        "client -> edge | KNOWN Map sessions: header/42",
+        "client -> storage | CONTENT Map header: false new: After: 21 New: 21",
+        "storage -> edge | CONTENT Map header: true new: After: 42 New: 21",
+        "edge -> core | CONTENT Map header: false new: After: 42 New: 21 expectContentUntil: header/100",
+        "edge -> client | CONTENT Map header: false new: After: 42 New: 21 expectContentUntil: header/100",
         "core -> edge | KNOWN Group sessions: header/5",
         "core -> storage | CONTENT Group header: true new: After: 0 New: 5",
-        "core -> edge | KNOWN Map sessions: header/41",
-        "core -> storage | CONTENT Map header: true new: After: 0 New: 41",
-        "core -> edge | KNOWN Map sessions: header/62",
-        "core -> storage | CONTENT Map header: false new: After: 41 New: 21",
-        "core -> edge | KNOWN Map sessions: header/83",
-        "core -> storage | CONTENT Map header: false new: After: 62 New: 21",
-        "client -> edge | KNOWN Map sessions: header/83",
-        "client -> storage | CONTENT Map header: false new: After: 62 New: 21",
-        "storage -> edge | CONTENT Map header: true new: After: 83 New: 17",
-        "edge -> core | CONTENT Map header: false new: After: 83 New: 17",
-        "edge -> client | CONTENT Map header: false new: After: 83 New: 17",
+        "core -> edge | KNOWN Map sessions: header/21",
+        "core -> storage | CONTENT Map header: true new: After: 0 New: 21",
+        "core -> edge | KNOWN Map sessions: header/42",
+        "core -> storage | CONTENT Map header: false new: After: 21 New: 21",
+        "core -> edge | KNOWN Map sessions: header/63",
+        "core -> storage | CONTENT Map header: false new: After: 42 New: 21",
+        "client -> edge | KNOWN Map sessions: header/63",
+        "client -> storage | CONTENT Map header: false new: After: 42 New: 21",
+        "storage -> edge | CONTENT Map header: true new: After: 63 New: 21",
+        "edge -> core | CONTENT Map header: false new: After: 63 New: 21 expectContentUntil: header/100",
+        "edge -> client | CONTENT Map header: false new: After: 63 New: 21 expectContentUntil: header/100",
+        "core -> edge | KNOWN Map sessions: header/84",
+        "core -> storage | CONTENT Map header: false new: After: 63 New: 21",
+        "client -> edge | KNOWN Map sessions: header/84",
+        "client -> storage | CONTENT Map header: false new: After: 63 New: 21",
+        "storage -> edge | CONTENT Map header: true new: After: 84 New: 16",
+        "edge -> core | CONTENT Map header: false new: After: 84 New: 16",
+        "edge -> client | CONTENT Map header: false new: After: 84 New: 16",
         "core -> edge | KNOWN Map sessions: header/100",
-        "core -> storage | CONTENT Map header: false new: After: 83 New: 17",
+        "core -> storage | CONTENT Map header: false new: After: 84 New: 16",
         "client -> edge | KNOWN Map sessions: header/100",
-        "client -> storage | CONTENT Map header: false new: After: 83 New: 17",
+        "client -> storage | CONTENT Map header: false new: After: 84 New: 16",
       ]
     `);
 

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

@@ -382,28 +382,28 @@ 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: 20 expectContentUntil: header/100",
-        "client -> server | CONTENT Map header: true new: After: 0 New: 20 expectContentUntil: header/100",
-        "client -> storage | CONTENT Map header: false new: After: 20 New: 21",
-        "client -> server | CONTENT Map header: false new: After: 20 New: 21",
-        "client -> storage | CONTENT Map header: false new: After: 41 New: 21",
-        "client -> server | CONTENT Map header: false new: After: 41 New: 21",
-        "client -> storage | CONTENT Map header: false new: After: 62 New: 21",
-        "client -> server | CONTENT Map header: false new: After: 62 New: 21",
-        "client -> storage | CONTENT Map header: false new: After: 83 New: 17",
-        "client -> server | CONTENT Map header: false new: After: 83 New: 17",
+        "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",
         "server -> client | KNOWN Group sessions: header/5",
         "server -> storage | CONTENT Group header: true new: After: 0 New: 5",
-        "server -> client | KNOWN Map sessions: header/20",
-        "server -> storage | CONTENT Map header: true new: After: 0 New: 20",
-        "server -> client | KNOWN Map sessions: header/41",
-        "server -> storage | CONTENT Map header: false new: After: 20 New: 21",
-        "server -> client | KNOWN Map sessions: header/62",
-        "server -> storage | CONTENT Map header: false new: After: 41 New: 21",
-        "server -> client | KNOWN Map sessions: header/83",
-        "server -> storage | CONTENT Map header: false new: After: 62 New: 21",
+        "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: 83 New: 17",
+        "server -> storage | CONTENT Map header: false new: After: 84 New: 16",
       ]
     `);
 
@@ -456,13 +456,14 @@ 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: 41 expectContentUntil: header/100",
+        "storage -> client | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
         "client -> server | LOAD Map sessions: header/100",
         "server -> client | KNOWN Group sessions: header/5",
         "server -> client | KNOWN Map sessions: header/100",
-        "storage -> client | CONTENT Map header: true new: After: 41 New: 21",
-        "storage -> client | CONTENT Map header: true new: After: 62 New: 21",
-        "storage -> client | CONTENT Map header: true new: After: 83 New: 17",
+        "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",
       ]
     `);
   });