@dxos/echo-pipeline 0.6.0 → 0.6.1-main.09a92b0

package/dist/lib/browser/index.mjs

@@ -25,20 +25,22 @@ import {
   mapTimeframeToFeedIndexes,
   startAfter,
   valueEncoding
-} from "./chunk-HS77A4I4.mjs";
+} from "./chunk-A2LCXJVD.mjs";
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
 import { Event, asyncTimeout } from "@dxos/async";
 import { next as automerge, getBackend, getHeads, isAutomerge, save } from "@dxos/automerge/automerge";
 import { Repo } from "@dxos/automerge/automerge-repo";
-import { Context, cancelWithContext } from "@dxos/context";
+import { Resource as Resource2, cancelWithContext } from "@dxos/context";
+import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
+import { log as log2 } from "@dxos/log";
 import { objectPointerCodec } from "@dxos/protocols";
 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";
@@ -87,19 +89,13 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   disconnect() {
   }
   async open() {
-    invariant(this._lifecycleState === LifecycleState.CLOSED, void 0, {
-      F: __dxlog_file,
-      L: 60,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.CLOSED",
-        ""
-      ]
-    });
+    if (this._lifecycleState === LifecycleState.OPEN) {
+      return;
+    }
     this._lifecycleState = LifecycleState.OPEN;
     log("emit ready", void 0, {
       F: __dxlog_file,
-      L: 63,
+      L: 65,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -108,15 +104,9 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
   }
   async close() {
-    invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file,
-      L: 71,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.OPEN",
-        ""
-      ]
-    });
+    if (this._lifecycleState === LifecycleState.CLOSED) {
+      return;
+    }
     for (const replicator of this._replicators) {
       await replicator.disconnect();
     }
