@dxos/echo-pipeline 0.6.1 → 0.6.2-main.000b1cc

package/dist/lib/browser/index.mjs

@@ -6,6 +6,7 @@ import {
   CredentialRetrieverExtension,
   CredentialServerExtension,
   DataServiceImpl,
+  DocumentsSynchronizer,
   MOCK_AUTH_PROVIDER,
   MOCK_AUTH_VERIFIER,
   MetadataStore,
@@ -25,14 +26,14 @@ import {
   mapTimeframeToFeedIndexes,
   startAfter,
   valueEncoding
-} from "./chunk-DMUP426Q.mjs";
+} from "./chunk-UJQ5VS5V.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, equals as headsEquals } from "@dxos/automerge/automerge";
+import { next as automerge, getBackend, getHeads, isAutomerge, equals as headsEquals, save } from "@dxos/automerge/automerge";
 import { Repo } from "@dxos/automerge/automerge-repo";
 import { Context, Resource as Resource2, cancelWithContext } from "@dxos/context";
-import { invariant as invariant3 } from "@dxos/invariant";
+import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log as log2 } from "@dxos/log";
 import { objectPointerCodec } from "@dxos/protocols";
@@ -105,7 +106,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   }
   async close() {
     if (this._lifecycleState === LifecycleState.CLOSED) {
-      return;
+      return this;
     }
     for (const replicator of this._replicators) {
       await replicator.disconnect();
@@ -455,144 +456,6 @@ var encodingOptions = {
 };
 var isLevelDbNotFoundError = (err) => err.code === "LEVEL_NOT_FOUND";
 
-// packages/core/echo/echo-pipeline/src/automerge/local-host-network-adapter.ts
-import { Trigger as Trigger2 } from "@dxos/async";
-import { NetworkAdapter as NetworkAdapter2, cbor } from "@dxos/automerge/automerge-repo";
-import { Stream } from "@dxos/codec-protobuf";
-import { invariant as invariant2 } from "@dxos/invariant";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/local-host-network-adapter.ts";
-var LocalHostNetworkAdapter = class extends NetworkAdapter2 {
-  constructor() {
-    super(...arguments);
-    this._peers = /* @__PURE__ */ new Map();
-    this._connected = new Trigger2();
-    this._isConnected = false;
-  }
-  /**
-  * Emits `ready` event. That signals to `Repo` that it can start using the adapter.
-  */
-  ready() {
-    this.emit("ready", {
-      network: this
-    });
-  }
-  /**
-  * Called by `Repo` to connect to the network.
-  *
-  * @param peerId Our peer Id.
-  */
-  connect(peerId) {
-    this.peerId = peerId;
-    this._isConnected = true;
-    this._connected.wake();
-  }
-  send(message) {
-    const peer = this._peers.get(message.targetId);
-    invariant2(peer, "Peer not found.", {
-      F: __dxlog_file2,
-      L: 51,
-      S: this,
-      A: [
-        "peer",
-        "'Peer not found.'"
-      ]
-    });
-    peer.send(message);
-  }
-  async close() {
-    this._peers.forEach((peer) => peer.disconnect());
-    this.emit("close");
-  }
-  disconnect() {
-  }
-  async whenConnected() {
-    await this._connected.wait({
-      timeout: 1e4
-    });
-  }
-  syncRepo({ id, syncMessage }) {
-    const peerId = this._getPeerId(id);
-    return new Stream(({ next, close }) => {
-      invariant2(!this._peers.has(peerId), "Peer already connected.", {
-        F: __dxlog_file2,
-        L: 73,
-        S: this,
-        A: [
-          "!this._peers.has(peerId)",
-          "'Peer already connected.'"
-        ]
-      });
-      this._peers.set(peerId, {
-        connected: true,
-        send: (message) => {
-          next({
-            syncMessage: cbor.encode(message)
-          });
-        },
-        disconnect: () => {
-          this._peers.delete(peerId);
-          close();
-          this.emit("peer-disconnected", {
-            peerId
-          });
-        }
-      });
-      invariant2(this._isConnected, void 0, {
-        F: __dxlog_file2,
-        L: 90,
-        S: this,
-        A: [
-          "this._isConnected",
-          ""
-        ]
-      });
-      this.emit("peer-candidate", {
-        peerMetadata: {},
-        peerId
-      });
-    });
-  }
-  async sendSyncMessage({ id, syncMessage }) {
-    invariant2(this._isConnected, void 0, {
-      F: __dxlog_file2,
-      L: 99,
-      S: this,
-      A: [
-        "this._isConnected",
-        ""
-      ]
-    });
-    const message = cbor.decode(syncMessage);
-    this.emit("message", message);
-  }
-  async getHostInfo() {
-    invariant2(this._isConnected, void 0, {
-      F: __dxlog_file2,
-      L: 105,
-      S: this,
-      A: [
-        "this._isConnected",
-        ""
-      ]
-    });
-    invariant2(this.peerId, "Peer id not set.", {
-      F: __dxlog_file2,
-      L: 106,
-      S: this,
-      A: [
-        "this.peerId",
-        "'Peer id not set.'"
-      ]
-    });
-    return {
-      peerId: this.peerId
-    };
-  }
-  _getPeerId(id) {
-    return id;
-  }
-};
-
 // packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -604,7 +467,7 @@ function _ts_decorate2(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   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 __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
 var AutomergeHost = class extends Resource2 {
   constructor({ db, indexMetadataStore }) {
     super();
@@ -627,26 +490,20 @@ var AutomergeHost = class extends Resource2 {
   async _open() {
     this._peerId = `host-${PublicKey.random().toHex()}`;
     await this._storage.open?.();
-    this._clientNetwork = new LocalHostNetworkAdapter();
     this._repo = new Repo({
       peerId: this._peerId,
       sharePolicy: this._sharePolicy.bind(this),
       storage: this._storage,
       network: [
-        // Downstream client.
-        this._clientNetwork,
         // Upstream swarm.
         this._echoNetworkAdapter
       ]
     });
-    this._clientNetwork.ready();
     await this._echoNetworkAdapter.open();
-    await this._clientNetwork.whenConnected();
     await this._echoNetworkAdapter.whenConnected();
   }
   async _close() {
     await this._storage.close?.();
-    await this._clientNetwork.close();
     await this._echoNetworkAdapter.close();
     await this._ctx.dispose();
   }
@@ -708,8 +565,8 @@ var AutomergeHost = class extends Resource2 {
         return;
       }
       const handle = await this.loadDoc(Context.default(void 0, {
-        F: __dxlog_file3,
-        L: 207
+        F: __dxlog_file2,
+        L: 189
       }), documentId);
       await waitForHeads(handle, heads2);
     }) ?? []);
@@ -720,8 +577,8 @@ var AutomergeHost = class extends Resource2 {
       log2.info("re-indexing heads for document", {
         documentId
       }, {
-        F: __dxlog_file3,
-        L: 218,
+        F: __dxlog_file2,
+        L: 200,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -736,17 +593,17 @@ var AutomergeHost = class extends Resource2 {
         log2.warn("document is not available locally, skipping", {
           documentId
         }, {
-          F: __dxlog_file3,
-          L: 222,
+          F: __dxlog_file2,
+          L: 204,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
       const doc = handle.docSync();
-      invariant3(doc, void 0, {
-        F: __dxlog_file3,
-        L: 227,
+      invariant2(doc, void 0, {
+        F: __dxlog_file2,
+        L: 209,
         S: this,
         A: [
           "doc",
@@ -759,8 +616,8 @@ var AutomergeHost = class extends Resource2 {
       await batch.write();
     }
     log2.info("done re-indexing heads", void 0, {
-      F: __dxlog_file3,
-      L: 234,
+      F: __dxlog_file2,
+      L: 216,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -853,17 +710,8 @@ var AutomergeHost = class extends Resource2 {
   /**
   * Flush documents to disk.
   */
-  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);
-        await waitForHeads(handle, heads);
-      }) ?? []);
-    }
-    await this._repo.flush(states?.map(({ documentId }) => documentId));
+  async flush({ documentIds } = {}) {
+    await this._repo.flush(documentIds);
   }
   async getHeads(documentId) {
     const handle = this._repo.handles[documentId];
@@ -877,24 +725,6 @@ var AutomergeHost = class extends Resource2 {
       return this._headsStore.getHeads(documentId);
     }
   }
-  /**
-  * Host <-> Client sync.
-  */
-  syncRepo(request) {
-    return this._clientNetwork.syncRepo(request);
-  }
-  /**
-  * Host <-> Client sync.
-  */
-  sendSyncMessage(request) {
-    return this._clientNetwork.sendSyncMessage(request);
-  }
-  /**
-  * Host <-> Client sync.
-  */
-  async getHostInfo() {
-    return this._clientNetwork.getHostInfo();
-  }
 };
 _ts_decorate2([
   trace.info()
@@ -940,351 +770,19 @@ var changeIsPresentInDoc = (doc, changeHash) => {
   return !!getBackend(doc).getChangeByHash(changeHash);
 };
 
-// packages/core/echo/echo-pipeline/src/automerge/automerge-doc-loader.ts
-import { Event as Event2 } from "@dxos/async";
-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 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;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
-    r = Reflect.decorate(decorators, target, key, desc);
-  else
-    for (var i = decorators.length - 1; i >= 0; i--)
-      if (d = decorators[i])
-        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-doc-loader.ts";
-var AutomergeDocumentLoaderImpl = class {
-  constructor(_spaceId, _repo, _spaceKey) {
-    this._spaceId = _spaceId;
-    this._repo = _repo;
-    this._spaceKey = _spaceKey;
-    this._spaceRootDocHandle = null;
-    this._objectDocumentHandles = /* @__PURE__ */ new Map();
-    this._objectsPendingDocumentLoad = /* @__PURE__ */ new Set();
-    this.onObjectDocumentLoaded = new Event2();
-  }
-  getAllHandles() {
-    return this._spaceRootDocHandle != null ? [
-      this._spaceRootDocHandle,
-      ...new Set(this._objectDocumentHandles.values())
-    ] : [];
-  }
-  async loadSpaceRootDocHandle(ctx, spaceState) {
-    if (this._spaceRootDocHandle != null) {
-      return;
-    }
-    if (!spaceState.rootUrl) {
-      throw new Error("Database opened with no rootUrl");
-    }
-    const existingDocHandle = await this._initDocHandle(ctx, spaceState.rootUrl);
-    const doc = existingDocHandle.docSync();
-    invariant4(doc, void 0, {
-      F: __dxlog_file4,
-      L: 84,
-      S: this,
-      A: [
-        "doc",
-        ""
-      ]
-    });
-    invariant4(doc.version === SpaceDocVersion.CURRENT, void 0, {
-      F: __dxlog_file4,
-      L: 85,
-      S: this,
-      A: [
-        "doc.version === SpaceDocVersion.CURRENT",
-        ""
-      ]
-    });
-    if (doc.access == null) {
-      this._initDocAccess(existingDocHandle);
-    }
-    this._spaceRootDocHandle = existingDocHandle;
-  }
-  loadObjectDocument(objectIdOrMany) {
-    const objectIds = Array.isArray(objectIdOrMany) ? objectIdOrMany : [
-      objectIdOrMany
-    ];
-    let hasUrlsToLoad = false;
-    const urlsToLoad = {};
-    for (const objectId of objectIds) {
-      invariant4(this._spaceRootDocHandle, void 0, {
-        F: __dxlog_file4,
-        L: 97,
-        S: this,
-        A: [
-          "this._spaceRootDocHandle",
-          ""
-        ]
-      });
-      if (this._objectDocumentHandles.has(objectId) || this._objectsPendingDocumentLoad.has(objectId)) {
-        continue;
-      }
-      const spaceRootDoc = this._spaceRootDocHandle.docSync();
-      invariant4(spaceRootDoc, void 0, {
-        F: __dxlog_file4,
-        L: 102,
-        S: this,
-        A: [
-          "spaceRootDoc",
-          ""
-        ]
-      });
-      const documentUrl = (spaceRootDoc.links ?? {})[objectId];
-      if (documentUrl == null) {
-        this._objectsPendingDocumentLoad.add(objectId);
-        log3.info("loading delayed until object links are initialized", {
-          objectId
-        }, {
-          F: __dxlog_file4,
-          L: 106,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      } else {
-        urlsToLoad[objectId] = documentUrl;
-        hasUrlsToLoad = true;
-      }
-    }
-    if (hasUrlsToLoad) {
-      this._loadLinkedObjects(urlsToLoad);
-    }
-  }
-  getObjectDocumentId(objectId) {
-    invariant4(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file4,
-      L: 118,
-      S: this,
-      A: [
-        "this._spaceRootDocHandle",
-        ""
-      ]
-    });
-    const spaceRootDoc = this._spaceRootDocHandle.docSync();
-    invariant4(spaceRootDoc, void 0, {
-      F: __dxlog_file4,
-      L: 120,
-      S: this,
-      A: [
-        "spaceRootDoc",
-        ""
-      ]
-    });
-    if (spaceRootDoc.objects?.[objectId]) {
-      return this._spaceRootDocHandle.documentId;
-    }
-    const documentUrl = (spaceRootDoc.links ?? {})[objectId];
-    return documentUrl && interpretAsDocumentId(documentUrl);
-  }
-  onObjectLinksUpdated(links) {
-    if (!links) {
-      return;
-    }
-    const linksAwaitingLoad = Object.entries(links).filter(([objectId]) => this._objectsPendingDocumentLoad.has(objectId));
-    this._loadLinkedObjects(Object.fromEntries(linksAwaitingLoad));
-    linksAwaitingLoad.forEach(([objectId]) => this._objectsPendingDocumentLoad.delete(objectId));
-  }
-  getSpaceRootDocHandle() {
-    invariant4(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file4,
-      L: 140,
-      S: this,
-      A: [
-        "this._spaceRootDocHandle",
-        ""
-      ]
-    });
-    return this._spaceRootDocHandle;
-  }
-  createDocumentForObject(objectId) {
-    invariant4(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file4,
-      L: 145,
-      S: this,
-      A: [
-        "this._spaceRootDocHandle",
-        ""
-      ]
-    });
-    const spaceDocHandle = this._repo.create({
-      version: SpaceDocVersion.CURRENT
-    });
-    this._initDocAccess(spaceDocHandle);
-    this.onObjectBoundToDocument(spaceDocHandle, objectId);
-    this._spaceRootDocHandle.change((newDoc) => {
-      newDoc.links ??= {};
-      newDoc.links[objectId] = spaceDocHandle.url;
-    });
-    return spaceDocHandle;
-  }
-  onObjectBoundToDocument(handle, objectId) {
-    this._objectDocumentHandles.set(objectId, handle);
-  }
-  clearHandleReferences() {
-    const objectsWithHandles = [
-      ...this._objectDocumentHandles.keys()
-    ];
-    this._objectDocumentHandles.clear();
-    this._spaceRootDocHandle = null;
-    return objectsWithHandles;
-  }
-  _loadLinkedObjects(links) {
-    if (!links) {
-      return;
-    }
-    for (const [objectId, automergeUrl] of Object.entries(links)) {
-      const logMeta = {
-        objectId,
-        automergeUrl
-      };
-      const objectDocumentHandle = this._objectDocumentHandles.get(objectId);
-      if (objectDocumentHandle != null && objectDocumentHandle.url !== automergeUrl) {
-        log3.warn("object already inlined in a different document, ignoring the link", {
-          ...logMeta,
-          actualDocumentUrl: objectDocumentHandle.url
-        }, {
-          F: __dxlog_file4,
-          L: 177,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        continue;
-      }
-      if (objectDocumentHandle?.url === automergeUrl) {
-        log3.warn("object document was already loaded", logMeta, {
-          F: __dxlog_file4,
-          L: 184,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        continue;
-      }
-      const handle = this._repo.find(automergeUrl);
-      log3.debug("document loading triggered", logMeta, {
-        F: __dxlog_file4,
-        L: 188,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      this._objectDocumentHandles.set(objectId, handle);
-      void this._createObjectOnDocumentLoad(handle, objectId);
-    }
-  }
-  async _initDocHandle(ctx, url) {
-    const docHandle = this._repo.find(url);
-    while (true) {
-      try {
-        await warnAfterTimeout(5e3, "Automerge root doc load timeout (CoreDatabase)", async () => {
-          await cancelWithContext2(ctx, docHandle.whenReady());
-        });
-        break;
-      } catch (err) {
-        if (`${err}`.includes("Timeout")) {
-          log3.info("wraparound", {
-            id: docHandle.documentId,
-            state: docHandle.state
-          }, {
-            F: __dxlog_file4,
-            L: 204,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          continue;
-        }
-        throw err;
-      }
-    }
-    if (docHandle.state === "unavailable") {
-      throw new Error("Automerge document is unavailable");
-    }
-    return docHandle;
-  }
-  _initDocAccess(handle) {
-    handle.change((newDoc) => {
-      newDoc.access ??= {
-        spaceKey: this._spaceKey.toHex()
-      };
-      newDoc.access.spaceKey = this._spaceKey.toHex();
-    });
-  }
-  async _createObjectOnDocumentLoad(handle, objectId) {
-    try {
-      await handle.whenReady();
-      const logMeta = {
-        objectId,
-        docUrl: handle.url
-      };
-      if (this.onObjectDocumentLoaded.listenerCount() === 0) {
-        log3.info("document loaded after all listeners were removed", logMeta, {
-          F: __dxlog_file4,
-          L: 231,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        return;
-      }
-      const objectDocHandle = this._objectDocumentHandles.get(objectId);
-      if (objectDocHandle?.url !== handle.url) {
-        log3.warn("object was rebound while a document was loading, discarding handle", logMeta, {
-          F: __dxlog_file4,
-          L: 236,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        return;
-      }
-      this.onObjectDocumentLoaded.emit({
-        handle,
-        objectId
-      });
-    } catch (err) {
-      const shouldRetryLoading = this.onObjectDocumentLoaded.listenerCount() > 0;
-      log3.warn("failed to load a document", {
-        objectId,
-        automergeUrl: handle.url,
-        retryLoading: shouldRetryLoading,
-        err
-      }, {
-        F: __dxlog_file4,
-        L: 242,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      if (shouldRetryLoading) {
-        await this._createObjectOnDocumentLoad(handle, objectId);
-      }
-    }
-  }
-};
-_ts_decorate3([
-  trace2.span({
-    showInBrowserTimeline: true
-  })
-], AutomergeDocumentLoaderImpl.prototype, "loadSpaceRootDocHandle", null);
-AutomergeDocumentLoaderImpl = _ts_decorate3([
-  trace2.resource()
-], AutomergeDocumentLoaderImpl);
-
 // packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts
-import { invariant as invariant6 } from "@dxos/invariant";
+import { invariant as invariant4 } from "@dxos/invariant";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
-import { log as log5 } from "@dxos/log";
+import { log as log4 } 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 { cbor } 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 { invariant as invariant3 } from "@dxos/invariant";
+import { log as log3 } 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 __dxlog_file3 = "/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) {
@@ -1302,8 +800,8 @@ var MeshReplicatorConnection = class extends Resource3 {
     });
     this.writable = new WritableStream({
       write: async (message, controller) => {
-        invariant5(this._isEnabled, "Writing to a disabled connection", {
-          F: __dxlog_file5,
+        invariant3(this._isEnabled, "Writing to a disabled connection", {
+          F: __dxlog_file3,
           L: 47,
           S: this,
           A: [
@@ -1313,7 +811,7 @@ var MeshReplicatorConnection = class extends Resource3 {
         });
         try {
           await this.replicatorExtension.sendSyncMessage({
-            payload: cbor2.encode(message)
+            payload: cbor.encode(message)
           });
         } catch (err) {
           controller.error(err);
@@ -1330,12 +828,12 @@ var MeshReplicatorConnection = class extends Resource3 {
         onStartReplication: async (info, remotePeerId) => {
           this.remoteDeviceKey = remotePeerId;
           this._remotePeerId = info.id;
-          log4("onStartReplication", {
+          log3("onStartReplication", {
             id: info.id,
             thisPeerId: this.peerId,
             remotePeerId: remotePeerId.toHex()
           }, {
-            F: __dxlog_file5,
+            F: __dxlog_file3,
             L: 81,
             S: this,
             C: (f, a) => f(...a)
@@ -1346,7 +844,7 @@ var MeshReplicatorConnection = class extends Resource3 {
           if (!this._isEnabled) {
             return;
           }
-          const message = cbor2.decode(payload);
+          const message = cbor.decode(payload);
           readableStreamController.enqueue(message);
         },
         onClose: async () => {
@@ -1361,8 +859,8 @@ var MeshReplicatorConnection = class extends Resource3 {
     }
   }
   get peerId() {
-    invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file5,
+    invariant3(this._remotePeerId != null, "Remote peer has not connected yet.", {
+      F: __dxlog_file3,
       L: 107,
       S: this,
       A: [
@@ -1380,8 +878,8 @@ var MeshReplicatorConnection = class extends Resource3 {
   * Call after the remote peer has connected.
   */
   enable() {
-    invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file5,
+    invariant3(this._remotePeerId != null, "Remote peer has not connected yet.", {
+      F: __dxlog_file3,
       L: 120,
       S: this,
       A: [
@@ -1400,7 +898,7 @@ var MeshReplicatorConnection = class extends Resource3 {
 };
 
 // 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 __dxlog_file4 = "/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();
@@ -1418,6 +916,9 @@ var MeshEchoReplicator = class {
     this._context = context;
   }
   async disconnect() {
+    for (const connection of this._connectionsPerPeer.values()) {
+      this._context?.onConnectionClosed(connection);
+    }
     for (const connection of this._connections) {
       await connection.close();
     }
@@ -1426,9 +927,9 @@ var MeshEchoReplicator = class {
     this._context = null;
   }
   createExtension(extensionFactory) {
-    invariant6(this._context, void 0, {
-      F: __dxlog_file6,
-      L: 51,
+    invariant4(this._context, void 0, {
+      F: __dxlog_file4,
+      L: 54,
       S: this,
       A: [
         "this._context",
@@ -1439,17 +940,17 @@ var MeshEchoReplicator = class {
       ownPeerId: this._context.peerId,
       replicatorFactory: extensionFactory,
       onRemoteConnected: async () => {
-        log5("onRemoteConnected", {
+        log4("onRemoteConnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file6,
-          L: 57,
+          F: __dxlog_file4,
+          L: 60,
           S: this,
           C: (f, a) => f(...a)
         });
-        invariant6(this._context, void 0, {
-          F: __dxlog_file6,
-          L: 58,
+        invariant4(this._context, void 0, {
+          F: __dxlog_file4,
+          L: 61,
           S: this,
           A: [
             "this._context",
@@ -1465,11 +966,11 @@ var MeshEchoReplicator = class {
         }
       },
       onRemoteDisconnected: async () => {
-        log5("onRemoteDisconnected", {
+        log4("onRemoteDisconnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file6,
-          L: 69,
+          F: __dxlog_file4,
+          L: 72,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1479,18 +980,18 @@ var MeshEchoReplicator = class {
         this._connections.delete(connection);
       },
       shouldAdvertise: async (params) => {
-        log5("shouldAdvertise", {
+        log4("shouldAdvertise", {
           peerId: connection.peerId,
           documentId: params.documentId
         }, {
-          F: __dxlog_file6,
-          L: 76,
+          F: __dxlog_file4,
+          L: 79,
           S: this,
           C: (f, a) => f(...a)
         });
-        invariant6(this._context, void 0, {
-          F: __dxlog_file6,
-          L: 77,
+        invariant4(this._context, void 0, {
+          F: __dxlog_file4,
+          L: 80,
           S: this,
           A: [
             "this._context",
@@ -1500,12 +1001,12 @@ var MeshEchoReplicator = class {
         try {
           const spaceKey = await this._context.getContainingSpaceForDocument(params.documentId);
           if (!spaceKey) {
-            log5("space key not found for share policy check", {
+            log4("space key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file6,
-              L: 81,
+              F: __dxlog_file4,
+              L: 84,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1513,19 +1014,19 @@ var MeshEchoReplicator = class {
           }
           const authorizedDevices = this._authorizedDevices.get(spaceKey);
           if (!connection.remoteDeviceKey) {
-            log5("device key not found for share policy check", {
+            log4("device key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file6,
-              L: 91,
+              F: __dxlog_file4,
+              L: 94,
               S: this,
               C: (f, a) => f(...a)
             });
             return false;
           }
           const isAuthorized = authorizedDevices?.has(connection.remoteDeviceKey) ?? false;
-          log5("share policy check", {
+          log4("share policy check", {
             localPeer: this._context.peerId,
             remotePeer: connection.peerId,
             documentId: params.documentId,
@@ -1533,16 +1034,16 @@ var MeshEchoReplicator = class {
             spaceKey,
             isAuthorized
           }, {
-            F: __dxlog_file6,
-            L: 99,
+            F: __dxlog_file4,
+            L: 102,
             S: this,
             C: (f, a) => f(...a)
           });
           return isAuthorized;
         } catch (err) {
-          log5.catch(err, void 0, {
-            F: __dxlog_file6,
-            L: 109,
+          log4.catch(err, void 0, {
+            F: __dxlog_file4,
+            L: 112,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1554,12 +1055,12 @@ var MeshEchoReplicator = class {
     return connection.replicatorExtension;
   }
   authorizeDevice(spaceKey, deviceKey) {
-    log5("authorizeDevice", {
+    log4("authorizeDevice", {
       spaceKey,
       deviceKey
     }, {
-      F: __dxlog_file6,
-      L: 120,
+      F: __dxlog_file4,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1576,13 +1077,12 @@ var MeshEchoReplicator = class {
 export {
   AuthExtension,
   AuthStatus,
-  AutomergeDocumentLoaderImpl,
   AutomergeHost,
   CredentialRetrieverExtension,
   CredentialServerExtension,
   DataServiceImpl,
+  DocumentsSynchronizer,
   LevelDBStorageAdapter,
-  LocalHostNetworkAdapter,
   MOCK_AUTH_PROVIDER,
   MOCK_AUTH_VERIFIER,
   MeshEchoReplicator,