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

package/dist/lib/browser/index.mjs

@@ -32,7 +32,6 @@ import { Repo } from "@dxos/automerge/automerge-repo";
 import { Context } from "@dxos/context";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
-import { log as log2 } from "@dxos/log";
 import { objectPointerCodec } from "@dxos/protocols";
 import { trace } from "@dxos/tracing";
 import { mapValues } from "@dxos/util";
@@ -591,7 +590,6 @@ var AutomergeHost = class {
     this._echoNetworkAdapter = new EchoNetworkAdapter({
       getContainingSpaceForDocument: this._getContainingSpaceForDocument.bind(this)
     });
-    this._requestedDocs = /* @__PURE__ */ new Set();
     this._storage = new LevelDBStorageAdapter({
       db,
       callbacks: {
@@ -647,21 +645,6 @@ var AutomergeHost = class {
     if (!documentId) {
       return false;
     }
-    const doc = this._repo.handles[documentId]?.docSync();
-    if (!doc) {
-      const isRequested = this._requestedDocs.has(`automerge:${documentId}`);
-      log2("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, {
@@ -742,7 +725,7 @@ var AutomergeHost = class {
     await Promise.all(states?.map(async ({ heads, documentId }) => {
       invariant3(heads, "heads are required for flush", {
         F: __dxlog_file3,
-        L: 237,
+        L: 223,
         S: this,
         A: [
           "heads",
@@ -815,8 +798,9 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 import { Event as Event2 } from "@dxos/async";
 import { cancelWithContext } 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 { log as log2 } 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;
@@ -850,7 +834,7 @@ var AutomergeDocumentLoaderImpl = class {
       return;
     }
     if (!spaceState.rootUrl) {
-      log3.error("Database opened with no rootUrl", {
+      log2.error("Database opened with no rootUrl", {
         spaceId: this._spaceId
       }, {
         F: __dxlog_file4,
@@ -909,7 +893,7 @@ var AutomergeDocumentLoaderImpl = class {
       const documentUrl = (spaceRootDoc.links ?? {})[objectId];
       if (documentUrl == null) {
         this._objectsPendingDocumentLoad.add(objectId);
-        log3.info("loading delayed until object links are initialized", {
+        log2.info("loading delayed until object links are initialized", {
           objectId
         }, {
           F: __dxlog_file4,
@@ -956,7 +940,9 @@ var AutomergeDocumentLoaderImpl = class {
         ""
       ]
     });
-    const spaceDocHandle = this._repo.create();
+    const spaceDocHandle = this._repo.create({
+      version: SpaceDocVersion.CURRENT
+    });
     this._initDocAccess(spaceDocHandle);
     this.onObjectBoundToDocument(spaceDocHandle, objectId);
     this._spaceRootDocHandle.change((newDoc) => {
@@ -987,30 +973,30 @@ var AutomergeDocumentLoaderImpl = class {
       };
       const objectDocumentHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocumentHandle != null && objectDocumentHandle.url !== automergeUrl) {
-        log3.warn("object already inlined in a different document, ignoring the link", {
+        log2.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) {
-        log3.warn("object document was already loaded", logMeta, {
+        log2.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);
-      log3.debug("document loading triggered", logMeta, {
+      log2.debug("document loading triggered", logMeta, {
         F: __dxlog_file4,
-        L: 168,
+        L: 170,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1028,12 +1014,12 @@ var AutomergeDocumentLoaderImpl = class {
         break;
       } catch (err) {
         if (`${err}`.includes("Timeout")) {
-          log3.info("wraparound", {
+          log2.info("wraparound", {
             id: docHandle.documentId,
             state: docHandle.state
           }, {
             F: __dxlog_file4,
-            L: 184,
+            L: 186,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1073,9 +1059,9 @@ var AutomergeDocumentLoaderImpl = class {
         docUrl: handle.url
       };
       if (this.onObjectDocumentLoaded.listenerCount() === 0) {
-        log3.info("document loaded after all listeners were removed", logMeta, {
+        log2.info("document loaded after all listeners were removed", logMeta, {
           F: __dxlog_file4,
-          L: 220,
+          L: 222,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1083,9 +1069,9 @@ var AutomergeDocumentLoaderImpl = class {
       }
       const objectDocHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocHandle?.url !== handle.url) {
-        log3.warn("object was rebound while a document was loading, discarding handle", logMeta, {
+        log2.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)
         });
@@ -1097,14 +1083,14 @@ var AutomergeDocumentLoaderImpl = class {
       });
     } catch (err) {
       const shouldRetryLoading = this.onObjectDocumentLoaded.listenerCount() > 0;
-      log3.warn("failed to load a document", {
+      log2.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)
       });
@@ -1128,7 +1114,7 @@ import { cbor as cbor2 } from "@dxos/automerge/automerge-repo";
 import { Resource as Resource2 } from "@dxos/context";
 import { invariant as invariant5 } from "@dxos/invariant";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
-import { log as log4 } from "@dxos/log";
+import { log as log3 } from "@dxos/log";
 import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
 import { ComplexMap, ComplexSet, defaultMap } from "@dxos/util";
 var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
@@ -1169,7 +1155,7 @@ var MeshEchoReplicator = class {
     const connection = new MeshReplicatorConnection({
       ownPeerId: this._context.peerId,
       onRemoteConnected: async () => {
-        log4("onRemoteConnected", {
+        log3("onRemoteConnected", {
           peerId: connection.peerId
         }, {
           F: __dxlog_file5,
@@ -1195,7 +1181,7 @@ var MeshEchoReplicator = class {
         }
       },
       onRemoteDisconnected: async () => {
-        log4("onRemoteDisconnected", {
+        log3("onRemoteDisconnected", {
           peerId: connection.peerId
         }, {
           F: __dxlog_file5,
@@ -1209,7 +1195,7 @@ var MeshEchoReplicator = class {
         this._connections.delete(connection);
       },
       shouldAdvertize: async (params) => {
-        log4("shouldAdvertize", {
+        log3("shouldAdvertize", {
           peerId: connection.peerId,
           documentId: params.documentId
         }, {
@@ -1230,7 +1216,7 @@ var MeshEchoReplicator = class {
         try {
           const spaceKey = await this._context.getContainingSpaceForDocument(params.documentId);
           if (!spaceKey) {
-            log4("space key not found for share policy check", {
+            log3("space key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
@@ -1243,7 +1229,7 @@ var MeshEchoReplicator = class {
           }
           const authorizedDevices = this._authorizedDevices.get(spaceKey);
           if (!connection.remoteDeviceKey) {
-            log4("device key not found for share policy check", {
+            log3("device key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
@@ -1255,7 +1241,7 @@ var MeshEchoReplicator = class {
             return false;
           }
           const isAuthorized = authorizedDevices?.has(connection.remoteDeviceKey) ?? false;
-          log4("share policy check", {
+          log3("share policy check", {
             localPeer: this._context.peerId,
             remotePeer: connection.peerId,
             documentId: params.documentId,
@@ -1270,7 +1256,7 @@ var MeshEchoReplicator = class {
           });
           return isAuthorized;
         } catch (err) {
-          log4.catch(err, void 0, {
+          log3.catch(err, void 0, {
             F: __dxlog_file5,
             L: 111,
             S: this,
@@ -1284,7 +1270,7 @@ var MeshEchoReplicator = class {
     return connection.replicatorExtension;
   }
   authorizeDevice(spaceKey, deviceKey) {
-    log4("authorizeDevice", {
+    log3("authorizeDevice", {
       spaceKey,
       deviceKey
     }, {
@@ -1294,6 +1280,11 @@ var MeshEchoReplicator = class {
       C: (f, a) => f(...a)
     });
     defaultMap(this._authorizedDevices, spaceKey, () => new ComplexSet(PublicKey2.hash)).add(deviceKey);
+    for (const connection of this._connections) {
+      if (connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
+        this._context?.onConnectionAuthScopeChanged(connection);
+      }
+    }
   }
 };
 var MeshReplicatorConnection = class extends Resource2 {
@@ -1325,13 +1316,13 @@ var MeshReplicatorConnection = class extends Resource2 {
       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,
-          L: 187,
+          L: 192,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1355,7 +1346,7 @@ var MeshReplicatorConnection = class extends Resource2 {
   get peerId() {
     invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
-      L: 210,
+      L: 215,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1374,7 +1365,7 @@ var MeshReplicatorConnection = class extends Resource2 {
   async enable() {
     invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
-      L: 223,
+      L: 228,
       S: this,
       A: [
         "this._remotePeerId != null",