@dxos/echo-pipeline 0.6.1-main.c52e5db → 0.6.1-main.de77b30

package/dist/lib/browser/index.mjs

@@ -40,7 +40,7 @@ import { trace } from "@dxos/tracing";
 import { mapValues } from "@dxos/util";
 
 // packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts
-import { Trigger, synchronized } from "@dxos/async";
+import { synchronized, Trigger } from "@dxos/async";
 import { NetworkAdapter } from "@dxos/automerge/automerge-repo";
 import { LifecycleState } from "@dxos/context";
 import { invariant } from "@dxos/invariant";
@@ -177,12 +177,12 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     await replicator.disconnect();
     this._replicators.delete(replicator);
   }
-  async shouldAdvertize(peerId, params) {
+  async shouldAdvertise(peerId, params) {
     const connection = this._connections.get(peerId);
     if (!connection) {
       return false;
     }
-    return connection.connection.shouldAdvertize(params);
+    return connection.connection.shouldAdvertise(params);
   }
   _onConnectionOpen(connection) {
     log("Connection opened", {
@@ -758,7 +758,7 @@ var AutomergeHost = class extends Resource2 {
     }
     const peerMetadata = this.repo.peerMetadataByPeerId[peerId];
     if (isEchoPeerMetadata(peerMetadata)) {
-      return this._echoNetworkAdapter.shouldAdvertize(peerId, {
+      return this._echoNetworkAdapter.shouldAdvertise(peerId, {
         documentId
       });
     }
@@ -1256,14 +1256,134 @@ AutomergeDocumentLoaderImpl = _ts_decorate3([
 ], AutomergeDocumentLoaderImpl);
 
 // packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts
+import { invariant as invariant6 } from "@dxos/invariant";
+import { PublicKey as PublicKey2 } from "@dxos/keys";
+import { log as log5 } from "@dxos/log";
+import { ComplexMap, ComplexSet, defaultMap } from "@dxos/util";
+
+// packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator-connection.ts
 import { cbor as cbor2 } from "@dxos/automerge/automerge-repo";
 import { Resource as Resource3 } from "@dxos/context";
 import { invariant as invariant5 } from "@dxos/invariant";
-import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { log as log4 } from "@dxos/log";
 import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
-import { ComplexMap, ComplexSet, defaultMap } from "@dxos/util";
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator-connection.ts";
+var DEFAULT_FACTORY = (params) => new AutomergeReplicator(...params);
+var MeshReplicatorConnection = class extends Resource3 {
+  constructor(_params) {
+    super();
+    this._params = _params;
+    this.remoteDeviceKey = null;
+    this._remotePeerId = null;
+    this._isEnabled = false;
+    let readableStreamController;
+    this.readable = new ReadableStream({
+      start: (controller) => {
+        readableStreamController = controller;
+        this._ctx.onDispose(() => controller.close());
+      }
+    });
+    this.writable = new WritableStream({
+      write: async (message, controller) => {
+        invariant5(this._isEnabled, "Writing to a disabled connection", {
+          F: __dxlog_file5,
+          L: 47,
+          S: this,
+          A: [
+            "this._isEnabled",
+            "'Writing to a disabled connection'"
+          ]
+        });
+        try {
+          await this.replicatorExtension.sendSyncMessage({
+            payload: cbor2.encode(message)
+          });
+        } catch (err) {
+          controller.error(err);
+          this._disconnectIfEnabled();
+        }
+      }
+    });
+    const createAutomergeReplicator = this._params.replicatorFactory ?? DEFAULT_FACTORY;
+    this.replicatorExtension = createAutomergeReplicator([
+      {
+        peerId: this._params.ownPeerId
+      },
+      {
+        onStartReplication: async (info, remotePeerId) => {
+          this.remoteDeviceKey = remotePeerId;
+          this._remotePeerId = info.id;
+          log4("onStartReplication", {
+            id: info.id,
+            thisPeerId: this.peerId,
+            remotePeerId: remotePeerId.toHex()
+          }, {
+            F: __dxlog_file5,
+            L: 81,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          this._params.onRemoteConnected();
+        },
+        onSyncMessage: async ({ payload }) => {
+          if (!this._isEnabled) {
+            return;
+          }
+          const message = cbor2.decode(payload);
+          readableStreamController.enqueue(message);
+        },
+        onClose: async () => {
+          this._disconnectIfEnabled();
+        }
+      }
+    ]);
+  }
+  _disconnectIfEnabled() {
+    if (this._isEnabled) {
+      this._params.onRemoteDisconnected();
+    }
+  }
+  get peerId() {
+    invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
+      F: __dxlog_file5,
+      L: 107,
+      S: this,
+      A: [
+        "this._remotePeerId != null",
+        "'Remote peer has not connected yet.'"
+      ]
+    });
+    return this._remotePeerId;
+  }
+  async shouldAdvertise(params) {
+    return this._params.shouldAdvertise(params);
+  }
+  /**
+  * Start exchanging messages with the remote peer.
+  * Call after the remote peer has connected.
+  */
+  enable() {
+    invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
+      F: __dxlog_file5,
+      L: 120,
+      S: this,
+      A: [
+        "this._remotePeerId != null",
+        "'Remote peer has not connected yet.'"
+      ]
+    });
+    this._isEnabled = true;
+  }
+  /**
+  * Stop exchanging messages with the remote peer.
+  */
+  disable() {
+    this._isEnabled = false;
+  }
+};
+
+// packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
 var MeshEchoReplicator = class {
   constructor() {
     this._connections = /* @__PURE__ */ new Set();
@@ -1288,10 +1408,10 @@ var MeshEchoReplicator = class {
     this._connectionsPerPeer.clear();
     this._context = null;
   }
-  createExtension() {
-    invariant5(this._context, void 0, {
-      F: __dxlog_file5,
-      L: 54,
+  createExtension(extensionFactory) {
+    invariant6(this._context, void 0, {
+      F: __dxlog_file6,
+      L: 51,
       S: this,
       A: [
         "this._context",
@@ -1300,18 +1420,19 @@ var MeshEchoReplicator = class {
     });
     const connection = new MeshReplicatorConnection({
       ownPeerId: this._context.peerId,
+      replicatorFactory: extensionFactory,
       onRemoteConnected: async () => {
-        log4("onRemoteConnected", {
+        log5("onRemoteConnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file5,
-          L: 59,
+          F: __dxlog_file6,
+          L: 57,
           S: this,
           C: (f, a) => f(...a)
         });
-        invariant5(this._context, void 0, {
-          F: __dxlog_file5,
-          L: 60,
+        invariant6(this._context, void 0, {
+          F: __dxlog_file6,
+          L: 58,
           S: this,
           A: [
             "this._context",
@@ -1323,36 +1444,36 @@ var MeshEchoReplicator = class {
         } else {
           this._connectionsPerPeer.set(connection.peerId, connection);
           this._context.onConnectionOpen(connection);
-          await connection.enable();
+          connection.enable();
         }
       },
       onRemoteDisconnected: async () => {
-        log4("onRemoteDisconnected", {
+        log5("onRemoteDisconnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file5,
-          L: 71,
+          F: __dxlog_file6,
+          L: 69,
           S: this,
           C: (f, a) => f(...a)
         });
         this._context?.onConnectionClosed(connection);
         this._connectionsPerPeer.delete(connection.peerId);
-        await connection.disable();
+        connection.disable();
         this._connections.delete(connection);
       },
-      shouldAdvertize: async (params) => {
-        log4("shouldAdvertize", {
+      shouldAdvertise: async (params) => {
+        log5("shouldAdvertise", {
           peerId: connection.peerId,
           documentId: params.documentId
         }, {
-          F: __dxlog_file5,
-          L: 78,
+          F: __dxlog_file6,
+          L: 76,
           S: this,
           C: (f, a) => f(...a)
         });
-        invariant5(this._context, void 0, {
-          F: __dxlog_file5,
-          L: 79,
+        invariant6(this._context, void 0, {
+          F: __dxlog_file6,
+          L: 77,
           S: this,
           A: [
             "this._context",
@@ -1362,12 +1483,12 @@ var MeshEchoReplicator = class {
         try {
           const spaceKey = await this._context.getContainingSpaceForDocument(params.documentId);
           if (!spaceKey) {
-            log4("space key not found for share policy check", {
+            log5("space key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file5,
-              L: 83,
+              F: __dxlog_file6,
+              L: 81,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1375,19 +1496,19 @@ var MeshEchoReplicator = class {
           }
           const authorizedDevices = this._authorizedDevices.get(spaceKey);
           if (!connection.remoteDeviceKey) {
-            log4("device key not found for share policy check", {
+            log5("device key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file5,
-              L: 93,
+              F: __dxlog_file6,
+              L: 91,
               S: this,
               C: (f, a) => f(...a)
             });
             return false;
           }
           const isAuthorized = authorizedDevices?.has(connection.remoteDeviceKey) ?? false;
-          log4("share policy check", {
+          log5("share policy check", {
             localPeer: this._context.peerId,
             remotePeer: connection.peerId,
             documentId: params.documentId,
@@ -1395,16 +1516,16 @@ var MeshEchoReplicator = class {
             spaceKey,
             isAuthorized
           }, {
-            F: __dxlog_file5,
-            L: 101,
+            F: __dxlog_file6,
+            L: 99,
             S: this,
             C: (f, a) => f(...a)
           });
           return isAuthorized;
         } catch (err) {
-          log4.catch(err, void 0, {
-            F: __dxlog_file5,
-            L: 111,
+          log5.catch(err, void 0, {
+            F: __dxlog_file6,
+            L: 109,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1416,115 +1537,23 @@ var MeshEchoReplicator = class {
     return connection.replicatorExtension;
   }
   authorizeDevice(spaceKey, deviceKey) {
-    log4("authorizeDevice", {
+    log5("authorizeDevice", {
       spaceKey,
       deviceKey
     }, {
-      F: __dxlog_file5,
-      L: 122,
+      F: __dxlog_file6,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
     defaultMap(this._authorizedDevices, spaceKey, () => new ComplexSet(PublicKey2.hash)).add(deviceKey);
     for (const connection of this._connections) {
       if (connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
-        this._context?.onConnectionAuthScopeChanged(connection);
-      }
-    }
-  }
-};
-var MeshReplicatorConnection = class extends Resource3 {
-  constructor(_params) {
-    super();
-    this._params = _params;
-    this.remoteDeviceKey = null;
-    this._remotePeerId = null;
-    this._isEnabled = false;
-    let readableStreamController;
-    this.readable = new ReadableStream({
-      start: (controller) => {
-        readableStreamController = controller;
-        this._ctx.onDispose(() => controller.close());
-      }
-    });
-    this.writable = new WritableStream({
-      write: async (message, controller) => {
-        this.replicatorExtension.sendSyncMessage({
-          payload: cbor2.encode(message)
-        }).catch((err) => {
-          controller.error(err);
-        });
-      }
-    });
-    this.replicatorExtension = new AutomergeReplicator({
-      peerId: this._params.ownPeerId
-    }, {
-      onStartReplication: async (info, remotePeerId) => {
-        this.remoteDeviceKey = remotePeerId;
-        this._remotePeerId = info.id;
-        log4("onStartReplication", {
-          id: info.id,
-          thisPeerId: this.peerId,
-          remotePeerId: remotePeerId.toHex()
-        }, {
-          F: __dxlog_file5,
-          L: 192,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        await this._params.onRemoteConnected();
-      },
-      onSyncMessage: async ({ payload }) => {
-        if (!this._isEnabled) {
-          return;
-        }
-        const message = cbor2.decode(payload);
-        readableStreamController.enqueue(message);
-      },
-      onClose: async () => {
-        if (!this._isEnabled) {
-          return;
+        if (this._connectionsPerPeer.has(connection.peerId)) {
+          this._context?.onConnectionAuthScopeChanged(connection);
         }
-        await this._params.onRemoteDisconnected();
       }
-    });
-  }
-  get peerId() {
-    invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file5,
-      L: 215,
-      S: this,
-      A: [
-        "this._remotePeerId != null",
-        "'Remote peer has not connected yet.'"
-      ]
-    });
-    return this._remotePeerId;
-  }
-  async shouldAdvertize(params) {
-    return this._params.shouldAdvertize(params);
-  }
-  /**
-  * Start exchanging messages with the remote peer.
-  * Call after the remote peer has connected.
-  */
-  async enable() {
-    invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file5,
-      L: 228,
-      S: this,
-      A: [
-        "this._remotePeerId != null",
-        "'Remote peer has not connected yet.'"
-      ]
-    });
-    this._isEnabled = true;
-  }
-  /**
-  * Stop exchanging messages with the remote peer.
-  */
-  async disable() {
-    this._isEnabled = false;
+    }
   }
 };
 export {