cojson 0.13.16 → 0.13.18

package/dist/tests/sync.upload.test.js

@@ -1,6 +1,8 @@
 import { beforeEach, describe, expect, test } from "vitest";
-import { expectMap } from "../coValue";
+import { expectList, expectMap } from "../coValue";
+import { WasmCrypto } from "../crypto/WasmCrypto";
 import { SyncMessagesLog, loadCoValueOrFail, setupTestNode, waitFor, } from "./testUtils";
+const Crypto = await WasmCrypto.create();
 let jazzCloud = setupTestNode({ isSyncServer: true });
 beforeEach(async () => {
     SyncMessagesLog.clear();
@@ -57,6 +59,35 @@ describe("client to server upload", () => {
       ]
     `);
     });
+    test("coValue uploading with a missing dependency", async () => {
+        const client = setupTestNode({
+            connected: true,
+        });
+        const group = client.node.createGroup();
+        const map = group.createMap();
+        map.set("hello", "world", "trusting");
+        await group.core.waitForSync();
+        await map.core.waitForSync();
+        map.set("hello", "new world", "trusting");
+        // Testing that with a missing group the sync will not fail
+        client.node.internalDeleteCoValue(group.id);
+        await map.core.waitForSync();
+        const mapOnServer = await loadCoValueOrFail(jazzCloud.node, map.id);
+        expect(mapOnServer.get("hello")).toEqual("new world");
+        expect(SyncMessagesLog.getMessages({
+            Group: group.core,
+            Map: map.core,
+        })).toMatchInlineSnapshot(`
+      [
+        "client -> server | CONTENT Group header: true new: After: 0 New: 3",
+        "server -> client | KNOWN Group sessions: header/3",
+        "client -> server | CONTENT Map header: true new: After: 0 New: 1",
+        "server -> client | KNOWN Map sessions: header/1",
+        "client -> server | CONTENT Map header: false new: After: 1 New: 1",
+        "server -> client | KNOWN Map sessions: header/2",
+      ]
+    `);
+    });
     test("wrong optimistic known state should be corrected", async () => {
         const client = setupTestNode({
             connected: true,
@@ -70,7 +101,7 @@ describe("client to server upload", () => {
         // Load the coValue on the client
         await map.core.waitForSync();
         // Forcefully delete the coValue from the client (simulating some data loss)
-        jazzCloud.node.coValuesStore.coValues.delete(map.id);
+        jazzCloud.node.internalDeleteCoValue(map.id);
         map.set("fromClient", "updated", "trusting");
         await waitFor(() => {
             const coValue = expectMap(jazzCloud.node.expectCoValueLoaded(map.id).getCurrentContent());
@@ -92,11 +123,68 @@ describe("client to server upload", () => {
       ]
     `);
     });
