@dxos/echo-pipeline 0.5.8 → 0.5.9-main.079a532

package/dist/lib/node/index.cjs

@@ -18,38 +18,38 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
-  AuthExtension: () => import_chunk_M475BGBI.AuthExtension,
-  AuthStatus: () => import_chunk_M475BGBI.AuthStatus,
+  AuthExtension: () => import_chunk_QPCNQ4ZK.AuthExtension,
+  AuthStatus: () => import_chunk_QPCNQ4ZK.AuthStatus,
   AutomergeDocumentLoaderImpl: () => AutomergeDocumentLoaderImpl,
   AutomergeHost: () => AutomergeHost,
-  AutomergeStorageAdapter: () => AutomergeStorageAdapter,
-  DataServiceImpl: () => import_chunk_M475BGBI.DataServiceImpl,
+  DataServiceImpl: () => import_chunk_QPCNQ4ZK.DataServiceImpl,
   LevelDBStorageAdapter: () => LevelDBStorageAdapter,
   LocalHostNetworkAdapter: () => LocalHostNetworkAdapter,
-  MOCK_AUTH_PROVIDER: () => import_chunk_M475BGBI.MOCK_AUTH_PROVIDER,
-  MOCK_AUTH_VERIFIER: () => import_chunk_M475BGBI.MOCK_AUTH_VERIFIER,
+  MOCK_AUTH_PROVIDER: () => import_chunk_QPCNQ4ZK.MOCK_AUTH_PROVIDER,
+  MOCK_AUTH_VERIFIER: () => import_chunk_QPCNQ4ZK.MOCK_AUTH_VERIFIER,
   MeshEchoReplicator: () => MeshEchoReplicator,
-  MetadataStore: () => import_chunk_M475BGBI.MetadataStore,
-  Pipeline: () => import_chunk_M475BGBI.Pipeline,
-  SnapshotManager: () => import_chunk_M475BGBI.SnapshotManager,
-  SnapshotStore: () => import_chunk_M475BGBI.SnapshotStore,
-  Space: () => import_chunk_M475BGBI.Space,
-  SpaceManager: () => import_chunk_M475BGBI.SpaceManager,
-  SpaceProtocol: () => import_chunk_M475BGBI.SpaceProtocol,
-  SpaceProtocolSession: () => import_chunk_M475BGBI.SpaceProtocolSession,
-  TimeframeClock: () => import_chunk_M475BGBI.TimeframeClock,
-  codec: () => import_chunk_M475BGBI.codec,
-  createMappedFeedWriter: () => import_chunk_M475BGBI.createMappedFeedWriter,
+  MetadataStore: () => import_chunk_QPCNQ4ZK.MetadataStore,
+  Pipeline: () => import_chunk_QPCNQ4ZK.Pipeline,
+  SnapshotManager: () => import_chunk_QPCNQ4ZK.SnapshotManager,
+  SnapshotStore: () => import_chunk_QPCNQ4ZK.SnapshotStore,
+  Space: () => import_chunk_QPCNQ4ZK.Space,
+  SpaceManager: () => import_chunk_QPCNQ4ZK.SpaceManager,
+  SpaceProtocol: () => import_chunk_QPCNQ4ZK.SpaceProtocol,
+  SpaceProtocolSession: () => import_chunk_QPCNQ4ZK.SpaceProtocolSession,
+  TimeframeClock: () => import_chunk_QPCNQ4ZK.TimeframeClock,
+  codec: () => import_chunk_QPCNQ4ZK.codec,
+  createIdFromSpaceKey: () => import_chunk_QPCNQ4ZK.createIdFromSpaceKey,
+  createMappedFeedWriter: () => import_chunk_QPCNQ4ZK.createMappedFeedWriter,
   encodingOptions: () => encodingOptions,
   getSpaceKeyFromDoc: () => getSpaceKeyFromDoc,
