@dxos/echo-pipeline 0.5.9-main.1c1903d → 0.5.9-main.1ea2105

package/dist/lib/node/index.cjs

@@ -56,7 +56,6 @@ var import_automerge_repo = require("@dxos/automerge/automerge-repo");
 var import_context = require("@dxos/context");
 var import_invariant = require("@dxos/invariant");
 var import_keys = require("@dxos/keys");
-var import_log = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
 var import_tracing = require("@dxos/tracing");
 var import_util = require("@dxos/util");
@@ -64,7 +63,7 @@ var import_async2 = require("@dxos/async");
 var import_automerge_repo2 = require("@dxos/automerge/automerge-repo");
 var import_context2 = require("@dxos/context");
 var import_invariant2 = require("@dxos/invariant");
-var import_log2 = require("@dxos/log");
+var import_log = require("@dxos/log");
 var import_context3 = require("@dxos/context");
 var import_async3 = require("@dxos/async");
 var import_automerge_repo3 = require("@dxos/automerge/automerge-repo");
@@ -73,14 +72,15 @@ var import_invariant3 = require("@dxos/invariant");
 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_log3 = require("@dxos/log");
+var import_log2 = 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_log4 = require("@dxos/log");
+var import_log3 = require("@dxos/log");
 var import_teleport_extension_automerge_replicator = require("@dxos/teleport-extension-automerge-replicator");
 var import_util2 = require("@dxos/util");
 function _ts_decorate(decorators, target, key, desc) {
@@ -115,7 +115,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     }
     connectionEntry.writer.write(message).catch((err) => {
       if (connectionEntry.isOpen) {
-        import_log2.log.catch(err, void 0, {
+        import_log.log.catch(err, void 0, {
           F: __dxlog_file,
           L: 49,
           S: this,
@@ -137,7 +137,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       ]
     });
     this._lifecycleState = import_context2.LifecycleState.OPEN;
-    (0, import_log2.log)("emit ready", void 0, {
+    (0, import_log.log)("emit ready", void 0, {
       F: __dxlog_file,
       L: 63,
       S: this,
@@ -235,7 +235,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     return connection.connection.shouldAdvertize(params);
   }
   _onConnectionOpen(connection) {
-    (0, import_log2.log)("Connection opened", {
+    (0, import_log.log)("Connection opened", {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
@@ -272,7 +272,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
         }
       } catch (err) {
         if (connectionEntry.isOpen) {
-          import_log2.log.catch(err, void 0, {
+          import_log.log.catch(err, void 0, {
             F: __dxlog_file,
             L: 139,
             S: this,
@@ -281,7 +281,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
         }
       }
     });
-    (0, import_log2.log)("emit peer-candidate", {
+    (0, import_log.log)("emit peer-candidate", {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
@@ -296,7 +296,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
   * 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", {
+    (0, import_log.log)("Connection auth scope changed", {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
@@ -320,7 +320,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     this._emitPeerCandidate(connection);
   }
   _onConnectionClosed(connection) {
-    (0, import_log2.log)("Connection closed", {
+    (0, import_log.log)("Connection closed", {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
@@ -342,13 +342,13 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     this.emit("peer-disconnected", {
       peerId: connection.peerId
     });
-    void entry.reader.cancel().catch((err) => import_log2.log.catch(err, void 0, {
+    void entry.reader.cancel().catch((err) => import_log.log.catch(err, void 0, {
       F: __dxlog_file,
       L: 168,
       S: this,
       C: (f, a) => f(...a)
     }));
-    void entry.writer.abort().catch((err) => import_log2.log.catch(err, void 0, {
+    void entry.writer.abort().catch((err) => import_log.log.catch(err, void 0, {
       F: __dxlog_file,
       L: 169,
       S: this,
@@ -620,7 +620,6 @@ var AutomergeHost = class {
     this._echoNetworkAdapter = new EchoNetworkAdapter({
       getContainingSpaceForDocument: this._getContainingSpaceForDocument.bind(this)
     });
-    this._requestedDocs = /* @__PURE__ */ new Set();
     this._storage = new LevelDBStorageAdapter({
       db,
       callbacks: {
@@ -676,21 +675,6 @@ var AutomergeHost = class {
     if (!documentId) {
       return false;
     }
-    const doc = this._repo.handles[documentId]?.docSync();
-    if (!doc) {
-      const isRequested = this._requestedDocs.has(`automerge:${documentId}`);
-      (0, import_log.log)("doc share policy check", {
-        peerId,
-        documentId,
-        isRequested
-      }, {
-        F: __dxlog_file3,
-        L: 143,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return isRequested;
-    }
     const peerMetadata = this.repo.peerMetadataByPeerId[peerId];
     if (peerMetadata?.dxos_peerSource === "EchoNetworkAdapter") {
       return this._echoNetworkAdapter.shouldAdvertize(peerId, {
@@ -771,7 +755,7 @@ var AutomergeHost = class {
     await Promise.all(states?.map(async ({ heads, documentId }) => {
       (0, import_invariant.invariant)(heads, "heads are required for flush", {
         F: __dxlog_file3,
-        L: 237,
+        L: 223,
         S: this,
         A: [
           "heads",
@@ -871,7 +855,7 @@ var AutomergeDocumentLoaderImpl = class {
       return;
     }
     if (!spaceState.rootUrl) {
-      import_log3.log.error("Database opened with no rootUrl", {
+      import_log2.log.error("Database opened with no rootUrl", {
         spaceId: this._spaceId
       }, {
         F: __dxlog_file4,
@@ -930,7 +914,7 @@ var AutomergeDocumentLoaderImpl = class {
       const documentUrl = (spaceRootDoc.links ?? {})[objectId];
       if (documentUrl == null) {
         this._objectsPendingDocumentLoad.add(objectId);
-        import_log3.log.info("loading delayed until object links are initialized", {
+        import_log2.log.info("loading delayed until object links are initialized", {
           objectId
         }, {
           F: __dxlog_file4,
@@ -977,7 +961,9 @@ var AutomergeDocumentLoaderImpl = class {
         ""
       ]
     });
-    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) => {
@@ -1008,30 +994,30 @@ var AutomergeDocumentLoaderImpl = class {
       };
       const objectDocumentHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocumentHandle != null && objectDocumentHandle.url !== automergeUrl) {
-        import_log3.log.warn("object already inlined in a different document, ignoring the link", {
+        import_log2.log.warn("object already inlined in a different document, ignoring the link", {
           ...logMeta,
           actualDocumentUrl: objectDocumentHandle.url
         }, {
           F: __dxlog_file4,
-          L: 157,
+          L: 159,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
       if (objectDocumentHandle?.url === automergeUrl) {
-        import_log3.log.warn("object document was already loaded", logMeta, {
+        import_log2.log.warn("object document was already loaded", logMeta, {
           F: __dxlog_file4,
-          L: 164,
+          L: 166,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
       const handle = this._repo.find(automergeUrl);
-      import_log3.log.debug("document loading triggered", logMeta, {
+      import_log2.log.debug("document loading triggered", logMeta, {
         F: __dxlog_file4,
-        L: 168,
+        L: 170,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1049,12 +1035,12 @@ var AutomergeDocumentLoaderImpl = class {
         break;
       } catch (err) {
         if (`${err}`.includes("Timeout")) {
-          import_log3.log.info("wraparound", {
+          import_log2.log.info("wraparound", {
             id: docHandle.documentId,
             state: docHandle.state
           }, {
             F: __dxlog_file4,
-            L: 184,
+            L: 186,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1094,9 +1080,9 @@ var AutomergeDocumentLoaderImpl = class {
         docUrl: handle.url
       };
       if (this.onObjectDocumentLoaded.listenerCount() === 0) {
-        import_log3.log.info("document loaded after all listeners were removed", logMeta, {
+        import_log2.log.info("document loaded after all listeners were removed", logMeta, {
           F: __dxlog_file4,
-          L: 220,
+          L: 222,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1104,9 +1090,9 @@ var AutomergeDocumentLoaderImpl = class {
       }
       const objectDocHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocHandle?.url !== handle.url) {
-        import_log3.log.warn("object was rebound while a document was loading, discarding handle", logMeta, {
+        import_log2.log.warn("object was rebound while a document was loading, discarding handle", logMeta, {
           F: __dxlog_file4,
-          L: 225,
+          L: 227,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1118,14 +1104,14 @@ var AutomergeDocumentLoaderImpl = class {
       });
     } catch (err) {
       const shouldRetryLoading = this.onObjectDocumentLoaded.listenerCount() > 0;
-      import_log3.log.warn("failed to load a document", {
+      import_log2.log.warn("failed to load a document", {
         objectId,
         automergeUrl: handle.url,
         retryLoading: shouldRetryLoading,
         err
       }, {
         F: __dxlog_file4,
-        L: 231,
+        L: 233,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1175,7 +1161,7 @@ var MeshEchoReplicator = class {
     const connection = new MeshReplicatorConnection({
       ownPeerId: this._context.peerId,
       onRemoteConnected: async () => {
-        (0, import_log4.log)("onRemoteConnected", {
+        (0, import_log3.log)("onRemoteConnected", {
           peerId: connection.peerId
         }, {
           F: __dxlog_file5,
@@ -1201,7 +1187,7 @@ var MeshEchoReplicator = class {
         }
       },
       onRemoteDisconnected: async () => {
-        (0, import_log4.log)("onRemoteDisconnected", {
+        (0, import_log3.log)("onRemoteDisconnected", {
           peerId: connection.peerId
         }, {
           F: __dxlog_file5,
@@ -1215,7 +1201,7 @@ var MeshEchoReplicator = class {
         this._connections.delete(connection);
       },
       shouldAdvertize: async (params) => {
-        (0, import_log4.log)("shouldAdvertize", {
+        (0, import_log3.log)("shouldAdvertize", {
           peerId: connection.peerId,
           documentId: params.documentId
         }, {
@@ -1236,7 +1222,7 @@ var MeshEchoReplicator = class {
         try {
           const spaceKey = await this._context.getContainingSpaceForDocument(params.documentId);
           if (!spaceKey) {
-            (0, import_log4.log)("space key not found for share policy check", {
+            (0, import_log3.log)("space key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
@@ -1249,7 +1235,7 @@ var MeshEchoReplicator = class {
           }
           const authorizedDevices = this._authorizedDevices.get(spaceKey);
           if (!connection.remoteDeviceKey) {
-            (0, import_log4.log)("device key not found for share policy check", {
+            (0, import_log3.log)("device key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
@@ -1261,7 +1247,7 @@ var MeshEchoReplicator = class {
             return false;
           }
           const isAuthorized = authorizedDevices?.has(connection.remoteDeviceKey) ?? false;
-          (0, import_log4.log)("share policy check", {
+          (0, import_log3.log)("share policy check", {
             localPeer: this._context.peerId,
             remotePeer: connection.peerId,
             documentId: params.documentId,
@@ -1276,7 +1262,7 @@ var MeshEchoReplicator = class {
           });
           return isAuthorized;
         } catch (err) {
-          import_log4.log.catch(err, void 0, {
+          import_log3.log.catch(err, void 0, {
             F: __dxlog_file5,
             L: 111,
             S: this,
@@ -1290,7 +1276,7 @@ var MeshEchoReplicator = class {
     return connection.replicatorExtension;
   }
   authorizeDevice(spaceKey, deviceKey) {
-    (0, import_log4.log)("authorizeDevice", {
+    (0, import_log3.log)("authorizeDevice", {
       spaceKey,
       deviceKey
     }, {
@@ -1300,6 +1286,11 @@ var MeshEchoReplicator = class {
       C: (f, a) => f(...a)
     });
     (0, import_util2.defaultMap)(this._authorizedDevices, spaceKey, () => new import_util2.ComplexSet(import_keys2.PublicKey.hash)).add(deviceKey);
+    for (const connection of this._connections) {
+      if (connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
+        this._context?.onConnectionAuthScopeChanged(connection);
+      }
+    }
   }
 };
 var MeshReplicatorConnection = class extends import_context5.Resource {
@@ -1331,13 +1322,13 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
       onStartReplication: async (info, remotePeerId) => {
         this.remoteDeviceKey = remotePeerId;
         this._remotePeerId = info.id;
-        (0, import_log4.log)("onStartReplication", {
+        (0, import_log3.log)("onStartReplication", {
           id: info.id,
           thisPeerId: this.peerId,
           remotePeerId: remotePeerId.toHex()
         }, {
           F: __dxlog_file5,
-          L: 187,
+          L: 192,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1361,7 +1352,7 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
   get peerId() {
     (0, import_invariant5.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
-      L: 210,
+      L: 215,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1380,7 +1371,7 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
   async enable() {
     (0, import_invariant5.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
-      L: 223,
+      L: 228,
       S: this,
       A: [
         "this._remotePeerId != null",