cojson 0.13.18 → 0.13.20

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

@@ -1,16 +1,11 @@
 import { assert, beforeEach, describe, expect, test } from "vitest";
 
-import { expectMap } from "../coValue";
-import { expectAccount } from "../coValues/account";
 import { WasmCrypto } from "../crypto/WasmCrypto";
 import { LocalNode } from "../localNode";
-import { toSimplifiedMessages } from "./messagesTestUtils";
 import {
   SyncMessagesLog,
   getSyncServerConnectedPeer,
-  loadCoValueOrFail,
   setupTestNode,
-  waitFor,
 } from "./testUtils";
 
 const Crypto = await WasmCrypto.create();
@@ -27,7 +22,7 @@ describe("LocalNode auth sync", () => {
       peerId: "new-account",
     });
 
-    const { accountID, node } = await LocalNode.withNewlyCreatedAccount({
+    const { node } = await LocalNode.withNewlyCreatedAccount({
       creationProps: {
         name: "new-account",
       },
@@ -128,6 +123,7 @@ describe("LocalNode auth sync", () => {
   test("authenticate to an existing account", async () => {
     const { peer: newAccountPeer } = getSyncServerConnectedPeer({
       peerId: "new-account",
+      ourName: "creation-node",
     });
 
     const { accountID, accountSecret } =
@@ -141,10 +137,9 @@ describe("LocalNode auth sync", () => {
 
     const { peer: existingAccountPeer } = getSyncServerConnectedPeer({
       peerId: "existing-account",
+      ourName: "auth-node",
     });
 
-    SyncMessagesLog.clear();
-
     const node = await LocalNode.withLoadedAccount({
       accountID,
       accountSecret,
@@ -169,19 +164,82 @@ describe("LocalNode auth sync", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "client -> server | LOAD Account sessions: empty",
-        "server -> client | KNOWN Account sessions: header/4",
-        "client -> server | CONTENT ProfileGroup header: true new: After: 0 New: 5",
-        "server -> client | CONTENT Account header: true new: After: 0 New: 4",
-        "server -> client | KNOWN ProfileGroup sessions: header/5",
-        "client -> server | CONTENT Profile header: true new: After: 0 New: 1",
-        "client -> server | KNOWN Account sessions: header/4",
-        "server -> client | KNOWN Profile sessions: header/1",
-        "client -> server | LOAD Profile sessions: empty",
-        "server -> client | CONTENT ProfileGroup header: true new: After: 0 New: 5",
-        "client -> server | KNOWN ProfileGroup sessions: header/5",
-        "server -> client | CONTENT Profile header: true new: After: 0 New: 1",
-        "client -> server | KNOWN Profile sessions: header/1",
+        "creation-node -> server | CONTENT Account header: true new: After: 0 New: 4",
+        "auth-node -> server | LOAD Account sessions: empty",
+        "server -> creation-node | KNOWN Account sessions: header/4",
+        "creation-node -> server | CONTENT ProfileGroup header: true new: After: 0 New: 5",
+        "server -> auth-node | CONTENT Account header: true new: After: 0 New: 4",
+        "server -> creation-node | KNOWN ProfileGroup sessions: header/5",
+        "creation-node -> server | CONTENT Profile header: true new: After: 0 New: 1",
+        "auth-node -> server | KNOWN Account sessions: header/4",
+        "server -> creation-node | KNOWN Profile sessions: header/1",
+        "auth-node -> server | LOAD Profile sessions: empty",
+        "server -> auth-node | CONTENT ProfileGroup header: true new: After: 0 New: 5",
+        "auth-node -> server | KNOWN ProfileGroup sessions: header/5",
+        "server -> auth-node | CONTENT Profile header: true new: After: 0 New: 1",
+        "auth-node -> server | KNOWN Profile sessions: header/1",
+      ]
+    `);
+  });
+
+  test("authenticate to an existing account after immediately close the creation node", async () => {
+    const { peer: newAccountPeer } = getSyncServerConnectedPeer({
+      peerId: "new-account",
+      ourName: "creation-node",
+    });
+
+    const {
+      accountID,
+      accountSecret,
+      node: creationNode,
+    } = await LocalNode.withNewlyCreatedAccount({
+      creationProps: {
+        name: "new-account",
+      },
+      peersToLoadFrom: [newAccountPeer],
+      crypto: Crypto,
+    });
+
+    creationNode.gracefulShutdown();
+
+    const { peer: existingAccountPeer } = getSyncServerConnectedPeer({
+      peerId: "existing-account",
+      ourName: "auth-node",
+    });
+
+    const node = await LocalNode.withLoadedAccount({
+      accountID,
+      accountSecret,
+      peersToLoadFrom: [existingAccountPeer],
+      sessionID: undefined,
+      crypto: Crypto,
+    });
+
+    const account = node.expectCurrentAccount("after login");
+    const profile = creationNode.getCoValue(account.get("profile")!);
+
+    assert(profile.isAvailable());
+
+    expect(account.id).toBe(accountID);
+    expect(node.agentSecret).toBe(accountSecret);
+
+    expect(
+      SyncMessagesLog.getMessages({
+        Account: account.core,
+        Profile: profile,
+        ProfileGroup: profile.getGroup().core,
+      }),
+    ).toMatchInlineSnapshot(`
+      [
+        "creation-node -> server | CONTENT Account header: true new: After: 0 New: 4",
+        "auth-node -> server | LOAD Account sessions: empty",
+        "server -> creation-node | KNOWN Account sessions: header/4",
+        "server -> auth-node | CONTENT Account header: true new: After: 0 New: 4",
+        "auth-node -> server | KNOWN Account sessions: header/4",
+        "auth-node -> server | LOAD Profile sessions: empty",
+        "server -> auth-node | KNOWN Profile sessions: empty",
+        "auth-node -> server | LOAD Profile sessions: empty",
+        "server -> auth-node | KNOWN Profile sessions: empty",
       ]
     `);
   });

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

@@ -197,8 +197,6 @@ describe("loading coValues from server", () => {
     await map.core.waitForSync();
     await mapOnClient.core.waitForSync();
 
-    expect(mapOnClient.get("fromServer")).toEqual("updated");
-    expect(mapOnClient.get("fromClient")).toEqual("updated");
     expect(
       SyncMessagesLog.getMessages({
         Group: group.core,
@@ -217,6 +215,9 @@ describe("loading coValues from server", () => {
         "client -> server | KNOWN Map sessions: header/3",
       ]
     `);
+
+    expect(mapOnClient.get("fromServer")).toEqual("updated");
+    expect(mapOnClient.get("fromClient")).toEqual("updated");
   });
 
   test("wrong optimistic known state should be corrected", async () => {

package/src/tests/testUtils.ts

@@ -448,6 +448,31 @@ export function getSyncServerConnectedPeer(opts: {
   };
 }
 
+export function createMockStoragePeer(opts: {
+  ourName?: string;
+  peerId: string;
+}) {
+  const storage = createTestNode();
+
+  const { peer1, peer2 } = connectedPeersWithMessagesTracking({
+    peer1: { id: storage.getCurrentAgent().id, role: "storage" },
+    peer2: {
+      id: opts.peerId,
+      role: "client",
+      name: opts.ourName,
+    },
+  });
+
+  peer1.priority = 100;
+
+  storage.syncManager.addPeer(peer2);
+
+  return {
+    storage,
+    peer: peer1,
+  };
+}
+
 export function setupTestNode(
   opts: {
     isSyncServer?: boolean;
@@ -485,26 +510,14 @@ export function setupTestNode(
   }
 
   function addStoragePeer(opts: { ourName?: string } = {}) {
-    const storage = createTestNode();
-
-    const { peer1, peer2 } = connectedPeersWithMessagesTracking({
-      peer1: { id: storage.getCurrentAgent().id, role: "storage" },
-      peer2: {
-        id: node.getCurrentAgent().id,
-        role: "client",
-        name: opts.ourName,
-      },
+    const { peer, storage } = createMockStoragePeer({
+      peerId: node.getCurrentAgent().id,
+      ourName: opts.ourName,
     });
 
-    peer1.priority = 100;
-
-    node.syncManager.addPeer(peer1);
-    storage.syncManager.addPeer(peer2);
+    node.syncManager.addPeer(peer);
 
-    return {
-      storage,
-      peer: node.syncManager.peers[peer1.id]!,
-    };
+    return { peer, peerState: node.syncManager.peers[peer.id]!, storage };
   }
 
   if (opts.connected) {
@@ -575,26 +588,14 @@ export async function setupTestAccount(
   }
 
   function addStoragePeer(opts: { ourName?: string } = {}) {
-    const storage = createTestNode();
-
-    const { peer1, peer2 } = connectedPeersWithMessagesTracking({
-      peer1: { id: storage.getCurrentAgent().id, role: "storage" },
-      peer2: {
-        id: ctx.node.getCurrentAgent().id,
-        role: "client",
-        name: opts.ourName,
-      },
+    const { peer, storage } = createMockStoragePeer({
+      peerId: ctx.node.getCurrentAgent().id,
+      ourName: opts.ourName,
     });
 
-    peer1.priority = 100;
-
-    ctx.node.syncManager.addPeer(peer1);
-    storage.syncManager.addPeer(peer2);
+    ctx.node.syncManager.addPeer(peer);
 
-    return {
-      storage,
-      peer: ctx.node.syncManager.peers[peer1.id]!,
-    };
+    return { peer, peerState: ctx.node.syncManager.peers[peer.id]!, storage };
   }
 
   if (opts.connected) {