cojson 0.18.32 → 0.18.34

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

@@ -214,7 +214,7 @@ describe("client with storage syncs with server", () => {
     ).toMatchInlineSnapshot(`
       [
         "client -> storage | CONTENT Group header: true new: After: 0 New: 3",
-        "client -> storage | CONTENT InitialMap header: true new: ",
+        "client -> storage | CONTENT InitialMap header: true new:  expectContentUntil: header/1",
         "client -> storage | CONTENT ChildMap header: true new: After: 0 New: 1",
         "client -> storage | CONTENT InitialMap header: false new: After: 0 New: 1",
       ]
@@ -304,28 +304,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",
-        "client -> server | CONTENT Map header: true new: After: 0 New: 20",
-        "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",
       ]
     `);
 
@@ -357,11 +357,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: 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",
-        "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",
         "server -> client | KNOWN Group sessions: header/5",
         "server -> client | KNOWN Map sessions: header/100",
       ]
@@ -398,7 +399,7 @@ describe("client syncs with a server with storage", () => {
 
     await largeMap.core.waitForSync();
 
-    const newContentChunks = largeMap.core.verified.newContentSince(
+    const newContentChunks = largeMap.core.newContentSince(
       emptyKnownState(largeMap.id),
     );
 

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

@@ -163,7 +163,7 @@ describe("client to server upload", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "client -> server | CONTENT Group header: true new: After: 0 New: 3",
+        "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",
         "client -> server | CONTENT Group header: false new: After: 3 New: 2",
         "client -> server | CONTENT Map header: true new: After: 0 New: 1",
@@ -363,7 +363,7 @@ describe("client to server upload", () => {
     ).toMatchInlineSnapshot(`
       [
         "client -> server | CONTENT Group header: true new: After: 0 New: 3",
-        "client -> server | CONTENT InitialMap header: true new: ",
+        "client -> server | CONTENT InitialMap header: true new:  expectContentUntil: header/1",
         "client -> server | CONTENT ChildMap header: true new: After: 0 New: 1",
         "client -> server | CONTENT InitialMap header: false new: After: 0 New: 1",
         "server -> client | KNOWN Group sessions: header/3",
@@ -379,7 +379,7 @@ describe("client to server upload", () => {
       connected: true,
     });
 
-    const group = jazzCloud.node.createGroup();
+    const group = client.node.createGroup();
     group.addMember("everyone", "writer");
 
     const largeMap = group.createMap();
@@ -396,7 +396,74 @@ describe("client to server upload", () => {
       largeMap.set(key, value, "trusting");
     }
 
-    await loadCoValueOrFail(client.node, largeMap.id);
+    await largeMap.core.waitForSync();
+
+    expect(
+      SyncMessagesLog.getMessages({
+        Group: group.core,
+        Map: largeMap.core,
+      }),
+    ).toMatchInlineSnapshot(`
+      [
+        "client -> server | CONTENT Group header: true new: After: 0 New: 5",
+        "client -> server | CONTENT Map header: true new: After: 0 New: 73 expectContentUntil: header/1024",
+        "client -> server | CONTENT Map header: false new: After: 73 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 146 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 219 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 292 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 365 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 438 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 511 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 584 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 657 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 730 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 803 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 876 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 949 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 1022 New: 2",
+        "server -> client | KNOWN Group sessions: header/5",
+        "server -> client | KNOWN Map sessions: header/73",
+        "server -> client | KNOWN Map sessions: header/146",
+        "server -> client | KNOWN Map sessions: header/219",
+        "server -> client | KNOWN Map sessions: header/292",
+        "server -> client | KNOWN Map sessions: header/365",
+        "server -> client | KNOWN Map sessions: header/438",
+        "server -> client | KNOWN Map sessions: header/511",
+        "server -> client | KNOWN Map sessions: header/584",
+        "server -> client | KNOWN Map sessions: header/657",
+        "server -> client | KNOWN Map sessions: header/730",
+        "server -> client | KNOWN Map sessions: header/803",
+        "server -> client | KNOWN Map sessions: header/876",
+        "server -> client | KNOWN Map sessions: header/949",
+        "server -> client | KNOWN Map sessions: header/1022",
+        "server -> client | KNOWN Map sessions: header/1024",
+      ]
+    `);
+  });
+
+  test("uploading a large update", async () => {
+    const client = setupTestNode({
+      connected: true,
+    });
+
+    const group = client.node.createGroup();
+    group.addMember("everyone", "writer");
+
+    const largeMap = group.createMap();
+
+    await largeMap.core.waitForSync();
+
+    // 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");
+    }
 
     await largeMap.core.waitForSync();
 
@@ -407,41 +474,40 @@ describe("client to server upload", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "client -> server | LOAD Map sessions: empty",
-        "server -> client | CONTENT Group header: true new: After: 0 New: 5",
-        "server -> client | CONTENT Map header: true new:  expectContentUntil: header/1024",
-        "server -> client | CONTENT Map header: false new: After: 0 New: 73",
-        "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 Group sessions: header/5",
-        "client -> server | KNOWN Map sessions: header/0",
-        "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 | CONTENT Group header: true new: After: 0 New: 5",
+        "client -> server | CONTENT Map header: true new: ",
+        "client -> server | CONTENT Map header: false new: After: 0 New: 73 expectContentUntil: header/1024",
+        "client -> server | CONTENT Map header: false new: After: 73 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 146 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 219 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 292 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 365 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 438 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 511 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 584 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 657 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 730 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 803 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 876 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 949 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 1022 New: 2",
+        "server -> client | KNOWN Group sessions: header/5",
+        "server -> client | KNOWN Map sessions: header/0",
+        "server -> client | KNOWN Map sessions: header/73",
+        "server -> client | KNOWN Map sessions: header/146",
+        "server -> client | KNOWN Map sessions: header/219",
+        "server -> client | KNOWN Map sessions: header/292",
+        "server -> client | KNOWN Map sessions: header/365",
+        "server -> client | KNOWN Map sessions: header/438",
+        "server -> client | KNOWN Map sessions: header/511",
+        "server -> client | KNOWN Map sessions: header/584",
+        "server -> client | KNOWN Map sessions: header/657",
+        "server -> client | KNOWN Map sessions: header/730",
+        "server -> client | KNOWN Map sessions: header/803",
+        "server -> client | KNOWN Map sessions: header/876",
+        "server -> client | KNOWN Map sessions: header/949",
+        "server -> client | KNOWN Map sessions: header/1022",
+        "server -> client | KNOWN Map sessions: header/1024",
       ]
     `);
   });
@@ -461,7 +527,7 @@ describe("client to server upload", () => {
     const map = coValue.getCurrentContent() as RawCoMap;
     map.set("hello", "world", "trusting");
 
-    const content = map.core.verified.newContentSince(undefined)?.[0];
+    const content = map.core.newContentSince(undefined)?.[0];
     assert(content);
 
     // Simulate a mismatch between the header and the coValue id

package/src/tests/testUtils.ts

@@ -14,6 +14,7 @@ import {
   type CoID,
   type CoValueCore,
   type RawAccount,
+  RawAccountID,
   type RawCoValue,
   StorageAPI,
 } from "../exports.js";
@@ -540,6 +541,13 @@ export function setupTestNode(
         isSyncServer: opts.isSyncServer,
       });
     },
+    disconnect: () => {
+      const allPeers = Object.values(node.syncManager.peers);
+      allPeers.forEach((peer) => {
+        peer.gracefulShutdown();
+      });
+      node.syncManager.peers = {};
+    },
   };
 
   return ctx;
@@ -550,14 +558,34 @@ export async function setupTestAccount(
     isSyncServer?: boolean;
     connected?: boolean;
     storage?: StorageAPI;
+    accountID?: RawAccountID;
+    accountSecret?: AgentSecret;
   } = {},
 ) {
-  const ctx = await LocalNode.withNewlyCreatedAccount({
-    peers: [],
-    crypto: Crypto,
-    creationProps: { name: "Client" },
-    storage: opts.storage,
-  });
+  const ctx =
+    opts.accountSecret && opts.accountID
+      ? {
+          node: await LocalNode.withLoadedAccount({
+            peers: [
+              getSyncServerConnectedPeer({
+                peerId: opts.accountID,
+              }).peer,
+            ],
+            crypto: Crypto,
+            storage: opts.storage,
+            accountID: opts.accountID,
+            accountSecret: opts.accountSecret,
+            sessionID: Crypto.newRandomSessionID(opts.accountID),
+          }),
+          accountID: opts.accountID,
+          accountSecret: opts.accountSecret,
+        }
+      : await LocalNode.withNewlyCreatedAccount({
+          peers: [],
+          crypto: Crypto,
+          creationProps: { name: "Client" },
+          storage: opts.storage,
+        });
 
   if (opts.isSyncServer) {
     syncServer.current = ctx.node;
@@ -570,7 +598,7 @@ export async function setupTestAccount(
   }) {
     const { peer, peerStateOnServer, peerOnServer } =
       getSyncServerConnectedPeer({
-        peerId: ctx.node.getCurrentAgent().id,
+        peerId: ctx.node.currentSessionID,
         syncServerName: opts?.syncServerName,
         ourName: opts?.ourName,
         syncServer: opts?.syncServer,
@@ -627,6 +655,13 @@ export async function setupTestAccount(
     connectToSyncServer,
     addStorage,
     addAsyncStorage,
+    spawnNewSession: () => {
+      return setupTestAccount({
+        accountID: ctx.accountID,
+        accountSecret: ctx.accountSecret,
+        connected: true,
+      });
+    },
     disconnect: () => {
       const allPeers = ctx.node.syncManager.getPeers(ctx.accountID);
       allPeers.forEach((peer) => {
@@ -715,8 +750,7 @@ export function createAccountInNode(node: LocalNode) {
 
   const accountCoreEntry = node.getCoValue(accountOnTempNode.id);
 
-  const content =
-    accountOnTempNode.core.verified.newContentSince(undefined)?.[0]!;
+  const content = accountOnTempNode.core.newContentSince(undefined)?.[0]!;
 
   node.syncManager.handleNewContent(content, "import");