@dxos/echo-pipeline 0.3.11-next.e28df4f → 0.3.11-next.ee2b64c

package/src/automerge/automerge-host.test.ts

@@ -7,7 +7,7 @@ import expect from 'expect';
 import waitForExpect from 'wait-for-expect';
 
 import { Trigger, asyncTimeout, sleep } from '@dxos/async';
-import { type Message, NetworkAdapter, type PeerId, Repo } from '@dxos/automerge/automerge-repo';
+import { type Message, NetworkAdapter, type PeerId, Repo, type HandleState } from '@dxos/automerge/automerge-repo';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { StorageType, createStorage } from '@dxos/random-access-storage';
@@ -353,6 +353,67 @@ describe('AutomergeHost', () => {
 
     await docC.whenReady();
   });
+
+  test('replicate document after request', async () => {
+    const [adapter1, adapter2] = TestAdapter.createPair();
+    const repoA = new Repo({
+      peerId: 'A' as any,
+      network: [adapter1],
+      sharePolicy: async () => true,
+    });
+    const repoB = new Repo({
+      peerId: 'B' as any,
+      network: [adapter2],
+      sharePolicy: async () => true,
+    });
+
+    const unavailable: HandleState = 'unavailable';
+
+    {
+      // Connect repos.
+      adapter1.ready();
+      adapter2.ready();
+      await adapter1.onConnect.wait();
+      await adapter2.onConnect.wait();
+    }
+
+    const docA = repoA.create();
+    // NOTE: Doesn't work if the doc is empty.
+    docA.change((doc: any) => {
+      doc.text = 'Hello world';
+    });
+
+    const docB = repoB.find(docA.url);
+    {
+      // Request document from repoB.
+      await asyncTimeout(docB.whenReady([unavailable]), 1_000);
+    }
+
+    {
+      // Failing to find a document.
+      // await (docB.whenReady([unavailable]), 1_000);
+    }
+
+    {
+      adapter1.peerCandidate(adapter2.peerId!);
+      await sleep(100);
+      adapter2.peerCandidate(adapter1.peerId!);
+    }
+
+    {
+      await asyncTimeout(docB.whenReady([unavailable]), 1_000);
+    }
+
+    {
+      // Note: Retry hack.
+      adapter1.peerDisconnected(adapter2.peerId!);
+      adapter2.peerDisconnected(adapter1.peerId!);
+      adapter1.peerCandidate(adapter2.peerId!);
+      adapter2.peerCandidate(adapter1.peerId!);
+
+      await asyncTimeout(docB.whenReady(), 1_000);
+    }
+  });
 });
 
 class TestAdapter extends NetworkAdapter {

package/src/automerge/automerge-host.ts

@@ -255,6 +255,7 @@ class LocalHostNetworkAdapter extends NetworkAdapter {
  */
 export class MeshNetworkAdapter extends NetworkAdapter {
   private readonly _extensions: Map<string, AutomergeReplicator> = new Map();
+  private _connected = new Trigger();
 
   /**
    * Emits `ready` event. That signals to `Repo` that it can start using the adapter.
@@ -269,6 +270,7 @@ export class MeshNetworkAdapter extends NetworkAdapter {
 
   override connect(peerId: PeerId): void {
     this.peerId = peerId;
+    this._connected.wake();
   }
 
   override send(message: Message): void {
@@ -292,18 +294,22 @@ export class MeshNetworkAdapter extends NetworkAdapter {
       },
       {
         onStartReplication: async (info, remotePeerId /** Teleport ID */) => {
+          await this._connected.wait();
+
           // Note: We store only one extension per peer.
           //       There can be a case where two connected peers have more than one teleport connection between them
           //       and each of them uses different teleport connections to send messages.
           //       It works because we receive messages from all teleport connections and Automerge Repo dedup them.
           // TODO(mykola): Use only one teleport connection per peer.
-          if (this._extensions.has(info.id)) {
-            return;
+          if (!this._extensions.has(info.id)) {
+            peerInfo = info;
+            // TODO(mykola): Fix race condition?
+            this._extensions.set(info.id, extension);
+          } else {
+            // TODO(mykola): retry hack.
+            this.emit('peer-disconnected', { peerId: info.id as PeerId });
           }
 
-          peerInfo = info;
-          // TODO(mykola): Fix race condition?
-          this._extensions.set(info.id, extension);
           this.emit('peer-candidate', {
             // TODO(mykola): Hack, stop abusing `peerMetadata` field.
             peerMetadata: {