@@ -131,7 +121,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   async addReplicator(replicator) {
     invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file,
-      L: 87,
+      L: 91,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -140,7 +130,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant(this.peerId, void 0, {
       F: __dxlog_file,
-      L: 88,
+      L: 92,
       S: this,
       A: [
         "this.peerId",
@@ -149,7 +139,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant(!this._replicators.has(replicator), void 0, {
       F: __dxlog_file,
-      L: 89,
+      L: 93,
       S: this,
       A: [
         "!this._replicators.has(replicator)",
@@ -168,7 +158,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   async removeReplicator(replicator) {
     invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file,
-      L: 103,
+      L: 107,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -177,7 +167,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant(this._replicators.has(replicator), void 0, {
       F: __dxlog_file,
-      L: 104,
+      L: 108,
       S: this,
       A: [
         "this._replicators.has(replicator)",
@@ -187,25 +177,25 @@ 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", {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 119,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant(!this._connections.has(connection.peerId), void 0, {
       F: __dxlog_file,
-      L: 120,
+      L: 124,
       S: this,
       A: [
         "!this._connections.has(connection.peerId as PeerId)",
@@ -234,7 +224,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
         if (connectionEntry.isOpen) {
           log.catch(err, void 0, {
             F: __dxlog_file,
-            L: 139,
+            L: 143,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -245,7 +235,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 144,
+      L: 148,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -260,14 +250,14 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 153,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     invariant(entry, void 0, {
       F: __dxlog_file,
-      L: 155,
+      L: 159,
       S: this,
       A: [
         "entry",
@@ -284,14 +274,14 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 161,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     invariant(entry, void 0, {
       F: __dxlog_file,
-      L: 163,
+      L: 167,
       S: this,
       A: [
         "entry",
@@ -304,13 +294,13 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     void entry.reader.cancel().catch((err) => log.catch(err, void 0, {
       F: __dxlog_file,
-      L: 168,
+      L: 172,
       S: this,
       C: (f, a) => f(...a)
     }));
     void entry.writer.abort().catch((err) => log.catch(err, void 0, {
       F: __dxlog_file,
-      L: 169,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -341,6 +331,34 @@ var createEchoPeerMetadata = () => ({
 });
 var isEchoPeerMetadata = (metadata) => metadata?.dxos_peerSource === "EchoNetworkAdapter";
 
+// packages/core/echo/echo-pipeline/src/automerge/heads-store.ts
+import { headsEncoding } from "@dxos/indexing";
+var HeadsStore = class {
+  constructor({ db }) {
+    this._db = db;
+  }
+  setHeads(documentId, heads, batch) {
+    batch.put(documentId, heads, {
+      sublevel: this._db,
+      keyEncoding: "utf8",
+      valueEncoding: headsEncoding
+    });
+  }
+  async getHeads(documentId) {
+    try {
+      return await this._db.get(documentId, {
+        keyEncoding: "utf8",
+        valueEncoding: headsEncoding
+      });
+    } catch (err) {
+      if (err.notFound) {
+        return void 0;
+      }
+      throw err;
+    }
+  }
+};
+
 // packages/core/echo/echo-pipeline/src/automerge/leveldb-storage-adapter.ts
 import { LifecycleState as LifecycleState2, Resource } from "@dxos/context";
 var LevelDBStorageAdapter = class extends Resource {
@@ -587,25 +605,26 @@ function _ts_decorate2(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
-var AutomergeHost = class {
+var AutomergeHost = class extends Resource2 {
   constructor({ db, indexMetadataStore }) {
-    this._ctx = new Context(void 0, {
-      F: __dxlog_file3,
-      L: 71
-    });
+    super();
     this._echoNetworkAdapter = new EchoNetworkAdapter({
       getContainingSpaceForDocument: this._getContainingSpaceForDocument.bind(this)
     });
+    this._db = db;
     this._storage = new LevelDBStorageAdapter({
-      db,
+      db: db.sublevel("automerge"),
       callbacks: {
         beforeSave: async (params) => this._beforeSave(params),
         afterSave: async () => this._afterSave()
       }
     });
+    this._headsStore = new HeadsStore({
+      db: db.sublevel("heads")
+    });
     this._indexMetadataStore = indexMetadataStore;
   }
-  async open() {
+  async _open() {
     this._peerId = `host-${PublicKey.random().toHex()}`;
     await this._storage.open?.();
     this._clientNetwork = new LocalHostNetworkAdapter();
@@ -625,7 +644,7 @@ var AutomergeHost = class {
     await this._clientNetwork.whenConnected();
     await this._echoNetworkAdapter.whenConnected();
   }
-  async close() {
+  async _close() {
     await this._storage.close?.();
     await this._clientNetwork.close();
     await this._echoNetworkAdapter.close();
@@ -637,6 +656,9 @@ var AutomergeHost = class {
   get repo() {
     return this._repo;
   }
+  get loadedDocsCount() {
+    return Object.keys(this._repo.handles).length;
+  }
   async addReplicator(replicator) {
     await this._echoNetworkAdapter.addReplicator(replicator);
   }
@@ -676,6 +698,56 @@ var AutomergeHost = class {
       return this._repo.create(initialValue);
     }
   }
+  async reIndexHeads(documentIds) {
+    for (const documentId of documentIds) {
+      log2.info("reindexing heads for document", {
+        documentId
+      }, {
+        F: __dxlog_file3,
+        L: 195,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      const handle = this._repo.find(documentId);
+      await handle.whenReady([
+        "ready",
+        "requesting"
+      ]);
+      if (handle.inState([
+        "requesting"
+      ])) {
+        log2.warn("document is not available locally, skipping", {
+          documentId
+        }, {
+          F: __dxlog_file3,
+          L: 199,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        continue;
+      }
+      const doc = handle.docSync();
+      invariant3(doc, void 0, {
+        F: __dxlog_file3,
+        L: 204,
+        S: this,
+        A: [
+          "doc",
+          ""
+        ]
+      });
+      const heads = getHeads(doc);
+      const batch = this._db.batch();
+      this._headsStore.setHeads(documentId, heads, batch);
+      await batch.write();
+    }
+    log2.info("done reindexing heads", void 0, {
+      F: __dxlog_file3,
+      L: 211,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
   // TODO(dmaretskyi): Share based on HALO permissions and space affinity.
   // Hosts, running in the worker, don't share documents unless requested by other peers.
   // NOTE: If both peers return sharePolicy=false the replication will not happen
@@ -689,7 +761,7 @@ var AutomergeHost = class {
     }
     const peerMetadata = this.repo.peerMetadataByPeerId[peerId];
     if (isEchoPeerMetadata(peerMetadata)) {
-      return this._echoNetworkAdapter.shouldAdvertize(peerId, {
+      return this._echoNetworkAdapter.shouldAdvertise(peerId, {
         documentId
       });
     }
@@ -705,7 +777,8 @@ var AutomergeHost = class {
       return;
     }
     const spaceKey = getSpaceKeyFromDoc(doc) ?? void 0;
-    const lastAvailableHash = getHeads(doc);
+    const heads = getHeads(doc);
+    this._headsStore.setHeads(handle.documentId, heads, batch);
     const objectIds = Object.keys(doc.objects ?? {});
     const encodedIds = objectIds.map((objectId) => objectPointerCodec.encode({
       documentId: handle.documentId,
@@ -714,7 +787,7 @@ var AutomergeHost = class {
     }));
     const idToLastHash = new Map(encodedIds.map((id) => [
       id,
-      lastAvailableHash
+      heads
     ]));
     this._indexMetadataStore.markDirty(idToLastHash, batch);
   }
@@ -763,18 +836,30 @@ var AutomergeHost = class {
   /**
   * Flush documents to disk.
   */
-  async flush({ states }) {
+  async flush({ states } = {}) {
     if (states) {
       await Promise.all(states.map(async ({ heads, documentId }) => {
         if (!heads) {
           return;
         }
-        const handle = this.repo.handles[documentId] ?? this._repo.find(documentId);
+        const handle = this._repo.handles[documentId] ?? this._repo.find(documentId);
         await waitForHeads(handle, heads);
       }) ?? []);
     }
     await this._repo.flush(states?.map(({ documentId }) => documentId));
   }
+  async getHeads(documentId) {
+    const handle = this._repo.handles[documentId];
+    if (handle) {
+      const doc = handle.docSync();
+      if (!doc) {
+        return void 0;
+      }
+      return getHeads(doc);
+    } else {
+      return this._headsStore.getHeads(documentId);
+    }
+  }
   /**
   * Host <-> Client sync.
   */
@@ -847,8 +932,8 @@ import { interpretAsDocumentId } from "@dxos/automerge/automerge-repo";
 import { cancelWithContext as cancelWithContext2 } from "@dxos/context";
 import { warnAfterTimeout } from "@dxos/debug";
 import { SpaceDocVersion } from "@dxos/echo-protocol";
-import { invariant as invariant3 } from "@dxos/invariant";
-import { log as log2 } from "@dxos/log";
+import { invariant as invariant4 } from "@dxos/invariant";
+import { log as log3 } from "@dxos/log";
 import { trace as trace2 } from "@dxos/tracing";
 function _ts_decorate3(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -886,7 +971,7 @@ var AutomergeDocumentLoaderImpl = class {
     }
     const existingDocHandle = await this._initDocHandle(ctx, spaceState.rootUrl);
     const doc = existingDocHandle.docSync();
-    invariant3(doc, void 0, {
+    invariant4(doc, void 0, {
       F: __dxlog_file4,
       L: 84,
       S: this,
@@ -895,7 +980,7 @@ var AutomergeDocumentLoaderImpl = class {
         ""
       ]
     });
-    invariant3(doc.version === SpaceDocVersion.CURRENT, void 0, {
+    invariant4(doc.version === SpaceDocVersion.CURRENT, void 0, {
       F: __dxlog_file4,
       L: 85,
       S: this,
@@ -916,7 +1001,7 @@ var AutomergeDocumentLoaderImpl = class {
     let hasUrlsToLoad = false;
     const urlsToLoad = {};
     for (const objectId of objectIds) {
-      invariant3(this._spaceRootDocHandle, void 0, {
+      invariant4(this._spaceRootDocHandle, void 0, {
         F: __dxlog_file4,
         L: 97,
         S: this,
@@ -929,7 +1014,7 @@ var AutomergeDocumentLoaderImpl = class {
         continue;
       }
       const spaceRootDoc = this._spaceRootDocHandle.docSync();
-      invariant3(spaceRootDoc, void 0, {
+      invariant4(spaceRootDoc, void 0, {
         F: __dxlog_file4,
         L: 102,
         S: this,
@@ -941,7 +1026,7 @@ var AutomergeDocumentLoaderImpl = class {
       const documentUrl = (spaceRootDoc.links ?? {})[objectId];
       if (documentUrl == null) {
         this._objectsPendingDocumentLoad.add(objectId);
-        log2.info("loading delayed until object links are initialized", {
+        log3.info("loading delayed until object links are initialized", {
           objectId
         }, {
           F: __dxlog_file4,
@@ -959,7 +1044,7 @@ var AutomergeDocumentLoaderImpl = class {
     }
   }
   getObjectDocumentId(objectId) {
-    invariant3(this._spaceRootDocHandle, void 0, {
+    invariant4(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file4,
       L: 118,
       S: this,
@@ -969,7 +1054,7 @@ var AutomergeDocumentLoaderImpl = class {
       ]
     });
     const spaceRootDoc = this._spaceRootDocHandle.docSync();
-    invariant3(spaceRootDoc, void 0, {
+    invariant4(spaceRootDoc, void 0, {
       F: __dxlog_file4,
       L: 120,
       S: this,
@@ -993,7 +1078,7 @@ var AutomergeDocumentLoaderImpl = class {
     linksAwaitingLoad.forEach(([objectId]) => this._objectsPendingDocumentLoad.delete(objectId));
   }
   getSpaceRootDocHandle() {
-    invariant3(this._spaceRootDocHandle, void 0, {
+    invariant4(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file4,
       L: 140,
       S: this,
@@ -1005,7 +1090,7 @@ var AutomergeDocumentLoaderImpl = class {
     return this._spaceRootDocHandle;
   }
   createDocumentForObject(objectId) {
-    invariant3(this._spaceRootDocHandle, void 0, {
+    invariant4(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file4,
       L: 145,
       S: this,
@@ -1047,7 +1132,7 @@ var AutomergeDocumentLoaderImpl = class {
       };
       const objectDocumentHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocumentHandle != null && objectDocumentHandle.url !== automergeUrl) {
-        log2.warn("object already inlined in a different document, ignoring the link", {
+        log3.warn("object already inlined in a different document, ignoring the link", {
           ...logMeta,
           actualDocumentUrl: objectDocumentHandle.url
         }, {
@@ -1059,7 +1144,7 @@ var AutomergeDocumentLoaderImpl = class {
         continue;
       }
       if (objectDocumentHandle?.url === automergeUrl) {
-        log2.warn("object document was already loaded", logMeta, {
+        log3.warn("object document was already loaded", logMeta, {
           F: __dxlog_file4,
           L: 184,
           S: this,
@@ -1068,7 +1153,7 @@ var AutomergeDocumentLoaderImpl = class {
         continue;
       }
       const handle = this._repo.find(automergeUrl);
-      log2.debug("document loading triggered", logMeta, {
+      log3.debug("document loading triggered", logMeta, {
         F: __dxlog_file4,
         L: 188,
         S: this,
@@ -1088,7 +1173,7 @@ var AutomergeDocumentLoaderImpl = class {
         break;
       } catch (err) {
         if (`${err}`.includes("Timeout")) {
-          log2.info("wraparound", {
+          log3.info("wraparound", {
             id: docHandle.documentId,
             state: docHandle.state
           }, {
@@ -1117,15 +1202,13 @@ var AutomergeDocumentLoaderImpl = class {
   }
   async _createObjectOnDocumentLoad(handle, objectId) {
     try {
-      await handle.doc([
-        "ready"
-      ]);
+      await handle.whenReady();
       const logMeta = {
         objectId,
         docUrl: handle.url
       };
       if (this.onObjectDocumentLoaded.listenerCount() === 0) {
-        log2.info("document loaded after all listeners were removed", logMeta, {
+        log3.info("document loaded after all listeners were removed", logMeta, {
           F: __dxlog_file4,
           L: 231,
           S: this,
@@ -1135,7 +1218,7 @@ var AutomergeDocumentLoaderImpl = class {
       }
       const objectDocHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocHandle?.url !== handle.url) {
-        log2.warn("object was rebound while a document was loading, discarding handle", logMeta, {
+        log3.warn("object was rebound while a document was loading, discarding handle", logMeta, {
           F: __dxlog_file4,
           L: 236,
           S: this,
@@ -1149,7 +1232,7 @@ var AutomergeDocumentLoaderImpl = class {
       });
     } catch (err) {
       const shouldRetryLoading = this.onObjectDocumentLoaded.listenerCount() > 0;
-      log2.warn("failed to load a document", {
+      log3.warn("failed to load a document", {
         objectId,
         automergeUrl: handle.url,
         retryLoading: shouldRetryLoading,
@@ -1176,14 +1259,134 @@ AutomergeDocumentLoaderImpl = _ts_decorate3([
 ], AutomergeDocumentLoaderImpl);
 
 // packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts
-import { cbor as cbor2 } from "@dxos/automerge/automerge-repo";
-import { Resource as Resource2 } from "@dxos/context";
-import { invariant as invariant4 } from "@dxos/invariant";
+import { invariant as invariant6 } from "@dxos/invariant";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
-import { log as log3 } from "@dxos/log";
-import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
+import { log as log5 } from "@dxos/log";
 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";
+
+// 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 { log as log4 } from "@dxos/log";
+import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
+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();
@@ -1208,10 +1411,10 @@ var MeshEchoReplicator = class {
     this._connectionsPerPeer.clear();
     this._context = null;
   }
-  createExtension() {
-    invariant4(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",
@@ -1220,18 +1423,19 @@ var MeshEchoReplicator = class {
     });
     const connection = new MeshReplicatorConnection({
       ownPeerId: this._context.peerId,
+      replicatorFactory: extensionFactory,
       onRemoteConnected: async () => {
-        log3("onRemoteConnected", {
+        log5("onRemoteConnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file5,
-          L: 59,
+          F: __dxlog_file6,
+          L: 57,
           S: this,
           C: (f, a) => f(...a)
         });
-        invariant4(this._context, void 0, {
-          F: __dxlog_file5,
-          L: 60,
+        invariant6(this._context, void 0, {
+          F: __dxlog_file6,
+          L: 58,
           S: this,
           A: [
             "this._context",
@@ -1243,36 +1447,36 @@ var MeshEchoReplicator = class {
         } else {
           this._connectionsPerPeer.set(connection.peerId, connection);
           this._context.onConnectionOpen(connection);
-          await connection.enable();
+          connection.enable();
         }
       },
       onRemoteDisconnected: async () => {
-        log3("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) => {
-        log3("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)
         });
-        invariant4(this._context, void 0, {
-          F: __dxlog_file5,
-          L: 79,
+        invariant6(this._context, void 0, {
+          F: __dxlog_file6,
+          L: 77,
           S: this,
           A: [
             "this._context",
@@ -1282,12 +1486,12 @@ var MeshEchoReplicator = class {
         try {
           const spaceKey = await this._context.getContainingSpaceForDocument(params.documentId);
           if (!spaceKey) {
-            log3("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)
             });
@@ -1295,19 +1499,19 @@ var MeshEchoReplicator = class {
           }
           const authorizedDevices = this._authorizedDevices.get(spaceKey);
           if (!connection.remoteDeviceKey) {
-            log3("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;
-          log3("share policy check", {
+          log5("share policy check", {
             localPeer: this._context.peerId,
             remotePeer: connection.peerId,
             documentId: params.documentId,
@@ -1315,16 +1519,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) {
-          log3.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)
           });
@@ -1336,115 +1540,23 @@ var MeshEchoReplicator = class {
     return connection.replicatorExtension;
   }
   authorizeDevice(spaceKey, deviceKey) {
-    log3("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 Resource2 {
-  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;
-        log3("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() {
-    invariant4(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() {
-    invariant4(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 {