cojson 0.13.12 → 0.13.14

package/src/tests/PeerState.test.ts

@@ -2,11 +2,12 @@ import { describe, expect, test, vi } from "vitest";
 import { PeerState } from "../PeerState.js";
 import { CO_VALUE_PRIORITY } from "../priority.js";
 import { CoValueKnownState, Peer, SyncMessage } from "../sync.js";
+import { waitFor } from "./testUtils.js";
 
 function setup() {
   const mockPeer: Peer = {
     id: "test-peer",
-    role: "peer",
+    role: "client",
     priority: 1,
     crashOnClose: false,
     incoming: (async function* () {})(),
@@ -62,13 +63,19 @@ describe("PeerState", () => {
       });
     });
 
-    const message1 = peerState.pushOutgoingMessage({
+    peerState.pushOutgoingMessage({
       action: "content",
       id: "co_z1",
       new: {},
       priority: CO_VALUE_PRIORITY.HIGH,
     });
-    const message2 = peerState.pushOutgoingMessage({
+    peerState.pushOutgoingMessage({
+      action: "content",
+      id: "co_z1",
+      new: {},
+      priority: CO_VALUE_PRIORITY.HIGH,
+    });
+    peerState.pushOutgoingMessage({
       action: "content",
       id: "co_z1",
       new: {},
@@ -77,14 +84,21 @@ describe("PeerState", () => {
 
     peerState.gracefulShutdown();
 
-    await Promise.allSettled([message1, message2]);
+    await waitFor(() => {
+      expect(peerState.isProcessing()).toBe(false);
+    });
 
-    await expect(message1).resolves.toBe(undefined);
-    await expect(message2).resolves.toBe(undefined);
+    expect(mockPeer.outgoing.push).toHaveBeenCalledTimes(1);
   });
 
   test("should schedule outgoing messages based on their priority", async () => {
-    const { peerState } = setup();
+    const { peerState, mockPeer } = setup();
+
+    mockPeer.outgoing.push = vi.fn().mockImplementation((message) => {
+      return new Promise<void>((resolve) => {
+        setTimeout(resolve, 0);
+      });
+    });
 
     const loadMessage: SyncMessage = {
       action: "load",
@@ -111,14 +125,14 @@ describe("PeerState", () => {
       priority: CO_VALUE_PRIORITY.LOW,
     };
 
-    const promises = [
-      peerState.pushOutgoingMessage(contentMessageLow),
-      peerState.pushOutgoingMessage(contentMessageMid),
-      peerState.pushOutgoingMessage(contentMessageHigh),
-      peerState.pushOutgoingMessage(loadMessage),
-    ];
+    peerState.pushOutgoingMessage(contentMessageLow);
+    peerState.pushOutgoingMessage(contentMessageMid);
+    peerState.pushOutgoingMessage(contentMessageHigh);
+    peerState.pushOutgoingMessage(loadMessage);
 
-    await Promise.all(promises);
+    await waitFor(() => {
+      expect(peerState.isProcessing()).toBe(false);
+    });
 
     // The first message is pushed directly, the other three are queued because are waiting
     // for the first push to be completed.

package/src/tests/PriorityBasedMessageQueue.test.ts

@@ -157,8 +157,7 @@ describe("PriorityBasedMessageQueue", () => {
       sessions: {},
     };
     void queue.push(message);
-    const pulledEntry = queue.pull();
-    expect(pulledEntry?.msg).toEqual(message);
+    expect(queue.pull()).toEqual(message);
   });
 
   test("should push message with specified priority", async () => {
@@ -170,8 +169,7 @@ describe("PriorityBasedMessageQueue", () => {
       priority: CO_VALUE_PRIORITY.HIGH,
     };
     void queue.push(message);
-    const pulledEntry = queue.pull();
-    expect(pulledEntry?.msg).toEqual(message);
+    expect(queue.pull()).toEqual(message);
   });
 
   test("should pull messages in priority order", async () => {
@@ -199,45 +197,13 @@ describe("PriorityBasedMessageQueue", () => {
     void queue.push(mediumPriorityMsg);
     void queue.push(highPriorityMsg);
 
-    expect(queue.pull()?.msg).toEqual(highPriorityMsg);
-    expect(queue.pull()?.msg).toEqual(mediumPriorityMsg);
-    expect(queue.pull()?.msg).toEqual(lowPriorityMsg);
+    expect(queue.pull()).toEqual(highPriorityMsg);
+    expect(queue.pull()).toEqual(mediumPriorityMsg);
+    expect(queue.pull()).toEqual(lowPriorityMsg);
   });
 
   test("should return undefined when pulling from empty queue", () => {
     const { queue } = setup();
     expect(queue.pull()).toBeUndefined();
   });
-
-  test("should resolve promise when message is pulled", async () => {
-    const { queue } = setup();
-    const message: SyncMessage = {
-      action: "load",
-      id: "co_ztest-id",
-      header: false,
-      sessions: {},
-    };
-    const pushPromise = queue.push(message);
-
-    const pulledEntry = queue.pull();
-    pulledEntry?.resolve();
-
-    await expect(pushPromise).resolves.toBeUndefined();
-  });
-
-  test("should reject promise when message is rejected", async () => {
-    const { queue } = setup();
-    const message: SyncMessage = {
-      action: "load",
-      id: "co_ztest-id",
-      header: false,
-      sessions: {},
-    };
-    const pushPromise = queue.push(message);
-
-    const pulledEntry = queue.pull();
-    pulledEntry?.reject(new Error("Test error"));
-
-    await expect(pushPromise).rejects.toThrow("Test error");
-  });
 });

package/src/tests/SyncStateManager.test.ts

@@ -7,8 +7,6 @@ import { connectedPeers } from "../streamUtils.js";
 import { emptyKnownState } from "../sync.js";
 import {
   SyncMessagesLog,
-  blockMessageTypeOnOutgoingPeer,
-  createTestNode,
   loadCoValueOrFail,
   setupTestNode,
   waitFor,
@@ -37,7 +35,7 @@ describe("SyncStateManager", () => {
     const updateSpy: GlobalSyncStateListenerCallback = vi.fn();
     const unsubscribe = subscriptionManager.subscribeToUpdates(updateSpy);
 
-    await client.node.syncManager.actuallySyncCoValue(map.core);
+    await client.node.syncManager.syncCoValue(map.core);
 
     expect(updateSpy).toHaveBeenCalledWith(
       peerState.id,
@@ -97,7 +95,7 @@ describe("SyncStateManager", () => {
       unsubscribe2();
     });
 
-    await client.node.syncManager.actuallySyncCoValue(map.core);
+    await client.node.syncManager.syncCoValue(map.core);
 
     expect(updateToJazzCloudSpy).toHaveBeenCalledWith(
       emptyKnownState(map.core.id),
@@ -132,7 +130,7 @@ describe("SyncStateManager", () => {
     const map = group.createMap();
     map.set("key1", "value1", "trusting");
 
-    await client.node.syncManager.actuallySyncCoValue(map.core);
+    await client.node.syncManager.syncCoValue(map.core);
 
     const subscriptionManager = client.node.syncManager.syncState;
 
@@ -173,7 +171,7 @@ describe("SyncStateManager", () => {
     unsubscribe1();
     unsubscribe2();
 
-    await client.node.syncManager.actuallySyncCoValue(map.core);
+    await client.node.syncManager.syncCoValue(map.core);
 
     anyUpdateSpy.mockClear();
 
@@ -217,9 +215,6 @@ describe("SyncStateManager", () => {
 
     const mapOnServer = await loadCoValueOrFail(serverNode, map.id);
 
-    // Block the content messages so the client won't fully sync immediately
-    const outgoing = blockMessageTypeOnOutgoingPeer(peerOnServer, "content");
-
     mapOnServer.set("key2", "value2", "trusting");
 
     expect(
@@ -236,9 +231,6 @@ describe("SyncStateManager", () => {
       ),
     ).toEqual({ uploaded: false });
 
-    await outgoing.sendBlockedMessages();
-    outgoing.unblock();
-
     await mapOnServer.core.waitForSync();
 
     expect(

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

@@ -74,8 +74,8 @@ describe("loading coValues from server", () => {
         "server -> client | CONTENT ParentGroup header: true new: After: 0 New: 6",
         "client -> server | KNOWN ParentGroup sessions: header/6",
         "server -> client | CONTENT Group header: true new: After: 0 New: 5",
-        "server -> client | CONTENT Map header: true new: After: 0 New: 1",
         "client -> server | KNOWN Group sessions: header/5",
+        "server -> client | CONTENT Map header: true new: After: 0 New: 1",
         "client -> server | KNOWN Map sessions: header/1",
       ]
     `);
@@ -118,6 +118,8 @@ describe("loading coValues from server", () => {
         "client -> server | LOAD Map sessions: header/1",
         "server -> client | CONTENT Map header: false new: After: 1 New: 1",
         "client -> server | KNOWN Map sessions: header/2",
+        "server -> client | CONTENT Map header: false new: After: 1 New: 1",
+        "client -> server | KNOWN Map sessions: header/2",
       ]
     `);
   });
@@ -161,9 +163,11 @@ describe("loading coValues from server", () => {
         "server -> client | KNOWN Group sessions: header/5",
         "client -> server | LOAD Map sessions: header/2",
         "server -> client | CONTENT Map header: false new: After: 1 New: 1",
-        "client -> server | KNOWN Map sessions: header/3",
         "client -> server | CONTENT Map header: false new: After: 0 New: 1",
+        "server -> client | CONTENT Map header: false new: After: 1 New: 1",
+        "client -> server | KNOWN Map sessions: header/3",
         "server -> client | KNOWN Map sessions: header/3",
+        "client -> server | KNOWN Map sessions: header/3",
       ]
     `);
   });
@@ -288,36 +292,36 @@ describe("loading coValues from server", () => {
         "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: ",
-        "server -> client | CONTENT Map header: false new: After: 0 New: 73",
         "client -> server | KNOWN Map sessions: header/0",
-        "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: 0 New: 73",
         "client -> server | KNOWN Map sessions: header/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: 73 New: 73",
         "client -> server | KNOWN Map sessions: header/146",
-        "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: 146 New: 73",
         "client -> server | KNOWN Map sessions: header/219",
-        "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: 219 New: 73",
         "client -> server | KNOWN Map sessions: header/292",
-        "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: 292 New: 73",
         "client -> server | KNOWN Map sessions: header/365",
-        "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: 365 New: 73",
         "client -> server | KNOWN Map sessions: header/438",
-        "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: 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",
       ]
     `);

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

@@ -66,10 +66,10 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
       [
         "edge-france -> core | CONTENT Group header: true new: After: 0 New: 3",
         "core -> edge-france | KNOWN Group sessions: header/3",
-        "core -> storage | CONTENT Group header: true new: After: 0 New: 3",
         "edge-france -> core | CONTENT Map header: true new: After: 0 New: 1",
-        "storage -> core | KNOWN Group sessions: header/3",
+        "core -> storage | CONTENT Group header: true new: After: 0 New: 3",
         "core -> edge-france | KNOWN Map sessions: header/1",
+        "storage -> core | KNOWN Group sessions: header/3",
         "core -> storage | CONTENT Map header: true new: After: 0 New: 1",
         "storage -> core | KNOWN Map sessions: header/1",
         "client -> edge-italy | LOAD Map sessions: empty",
@@ -77,17 +77,16 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
         "core -> edge-italy | CONTENT Group header: true new: After: 0 New: 3",
         "edge-italy -> core | KNOWN Group sessions: header/3",
         "core -> edge-italy | CONTENT Map header: true new: After: 0 New: 1",
+        "edge-italy -> core | KNOWN Map sessions: header/1",
         "edge-italy -> client | CONTENT Group header: true new: After: 0 New: 3",
         "client -> edge-italy | KNOWN Group sessions: header/3",
-        "edge-italy -> core | KNOWN Map sessions: header/1",
         "edge-italy -> client | CONTENT Map header: true new: After: 0 New: 1",
         "client -> edge-italy | KNOWN Map sessions: header/1",
       ]
     `);
   });
 
-  // FIXME: Expected parent group to be loaded: CoValue co_zEKiodKQprnfsi2qfDtsHGCGDSo not yet loaded
-  test.skip("coValue created on a different edge with parent groups loading", async () => {
+  test("coValue created on a different edge with parent groups loading", async () => {
     const client = setupTestNode();
 
     client.connectToSyncServer({
@@ -96,7 +95,7 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
     });
 
     const group = mesh.edgeFrance.node.createGroup();
-    const parentGroup = mesh.edgeItaly.node.createGroup();
+    const parentGroup = mesh.edgeFrance.node.createGroup();
     parentGroup.addMember("everyone", "reader");
 
     group.extend(parentGroup);
@@ -115,7 +114,36 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
         Group: group.core,
         Map: map.core,
       }),
-    ).toMatchInlineSnapshot();
+    ).toMatchInlineSnapshot(`
+      [
+        "edge-france -> core | CONTENT ParentGroup header: true new: After: 0 New: 6",
+        "core -> edge-france | KNOWN ParentGroup sessions: header/6",
+        "edge-france -> core | CONTENT Group header: true new: After: 0 New: 5",
+        "core -> storage | CONTENT ParentGroup header: true new: After: 0 New: 6",
+        "core -> edge-france | KNOWN Group sessions: header/5",
+        "edge-france -> core | CONTENT Map header: true new: After: 0 New: 1",
+        "storage -> core | KNOWN ParentGroup sessions: header/6",
+        "core -> storage | CONTENT Group header: true new: After: 0 New: 5",
+        "core -> edge-france | KNOWN Map sessions: header/1",
+        "storage -> core | KNOWN Group sessions: header/5",
+        "core -> storage | CONTENT Map header: true new: After: 0 New: 1",
+        "storage -> core | KNOWN Map sessions: header/1",
+        "client -> edge-italy | LOAD Map sessions: empty",
+        "edge-italy -> core | LOAD Map sessions: empty",
+        "core -> edge-italy | CONTENT ParentGroup header: true new: After: 0 New: 6",
+        "edge-italy -> core | KNOWN ParentGroup sessions: header/6",
+        "core -> edge-italy | CONTENT Group header: true new: After: 0 New: 5",
+        "edge-italy -> core | KNOWN Group sessions: header/5",
+        "core -> edge-italy | CONTENT Map header: true new: After: 0 New: 1",
+        "edge-italy -> core | KNOWN Map sessions: header/1",
+        "edge-italy -> client | CONTENT ParentGroup header: true new: After: 0 New: 6",
+        "client -> edge-italy | KNOWN ParentGroup sessions: header/6",
+        "edge-italy -> client | CONTENT Group header: true new: After: 0 New: 5",
+        "client -> edge-italy | KNOWN Group sessions: header/5",
+        "edge-italy -> client | CONTENT Map header: true new: After: 0 New: 1",
+        "client -> edge-italy | KNOWN Map sessions: header/1",
+      ]
+    `);
   });
 
   test("updating a coValue coming from a different edge", async () => {
@@ -155,8 +183,8 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
         "edge-italy -> core | CONTENT Map header: false new: After: 0 New: 1",
         "core -> edge-italy | KNOWN Map sessions: header/2",
         "core -> storage | CONTENT Map header: false new: After: 0 New: 1",
-        "storage -> core | KNOWN Map sessions: header/2",
         "core -> edge-france | CONTENT Map header: false new: After: 0 New: 1",
+        "storage -> core | KNOWN Map sessions: header/2",
         "edge-france -> core | KNOWN Map sessions: header/2",
       ]
     `);
@@ -210,29 +238,29 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
         "edge-italy -> core | CONTENT Group header: true new: After: 0 New: 5",
         "edge-italy -> client | CONTENT Group header: true new: After: 0 New: 5",
         "core -> edge-italy | KNOWN Group sessions: header/5",
-        "client -> edge-italy | KNOWN Group sessions: header/5",
-        "core -> storage | CONTENT Group header: true new: After: 0 New: 5",
         "edge-italy -> core | CONTENT Map header: true new: After: 0 New: 1",
+        "client -> edge-italy | KNOWN Group sessions: header/5",
         "edge-italy -> client | CONTENT Map header: true new: After: 0 New: 1",
-        "storage -> core | KNOWN Group sessions: header/5",
+        "core -> storage | CONTENT Group header: true new: After: 0 New: 5",
         "core -> edge-italy | KNOWN Map sessions: header/1",
-        "core -> storage | CONTENT Map header: true new: After: 0 New: 1",
         "client -> edge-italy | KNOWN Map sessions: header/1",
+        "storage -> core | KNOWN Group sessions: header/5",
+        "core -> storage | CONTENT Map header: true new: After: 0 New: 1",
         "storage -> core | KNOWN Map sessions: header/1",
         "client -> edge-italy | CONTENT Map header: false new: After: 0 New: 1",
         "core -> storage | CONTENT Map header: false new: After: 0 New: 1",
+        "core -> edge-italy | CONTENT Map header: false new: After: 0 New: 1",
         "edge-italy -> client | KNOWN CORRECTION Map sessions: empty",
         "storage -> core | KNOWN Map sessions: header/2",
-        "core -> edge-italy | CONTENT Map header: false new: After: 0 New: 1",
-        "client -> edge-italy | CONTENT Map header: true new: After: 0 New: 1 | After: 0 New: 1",
         "edge-italy -> core | KNOWN CORRECTION Map sessions: empty",
-        "edge-italy -> client | KNOWN Map sessions: header/2",
+        "client -> edge-italy | CONTENT Map header: true new: After: 0 New: 1 | After: 0 New: 1",
         "core -> edge-italy | CONTENT Map header: true new: After: 0 New: 1 | After: 0 New: 1",
-        "edge-italy -> core | CONTENT Map header: false new: After: 0 New: 1",
-        "edge-italy -> client | CONTENT Map header: false new: After: 0 New: 1",
-        "core -> edge-italy | KNOWN Map sessions: header/3",
+        "edge-italy -> client | KNOWN Map sessions: header/2",
         "edge-italy -> core | KNOWN Map sessions: header/3",
+        "edge-italy -> client | CONTENT Map header: false new: After: 0 New: 1",
+        "edge-italy -> core | CONTENT Map header: false new: After: 0 New: 1",
         "client -> edge-italy | KNOWN Map sessions: header/3",
+        "core -> edge-italy | KNOWN Map sessions: header/3",
         "core -> storage | CONTENT Map header: false new: After: 0 New: 1",
         "storage -> core | KNOWN Map sessions: header/3",
       ]

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

@@ -1,18 +1,7 @@
 import { assert, beforeEach, describe, expect, test } from "vitest";
 import { expectMap } from "../coValue";
 import { WasmCrypto } from "../crypto/WasmCrypto";
-import { CoValueCore, RawCoMap } from "../exports";
-import { LocalNode } from "../localNode";
-import { toSimplifiedMessages } from "./messagesTestUtils";
-import {
-  SyncMessagesLog,
-  createTestNode,
-  randomAnonymousAccountAndSessionID,
-  setupTestNode,
-  waitFor,
-} from "./testUtils";
-
-const Crypto = await WasmCrypto.create();
+import { SyncMessagesLog, setupTestNode, waitFor } from "./testUtils";
 
 let jazzCloud = setupTestNode({ isSyncServer: true });
 
@@ -32,8 +21,6 @@ describe("peer reconciliation", () => {
 
     client.connectToSyncServer();
 
-    await new Promise((resolve) => setTimeout(resolve, 100));
-
     await map.core.waitForSync();
 
     expect(
@@ -44,12 +31,12 @@ describe("peer reconciliation", () => {
     ).toMatchInlineSnapshot(`
       [
         "client -> server | LOAD Group sessions: header/3",
-        "server -> client | KNOWN Group sessions: empty",
         "client -> server | LOAD Map sessions: header/1",
-        "server -> client | KNOWN Map sessions: empty",
+        "server -> client | KNOWN Group sessions: empty",
         "client -> server | CONTENT Group header: true new: After: 0 New: 3",
-        "server -> client | KNOWN Group sessions: header/3",
+        "server -> client | KNOWN Map sessions: empty",
         "client -> server | CONTENT Map header: true new: After: 0 New: 1",
+        "server -> client | KNOWN Group sessions: header/3",
         "server -> client | KNOWN Map sessions: header/1",
       ]
     `);
@@ -93,10 +80,10 @@ describe("peer reconciliation", () => {
     ).toMatchInlineSnapshot(`
       [
         "client -> server | LOAD Group sessions: header/3",
-        "server -> client | KNOWN Group sessions: header/3",
         "client -> server | LOAD Map sessions: header/2",
-        "server -> client | KNOWN Map sessions: header/1",
+        "server -> client | KNOWN Group sessions: header/3",
         "client -> server | CONTENT Map header: false new: After: 1 New: 1",
+        "server -> client | KNOWN Map sessions: header/1",
         "server -> client | KNOWN Map sessions: header/2",
       ]
     `);
@@ -148,10 +135,11 @@ describe("peer reconciliation", () => {
     ).toMatchInlineSnapshot(`
       [
         "client -> server | LOAD Group sessions: header/3",
-        "server -> client | KNOWN Group sessions: header/3",
+        "client -> server | LOAD Group sessions: header/3",
         "client -> server | LOAD Map sessions: header/2",
-        "server -> client | KNOWN Map sessions: header/1",
+        "server -> client | KNOWN Group sessions: header/3",
         "client -> server | CONTENT Map header: false new: After: 1 New: 1",
+        "server -> client | KNOWN Map sessions: header/1",
         "server -> client | KNOWN Map sessions: header/2",
       ]
     `);
@@ -191,16 +179,16 @@ describe("peer reconciliation", () => {
     ).toMatchInlineSnapshot(`
       [
         "client -> server | LOAD Group sessions: header/3",
-        "server -> client | KNOWN Group sessions: empty",
         "client -> server | LOAD Map sessions: header/2",
-        "server -> client | KNOWN Map sessions: empty",
+        "server -> client | KNOWN Group sessions: empty",
         "client -> server | CONTENT Group header: true new: After: 0 New: 3",
-        "server -> client | KNOWN Group sessions: header/3",
+        "server -> client | KNOWN Map sessions: empty",
         "client -> server | CONTENT Map header: true new: After: 0 New: 2",
+        "server -> client | KNOWN Group sessions: header/3",
         "server -> client | KNOWN Map sessions: header/2",
         "client -> server | LOAD Group sessions: header/3",
-        "server -> client | KNOWN Group sessions: header/3",
         "client -> server | LOAD Map sessions: header/2",
+        "server -> client | KNOWN Group sessions: header/3",
         "server -> client | KNOWN Map sessions: header/2",
       ]
     `);

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

@@ -39,11 +39,11 @@ describe("client with storage syncs with server", () => {
         "client -> server | LOAD Map sessions: empty",
         "server -> client | CONTENT Group header: true new: After: 0 New: 3",
         "client -> server | KNOWN Group sessions: header/3",
-        "client -> storage | CONTENT Group header: true new: After: 0 New: 3",
         "server -> client | CONTENT Map header: true new: After: 0 New: 1",
+        "client -> storage | CONTENT Group header: true new: After: 0 New: 3",
+        "client -> server | KNOWN Map sessions: header/1",
         "storage -> client | KNOWN Group sessions: header/3",
         "client -> storage | CONTENT Map header: true new: After: 0 New: 1",
-        "client -> server | KNOWN Map sessions: header/1",
         "storage -> client | KNOWN Map sessions: header/1",
       ]
     `);
@@ -76,10 +76,12 @@ describe("client with storage syncs with server", () => {
         "client -> storage | KNOWN Group sessions: header/3",
         "storage -> client | CONTENT Map header: true new: After: 0 New: 1",
         "client -> server | CONTENT Group header: true new: After: 0 New: 3",
+        "client -> storage | KNOWN Map sessions: header/1",
         "server -> client | KNOWN Group sessions: header/3",
         "client -> server | LOAD Map sessions: header/1",
-        "client -> storage | KNOWN Map sessions: header/1",
         "server -> client | CONTENT Group header: true new: After: 0 New: 3",
+        "client -> server | CONTENT Map header: true new: After: 0 New: 1",
+        "server -> client | KNOWN Map sessions: header/1",
         "client -> server | KNOWN Group sessions: header/3",
         "server -> client | KNOWN Map sessions: header/1",
       ]
@@ -117,16 +119,16 @@ describe("client with storage syncs with server", () => {
         "client -> server | LOAD Map sessions: empty",
         "server -> client | CONTENT ParentGroup header: true new: After: 0 New: 6",
         "client -> server | KNOWN ParentGroup sessions: header/6",
-        "client -> storage | CONTENT ParentGroup header: true new: After: 0 New: 6",
         "server -> client | CONTENT Group header: true new: After: 0 New: 5",
-        "storage -> client | KNOWN ParentGroup sessions: header/6",
+        "client -> storage | CONTENT ParentGroup header: true new: After: 0 New: 6",
+        "client -> server | KNOWN Group sessions: header/5",
         "server -> client | CONTENT Map header: true new: After: 0 New: 1",
+        "storage -> client | KNOWN ParentGroup sessions: header/6",
         "client -> storage | CONTENT Group header: true new: After: 0 New: 5",
+        "client -> server | KNOWN Map sessions: header/1",
         "storage -> client | KNOWN Group sessions: header/5",
-        "client -> server | KNOWN Group sessions: header/5",
         "client -> storage | CONTENT Map header: true new: After: 0 New: 1",
         "storage -> client | KNOWN Map sessions: header/1",
-        "client -> server | KNOWN Map sessions: header/1",
       ]
     `);
   });
@@ -167,7 +169,9 @@ describe("client with storage syncs with server", () => {
         "client -> server | LOAD Map sessions: header/1",
         "server -> client | CONTENT Map header: false new: After: 1 New: 1",
         "client -> server | KNOWN Map sessions: header/2",
+        "server -> client | CONTENT Map header: false new: After: 1 New: 1",
         "client -> storage | CONTENT Map header: false new: After: 1 New: 1",
+        "client -> server | KNOWN Map sessions: header/2",
         "storage -> client | KNOWN Map sessions: header/2",
       ]
     `);
@@ -212,10 +216,10 @@ describe("client syncs with a server with storage", () => {
       [
         "client -> server | CONTENT Group header: true new: After: 0 New: 3",
         "server -> client | KNOWN Group sessions: header/3",
-        "server -> storage | CONTENT Group header: true new: After: 0 New: 3",
         "client -> server | CONTENT Map header: true new: After: 0 New: 1",
-        "storage -> server | KNOWN Group sessions: header/3",
+        "server -> storage | CONTENT Group header: true new: After: 0 New: 3",
         "server -> client | KNOWN Map sessions: header/1",
+        "storage -> server | KNOWN Group sessions: header/3",
         "server -> storage | CONTENT Map header: true new: After: 0 New: 1",
         "storage -> server | KNOWN Map sessions: header/1",
       ]