cojson 0.13.17 → 0.13.20

package/src/tests/SyncStateManager.test.ts

@@ -70,12 +70,12 @@ describe("SyncStateManager", () => {
     const map = group.createMap();
     map.set("key1", "value1", "trusting");
 
-    const [clientStoragePeer] = connectedPeers("clientStorage", "unusedPeer", {
-      peer1role: "client",
-      peer2role: "server",
+    const [serverPeer] = connectedPeers("serverPeer", "unusedPeer", {
+      peer1role: "server",
+      peer2role: "client",
     });
 
-    client.node.syncManager.addPeer(clientStoragePeer);
+    client.node.syncManager.addPeer(serverPeer);
 
     const subscriptionManager = client.node.syncManager.syncState;
 
@@ -86,7 +86,7 @@ describe("SyncStateManager", () => {
       updateToJazzCloudSpy,
     );
     const unsubscribe2 = subscriptionManager.subscribeToPeerUpdates(
-      clientStoragePeer.id,
+      serverPeer.id,
       updateToStorageSpy,
     );
 
@@ -115,7 +115,7 @@ describe("SyncStateManager", () => {
     );
 
     expect(updateToStorageSpy).toHaveBeenLastCalledWith(
-      emptyKnownState(map.core.id),
+      emptyKnownState(group.core.id),
       { uploaded: false },
     );
   });
@@ -247,4 +247,54 @@ describe("SyncStateManager", () => {
       ),
     ).toEqual({ uploaded: true });
   });
+
+  test("should skip closed peers", async () => {
+    const client = setupTestNode();
+    const { peerState } = client.connectToSyncServer();
+
+    peerState.gracefulShutdown();
+
+    const group = client.node.createGroup();
+    const map = group.createMap();
+
+    await expect(map.core.waitForSync()).resolves.toBeUndefined();
+  });
+
+  test("should skip client peers that are not subscribed to the coValue", async () => {
+    const server = setupTestNode({ isSyncServer: true });
+    const client = setupTestNode();
+
+    client.connectToSyncServer({
+      syncServer: server.node,
+    });
+
+    const group = server.node.createGroup();
+    const map = group.createMap();
+
+    await map.core.waitForSync();
+
+    expect(client.node.getCoValue(map.id).isAvailable()).toBe(false);
+  });
+
+  test("should wait for client peers that are subscribed to the coValue", async () => {
+    const server = setupTestNode({ isSyncServer: true });
+    const client = setupTestNode();
+
+    const { peerStateOnServer } = client.connectToSyncServer();
+
+    const group = server.node.createGroup();
+    const map = group.createMap();
+    map.set("key1", "value1", "trusting");
+
+    // Simulate the subscription to the coValue
+    peerStateOnServer.setKnownState(map.core.id, {
+      id: map.core.id,
+      header: true,
+      sessions: {},
+    });
+
+    await map.core.waitForSync();
+
+    expect(client.node.getCoValue(map.id).isAvailable()).toBe(true);
+  });
 });

package/src/tests/account.test.ts

@@ -1,7 +1,9 @@
 import { expect, test } from "vitest";
+import { expectAccount } from "../coValues/account.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
 import { LocalNode } from "../localNode.js";
 import { connectedPeers } from "../streamUtils.js";
+import { createMockStoragePeer } from "./testUtils.js";
 
 const Crypto = await WasmCrypto.create();
 
@@ -85,3 +87,25 @@ test("throws an error if the user tried to create an invite from an account", as
     "Cannot create invite from an account",
   );
 });
+
+test("wait for storage sync before resolving withNewlyCreatedAccount", async () => {
+  const { storage, peer } = createMockStoragePeer({
+    peerId: "account-node",
+  });
+
+  const { node, accountID } = await LocalNode.withNewlyCreatedAccount({
+    creationProps: { name: "Hermes Puggington" },
+    crypto: Crypto,
+    peersToLoadFrom: [peer],
+  });
+
+  const account = storage.getCoValue(accountID);
+
+  expect(account.isAvailable()).toBe(true);
+
+  const profile = storage.getCoValue(
+    expectAccount(account.getCurrentContent()).get("profile")!,
+  );
+
+  expect(profile.isAvailable()).toBe(true);
+});

package/src/tests/coList.test.ts

@@ -2,9 +2,11 @@ import { beforeEach, expect, test } from "vitest";
 import { expectList } from "../coValue.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
 import { LocalNode } from "../localNode.js";
