cojson 0.13.16 → 0.13.18

package/src/tests/coStream.test.ts

@@ -1,6 +1,6 @@
-import { describe, expect, test } from "vitest";
+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,
@@ -10,12 +10,22 @@ import {
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
 import { SessionID } from "../ids.js";
 import { LocalNode } from "../localNode.js";
-import { randomAnonymousAccountAndSessionID } from "./testUtils.js";
+import {
+  loadCoValueOrFail,
+  nodeWithRandomAgentAndSessionID,
+  randomAgentAndSessionID,
+  setupTestNode,
+  waitFor,
+} from "./testUtils.js";
 
 const Crypto = await WasmCrypto.create();
 
+beforeEach(async () => {
+  setupTestNode({ isSyncServer: true });
+});
+
 test("Empty CoStream works", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -32,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",
@@ -58,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",
@@ -84,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",
@@ -120,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",
@@ -152,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();
@@ -167,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: {},
@@ -190,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",
@@ -222,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();
@@ -230,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: {},
@@ -252,9 +270,54 @@ test("When adding large transactions (bigger than MAX_RECOMMENDED_TX_SIZE), we s
   );
 });
 
+test("totalValidTransactions should return the number of valid transactions processed", async () => {
+  const client = setupTestNode({
+    connected: true,
+  });
+  const otherClient = setupTestNode({});
+
+  const otherClientConnection = otherClient.connectToSyncServer();
+
+  const group = client.node.createGroup();
+  group.addMember("everyone", "reader");
+
+  const stream = group.createStream();
+  stream.push(1, "trusting");
+
+  const streamOnOtherClient = await loadCoValueOrFail(
+    otherClient.node,
+    stream.id,
+  );
+
+  otherClientConnection.peerState.gracefulShutdown();
+
+  group.addMember("everyone", "writer");
+
+  await new Promise((resolve) => setTimeout(resolve, 50));
+
+  streamOnOtherClient.push(2, "trusting");
+
+  expect(streamOnOtherClient.totalValidTransactions).toEqual(1);
+  expect(Object.keys(streamOnOtherClient.toJSON()).length).toEqual(1);
+
+  otherClient.connectToSyncServer();
+
+  await waitFor(() => {
+    expect(
+      Object.keys(
+        streamOnOtherClient.core.getCurrentContent().toJSON() as object,
+      ).length,
+    ).toEqual(2);
+  });
+
+  expect(
+    streamOnOtherClient.core.getCurrentContent().totalValidTransactions,
+  ).toEqual(2);
+});
+
 describe("isBinaryStreamEnded", () => {
   function setup() {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
 
     const coValue = node.createCoValue({
       type: "costream",
@@ -317,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" },
@@ -349,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" },
@@ -382,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" },

package/src/tests/coValueCore.test.ts

@@ -1,5 +1,6 @@
 import { assert, afterEach, beforeEach, expect, test, vi } from "vitest";
-import { CoValueCore, Transaction } from "../coValueCore.js";
+import { CoValueCore } from "../coValueCore/coValueCore.js";
+import { Transaction } from "../coValueCore/verifiedState.js";
 import { MapOpPayload } from "../coValues/coMap.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
 import { stableStringify } from "../jsonStringify.js";
@@ -10,7 +11,8 @@ import {
   createTestNode,
   createTwoConnectedNodes,
   loadCoValueOrFail,
-  randomAnonymousAccountAndSessionID,
+  nodeWithRandomAgentAndSessionID,
+  randomAgentAndSessionID,
   tearDownTestMetricReader,
 } from "./testUtils.js";
 
@@ -27,8 +29,8 @@ afterEach(() => {
 });
 
 test("Can create coValue with new agent credentials and add transaction to it", () => {
-  const [account, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(account, sessionID, Crypto);
+  const [agent, sessionID] = randomAgentAndSessionID();
+  const node = new LocalNode(agent.agentSecret, sessionID, Crypto);
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -47,7 +49,7 @@ test("Can create coValue with new agent credentials and add transaction to it",
     ]),
   };
 
-  const { expectedNewHash } = coValue.expectedNewHashAfter(
+  const { expectedNewHash } = coValue.verified.expectedNewHashAfter(
     node.currentSessionID,
     [transaction],
   );
@@ -58,7 +60,8 @@ test("Can create coValue with new agent credentials and add transaction to it",
         node.currentSessionID,
         [transaction],
         expectedNewHash,
-        Crypto.sign(account.currentSignerSecret(), expectedNewHash),
+        Crypto.sign(agent.currentSignerSecret(), expectedNewHash),
+        "immediate",
       )
       ._unsafeUnwrap(),
   ).toBe(true);
@@ -66,8 +69,7 @@ test("Can create coValue with new agent credentials and add transaction to it",
 
 test("transactions with wrong signature are rejected", () => {
   const wrongAgent = Crypto.newRandomAgentSecret();
-  const [agentSecret, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(agentSecret, sessionID, Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -86,7 +88,7 @@ test("transactions with wrong signature are rejected", () => {
     ]),
   };
 
-  const { expectedNewHash } = coValue.expectedNewHashAfter(
+  const { expectedNewHash } = coValue.verified.expectedNewHashAfter(
     node.currentSessionID,
     [transaction],
   );
@@ -98,13 +100,14 @@ test("transactions with wrong signature are rejected", () => {
       [transaction],
       expectedNewHash,
       Crypto.sign(Crypto.getAgentSignerSecret(wrongAgent), expectedNewHash),
+      "immediate",
     )
     ._unsafeUnwrapErr({ withStackTrace: true });
 });
 
 test("transactions with correctly signed, but wrong hash are rejected", () => {
-  const [account, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(account, sessionID, Crypto);
+  const [agent, sessionID] = randomAgentAndSessionID();
+  const node = new LocalNode(agent.agentSecret, sessionID, Crypto);
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -123,7 +126,7 @@ test("transactions with correctly signed, but wrong hash are rejected", () => {
     ]),
   };
 
-  const { expectedNewHash } = coValue.expectedNewHashAfter(
+  const { expectedNewHash } = coValue.verified.expectedNewHashAfter(
     node.currentSessionID,
     [
       {
@@ -144,14 +147,15 @@ test("transactions with correctly signed, but wrong hash are rejected", () => {
       node.currentSessionID,
       [transaction],
       expectedNewHash,
-      Crypto.sign(account.currentSignerSecret(), expectedNewHash),
+      Crypto.sign(agent.currentSignerSecret(), expectedNewHash),
+      "immediate",
     )
     ._unsafeUnwrapErr({ withStackTrace: true });
 });
 
 test("New transactions in a group correctly update owned values, including subscriptions", async () => {
-  const [account, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(account, sessionID, Crypto);
+  const [agent, sessionID] = randomAgentAndSessionID();
+  const node = new LocalNode(agent.agentSecret, sessionID, Crypto);
 
   const group = node.createGroup();
 
@@ -175,18 +179,19 @@ test("New transactions in a group correctly update owned values, including subsc
     changes: stableStringify([
       {
         op: "set",
-        key: account.id,
+        key: agent.id,
         value: "revoked",
-      } satisfies MapOpPayload<typeof account.id, Role>,
+      } satisfies MapOpPayload<typeof agent.id, Role>,
     ]),
   } satisfies Transaction;
 
-  const { expectedNewHash } = group.core.expectedNewHashAfter(sessionID, [
-    resignationThatWeJustLearnedAbout,
-  ]);
+  const { expectedNewHash } = group.core.verified.expectedNewHashAfter(
+    sessionID,
+    [resignationThatWeJustLearnedAbout],
+  );
 
   const signature = Crypto.sign(
-    node.account.currentSignerSecret(),
+    node.getCurrentAgent().currentSignerSecret(),
     expectedNewHash,
   );
 
@@ -198,6 +203,7 @@ test("New transactions in a group correctly update owned values, including subsc
       [resignationThatWeJustLearnedAbout],
       expectedNewHash,
       signature,
+      "immediate",
     )
     ._unsafeUnwrap({ withStackTrace: true });
 
@@ -210,8 +216,7 @@ test("New transactions in a group correctly update owned values, including subsc
 });
 
 test("correctly records transactions", async () => {
-  const [account, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(account, sessionID, Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const changes1 = stableStringify([{ hello: "world" }]);
   node.syncManager.recordTransactionsSize(
@@ -253,8 +258,7 @@ test("correctly records transactions", async () => {
 });
 
 test("(smoke test) records transactions from local node", async () => {
-  const [account, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(account, sessionID, Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   node.createGroup();
 
@@ -294,8 +298,7 @@ test("creating a coValue with a group should't trigger automatically a content c
 });
 
 test("loading a coValue core without having the owner group available doesn't crash", () => {
-  const [account, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(account, sessionID, Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const otherNode = createTestNode();