cojson 0.18.33 → 0.18.34

package/src/tests/testUtils.ts

@@ -14,6 +14,7 @@ import {
   type CoID,
   type CoValueCore,
   type RawAccount,
+  RawAccountID,
   type RawCoValue,
   StorageAPI,
 } from "../exports.js";
@@ -557,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;
@@ -577,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,
@@ -635,19 +656,10 @@ export async function setupTestAccount(
     addStorage,
     addAsyncStorage,
     spawnNewSession: () => {
-      const { peer } = getSyncServerConnectedPeer({
-        peerId: ctx.node.getCurrentAgent().id,
-      });
-
-      ctx.node.syncManager.addPeer(peer);
-
-      return LocalNode.withLoadedAccount({
-        peers: [peer],
-        crypto: Crypto,
-        storage: opts.storage,
+      return setupTestAccount({
         accountID: ctx.accountID,
         accountSecret: ctx.accountSecret,
-        sessionID: Crypto.newRandomSessionID(ctx.accountID),
+        connected: true,
       });
     },
     disconnect: () => {