-  hasInvitationExpired: () => import_chunk_M475BGBI.hasInvitationExpired,
-  mapFeedIndexesToTimeframe: () => import_chunk_M475BGBI.mapFeedIndexesToTimeframe,
-  mapTimeframeToFeedIndexes: () => import_chunk_M475BGBI.mapTimeframeToFeedIndexes,
-  startAfter: () => import_chunk_M475BGBI.startAfter,
-  valueEncoding: () => import_chunk_M475BGBI.valueEncoding
+  hasInvitationExpired: () => import_chunk_QPCNQ4ZK.hasInvitationExpired,
+  mapFeedIndexesToTimeframe: () => import_chunk_QPCNQ4ZK.mapFeedIndexesToTimeframe,
+  mapTimeframeToFeedIndexes: () => import_chunk_QPCNQ4ZK.mapTimeframeToFeedIndexes,
+  startAfter: () => import_chunk_QPCNQ4ZK.startAfter,
+  valueEncoding: () => import_chunk_QPCNQ4ZK.valueEncoding
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_M475BGBI = require("./chunk-M475BGBI.cjs");
+var import_chunk_QPCNQ4ZK = require("./chunk-QPCNQ4ZK.cjs");
 var import_async = require("@dxos/async");
 var import_automerge = require("@dxos/automerge/automerge");
 var import_automerge_repo = require("@dxos/automerge/automerge-repo");
@@ -70,23 +70,20 @@ var import_async3 = require("@dxos/async");
 var import_automerge_repo3 = require("@dxos/automerge/automerge-repo");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_invariant3 = require("@dxos/invariant");
-var import_automerge_repo_storage_indexeddb = require("@dxos/automerge/automerge-repo-storage-indexeddb");
-var import_log3 = require("@dxos/log");
-var import_random_access_storage = require("@dxos/random-access-storage");
-var import_util2 = require("@dxos/util");
 var import_async4 = require("@dxos/async");
 var import_context4 = require("@dxos/context");
 var import_debug = require("@dxos/debug");
+var import_echo_protocol = require("@dxos/echo-protocol");
 var import_invariant4 = require("@dxos/invariant");
-var import_log4 = require("@dxos/log");
+var import_log3 = require("@dxos/log");
 var import_tracing2 = require("@dxos/tracing");
 var import_automerge_repo4 = require("@dxos/automerge/automerge-repo");
 var import_context5 = require("@dxos/context");
 var import_invariant5 = require("@dxos/invariant");
 var import_keys2 = require("@dxos/keys");
-var import_log5 = require("@dxos/log");
+var import_log4 = require("@dxos/log");
 var import_teleport_extension_automerge_replicator = require("@dxos/teleport-extension-automerge-replicator");
-var import_util3 = require("@dxos/util");
+var import_util2 = require("@dxos/util");
 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")
@@ -205,13 +202,14 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       peerId: this.peerId,
       onConnectionOpen: this._onConnectionOpen.bind(this),
       onConnectionClosed: this._onConnectionClosed.bind(this),
+      onConnectionAuthScopeChanged: this._onConnectionAuthScopeChanged.bind(this),
       getContainingSpaceForDocument: this._params.getContainingSpaceForDocument
     });
   }
   async removeReplicator(replicator) {
     (0, import_invariant2.invariant)(this._lifecycleState === import_context2.LifecycleState.OPEN, void 0, {
       F: __dxlog_file,
-      L: 102,
+      L: 103,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -220,14 +218,13 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
     (0, import_invariant2.invariant)(this._replicators.has(replicator), void 0, {
       F: __dxlog_file,
-      L: 103,
+      L: 104,
       S: this,
       A: [
         "this._replicators.has(replicator)",
         ""
       ]
     });
-    "";
     await replicator.disconnect();
     this._replicators.delete(replicator);
   }
@@ -293,27 +290,49 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       S: this,
       C: (f, a) => f(...a)
     });