+import { expectGroup } from "../typeUtils/expectGroup.js";
 import {
   loadCoValueOrFail,
-  randomAnonymousAccountAndSessionID,
+  nodeWithRandomAgentAndSessionID,
+  randomAgentAndSessionID,
   setupTestNode,
   waitFor,
 } from "./testUtils.js";
@@ -16,7 +18,7 @@ beforeEach(async () => {
 });
 
 test("Empty CoList works", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "colist",
@@ -32,7 +34,7 @@ test("Empty CoList works", () => {
 });
 
 test("Can append, prepend, delete and replace items in CoList", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "colist",
@@ -63,7 +65,7 @@ test("Can append, prepend, delete and replace items in CoList", () => {
 });
 
 test("Push is equivalent to append after last item", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "colist",
@@ -85,7 +87,7 @@ test("Push is equivalent to append after last item", () => {
 });
 
 test("appendItems add an array of items at the end of the list", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "colist",
@@ -105,7 +107,7 @@ test("appendItems add an array of items at the end of the list", () => {
 });
 
 test("appendItems at index", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "colist",
@@ -135,7 +137,7 @@ test("appendItems at index", () => {
 });
 
 test("appendItems at index", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "colist",
@@ -157,7 +159,7 @@ test("appendItems at index", () => {
 });
 
 test("appendItems with negative index", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "colist",
@@ -175,7 +177,7 @@ test("appendItems with negative index", () => {
 });
 
 test("Can push into empty list", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "colist",
@@ -193,7 +195,7 @@ test("Can push into empty list", () => {
 });
 
 test("init the list correctly", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const group = node.createGroup();
 
@@ -213,7 +215,7 @@ test("init the list correctly", () => {
 });
 
 test("Items prepended to start appear with latest first", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "colist",
@@ -232,7 +234,7 @@ test("Items prepended to start appear with latest first", () => {
 });
 
 test("mixing prepend and append", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "colist",
@@ -251,7 +253,7 @@ test("mixing prepend and append", () => {
 });
 
 test("Items appended to start", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "colist",
@@ -277,7 +279,9 @@ test("syncing appends with an older timestamp", async () => {
   });
   const otherClient = setupTestNode({});
 
-  const otherClientConnection = otherClient.connectToSyncServer();
+  const otherClientConnection = otherClient.connectToSyncServer({
+    ourName: "otherClient",
+  });
 
   const coValue = client.node.createCoValue({
     type: "colist",
@@ -309,7 +313,9 @@ test("syncing appends with an older timestamp", async () => {
 
   list.append(6, undefined, "trusting");
 
-  otherClient.connectToSyncServer();
+  otherClient.connectToSyncServer({
+    ourName: "otherClient",
+  });
 
   await waitFor(() => {
     expect(list.toJSON()).toEqual([1, 2, 4, 6, 3, 5]);

package/src/tests/coMap.test.ts

@@ -2,12 +2,11 @@ import { beforeEach, expect, test } from "vitest";
 import { expectMap } from "../coValue.js";
 import { operationToEditEntry } from "../coValues/coMap.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
-import { LocalNode } from "../localNode.js";
 import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfromSessionID.js";
 import {
   hotSleep,
   loadCoValueOrFail,
-  randomAnonymousAccountAndSessionID,
+  nodeWithRandomAgentAndSessionID,
   setupTestNode,
   waitFor,
 } from "./testUtils.js";
@@ -19,7 +18,7 @@ beforeEach(async () => {
 });
 
 test("Empty CoMap works", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "comap",
@@ -36,7 +35,7 @@ test("Empty CoMap works", () => {
 });
 
 test("Can insert and delete CoMap entries in edit()", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "comap",
@@ -60,7 +59,7 @@ test("Can insert and delete CoMap entries in edit()", () => {
 });
 
 test("Can get CoMap entry values at different points in time", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "comap",
@@ -110,7 +109,7 @@ test("Can get CoMap entry values at different points in time", () => {
 });
 
 test("Can get all historic values of key in CoMap", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "comap",
@@ -134,25 +133,25 @@ test("Can get all historic values of key in CoMap", () => {
   expect([...content.editsAt("hello")]).toEqual([
     {
       tx: editA!.tx,
-      by: node.account.id,
+      by: node.getCurrentAgent().id,
       value: "A",
       at: editA?.at,
     },
     {
       tx: editB!.tx,
-      by: node.account.id,
+      by: node.getCurrentAgent().id,
       value: "B",
       at: editB?.at,
     },
     {
       tx: editDel!.tx,
-      by: node.account.id,
+      by: node.getCurrentAgent().id,
       value: undefined,
       at: editDel?.at,
     },
     {
       tx: editC!.tx,
-      by: node.account.id,
+      by: node.getCurrentAgent().id,
       value: "C",
       at: editC?.at,
     },
@@ -160,7 +159,7 @@ test("Can get all historic values of key in CoMap", () => {
 });
 
 test("Can get last tx ID for a key in CoMap", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "comap",
@@ -177,7 +176,7 @@ test("Can get last tx ID for a key in CoMap", () => {
   content.set("hello", "A", "trusting");
   const sessionID = content.lastEditAt("hello")?.tx.sessionID;
   expect(sessionID && accountOrAgentIDfromSessionID(sessionID)).toEqual(
-    node.account.id,
+    node.getCurrentAgent().id,
   );
   expect(content.lastEditAt("hello")?.tx.txIndex).toEqual(0);
   content.set("hello", "B", "trusting");
@@ -187,7 +186,7 @@ test("Can get last tx ID for a key in CoMap", () => {
 });
 
 test("Can set items in bulk with assign", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "comap",

package/src/tests/coPlainText.test.ts

@@ -2,7 +2,10 @@ import { afterEach, expect, test, vi } from "vitest";
 import { expectPlainText } from "../coValue.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
 import { LocalNode } from "../localNode.js";
-import { randomAnonymousAccountAndSessionID } from "./testUtils.js";
+import {
+  nodeWithRandomAgentAndSessionID,
+  randomAgentAndSessionID,
+} from "./testUtils.js";
 
 const Crypto = await WasmCrypto.create();
 
@@ -13,7 +16,7 @@ test("should throw on creation if Intl.Segmenter is not available", () => {
     Segmenter: undefined,
   });
 
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
   const group = node.createGroup();
   expect(() => group.createPlainText()).toThrow(
     "Intl.Segmenter is not supported. Use a polyfill to get coPlainText support in Jazz. (eg. https://formatjs.github.io/docs/polyfills/intl-segmenter/)",
@@ -21,7 +24,7 @@ test("should throw on creation if Intl.Segmenter is not available", () => {
 });
 
 test("Empty CoPlainText works", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "coplaintext",
@@ -37,7 +40,7 @@ test("Empty CoPlainText works", () => {
 });
 
 test("Can insert into empty CoPlainText", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "coplaintext",
@@ -55,7 +58,7 @@ test("Can insert into empty CoPlainText", () => {
 });
 
 test("Can insert and delete in CoPlainText", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "coplaintext",
@@ -88,7 +91,7 @@ test("Can insert and delete in CoPlainText", () => {
 });
 
 test("Multiple items inserted appear in correct order", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "coplaintext",
@@ -109,7 +112,7 @@ test("Multiple items inserted appear in correct order", () => {
 });
 
 test("Items inserted at start appear with latest first", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "coplaintext",
@@ -131,7 +134,7 @@ test("Items inserted at start appear with latest first", () => {
 });
 
 test("Handles different locales correctly", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   // Test with explicit locale in meta
   const coValueJa = node.createCoValue({
@@ -175,7 +178,7 @@ test("Handles different locales correctly", () => {
 });
 
 test("insertBefore and insertAfter work as expected", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
   const coValue = node.createCoValue({
     type: "coplaintext",
     ruleset: { type: "unsafeAllowAll" },

package/src/tests/coStream.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, test } from "vitest";
 import { expectStream } from "../coValue.js";
-import { MAX_RECOMMENDED_TX_SIZE } from "../coValueCore.js";
+import { MAX_RECOMMENDED_TX_SIZE } from "../coValueCore/coValueCore.js";
 import {
   BinaryStreamItem,
   CoStreamItem,
@@ -12,7 +12,8 @@ import { SessionID } from "../ids.js";
 import { LocalNode } from "../localNode.js";
 import {
   loadCoValueOrFail,
-  randomAnonymousAccountAndSessionID,
+  nodeWithRandomAgentAndSessionID,
+  randomAgentAndSessionID,
   setupTestNode,
   waitFor,
 } from "./testUtils.js";
@@ -24,7 +25,7 @@ beforeEach(async () => {
 });
 
 test("Empty CoStream works", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -41,7 +42,7 @@ test("Empty CoStream works", () => {
 });
 
 test("Can push into CoStream", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -67,7 +68,7 @@ test("Can push into CoStream", () => {
 });
 
 test("Empty RawBinaryCoStream works", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -93,7 +94,7 @@ test("Empty RawBinaryCoStream works", () => {
 });
 
 test("Can push into RawBinaryCoStream", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -129,7 +130,7 @@ test("Can push into RawBinaryCoStream", () => {
 });
 
 test("When adding large transactions (small fraction of MAX_RECOMMENDED_TX_SIZE), we store an inbetween signature every time we reach MAX_RECOMMENDED_TX_SIZE and split up newContentSince accordingly", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -161,7 +162,11 @@ test("When adding large transactions (small fraction of MAX_RECOMMENDED_TX_SIZE)
 
   content.endBinaryStream("trusting");
 
-  const sessionEntry = coValue.sessionLogs.get(node.currentSessionID)!;
+  if (!coValue.isAvailable()) {
+    throw new Error("CoValue is not available");
+  }
+
+  const sessionEntry = coValue.verified.sessions.get(node.currentSessionID)!;
   expect(sessionEntry.transactions.length).toEqual(12);
   expect(sessionEntry.signatureAfter[0]).not.toBeDefined();
   expect(sessionEntry.signatureAfter[1]).not.toBeDefined();
@@ -176,7 +181,7 @@ test("When adding large transactions (small fraction of MAX_RECOMMENDED_TX_SIZE)
   expect(sessionEntry.signatureAfter[10]).not.toBeDefined();
   expect(sessionEntry.signatureAfter[11]).not.toBeDefined();
 
-  const newContent = coValue.newContentSince({
+  const newContent = coValue.verified.newContentSince({
     id: coValue.id,
     header: false,
     sessions: {},
@@ -199,7 +204,7 @@ test("When adding large transactions (small fraction of MAX_RECOMMENDED_TX_SIZE)
 });
 
 test("When adding large transactions (bigger than MAX_RECOMMENDED_TX_SIZE), we store an inbetween signature after every large transaction and split up newContentSince accordingly", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -231,7 +236,11 @@ test("When adding large transactions (bigger than MAX_RECOMMENDED_TX_SIZE), we s
 
   content.endBinaryStream("trusting");
 
-  const sessionEntry = coValue.sessionLogs.get(node.currentSessionID)!;
+  if (!coValue.isAvailable()) {
+    throw new Error("CoValue is not available");
+  }
+
+  const sessionEntry = coValue.verified.sessions.get(node.currentSessionID)!;
   expect(sessionEntry.transactions.length).toEqual(5);
   expect(sessionEntry.signatureAfter[0]).not.toBeDefined();
   expect(sessionEntry.signatureAfter[1]).toBeDefined();
@@ -239,7 +248,7 @@ test("When adding large transactions (bigger than MAX_RECOMMENDED_TX_SIZE), we s
   expect(sessionEntry.signatureAfter[3]).toBeDefined();
   expect(sessionEntry.signatureAfter[4]).not.toBeDefined();
 
-  const newContent = coValue.newContentSince({
+  const newContent = coValue.verified.newContentSince({
     id: coValue.id,
     header: false,
     sessions: {},
@@ -308,7 +317,7 @@ test("totalValidTransactions should return the number of valid transactions proc
 
 describe("isBinaryStreamEnded", () => {
   function setup() {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
 
     const coValue = node.createCoValue({
       type: "costream",
@@ -371,7 +380,7 @@ describe("Binary stream order", () => {
   }
 
   test("sorts by madeAt timestamp first", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
     const coValue = node.createCoValue({
       type: "costream",
       ruleset: { type: "unsafeAllowAll" },
@@ -403,7 +412,7 @@ describe("Binary stream order", () => {
   });
 
   test("sorts by sessionID when timestamps are equal", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
     const coValue = node.createCoValue({
       type: "costream",
       ruleset: { type: "unsafeAllowAll" },
@@ -436,7 +445,7 @@ describe("Binary stream order", () => {
   });
 
   test("sorts by txIndex when timestamps and sessionIDs are equal", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
     const coValue = node.createCoValue({
       type: "costream",
       ruleset: { type: "unsafeAllowAll" },