@dxos/echo-pipeline 0.5.1-main.39e0ee2 → 0.5.1-main.3c7169d

package/dist/lib/browser/index.mjs

@@ -29,236 +29,15 @@ import { Event } from "@dxos/async";
 import { next as automerge, getBackend, getHeads } from "@dxos/automerge/automerge";
 import { Repo } from "@dxos/automerge/automerge-repo";
 import { Context } from "@dxos/context";
-import { invariant as invariant4 } from "@dxos/invariant";
+import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
-import { log as log4 } from "@dxos/log";
+import { log as log3 } from "@dxos/log";
 import { idCodec } from "@dxos/protocols";
 import { trace } from "@dxos/tracing";
 import { ComplexMap, ComplexSet, defaultMap, mapValues } from "@dxos/util";
 
-// packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts
-import { Trigger, synchronized } from "@dxos/async";
-import { NetworkAdapter } from "@dxos/automerge/automerge-repo";
-import { LifecycleState } from "@dxos/context";
-import { invariant } from "@dxos/invariant";
-import { log } from "@dxos/log";
-function _ts_decorate(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_file = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts";
-var EchoNetworkAdapter = class extends NetworkAdapter {
-  constructor() {
-    super(...arguments);
-    this._replicators = /* @__PURE__ */ new Set();
-    /**
-    * Remote peer id -> connection.
-    */
-    this._connections = /* @__PURE__ */ new Map();
-    this._lifecycleState = LifecycleState.CLOSED;
-    this._connected = new Trigger();
-  }
-  connect(peerId, peerMetadata) {
-    this.peerId = peerId;
-    this.peerMetadata = peerMetadata;
-    this._connected.wake();
-  }
-  send(message) {
-    const connectionEntry = this._connections.get(message.targetId);
-    if (!connectionEntry) {
-      throw new Error("Connection not found.");
-    }
-    connectionEntry.writer.write(message).catch((err) => {
-      if (connectionEntry.isOpen) {
-        log.catch(err, void 0, {
-          F: __dxlog_file,
-          L: 40,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    });
-  }
-  disconnect() {
-  }
-  async open() {
-    invariant(this._lifecycleState === LifecycleState.CLOSED, void 0, {
-      F: __dxlog_file,
-      L: 51,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.CLOSED",
-        ""
-      ]
-    });
-    this._lifecycleState = LifecycleState.OPEN;
-    this.emit("ready", {
-      network: this
-    });
-  }
-  async close() {
-    invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file,
-      L: 61,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.OPEN",
-        ""
-      ]
-    });
-    for (const replicator of this._replicators) {
-      await replicator.disconnect();
-    }
-    this._replicators.clear();
-    this._lifecycleState = LifecycleState.CLOSED;
-  }
-  async whenConnected() {
-    await this._connected.wait({
-      timeout: 1e4
-    });
-  }
-  async addReplicator(replicator) {
-    invariant(this.peerId, void 0, {
-      F: __dxlog_file,
-      L: 77,
-      S: this,
-      A: [
-        "this.peerId",
-        ""
-      ]
-    });
-    invariant(!this._replicators.has(replicator), void 0, {
-      F: __dxlog_file,
-      L: 78,
-      S: this,
-      A: [
-        "!this._replicators.has(replicator)",
-        ""
-      ]
-    });
-    await replicator.connect({
-      peerId: this.peerId,
-      onConnectionOpen: this._onConnectionOpen.bind(this),
-      onConnectionClosed: this._onConnectionClosed.bind(this)
-    });
-  }
-  async removeReplicator(replicator) {
-    invariant(this._replicators.has(replicator), void 0, {
-      F: __dxlog_file,
-      L: 89,
-      S: this,
-      A: [
-        "this._replicators.has(replicator)",
-        ""
-      ]
-    });
-    await replicator.disconnect();
-  }
-  async shouldAdvertize(peerId, params) {
-    const connection = this._connections.get(peerId);
-    if (!connection) {
-      return false;
-    }
-    return connection.connection.shouldAdvertize(params);
-  }
-  _onConnectionOpen(connection) {
-    invariant(!this._connections.has(connection.peerId), void 0, {
-      F: __dxlog_file,
-      L: 103,
-      S: this,
-      A: [
-        "!this._connections.has(connection.peerId as PeerId)",
-        ""
-      ]
-    });
-    const reader = connection.readable.getReader();
-    const writer = connection.writable.getWriter();
-    const connectionEntry = {
-      connection,
-      reader,
-      writer,
-      isOpen: true
-    };
-    this._connections.set(connection.peerId, connectionEntry);
-    queueMicrotask(async () => {
-      try {
-        while (true) {
-          const { done, value } = await reader.read();
-          if (done) {
-            break;
-          }
-          this.emit("message", value);
-        }
-      } catch (err) {
-        if (connectionEntry.isOpen) {
-          log.catch(err, void 0, {
-            F: __dxlog_file,
-            L: 122,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-        }
-      }
-    });
-    this.emit("peer-candidate", {
-      peerId: connection.peerId,
-      peerMetadata: {
-        // TODO(dmaretskyi): Refactor this.
-        dxos_peerSource: "EchoNetworkAdapter"
-      }
-    });
-  }
-  _onConnectionClosed(connection) {
-    const entry = this._connections.get(connection.peerId);
-    invariant(entry, void 0, {
-      F: __dxlog_file,
-      L: 138,
-      S: this,
-      A: [
-        "entry",
-        ""
-      ]
-    });
-    entry.isOpen = false;
-    this.emit("peer-disconnected", {
-      peerId: connection.peerId
-    });
-    void entry.reader.cancel().catch((err) => log.catch(err, void 0, {
-      F: __dxlog_file,
-      L: 143,
-      S: this,
-      C: (f, a) => f(...a)
-    }));
-    void entry.writer.abort().catch((err) => log.catch(err, void 0, {
-      F: __dxlog_file,
-      L: 144,
-      S: this,
-      C: (f, a) => f(...a)
-    }));
-    this._connections.delete(connection.peerId);
-  }
-};
-_ts_decorate([
-  synchronized
-], EchoNetworkAdapter.prototype, "open", null);
-_ts_decorate([
-  synchronized
-], EchoNetworkAdapter.prototype, "close", null);
-_ts_decorate([
-  synchronized
-], EchoNetworkAdapter.prototype, "addReplicator", null);
-_ts_decorate([
-  synchronized
-], EchoNetworkAdapter.prototype, "removeReplicator", null);
-
 // packages/core/echo/echo-pipeline/src/automerge/leveldb-storage-adapter.ts
-import { LifecycleState as LifecycleState2, Resource } from "@dxos/context";
+import { LifecycleState, Resource } from "@dxos/context";
 var LevelDBStorageAdapter = class extends Resource {
   constructor(_params) {
     super();
@@ -266,7 +45,7 @@ var LevelDBStorageAdapter = class extends Resource {
   }
   async load(keyArray) {
     try {
-      if (this._lifecycleState !== LifecycleState2.OPEN) {
+      if (this._lifecycleState !== LifecycleState.OPEN) {
         return void 0;
       }
       return await this._params.db.get(keyArray, {
@@ -280,7 +59,7 @@ var LevelDBStorageAdapter = class extends Resource {
     }
   }
   async save(keyArray, binary) {
-    if (this._lifecycleState !== LifecycleState2.OPEN) {
+    if (this._lifecycleState !== LifecycleState.OPEN) {
       return void 0;
     }
     const batch = this._params.db.batch();
@@ -295,7 +74,7 @@ var LevelDBStorageAdapter = class extends Resource {
     await this._params.callbacks?.afterSave?.(keyArray);
   }
   async remove(keyArray) {
-    if (this._lifecycleState !== LifecycleState2.OPEN) {
+    if (this._lifecycleState !== LifecycleState.OPEN) {
       return void 0;
     }
     await this._params.db.del(keyArray, {
@@ -303,7 +82,7 @@ var LevelDBStorageAdapter = class extends Resource {
     });
   }
   async loadRange(keyPrefix) {
-    if (this._lifecycleState !== LifecycleState2.OPEN) {
+    if (this._lifecycleState !== LifecycleState.OPEN) {
       return [];
     }
     const result = [];
@@ -323,7 +102,7 @@ var LevelDBStorageAdapter = class extends Resource {
     return result;
   }
   async removeRange(keyPrefix) {
-    if (this._lifecycleState !== LifecycleState2.OPEN) {
+    if (this._lifecycleState !== LifecycleState.OPEN) {
       return void 0;
     }
     const batch = this._params.db.batch();
@@ -354,16 +133,16 @@ 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 { Trigger } from "@dxos/async";
+import { NetworkAdapter, 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 {
+import { invariant } from "@dxos/invariant";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/local-host-network-adapter.ts";
+var LocalHostNetworkAdapter = class extends NetworkAdapter {
   constructor() {
     super(...arguments);
     this._peers = /* @__PURE__ */ new Map();
-    this._connected = new Trigger2();
+    this._connected = new Trigger();
     this._isConnected = false;
   }
   /**
@@ -386,8 +165,8 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter2 {
   }
   send(message) {
     const peer = this._peers.get(message.targetId);
-    invariant2(peer, "Peer not found.", {
-      F: __dxlog_file2,
+    invariant(peer, "Peer not found.", {
+      F: __dxlog_file,
       L: 51,
       S: this,
       A: [
@@ -411,8 +190,8 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter2 {
   syncRepo({ id, syncMessage }) {
     const peerId = this._getPeerId(id);
     return new Stream(({ next, close }) => {
-      invariant2(!this._peers.has(peerId), "Peer already connected.", {
-        F: __dxlog_file2,
+      invariant(!this._peers.has(peerId), "Peer already connected.", {
+        F: __dxlog_file,
         L: 73,
         S: this,
         A: [
@@ -435,8 +214,8 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter2 {
           });
         }
       });
-      invariant2(this._isConnected, void 0, {
-        F: __dxlog_file2,
+      invariant(this._isConnected, void 0, {
+        F: __dxlog_file,
         L: 90,
         S: this,
         A: [
@@ -451,8 +230,8 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter2 {
     });
   }
   async sendSyncMessage({ id, syncMessage }) {
-    invariant2(this._isConnected, void 0, {
-      F: __dxlog_file2,
+    invariant(this._isConnected, void 0, {
+      F: __dxlog_file,
       L: 99,
       S: this,
       A: [
@@ -464,8 +243,8 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter2 {
     this.emit("message", message);
   }
   async getHostInfo() {
-    invariant2(this._isConnected, void 0, {
-      F: __dxlog_file2,
+    invariant(this._isConnected, void 0, {
+      F: __dxlog_file,
       L: 105,
       S: this,
       A: [
@@ -473,8 +252,8 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter2 {
         ""
       ]
     });
-    invariant2(this.peerId, "Peer id not set.", {
-      F: __dxlog_file2,
+    invariant(this.peerId, "Peer id not set.", {
+      F: __dxlog_file,
       L: 106,
       S: this,
       A: [
@@ -492,17 +271,17 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter2 {
 };
 
 // packages/core/echo/echo-pipeline/src/automerge/mesh-network-adapter.ts
-import { Trigger as Trigger3 } from "@dxos/async";
-import { NetworkAdapter as NetworkAdapter3, cbor as cbor2 } from "@dxos/automerge/automerge-repo";
-import { invariant as invariant3 } from "@dxos/invariant";
-import { log as log2 } from "@dxos/log";
+import { Trigger as Trigger2 } from "@dxos/async";
+import { NetworkAdapter as NetworkAdapter2, cbor as cbor2 } from "@dxos/automerge/automerge-repo";
+import { invariant as invariant2 } from "@dxos/invariant";
+import { log } from "@dxos/log";
 import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-network-adapter.ts";
-var MeshNetworkAdapter = class extends NetworkAdapter3 {
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-network-adapter.ts";
+var MeshNetworkAdapter = class extends NetworkAdapter2 {
   constructor() {
     super(...arguments);
     this._extensions = /* @__PURE__ */ new Map();
-    this._connected = new Trigger3();
+    this._connected = new Trigger2();
   }
   /**
   * Emits `ready` event. That signals to `Repo` that it can start using the adapter.
@@ -519,8 +298,8 @@ var MeshNetworkAdapter = class extends NetworkAdapter3 {
   send(message) {
     const receiverId = message.targetId;
     const extension = this._extensions.get(receiverId);
-    invariant3(extension, "Extension not found.", {
-      F: __dxlog_file3,
+    invariant2(extension, "Extension not found.", {
+      F: __dxlog_file2,
       L: 38,
       S: this,
       A: [
@@ -530,8 +309,8 @@ var MeshNetworkAdapter = class extends NetworkAdapter3 {
     });
     extension.sendSyncMessage({
       payload: cbor2.encode(message)
-    }).catch((err) => log2.catch(err, void 0, {
-      F: __dxlog_file3,
+    }).catch((err) => log.catch(err, void 0, {
+      F: __dxlog_file2,
       L: 39,
       S: this,
       C: (f, a) => f(...a)
@@ -540,8 +319,8 @@ var MeshNetworkAdapter = class extends NetworkAdapter3 {
   disconnect() {
   }
   createExtension() {
-    invariant3(this.peerId, "Peer id not set.", {
-      F: __dxlog_file3,
+    invariant2(this.peerId, "Peer id not set.", {
+      F: __dxlog_file2,
       L: 47,
       S: this,
       A: [
@@ -555,12 +334,12 @@ var MeshNetworkAdapter = class extends NetworkAdapter3 {
     }, {
       onStartReplication: async (info, remotePeerId) => {
         await this._connected.wait();
-        log2("onStartReplication", {
+        log("onStartReplication", {
           id: info.id,
           thisPeerId: this.peerId,
           remotePeerId: remotePeerId.toHex()
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file2,
           L: 70,
           S: this,
           C: (f, a) => f(...a)
@@ -568,12 +347,12 @@ var MeshNetworkAdapter = class extends NetworkAdapter3 {
         if (!this._extensions.has(info.id)) {
           peerInfo = info;
           this._extensions.set(info.id, extension);
-          log2("peer-candidate", {
+          log("peer-candidate", {
             id: info.id,
             thisPeerId: this.peerId,
             remotePeerId: remotePeerId.toHex()
           }, {
-            F: __dxlog_file3,
+            F: __dxlog_file2,
             L: 76,
             S: this,
             C: (f, a) => f(...a)
@@ -610,7 +389,7 @@ var MeshNetworkAdapter = class extends NetworkAdapter3 {
 
 // packages/core/echo/echo-pipeline/src/automerge/migrations.ts
 import { IndexedDBStorageAdapter } from "@dxos/automerge/automerge-repo-storage-indexeddb";
-import { log as log3 } from "@dxos/log";
+import { log as log2 } from "@dxos/log";
 import { StorageType } from "@dxos/random-access-storage";
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-storage-adapter.ts
@@ -690,7 +469,7 @@ var AutomergeStorageAdapter = class {
 };
 
 // packages/core/echo/echo-pipeline/src/automerge/migrations.ts
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/migrations.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/migrations.ts";
 var levelMigration = async ({ db, directory }) => {
   const isNewLevel = !await db.iterator({
     ...encodingOptions
@@ -704,10 +483,10 @@ var levelMigration = async ({ db, directory }) => {
     return;
   }
   const batch = db.batch();
-  log3.info("found chunks on old storage adapter", {
+  log2.info("found chunks on old storage adapter", {
     chunks: chunks.length
   }, {
-    F: __dxlog_file4,
+    F: __dxlog_file3,
     L: 36,
     S: void 0,
     C: (f, a) => f(...a)
@@ -721,7 +500,7 @@ var levelMigration = async ({ db, directory }) => {
 };
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
-function _ts_decorate2(decorators, target, key, desc) {
+function _ts_decorate(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);
@@ -731,11 +510,10 @@ 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_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
 var AutomergeHost = class {
   constructor({ directory, db, indexMetadataStore }) {
     this._ctx = new Context();
-    this._echoNetworkAdapter = new EchoNetworkAdapter();
     /**
     * spaceKey -> deviceKey[]
     */
@@ -765,8 +543,7 @@ var AutomergeHost = class {
       peerId: this._peerId,
       network: [
         this._clientNetwork,
-        this._meshNetwork,
-        this._echoNetworkAdapter
+        this._meshNetwork
       ],
       storage: this._storage,
       // TODO(dmaretskyi): Share based on HALO permissions and space affinity.
@@ -778,22 +555,16 @@ var AutomergeHost = class {
         if (!documentId) {
           return false;
         }
-        const peerMetadata = this.repo.peerMetadataByPeerId[peerId];
-        if (peerMetadata?.dxos_peerSource === "EchoNetworkAdapter") {
-          return this._echoNetworkAdapter.shouldAdvertize(peerId, {
-            documentId
-          });
-        }
         const doc = this._repo.handles[documentId]?.docSync();
         if (!doc) {
           const isRequested = this._requestedDocs.has(`automerge:${documentId}`);
-          log4("doc share policy check", {
+          log3("doc share policy check", {
             peerId,
             documentId,
             isRequested
           }, {
-            F: __dxlog_file5,
-            L: 124,
+            F: __dxlog_file4,
+            L: 116,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -802,26 +573,26 @@ var AutomergeHost = class {
         try {
           const spaceKey = getSpaceKeyFromDoc(doc);
           if (!spaceKey) {
-            log4("space key not found for share policy check", {
+            log3("space key not found for share policy check", {
               peerId,
               documentId
             }, {
-              F: __dxlog_file5,
-              L: 131,
+              F: __dxlog_file4,
+              L: 123,
               S: this,
               C: (f, a) => f(...a)
             });
             return false;
           }
           const authorizedDevices = this._authorizedDevices.get(PublicKey.from(spaceKey));
-          const deviceKeyHex = peerMetadata?.dxos_deviceKey;
+          const deviceKeyHex = this.repo.peerMetadataByPeerId[peerId]?.dxos_deviceKey;
           if (!deviceKeyHex) {
-            log4("device key not found for share policy check", {
+            log3("device key not found for share policy check", {
               peerId,
               documentId
             }, {
-              F: __dxlog_file5,
-              L: 140,
+              F: __dxlog_file4,
+              L: 132,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -829,7 +600,7 @@ var AutomergeHost = class {
           }
           const deviceKey = PublicKey.from(deviceKeyHex);
           const isAuthorized = authorizedDevices?.has(deviceKey) ?? false;
-          log4("share policy check", {
+          log3("share policy check", {
             localPeer: this._peerId,
             remotePeer: peerId,
             documentId,
@@ -837,16 +608,16 @@ var AutomergeHost = class {
             spaceKey,
             isAuthorized
           }, {
-            F: __dxlog_file5,
-            L: 146,
+            F: __dxlog_file4,
+            L: 138,
             S: this,
             C: (f, a) => f(...a)
           });
           return isAuthorized;
         } catch (err) {
-          log4.catch(err, void 0, {
-            F: __dxlog_file5,
-            L: 156,
+          log3.catch(err, void 0, {
+            F: __dxlog_file4,
+            L: 148,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -856,25 +627,16 @@ var AutomergeHost = class {
     });
     this._clientNetwork.ready();
     this._meshNetwork.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();
   }
   get repo() {
     return this._repo;
   }
-  async addReplicator(replicator) {
-    await this._echoNetworkAdapter.addReplicator(replicator);
-  }
-  async removeReplicator(replicator) {
-    await this._echoNetworkAdapter.removeReplicator(replicator);
-  }
   async _beforeSave({ path, batch }) {
     const handle = this._repo.handles[path[0]];
     if (!handle) {
@@ -932,9 +694,9 @@ var AutomergeHost = class {
   //
   async flush({ states }) {
     await Promise.all(states?.map(async ({ heads, documentId }) => {
-      invariant4(heads, "heads are required for flush", {
-        F: __dxlog_file5,
-        L: 252,
+      invariant3(heads, "heads are required for flush", {
+        F: __dxlog_file4,
+        L: 233,
         S: this,
         A: [
           "heads",
@@ -962,37 +724,37 @@ var AutomergeHost = class {
     return this._meshNetwork.createExtension();
   }
   authorizeDevice(spaceKey, deviceKey) {
-    log4("authorizeDevice", {
+    log3("authorizeDevice", {
       spaceKey,
       deviceKey
     }, {
-      F: __dxlog_file5,
-      L: 282,
+      F: __dxlog_file4,
+      L: 263,
       S: this,
       C: (f, a) => f(...a)
     });
     defaultMap(this._authorizedDevices, spaceKey, () => new ComplexSet(PublicKey.hash)).add(deviceKey);
   }
 };
-_ts_decorate2([
+_ts_decorate([
   trace.info()
 ], AutomergeHost.prototype, "_peerId", void 0);
-_ts_decorate2([
+_ts_decorate([
   trace.info({
     depth: null
   })
 ], AutomergeHost.prototype, "_automergeDocs", null);
-_ts_decorate2([
+_ts_decorate([
   trace.info({
     depth: null
   })
 ], AutomergeHost.prototype, "_automergePeers", null);
-_ts_decorate2([
+_ts_decorate([
   trace.span({
     showInBrowserTimeline: true
   })
 ], AutomergeHost.prototype, "flush", null);
-AutomergeHost = _ts_decorate2([
+AutomergeHost = _ts_decorate([
   trace.resource()
 ], AutomergeHost);
 var getSpaceKeyFromDoc = (doc) => {
@@ -1025,10 +787,10 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 import { Event as Event2 } from "@dxos/async";
 import { cancelWithContext } from "@dxos/context";
 import { warnAfterTimeout } from "@dxos/debug";
-import { invariant as invariant5 } from "@dxos/invariant";
-import { log as log5 } from "@dxos/log";
+import { invariant as invariant4 } from "@dxos/invariant";
+import { log as log4 } from "@dxos/log";
 import { trace as trace2 } from "@dxos/tracing";
-function _ts_decorate3(decorators, target, key, desc) {
+function _ts_decorate2(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);
@@ -1038,7 +800,7 @@ function _ts_decorate3(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_file6 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-doc-loader.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-doc-loader.ts";
 var AutomergeDocumentLoaderImpl = class {
   constructor(_spaceKey, _repo) {
     this._spaceKey = _spaceKey;
@@ -1049,21 +811,20 @@ var AutomergeDocumentLoaderImpl = class {
     this.onObjectDocumentLoaded = new Event2();
   }
   getAllHandles() {
-    return this._spaceRootDocHandle != null ? [
-      this._spaceRootDocHandle,
+    return [
       ...new Set(this._objectDocumentHandles.values())
-    ] : [];
+    ];
   }
   async loadSpaceRootDocHandle(ctx, spaceState) {
     if (this._spaceRootDocHandle != null) {
       return;
     }
     if (!spaceState.rootUrl) {
-      log5.error("Database opened with no rootUrl", {
+      log4.error("Database opened with no rootUrl", {
         spaceKey: this._spaceKey
       }, {
-        F: __dxlog_file6,
-        L: 70,
+        F: __dxlog_file5,
+        L: 68,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1071,9 +832,9 @@ var AutomergeDocumentLoaderImpl = class {
     } else {
       const existingDocHandle = await this._initDocHandle(ctx, spaceState.rootUrl);
       const doc = existingDocHandle.docSync();
-      invariant5(doc, void 0, {
-        F: __dxlog_file6,
-        L: 75,
+      invariant4(doc, void 0, {
+        F: __dxlog_file5,
+        L: 73,
         S: this,
         A: [
           "doc",
@@ -1093,9 +854,9 @@ var AutomergeDocumentLoaderImpl = class {
     let hasUrlsToLoad = false;
     const urlsToLoad = {};
     for (const objectId of objectIds) {
-      invariant5(this._spaceRootDocHandle, void 0, {
-        F: __dxlog_file6,
-        L: 88,
+      invariant4(this._spaceRootDocHandle, void 0, {
+        F: __dxlog_file5,
+        L: 86,
         S: this,
         A: [
           "this._spaceRootDocHandle",
@@ -1106,9 +867,9 @@ var AutomergeDocumentLoaderImpl = class {
         continue;
       }
       const spaceRootDoc = this._spaceRootDocHandle.docSync();
-      invariant5(spaceRootDoc, void 0, {
-        F: __dxlog_file6,
-        L: 93,
+      invariant4(spaceRootDoc, void 0, {
+        F: __dxlog_file5,
+        L: 91,
         S: this,
         A: [
           "spaceRootDoc",
@@ -1118,11 +879,11 @@ var AutomergeDocumentLoaderImpl = class {
       const documentUrl = (spaceRootDoc.links ?? {})[objectId];
       if (documentUrl == null) {
         this._objectsPendingDocumentLoad.add(objectId);
-        log5.info("loading delayed until object links are initialized", {
+        log4.info("loading delayed until object links are initialized", {
           objectId
         }, {
-          F: __dxlog_file6,
-          L: 97,
+          F: __dxlog_file5,
+          L: 95,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1144,9 +905,9 @@ var AutomergeDocumentLoaderImpl = class {
     linksAwaitingLoad.forEach(([objectId]) => this._objectsPendingDocumentLoad.delete(objectId));
   }
   getSpaceRootDocHandle() {
-    invariant5(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file6,
-      L: 120,
+    invariant4(this._spaceRootDocHandle, void 0, {
+      F: __dxlog_file5,
+      L: 118,
       S: this,
       A: [
         "this._spaceRootDocHandle",
@@ -1156,9 +917,9 @@ var AutomergeDocumentLoaderImpl = class {
     return this._spaceRootDocHandle;
   }
   createDocumentForObject(objectId) {
-    invariant5(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file6,
-      L: 125,
+    invariant4(this._spaceRootDocHandle, void 0, {
+      F: __dxlog_file5,
+      L: 123,
       S: this,
       A: [
         "this._spaceRootDocHandle",
@@ -1196,30 +957,30 @@ var AutomergeDocumentLoaderImpl = class {
       };
       const objectDocumentHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocumentHandle != null && objectDocumentHandle.url !== automergeUrl) {
-        log5.warn("object already inlined in a different document, ignoring the link", {
+        log4.warn("object already inlined in a different document, ignoring the link", {
           ...logMeta,
           actualDocumentUrl: objectDocumentHandle.url
         }, {
-          F: __dxlog_file6,
-          L: 155,
+          F: __dxlog_file5,
+          L: 153,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
       if (objectDocumentHandle?.url === automergeUrl) {
-        log5.warn("object document was already loaded", logMeta, {
-          F: __dxlog_file6,
-          L: 162,
+        log4.warn("object document was already loaded", logMeta, {
+          F: __dxlog_file5,
+          L: 160,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
       const handle = this._repo.find(automergeUrl);
-      log5.debug("document loading triggered", logMeta, {
-        F: __dxlog_file6,
-        L: 166,
+      log4.debug("document loading triggered", logMeta, {
+        F: __dxlog_file5,
+        L: 164,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1237,12 +998,12 @@ var AutomergeDocumentLoaderImpl = class {
         break;
       } catch (err) {
         if (`${err}`.includes("Timeout")) {
-          log5.info("wraparound", {
+          log4.info("wraparound", {
             id: docHandle.documentId,
             state: docHandle.state
           }, {
-            F: __dxlog_file6,
-            L: 182,
+            F: __dxlog_file5,
+            L: 180,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1282,9 +1043,9 @@ var AutomergeDocumentLoaderImpl = class {
         docUrl: handle.url
       };
       if (this.onObjectDocumentLoaded.listenerCount() === 0) {
-        log5.info("document loaded after all listeners were removed", logMeta, {
-          F: __dxlog_file6,
-          L: 218,
+        log4.info("document loaded after all listeners were removed", logMeta, {
+          F: __dxlog_file5,
+          L: 216,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1292,9 +1053,9 @@ var AutomergeDocumentLoaderImpl = class {
       }
       const objectDocHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocHandle?.url !== handle.url) {
-        log5.warn("object was rebound while a document was loading, discarding handle", logMeta, {
-          F: __dxlog_file6,
-          L: 223,
+        log4.warn("object was rebound while a document was loading, discarding handle", logMeta, {
+          F: __dxlog_file5,
+          L: 221,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1306,14 +1067,14 @@ var AutomergeDocumentLoaderImpl = class {
       });
     } catch (err) {
       const shouldRetryLoading = this.onObjectDocumentLoaded.listenerCount() > 0;
-      log5.warn("failed to load a document", {
+      log4.warn("failed to load a document", {
         objectId,
         automergeUrl: handle.url,
         retryLoading: shouldRetryLoading,
         err
       }, {
-        F: __dxlog_file6,
-        L: 229,
+        F: __dxlog_file5,
+        L: 227,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1323,12 +1084,12 @@ var AutomergeDocumentLoaderImpl = class {
     }
   }
 };
-_ts_decorate3([
+_ts_decorate2([
   trace2.span({
     showInBrowserTimeline: true
   })
 ], AutomergeDocumentLoaderImpl.prototype, "loadSpaceRootDocHandle", null);
-AutomergeDocumentLoaderImpl = _ts_decorate3([
+AutomergeDocumentLoaderImpl = _ts_decorate2([
   trace2.resource()
 ], AutomergeDocumentLoaderImpl);
 export {