@dxos/echo-pipeline 0.3.10-next.ef70620 → 0.3.10

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

@@ -49,54 +49,6 @@ describe('AutomergeHost', () => {
       client: new Trigger<TestAdapter>(),
       host: new Trigger<TestAdapter>(),
     };
-
-    class TestAdapter extends NetworkAdapter {
-      constructor(public readonly context: Context, public readonly role: 'host' | 'client') {
-        super();
-      }
-
-      // NOTE: Emitting `ready` event in NetworkAdapter`s constructor causes a race condition
-      //       because `Repo` waits for `ready` event (which it never receives) before it starts using the adapter.
-      ready() {
-        this.emit('ready', { network: this });
-      }
-
-      override connect(peerId: PeerId) {
-        this.peerId = peerId;
-        context[this.role].wake(this);
-        context[this.role === 'host' ? 'client' : 'host']
-          .wait()
-          .then((adapter) => {
-            invariant(adapter.peerId, 'Peer id is not set');
-            this.emit('peer-candidate', { peerId: adapter.peerId });
-          })
-          .catch((error) => {
-            log.catch(error);
-          });
-      }
-
-      override send(message: Message) {
-        context[this.role === 'host' ? 'client' : 'host']
-          .wait()
-          .then((adapter) => {
-            adapter.receive(message);
-          })
-          .catch((error) => {
-            log.catch(error);
-          });
-      }
-
-      override disconnect() {
-        this.peerId = undefined;
-        this.context[this.role].reset();
-      }
-
-      receive(message: Message) {
-        invariant(this.peerId, 'Peer id is not set');
-        this.emit('message', message);
-      }
-    }
-
     const hostAdapter = new TestAdapter(context, 'host');
     const clientAdapter = new TestAdapter(context, 'client');
 
@@ -119,4 +71,55 @@ describe('AutomergeHost', () => {
     await asyncTimeout(docOnClient.whenReady(), 3_000);
     expect(docOnClient.docSync().text).toEqual(text);
   });
+
+  test('doubled connection', async () => {});
 });
+
+type Context = { client: Trigger<TestAdapter>; host: Trigger<TestAdapter> };
+
+class TestAdapter extends NetworkAdapter {
+  constructor(public readonly context: Context, public readonly role: 'host' | 'client') {
+    super();
+  }
+
+  // NOTE: Emitting `ready` event in NetworkAdapter`s constructor causes a race condition
+  //       because `Repo` waits for `ready` event (which it never receives) before it starts using the adapter.
+  ready() {
+    this.emit('ready', { network: this });
+  }
+
+  override connect(peerId: PeerId) {
+    this.peerId = peerId;
+    this.context[this.role].wake(this);
+    this.context[this.role === 'host' ? 'client' : 'host']
+      .wait()
+      .then((adapter) => {
+        invariant(adapter.peerId, 'Peer id is not set');
+        this.emit('peer-candidate', { peerId: adapter.peerId });
+      })
+      .catch((error) => {
+        log.catch(error);
+      });
+  }
+
+  override send(message: Message) {
+    this.context[this.role === 'host' ? 'client' : 'host']
+      .wait()
+      .then((adapter) => {
+        adapter.receive(message);
+      })
+      .catch((error) => {
+        log.catch(error);
+      });
+  }
+
+  override disconnect() {
+    this.peerId = undefined;
+    this.context[this.role].reset();
+  }
+
+  receive(message: Message) {
+    invariant(this.peerId, 'Peer id is not set');
+    this.emit('message', message);
+  }
+}

package/src/automerge/automerge-host.ts

@@ -205,6 +205,15 @@ class MeshNetworkAdapter extends NetworkAdapter {
       },
       {
         onStartReplication: async (info) => {
+          // 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;
+          }
+
           peerInfo = info;
           // TODO(mykola): Fix race condition?
           this._extensions.set(info.id, extension);
@@ -214,6 +223,7 @@ class MeshNetworkAdapter extends NetworkAdapter {
         },
         onSyncMessage: async ({ payload }) => {
           const message = cbor.decode(payload) as Message;
+          // Note: automerge Repo dedup messages.
           this.emit('message', message);
         },
         onClose: async () => {