-    this.emit("peer-candidate", {
-      peerId: connection.peerId,
-      peerMetadata: {
-        // TODO(dmaretskyi): Refactor this.
-        dxos_peerSource: "EchoNetworkAdapter"
-      }
+    this._emitPeerCandidate(connection);
+  }
+  /**
+  * Trigger doc-synchronizer shared documents set recalculation. Happens on peer-candidate.
+  * TODO(y): replace with a proper API call when sharePolicy update becomes supported by automerge-repo
+  */
+  _onConnectionAuthScopeChanged(connection) {
+    (0, import_log2.log)("Connection auth scope changed", {
+      peerId: connection.peerId
+    }, {
+      F: __dxlog_file,
+      L: 153,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const entry = this._connections.get(connection.peerId);
+    (0, import_invariant2.invariant)(entry, void 0, {
+      F: __dxlog_file,
+      L: 155,
+      S: this,
+      A: [
+        "entry",
+        ""
+      ]
     });
+    this.emit("peer-disconnected", {
+      peerId: connection.peerId
+    });
+    this._emitPeerCandidate(connection);
   }
   _onConnectionClosed(connection) {
     (0, import_log2.log)("Connection closed", {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 155,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     (0, import_invariant2.invariant)(entry, void 0, {
       F: __dxlog_file,
-      L: 157,
+      L: 163,
       S: this,
       A: [
         "entry",
@@ -326,18 +345,27 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
     void entry.reader.cancel().catch((err) => import_log2.log.catch(err, void 0, {
       F: __dxlog_file,
-      L: 162,
+      L: 168,
       S: this,
       C: (f, a) => f(...a)
     }));
     void entry.writer.abort().catch((err) => import_log2.log.catch(err, void 0, {
       F: __dxlog_file,
-      L: 163,
+      L: 169,
       S: this,
       C: (f, a) => f(...a)
     }));
     this._connections.delete(connection.peerId);
   }
+  _emitPeerCandidate(connection) {
+    this.emit("peer-candidate", {
+      peerId: connection.peerId,
+      peerMetadata: {
+        // TODO(dmaretskyi): Refactor this.
+        dxos_peerSource: "EchoNetworkAdapter"
+      }
+    });
+  }
 };
 _ts_decorate([
   import_async2.synchronized
@@ -576,108 +604,6 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo3.NetworkAdapte
     return id;
   }
 };
-var AutomergeStorageAdapter = class {
-  constructor(_directory) {
-    this._directory = _directory;
-    this._state = "opened";
-  }
-  async load(key) {
-    if (this._state !== "opened") {
-      return void 0;
-    }
-    const filename = this._getFilename(key);
-    const file = this._directory.getOrCreateFile(filename);
-    const { size } = await file.stat();
-    if (!size || size === 0) {
-      return void 0;
-    }
-    const buffer = await file.read(0, size);
-    return (0, import_util2.bufferToArray)(buffer);
-  }
-  async save(key, data) {
-    if (this._state !== "opened") {
-      return void 0;
-    }
-    const filename = this._getFilename(key);
-    const file = this._directory.getOrCreateFile(filename);
-    await file.write(0, (0, import_util2.arrayToBuffer)(data));
-    await file.truncate?.(data.length);
-    await file.flush?.();
-  }
-  async remove(key) {
-    if (this._state !== "opened") {
-      return void 0;
-    }
-    const filename = this._getFilename(key);
-    const file = this._directory.getOrCreateFile(filename);
-    await file.destroy();
-  }
-  async loadRange(keyPrefix) {
-    if (this._state !== "opened") {
-      return [];
-    }
-    const filename = this._getFilename(keyPrefix);
-    const entries = await this._directory.list();
-    return Promise.all(entries.filter((entry) => entry.startsWith(filename)).map(async (entry) => {
-      const file = this._directory.getOrCreateFile(entry);
-      const { size } = await file.stat();
-      const buffer = await file.read(0, size);
-      return {
-        key: this._getKeyFromFilename(entry),
-        data: (0, import_util2.bufferToArray)(buffer)
-      };
-    }));
-  }
-  async removeRange(keyPrefix) {
-    if (this._state !== "opened") {
-      return void 0;
-    }
-    const filename = this._getFilename(keyPrefix);
-    const entries = await this._directory.list();
-    await Promise.all(entries.filter((entry) => entry.startsWith(filename)).map(async (entry) => {
-      const file = this._directory.getOrCreateFile(entry);
-      await file.destroy();
-    }));
-  }
-  async close() {
-    this._state = "closed";
-  }
-  _getFilename(key) {
-    return key.map((k) => k.replaceAll("%", "%25").replaceAll("-", "%2D")).join("-");
-  }
-  _getKeyFromFilename(filename) {
-    return filename.split("-").map((k) => k.replaceAll("%2D", "-").replaceAll("%25", "%"));
-  }
-};
-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
-  }).next();
-  if (!isNewLevel) {
-    return;
-  }
-  const oldStorageAdapter = directory.type === import_random_access_storage.StorageType.IDB ? new import_automerge_repo_storage_indexeddb.IndexedDBStorageAdapter(directory.path, "data") : new AutomergeStorageAdapter(directory);
-  const chunks = await oldStorageAdapter.loadRange([]);
-  if (chunks.length === 0) {
-    return;
-  }
-  const batch = db.batch();
-  import_log3.log.info("found chunks on old storage adapter", {
-    chunks: chunks.length
-  }, {
-    F: __dxlog_file3,
-    L: 36,
-    S: void 0,
-    C: (f, a) => f(...a)
-  });
-  for (const { key, data } of await oldStorageAdapter.loadRange([])) {
-    data && batch.put(key, data, {
-      ...encodingOptions
-    });
-  }
-  await batch.write();
-};
 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")
@@ -688,41 +614,37 @@ 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_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
 var AutomergeHost = class {
-  constructor({ directory, db, indexMetadataStore }) {
+  constructor({ db, indexMetadataStore }) {
     this._ctx = new import_context.Context();
     this._echoNetworkAdapter = new EchoNetworkAdapter({
       getContainingSpaceForDocument: this._getContainingSpaceForDocument.bind(this)
     });
     this._requestedDocs = /* @__PURE__ */ new Set();
-    this._directory = directory;
-    this._db = db;
-    this._indexMetadataStore = indexMetadataStore;
-  }
-  async open() {
-    this._directory && await levelMigration({
-      db: this._db,
-      directory: this._directory
-    });
     this._storage = new LevelDBStorageAdapter({
-      db: this._db,
+      db,
       callbacks: {
         beforeSave: async (params) => this._beforeSave(params),
         afterSave: async () => this._afterSave()
       }
     });
-    await this._storage.open?.();
+    this._indexMetadataStore = indexMetadataStore;
+  }
+  async open() {
     this._peerId = `host-${import_keys.PublicKey.random().toHex()}`;
+    await this._storage.open?.();
     this._clientNetwork = new LocalHostNetworkAdapter();
     this._repo = new import_automerge_repo.Repo({
       peerId: this._peerId,
+      sharePolicy: this._sharePolicy.bind(this),
+      storage: this._storage,
       network: [
+        // Downstream client.
         this._clientNetwork,
+        // Upstream swarm.
         this._echoNetworkAdapter
-      ],
-      storage: this._storage,
-      sharePolicy: this._sharePolicy.bind(this)
+      ]
     });
     this._clientNetwork.ready();
     await this._echoNetworkAdapter.open();
@@ -763,8 +685,8 @@ var AutomergeHost = class {
         documentId,
         isRequested
       }, {
-        F: __dxlog_file4,
-        L: 149,
+        F: __dxlog_file3,
+        L: 143,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -849,8 +771,8 @@ var AutomergeHost = class {
   async flush({ states }) {
     await Promise.all(states?.map(async ({ heads, documentId }) => {
       (0, import_invariant.invariant)(heads, "heads are required for flush", {
-        F: __dxlog_file4,
-        L: 243,
+        F: __dxlog_file3,
+        L: 237,
         S: this,
         A: [
           "heads",
@@ -928,11 +850,12 @@ 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_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-doc-loader.ts";
+var __dxlog_file4 = "/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;
+  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();
@@ -949,11 +872,11 @@ var AutomergeDocumentLoaderImpl = class {
       return;
     }
     if (!spaceState.rootUrl) {
-      import_log4.log.error("Database opened with no rootUrl", {
-        spaceKey: this._spaceKey
+      import_log3.log.error("Database opened with no rootUrl", {
+        spaceId: this._spaceId
       }, {
-        F: __dxlog_file5,
-        L: 70,
+        F: __dxlog_file4,
+        L: 72,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -962,8 +885,8 @@ var AutomergeDocumentLoaderImpl = class {
       const existingDocHandle = await this._initDocHandle(ctx, spaceState.rootUrl);
       const doc = existingDocHandle.docSync();
       (0, import_invariant4.invariant)(doc, void 0, {
-        F: __dxlog_file5,
-        L: 75,
+        F: __dxlog_file4,
+        L: 77,
         S: this,
         A: [
           "doc",
@@ -984,8 +907,8 @@ var AutomergeDocumentLoaderImpl = class {
     const urlsToLoad = {};
     for (const objectId of objectIds) {
       (0, import_invariant4.invariant)(this._spaceRootDocHandle, void 0, {
-        F: __dxlog_file5,
-        L: 88,
+        F: __dxlog_file4,
+        L: 90,
         S: this,
         A: [
           "this._spaceRootDocHandle",
@@ -997,8 +920,8 @@ var AutomergeDocumentLoaderImpl = class {
       }
       const spaceRootDoc = this._spaceRootDocHandle.docSync();
       (0, import_invariant4.invariant)(spaceRootDoc, void 0, {
-        F: __dxlog_file5,
-        L: 93,
+        F: __dxlog_file4,
+        L: 95,
         S: this,
         A: [
           "spaceRootDoc",
@@ -1008,11 +931,11 @@ var AutomergeDocumentLoaderImpl = class {
       const documentUrl = (spaceRootDoc.links ?? {})[objectId];
       if (documentUrl == null) {
         this._objectsPendingDocumentLoad.add(objectId);
-        import_log4.log.info("loading delayed until object links are initialized", {
+        import_log3.log.info("loading delayed until object links are initialized", {
           objectId
         }, {
-          F: __dxlog_file5,
-          L: 97,
+          F: __dxlog_file4,
+          L: 99,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1035,8 +958,8 @@ var AutomergeDocumentLoaderImpl = class {
   }
   getSpaceRootDocHandle() {
     (0, import_invariant4.invariant)(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file5,
-      L: 120,
+      F: __dxlog_file4,
+      L: 122,
       S: this,
       A: [
         "this._spaceRootDocHandle",
@@ -1047,15 +970,17 @@ var AutomergeDocumentLoaderImpl = class {
   }
   createDocumentForObject(objectId) {
     (0, import_invariant4.invariant)(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file5,
-      L: 125,
+      F: __dxlog_file4,
+      L: 127,
       S: this,
       A: [
         "this._spaceRootDocHandle",
         ""
       ]
     });
-    const spaceDocHandle = this._repo.create();
+    const spaceDocHandle = this._repo.create({
+      version: import_echo_protocol.SpaceDocVersion.CURRENT
+    });
     this._initDocAccess(spaceDocHandle);
     this.onObjectBoundToDocument(spaceDocHandle, objectId);
     this._spaceRootDocHandle.change((newDoc) => {
@@ -1086,30 +1011,30 @@ var AutomergeDocumentLoaderImpl = class {
       };
       const objectDocumentHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocumentHandle != null && objectDocumentHandle.url !== automergeUrl) {
-        import_log4.log.warn("object already inlined in a different document, ignoring the link", {
+        import_log3.log.warn("object already inlined in a different document, ignoring the link", {
           ...logMeta,
           actualDocumentUrl: objectDocumentHandle.url
         }, {
-          F: __dxlog_file5,
-          L: 155,
+          F: __dxlog_file4,
+          L: 159,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
       if (objectDocumentHandle?.url === automergeUrl) {
-        import_log4.log.warn("object document was already loaded", logMeta, {
-          F: __dxlog_file5,
-          L: 162,
+        import_log3.log.warn("object document was already loaded", logMeta, {
+          F: __dxlog_file4,
+          L: 166,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
       const handle = this._repo.find(automergeUrl);
-      import_log4.log.debug("document loading triggered", logMeta, {
-        F: __dxlog_file5,
-        L: 166,
+      import_log3.log.debug("document loading triggered", logMeta, {
+        F: __dxlog_file4,
+        L: 170,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1121,18 +1046,18 @@ var AutomergeDocumentLoaderImpl = class {
     const docHandle = this._repo.find(url);
     while (true) {
       try {
-        await (0, import_debug.warnAfterTimeout)(5e3, "Automerge root doc load timeout (AutomergeDb)", async () => {
+        await (0, import_debug.warnAfterTimeout)(5e3, "Automerge root doc load timeout (CoreDatabase)", async () => {
           await (0, import_context4.cancelWithContext)(ctx, docHandle.whenReady());
         });
         break;
       } catch (err) {
         if (`${err}`.includes("Timeout")) {
-          import_log4.log.info("wraparound", {
+          import_log3.log.info("wraparound", {
             id: docHandle.documentId,
             state: docHandle.state
           }, {
-            F: __dxlog_file5,
-            L: 182,
+            F: __dxlog_file4,
+            L: 186,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1172,9 +1097,9 @@ var AutomergeDocumentLoaderImpl = class {
         docUrl: handle.url
       };
       if (this.onObjectDocumentLoaded.listenerCount() === 0) {
-        import_log4.log.info("document loaded after all listeners were removed", logMeta, {
-          F: __dxlog_file5,
-          L: 218,
+        import_log3.log.info("document loaded after all listeners were removed", logMeta, {
+          F: __dxlog_file4,
+          L: 222,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1182,9 +1107,9 @@ var AutomergeDocumentLoaderImpl = class {
       }
       const objectDocHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocHandle?.url !== handle.url) {
-        import_log4.log.warn("object was rebound while a document was loading, discarding handle", logMeta, {
-          F: __dxlog_file5,
-          L: 223,
+        import_log3.log.warn("object was rebound while a document was loading, discarding handle", logMeta, {
+          F: __dxlog_file4,
+          L: 227,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1196,14 +1121,14 @@ var AutomergeDocumentLoaderImpl = class {
       });
     } catch (err) {
       const shouldRetryLoading = this.onObjectDocumentLoaded.listenerCount() > 0;
-      import_log4.log.warn("failed to load a document", {
+      import_log3.log.warn("failed to load a document", {
         objectId,
         automergeUrl: handle.url,
         retryLoading: shouldRetryLoading,
         err
       }, {
-        F: __dxlog_file5,
-        L: 229,
+        F: __dxlog_file4,
+        L: 233,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1221,12 +1146,12 @@ _ts_decorate3([
 AutomergeDocumentLoaderImpl = _ts_decorate3([
   import_tracing2.trace.resource()
 ], AutomergeDocumentLoaderImpl);
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
 var MeshEchoReplicator = class {
   constructor() {
     this._connections = /* @__PURE__ */ new Set();
     this._connectionsPerPeer = /* @__PURE__ */ new Map();
-    this._authorizedDevices = new import_util3.ComplexMap(import_keys2.PublicKey.hash);
+    this._authorizedDevices = new import_util2.ComplexMap(import_keys2.PublicKey.hash);
     this._context = null;
   }
   async connect(context) {
@@ -1242,7 +1167,7 @@ var MeshEchoReplicator = class {
   }
   createExtension() {
     (0, import_invariant5.invariant)(this._context, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file5,
       L: 54,
       S: this,
       A: [
@@ -1253,16 +1178,16 @@ var MeshEchoReplicator = class {
     const connection = new MeshReplicatorConnection({
       ownPeerId: this._context.peerId,
       onRemoteConnected: async () => {
-        (0, import_log5.log)("onRemoteConnected", {
+        (0, import_log4.log)("onRemoteConnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file6,
+          F: __dxlog_file5,
           L: 59,
           S: this,
           C: (f, a) => f(...a)
         });
         (0, import_invariant5.invariant)(this._context, void 0, {
-          F: __dxlog_file6,
+          F: __dxlog_file5,
           L: 60,
           S: this,
           A: [
@@ -1270,18 +1195,20 @@ var MeshEchoReplicator = class {
             ""
           ]
         });
-        if (!this._connectionsPerPeer.has(connection.peerId)) {
+        if (this._connectionsPerPeer.has(connection.peerId)) {
+          this._context.onConnectionAuthScopeChanged(connection);
+        } else {
           this._connectionsPerPeer.set(connection.peerId, connection);
           await connection.enable();
           this._context.onConnectionOpen(connection);
         }
       },
       onRemoteDisconnected: async () => {
-        (0, import_log5.log)("onRemoteDisconnected", {
+        (0, import_log4.log)("onRemoteDisconnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file6,
-          L: 69,
+          F: __dxlog_file5,
+          L: 71,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1291,18 +1218,18 @@ var MeshEchoReplicator = class {
         this._connections.delete(connection);
       },
       shouldAdvertize: async (params) => {
-        (0, import_log5.log)("shouldAdvertize", {
+        (0, import_log4.log)("shouldAdvertize", {
           peerId: connection.peerId,
           documentId: params.documentId
         }, {
-          F: __dxlog_file6,
-          L: 76,
+          F: __dxlog_file5,
+          L: 78,
           S: this,
           C: (f, a) => f(...a)
         });
         (0, import_invariant5.invariant)(this._context, void 0, {
-          F: __dxlog_file6,
-          L: 77,
+          F: __dxlog_file5,
+          L: 79,
           S: this,
           A: [
             "this._context",
@@ -1312,12 +1239,12 @@ var MeshEchoReplicator = class {
         try {
           const spaceKey = await this._context.getContainingSpaceForDocument(params.documentId);
           if (!spaceKey) {
-            (0, import_log5.log)("space key not found for share policy check", {
+            (0, import_log4.log)("space key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file6,
-              L: 81,
+              F: __dxlog_file5,
+              L: 83,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1325,19 +1252,19 @@ var MeshEchoReplicator = class {
           }
           const authorizedDevices = this._authorizedDevices.get(spaceKey);
           if (!connection.remoteDeviceKey) {
-            (0, import_log5.log)("device key not found for share policy check", {
+            (0, import_log4.log)("device key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file6,
-              L: 91,
+              F: __dxlog_file5,
+              L: 93,
               S: this,
               C: (f, a) => f(...a)
             });
             return false;
           }
           const isAuthorized = authorizedDevices?.has(connection.remoteDeviceKey) ?? false;
-          (0, import_log5.log)("share policy check", {
+          (0, import_log4.log)("share policy check", {
             localPeer: this._context.peerId,
             remotePeer: connection.peerId,
             documentId: params.documentId,
@@ -1345,16 +1272,16 @@ var MeshEchoReplicator = class {
             spaceKey,
             isAuthorized
           }, {
-            F: __dxlog_file6,
-            L: 99,
+            F: __dxlog_file5,
+            L: 101,
             S: this,
             C: (f, a) => f(...a)
           });
           return isAuthorized;
         } catch (err) {
-          import_log5.log.catch(err, void 0, {
-            F: __dxlog_file6,
-            L: 109,
+          import_log4.log.catch(err, void 0, {
+            F: __dxlog_file5,
+            L: 111,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1366,16 +1293,16 @@ var MeshEchoReplicator = class {
     return connection.replicatorExtension;
   }
   authorizeDevice(spaceKey, deviceKey) {
-    (0, import_log5.log)("authorizeDevice", {
+    (0, import_log4.log)("authorizeDevice", {
       spaceKey,
       deviceKey
     }, {
-      F: __dxlog_file6,
-      L: 120,
+      F: __dxlog_file5,
+      L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_util3.defaultMap)(this._authorizedDevices, spaceKey, () => new import_util3.ComplexSet(import_keys2.PublicKey.hash)).add(deviceKey);
+    (0, import_util2.defaultMap)(this._authorizedDevices, spaceKey, () => new import_util2.ComplexSet(import_keys2.PublicKey.hash)).add(deviceKey);
   }
 };
 var MeshReplicatorConnection = class extends import_context5.Resource {
@@ -1407,13 +1334,13 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
       onStartReplication: async (info, remotePeerId) => {
         this.remoteDeviceKey = remotePeerId;
         this._remotePeerId = info.id;
-        (0, import_log5.log)("onStartReplication", {
+        (0, import_log4.log)("onStartReplication", {
           id: info.id,
           thisPeerId: this.peerId,
           remotePeerId: remotePeerId.toHex()
         }, {
-          F: __dxlog_file6,
-          L: 185,
+          F: __dxlog_file5,
+          L: 187,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1436,8 +1363,8 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
   }
   get peerId() {
     (0, import_invariant5.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file6,
-      L: 208,
+      F: __dxlog_file5,
+      L: 210,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1455,8 +1382,8 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
   */
   async enable() {
     (0, import_invariant5.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file6,
-      L: 221,
+      F: __dxlog_file5,
+      L: 223,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1478,7 +1405,6 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
   AuthStatus,
   AutomergeDocumentLoaderImpl,
   AutomergeHost,
-  AutomergeStorageAdapter,
   DataServiceImpl,
   LevelDBStorageAdapter,
   LocalHostNetworkAdapter,
@@ -1495,6 +1421,7 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
   SpaceProtocolSession,
   TimeframeClock,
   codec,
+  createIdFromSpaceKey,
   createMappedFeedWriter,
   encodingOptions,
   getSpaceKeyFromDoc,