+    test("syncing changes between two clients with a sync server in the middle", async () => {
+        const client = setupTestNode({
+            connected: true,
+        });
+        const otherClient = setupTestNode({});
+        const otherClientConnection = otherClient.connectToSyncServer({
+            ourName: "otherClient",
+        });
+        const coValue = client.node.createCoValue({
+            type: "colist",
+            ruleset: { type: "unsafeAllowAll" },
+            meta: null,
+            ...Crypto.createdNowUnique(),
+        });
+        const list = expectList(coValue.getCurrentContent());
+        list.append(1, undefined, "trusting");
+        const listOnOtherClient = await loadCoValueOrFail(otherClient.node, list.id);
+        otherClientConnection.peerState.gracefulShutdown();
+        listOnOtherClient.append(1, undefined, "trusting");
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        list.append(1, undefined, "trusting");
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        listOnOtherClient.append(1, undefined, "trusting");
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        list.append(1, undefined, "trusting");
+        otherClient.connectToSyncServer({
+            ourName: "otherClient",
+        });
+        await waitFor(() => {
+            expect(list.toJSON()).toEqual([1, 1, 1, 1, 1]);
+        });
+        expect(SyncMessagesLog.getMessages({
+            Colist: coValue,
+        })).toMatchInlineSnapshot(`
+      [
+        "otherClient -> server | LOAD Colist sessions: empty",
+        "client -> server | CONTENT Colist header: true new: After: 0 New: 1",
+        "server -> otherClient | KNOWN Colist sessions: empty",
+        "server -> client | KNOWN Colist sessions: header/1",
+        "server -> otherClient | CONTENT Colist header: true new: After: 0 New: 1",
+        "otherClient -> server | KNOWN Colist sessions: header/1",
+        "client -> server | CONTENT Colist header: false new: After: 1 New: 1",
+        "server -> client | KNOWN Colist sessions: header/2",
+        "otherClient -> server | LOAD Colist sessions: header/3",
+        "client -> server | CONTENT Colist header: false new: After: 2 New: 1",
+        "server -> otherClient | CONTENT Colist header: false new: After: 1 New: 1",
+        "server -> client | KNOWN Colist sessions: header/3",
+        "otherClient -> server | KNOWN Colist sessions: header/4",
+        "server -> otherClient | CONTENT Colist header: false new: After: 2 New: 1",
+        "otherClient -> server | CONTENT Colist header: false new: After: 0 New: 2",
+        "server -> otherClient | KNOWN Colist sessions: header/5",
+        "server -> client | CONTENT Colist header: false new: After: 0 New: 2",
+        "otherClient -> server | KNOWN Colist sessions: header/5",
+        "client -> server | KNOWN Colist sessions: header/5",
+      ]
+    `);
+    });
     test("large coValue upload streaming", async () => {
         const client = setupTestNode({
             connected: true,
         });
-        const group = client.node.createGroup();
+        const group = jazzCloud.node.createGroup();
         group.addMember("everyone", "writer");
         const largeMap = group.createMap();
         // Generate a large amount of data (about 100MB)
@@ -115,40 +203,41 @@ describe("client to server upload", () => {
             Map: largeMap.core,
         })).toMatchInlineSnapshot(`
       [
-        "client -> server | CONTENT Group header: true new: After: 0 New: 5",
-        "server -> client | KNOWN Group sessions: header/5",
-        "client -> server | CONTENT Map header: true new: ",
-        "server -> client | KNOWN Map sessions: header/0",
-        "client -> server | CONTENT Map header: false new: After: 0 New: 73",
-        "server -> client | KNOWN Map sessions: header/73",
-        "client -> server | CONTENT Map header: false new: After: 73 New: 73",
-        "server -> client | KNOWN Map sessions: header/146",
-        "client -> server | CONTENT Map header: false new: After: 146 New: 73",
-        "server -> client | KNOWN Map sessions: header/219",
-        "client -> server | CONTENT Map header: false new: After: 219 New: 73",
-        "server -> client | KNOWN Map sessions: header/292",
-        "client -> server | CONTENT Map header: false new: After: 292 New: 73",
-        "server -> client | KNOWN Map sessions: header/365",
-        "client -> server | CONTENT Map header: false new: After: 365 New: 73",
-        "server -> client | KNOWN Map sessions: header/438",
-        "client -> server | CONTENT Map header: false new: After: 438 New: 73",
-        "server -> client | KNOWN Map sessions: header/511",
-        "client -> server | CONTENT Map header: false new: After: 511 New: 73",
-        "server -> client | KNOWN Map sessions: header/584",
-        "client -> server | CONTENT Map header: false new: After: 584 New: 73",
-        "server -> client | KNOWN Map sessions: header/657",
-        "client -> server | CONTENT Map header: false new: After: 657 New: 73",
-        "server -> client | KNOWN Map sessions: header/730",
-        "client -> server | CONTENT Map header: false new: After: 730 New: 73",
-        "server -> client | KNOWN Map sessions: header/803",
-        "client -> server | CONTENT Map header: false new: After: 803 New: 73",
-        "server -> client | KNOWN Map sessions: header/876",
-        "client -> server | CONTENT Map header: false new: After: 876 New: 73",
-        "server -> client | KNOWN Map sessions: header/949",
-        "client -> server | CONTENT Map header: false new: After: 949 New: 73",
-        "server -> client | KNOWN Map sessions: header/1022",
-        "client -> server | CONTENT Map header: false new: After: 1022 New: 2",
-        "server -> client | KNOWN Map sessions: header/1024",
+        "client -> server | LOAD Map sessions: empty",
+        "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: ",
+        "client -> server | KNOWN Map sessions: header/0",
+        "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: 73 New: 73",
+        "client -> server | KNOWN Map sessions: header/146",
+        "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: 219 New: 73",
+        "client -> server | KNOWN Map sessions: header/292",
+        "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: 365 New: 73",
+        "client -> server | KNOWN Map sessions: header/438",
+        "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/dist/tests/sync.upload.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync.upload.test.js","sourceRoot":"","sources":["../../src/tests/sync.upload.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync.upload.test.js","sourceRoot":"","sources":["../../src/tests/sync.upload.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/testUtils.d.ts

@@ -1,25 +1,23 @@
 import { MetricReader } from "@opentelemetry/sdk-metrics";
-import { ControlledAgent } from "../coValues/account.js";
-import type { CoID, CoValueCore, RawCoValue } from "../exports.js";
+import { ControlledAccount, ControlledAgent } from "../coValues/account.js";
+import type { AgentSecret, CoID, CoValueCore, RawCoValue } from "../exports.js";
 import type { SessionID } from "../ids.js";
 import { LocalNode } from "../localNode.js";
 import type { Peer, SyncMessage } from "../sync.js";
-export declare function randomAnonymousAccountAndSessionID(): [
-    ControlledAgent,
-    SessionID
-];
+export declare function randomAgentAndSessionID(): [ControlledAgent, SessionID];
+export declare function nodeWithRandomAgentAndSessionID(): LocalNode;
 export declare function createTestNode(): LocalNode;
 export declare function createTwoConnectedNodes(node1Role: Peer["role"], node2Role: Peer["role"]): Promise<{
     node1: {
         node: LocalNode;
         accountID: import("../exports.js").RawAccountID;
-        accountSecret: import("../exports.js").AgentSecret;
+        accountSecret: AgentSecret;
         sessionID: SessionID;
     };
     node2: {
         node: LocalNode;
         accountID: import("../exports.js").RawAccountID;
-        accountSecret: import("../exports.js").AgentSecret;
+        accountSecret: AgentSecret;
         sessionID: SessionID;
     };
     node1ToNode2Peer: Peer;
@@ -29,19 +27,19 @@ export declare function createThreeConnectedNodes(node1Role: Peer["role"], node2
     node1: {
         node: LocalNode;
         accountID: import("../exports.js").RawAccountID;
-        accountSecret: import("../exports.js").AgentSecret;
+        accountSecret: AgentSecret;
         sessionID: SessionID;
     };
     node2: {
         node: LocalNode;
         accountID: import("../exports.js").RawAccountID;
-        accountSecret: import("../exports.js").AgentSecret;
+        accountSecret: AgentSecret;
         sessionID: SessionID;
     };
     node3: {
         node: LocalNode;
         accountID: import("../exports.js").RawAccountID;
-        accountSecret: import("../exports.js").AgentSecret;
+        accountSecret: AgentSecret;
         sessionID: SessionID;
     };
     node1ToNode2Peer: Peer;
@@ -54,14 +52,14 @@ export declare function createThreeConnectedNodes(node1Role: Peer["role"], node2
 export declare function connectTwoPeers(a: LocalNode, b: LocalNode, aRole: "client" | "server", bRole: "client" | "server"): void;
 export declare function newGroup(): {
     node: LocalNode;
-    groupCore: CoValueCore;
+    groupCore: import("../coValueCore/coValueCore.js").AvailableCoValueCore;
     admin: ControlledAgent;
 };
 export declare function groupWithTwoAdmins(): {
     group: import("../exports.js").RawGroup<import("../jsonValue.js").JsonObject | null>;
-    groupCore: CoValueCore;
+    groupCore: import("../coValueCore/coValueCore.js").AvailableCoValueCore;
     admin: ControlledAgent;
-    otherAdmin: import("../exports.js").RawControlledAccount<import("../exports.js").AccountMeta>;
+    otherAdmin: ControlledAccount;
     node: LocalNode;
 };
 export declare function newGroupHighLevel(): {
@@ -73,7 +71,7 @@ export declare function groupWithTwoAdminsHighLevel(): {
     admin: ControlledAgent;
     node: LocalNode;
     group: import("../exports.js").RawGroup<import("../jsonValue.js").JsonObject | null>;
-    otherAdmin: import("../exports.js").RawControlledAccount<import("../exports.js").AccountMeta>;
+    otherAdmin: ControlledAccount;
 };
 export declare function shouldNotResolve<T>(promise: Promise<T>, ops: {
     timeout: number;
@@ -115,6 +113,16 @@ export declare class SyncMessagesLog {
         [key: string]: CoValueCore;
     }): void;
 }
+export declare function getSyncServerConnectedPeer(opts: {
+    syncServerName?: string;
+    ourName?: string;
+    syncServer?: LocalNode;
+    peerId: string;
+}): {
+    peer: Peer;
+    peerStateOnServer: import("../PeerState.js").PeerState;
+    peerOnServer: Peer;
+};
 export declare function setupTestNode(opts?: {
     isSyncServer?: boolean;
     connected?: boolean;
@@ -182,5 +190,6 @@ export declare function connectedPeersWithMessagesTracking(opts: {
     peer1: Peer;
     peer2: Peer;
 };
+export declare function createAccountInNode(node: LocalNode): ControlledAccount;
 export {};
 //# sourceMappingURL=testUtils.d.ts.map

package/dist/tests/testUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../../src/tests/testUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../../src/tests/testUtils.ts"],"names":[],"mappings":"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"}

package/dist/tests/testUtils.js

@@ -1,7 +1,7 @@
 import { metrics } from "@opentelemetry/api";
 import { AggregationTemporality, InMemoryMetricExporter, MeterProvider, MetricReader, } from "@opentelemetry/sdk-metrics";
 import { expect, onTestFinished, vi } from "vitest";
-import { ControlledAgent } from "../coValues/account.js";
+import { ControlledAccount, ControlledAgent } from "../coValues/account.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
 import { LocalNode } from "../localNode.js";
 import { connectedPeers } from "../streamUtils.js";
@@ -11,14 +11,18 @@ const Crypto = await WasmCrypto.create();
 const syncServer = {
     current: undefined,
 };
-export function randomAnonymousAccountAndSessionID() {
+export function randomAgentAndSessionID() {
     const agentSecret = Crypto.newRandomAgentSecret();
     const sessionID = Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret));
     return [new ControlledAgent(agentSecret, Crypto), sessionID];
 }
+export function nodeWithRandomAgentAndSessionID() {
+    const [agent, session] = randomAgentAndSessionID();
+    return new LocalNode(agent.agentSecret, session, Crypto);
+}
 export function createTestNode() {
-    const [admin, session] = randomAnonymousAccountAndSessionID();
-    return new LocalNode(admin, session, Crypto);
+    const [admin, session] = randomAgentAndSessionID();
+    return new LocalNode(admin.agentSecret, session, Crypto);
 }
 export async function createTwoConnectedNodes(node1Role, node2Role) {
     // Connect nodes initially
@@ -84,7 +88,7 @@ export async function createThreeConnectedNodes(node1Role, node2Role, node3Role)
     };
 }
 export function connectTwoPeers(a, b, aRole, bRole) {
-    const [aAsPeer, bAsPeer] = connectedPeers("peer:" + a.account.id, "peer:" + b.account.id, {
+    const [aAsPeer, bAsPeer] = connectedPeers("peer:" + a.getCurrentAgent().id, "peer:" + b.getCurrentAgent().id, {
         peer1role: aRole,
         peer2role: bRole,
     });
@@ -92,22 +96,22 @@ export function connectTwoPeers(a, b, aRole, bRole) {
     b.syncManager.addPeer(aAsPeer);
 }
 export function newGroup() {
-    const [admin, sessionID] = randomAnonymousAccountAndSessionID();
-    const node = new LocalNode(admin, sessionID, Crypto);
+    const [admin, sessionID] = randomAgentAndSessionID();
+    const node = new LocalNode(admin.agentSecret, sessionID, Crypto);
     const groupCore = node.createCoValue({
         type: "comap",
-        ruleset: { type: "group", initialAdmin: admin.id },
+        ruleset: { type: "group", initialAdmin: node.getCurrentAgent().id },
         meta: null,
         ...Crypto.createdNowUnique(),
     });
     const group = expectGroup(groupCore.getCurrentContent());
-    group.set(admin.id, "admin", "trusting");
-    expect(group.get(admin.id)).toEqual("admin");
+    group.set(node.getCurrentAgent().id, "admin", "trusting");
+    expect(group.get(node.getCurrentAgent().id)).toEqual("admin");
     return { node, groupCore, admin };
 }
 export function groupWithTwoAdmins() {
     const { groupCore, admin, node } = newGroup();
-    const otherAdmin = node.createAccount();
+    const otherAdmin = createAccountInNode(node);
     const group = expectGroup(groupCore.getCurrentContent());
     group.set(otherAdmin.id, "admin", "trusting");
     expect(group.get(otherAdmin.id)).toEqual("admin");
@@ -118,8 +122,8 @@ export function groupWithTwoAdmins() {
     return { group, groupCore, admin, otherAdmin, node };
 }
 export function newGroupHighLevel() {
-    const [admin, sessionID] = randomAnonymousAccountAndSessionID();
-    const node = new LocalNode(admin, sessionID, Crypto);
+    const [admin, sessionID] = randomAgentAndSessionID();
+    const node = new LocalNode(admin.agentSecret, sessionID, Crypto);
     const group = node.createGroup();
     onTestFinished(() => {
         node.gracefulShutdown();
@@ -128,7 +132,7 @@ export function newGroupHighLevel() {
 }
 export function groupWithTwoAdminsHighLevel() {
     const { admin, node, group } = newGroupHighLevel();
-    const otherAdmin = node.createAccount();
+    const otherAdmin = createAccountInNode(node);
     group.addMember(otherAdmin, "admin");
     return { admin, node, group, otherAdmin };
 }
@@ -267,42 +271,63 @@ export class SyncMessagesLog {
     }
 }
 SyncMessagesLog.messages = [];
+export function getSyncServerConnectedPeer(opts) {
+    const currentSyncServer = opts?.syncServer ?? syncServer.current;
+    if (!currentSyncServer) {
+        throw new Error("Sync server not initialized");
+    }
+    if (currentSyncServer.getCurrentAgent().id === opts.peerId) {
+        throw new Error("Cannot connect to self");
+    }
+    const { peer1, peer2 } = connectedPeersWithMessagesTracking({
+        peer1: {
+            id: currentSyncServer.getCurrentAgent().id,
+            role: "server",
+            name: opts.syncServerName,
+        },
+        peer2: {
+            id: opts.peerId,
+            role: "client",
+            name: opts.ourName,
+        },
+    });
+    currentSyncServer.syncManager.addPeer(peer2);
+    return {
+        peer: peer1,
+        peerStateOnServer: currentSyncServer.syncManager.peers[peer2.id],
+        peerOnServer: peer2,
+    };
+}
 export function setupTestNode(opts = {}) {
-    const [admin, session] = randomAnonymousAccountAndSessionID();
-    let node = new LocalNode(admin, session, Crypto);
+    const [admin, session] = randomAgentAndSessionID();
+    let node = new LocalNode(admin.agentSecret, session, Crypto);
     if (opts.isSyncServer) {
         syncServer.current = node;
     }
     function connectToSyncServer(opts) {
-        const currentSyncServer = opts?.syncServer ?? syncServer.current;
-        if (!currentSyncServer) {
-            throw new Error("Sync server not initialized");
-        }
-        if (currentSyncServer.account.id === node.account.id) {
-            throw new Error("Cannot connect to self");
-        }
-        const { peer1, peer2 } = connectedPeersWithMessagesTracking({
-            peer1: {
-                id: currentSyncServer.account.id,
-                role: "server",
-                name: opts?.syncServerName,
-            },
-            peer2: { id: node.account.id, role: "client", name: opts?.ourName },
+        const { peer, peerStateOnServer, peerOnServer } = getSyncServerConnectedPeer({
+            peerId: node.getCurrentAgent().id,
+            syncServerName: opts?.syncServerName,
+            ourName: opts?.ourName,
+            syncServer: opts?.syncServer,
         });
-        node.syncManager.addPeer(peer1);
-        currentSyncServer.syncManager.addPeer(peer2);
+        node.syncManager.addPeer(peer);
         return {
-            peerState: node.syncManager.peers[peer1.id],
-            peer: peer1,
-            peerStateOnServer: currentSyncServer.syncManager.peers[peer2.id],
-            peerOnServer: peer2,
+            peerState: node.syncManager.peers[peer.id],
+            peer: peer,
+            peerStateOnServer: peerStateOnServer,
+            peerOnServer: peerOnServer,
         };
     }
     function addStoragePeer(opts = {}) {
         const storage = createTestNode();
         const { peer1, peer2 } = connectedPeersWithMessagesTracking({
-            peer1: { id: storage.account.id, role: "storage" },
-            peer2: { id: node.account.id, role: "client", name: opts.ourName },
+            peer1: { id: storage.getCurrentAgent().id, role: "storage" },
+            peer2: {
+                id: node.getCurrentAgent().id,
+                role: "client",
+                name: opts.ourName,
+            },
         });
         peer1.priority = 100;
         node.syncManager.addPeer(peer1);
@@ -321,7 +346,7 @@ export function setupTestNode(opts = {}) {
         addStoragePeer,
         restart: () => {
             node.gracefulShutdown();
-            ctx.node = node = new LocalNode(admin, session, Crypto);
+            ctx.node = node = new LocalNode(admin.agentSecret, session, Crypto);
             if (opts.isSyncServer) {
                 syncServer.current = node;
             }
@@ -340,39 +365,33 @@ export async function setupTestAccount(opts = {}) {
         syncServer.current = ctx.node;
     }
     function connectToSyncServer(opts) {
-        const currentSyncServer = opts?.syncServer ?? syncServer.current;
-        if (!currentSyncServer) {
-            throw new Error("Sync server not initialized");
-        }
-        if (currentSyncServer.account.id === ctx.node.account.id) {
-            throw new Error("Cannot connect to self");
-        }
-        const { peer1, peer2 } = connectedPeersWithMessagesTracking({
-            peer1: {
-                id: currentSyncServer.account.id,
-                role: "server",
-                name: opts?.syncServerName,
-            },
-            peer2: { id: ctx.node.account.id, role: "client", name: opts?.ourName },
+        const { peer, peerStateOnServer, peerOnServer } = getSyncServerConnectedPeer({
+            peerId: ctx.node.getCurrentAgent().id,
+            syncServerName: opts?.syncServerName,
+            ourName: opts?.ourName,
+            syncServer: opts?.syncServer,
         });
-        ctx.node.syncManager.addPeer(peer1);
-        currentSyncServer.syncManager.addPeer(peer2);
+        ctx.node.syncManager.addPeer(peer);
         function getCurrentPeerState() {
-            return ctx.node.syncManager.peers[peer1.id];
+            return ctx.node.syncManager.peers[peer.id];
         }
         return {
             peerState: getCurrentPeerState(),
-            peer: peer1,
-            peerStateOnServer: currentSyncServer.syncManager.peers[peer2.id],
-            peerOnServer: peer2,
+            peer,
+            peerStateOnServer: peerStateOnServer,
+            peerOnServer: peerOnServer,
             getCurrentPeerState,
         };
     }
     function addStoragePeer(opts = {}) {
         const storage = createTestNode();
         const { peer1, peer2 } = connectedPeersWithMessagesTracking({
-            peer1: { id: storage.account.id, role: "storage" },
-            peer2: { id: ctx.node.account.id, role: "client", name: opts.ourName },
+            peer1: { id: storage.getCurrentAgent().id, role: "storage" },
+            peer2: {
+                id: ctx.node.getCurrentAgent().id,
+                role: "client",
+                name: opts.ourName,
+            },
         });
         peer1.priority = 100;
         ctx.node.syncManager.addPeer(peer1);
@@ -420,4 +439,12 @@ export function connectedPeersWithMessagesTracking(opts) {
         peer2,
     };
 }
+export function createAccountInNode(node) {
+    const accountOnTempNode = LocalNode.internalCreateAccount({
+        crypto: node.crypto,
+    });
+    const accountCoreEntry = node.getCoValue(accountOnTempNode.id);
+    accountCoreEntry.internalMarkMagicallyAvailable(accountOnTempNode.core.verified);
+    return new ControlledAccount(accountCoreEntry.getCurrentContent(), accountOnTempNode.core.node.agentSecret);
+}
 //# sourceMappingURL=testUtils.js.map