@dxos/echo-pipeline 0.3.11-main.c86e105 → 0.3.11-main.c95bc86

package/dist/lib/browser/{chunk-44D2XTQP.mjs → chunk-JBCUDOBI.mjs}

@@ -2685,7 +2685,7 @@ var SpaceManager = class {
       ...this._spaces.values()
     ].map((space) => space.close()));
   }
-  async constructSpace({ metadata, swarmIdentity, onNetworkConnection, onAuthFailure, memberKey }) {
+  async constructSpace({ metadata, swarmIdentity, onAuthorizedConnection, onAuthFailure, memberKey }) {
     log12.trace("dxos.echo.space-manager.construct-space", trace4.begin({
       id: this._instanceId
     }), {
@@ -2708,7 +2708,7 @@ var SpaceManager = class {
       topic: spaceKey,
       swarmIdentity,
       networkManager: this._networkManager,
-      onSessionAuth: onNetworkConnection,
+      onSessionAuth: onAuthorizedConnection,
       onAuthFailure,
       blobStore: this._blobStore
     });
@@ -2746,28 +2746,96 @@ SpaceManager = _ts_decorate8([
 ], SpaceManager);
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
+import { Trigger as Trigger2 } from "@dxos/async";
 import { Repo, NetworkAdapter, StorageAdapter, cbor } from "@dxos/automerge/automerge-repo";
 import { IndexedDBStorageAdapter } from "@dxos/automerge/automerge-repo-storage-indexeddb";
 import { Stream as Stream2 } from "@dxos/codec-protobuf";
 import { invariant as invariant10 } from "@dxos/invariant";
+import { PublicKey as PublicKey8 } from "@dxos/keys";
 import { log as log13 } from "@dxos/log";
 import { StorageType } from "@dxos/random-access-storage";
 import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
-import { arrayToBuffer as arrayToBuffer2, bufferToArray } from "@dxos/util";
+import { ComplexMap as ComplexMap7, ComplexSet, arrayToBuffer as arrayToBuffer2, bufferToArray, defaultMap } from "@dxos/util";
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
 var AutomergeHost = class {
   constructor(storageDirectory) {
+    /**
+    * spaceKey -> deviceKey[]
+    */
+    this._authorizedDevices = new ComplexMap7(PublicKey8.hash);
     this._meshNetwork = new MeshNetworkAdapter();
     this._clientNetwork = new LocalHostNetworkAdapter();
     this._storage = storageDirectory.type === StorageType.IDB ? new IndexedDBStorageAdapter(storageDirectory.path, "data") : new AutomergeStorageAdapter(storageDirectory);
     this._repo = new Repo({
+      peerId: `host-${PublicKey8.random().toHex()}`,
       network: [
         this._clientNetwork,
         this._meshNetwork
       ],
       storage: this._storage,
       // TODO(dmaretskyi): Share based on HALO permissions and space affinity.
-      sharePolicy: async (peerId, documentId) => true
+      // Hosts, running in the worker, don't share documents unless requested by other peers.
+      sharePolicy: async (peerId, documentId) => {
+        if (peerId.startsWith("client-")) {
+          return true;
+        }
+        if (!documentId) {
+          return false;
+        }
+        const doc = this._repo.handles[documentId]?.docSync();
+        if (!doc) {
+          log13.warn("doc not found for share policy check", {
+            peerId,
+            documentId
+          }, {
+            F: __dxlog_file14,
+            L: 65,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          return false;
+        }
+        try {
+          const spaceKey = PublicKey8.from(doc.experimental_spaceKey);
+          const authorizedDevices = this._authorizedDevices.get(spaceKey);
+          const deviceKeyHex = this.repo.peerMetadataByPeerId[peerId]?.dxos_deviceKey;
+          if (!deviceKeyHex) {
+            log13.warn("device key not found for share policy check", {
+              peerId,
+              documentId
+            }, {
+              F: __dxlog_file14,
+              L: 76,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            return false;
+          }
+          const deviceKey = PublicKey8.from(deviceKeyHex);
+          const isAuthorized = authorizedDevices?.has(deviceKey) ?? false;
+          log13.info("share policy check", {
+            peerId,
+            documentId,
+            deviceKey,
+            spaceKey,
+            isAuthorized
+          }, {
+            F: __dxlog_file14,
+            L: 82,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          return isAuthorized;
+        } catch (err) {
+          log13.catch(err, void 0, {
+            F: __dxlog_file14,
+            L: 85,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          return false;
+        }
+      }
     });
     this._clientNetwork.ready();
     this._meshNetwork.ready();
@@ -2776,6 +2844,7 @@ var AutomergeHost = class {
     return this._repo;
   }
   async close() {
+    this._storage instanceof AutomergeStorageAdapter && await this._storage.close();
     await this._clientNetwork.close();
   }
   //
@@ -2787,7 +2856,7 @@ var AutomergeHost = class {
   sendSyncMessage(request) {
     return this._clientNetwork.sendSyncMessage(request);
   }
-  getHostInfo() {
+  async getHostInfo() {
     return this._clientNetwork.getHostInfo();
   }
   //
@@ -2796,11 +2865,15 @@ var AutomergeHost = class {
   createExtension() {
     return this._meshNetwork.createExtension();
   }
+  authorizeDevice(spaceKey, deviceKey) {
+    defaultMap(this._authorizedDevices, spaceKey, () => new ComplexSet(PublicKey8.hash)).add(deviceKey);
+  }
 };
 var LocalHostNetworkAdapter = class extends NetworkAdapter {
   constructor() {
     super(...arguments);
     this._peers = /* @__PURE__ */ new Map();
+    this._connected = new Trigger2();
   }
   /**
   * Emits `ready` event. That signals to `Repo` that it can start using the adapter.
@@ -2812,12 +2885,13 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
   }
   connect(peerId) {
     this.peerId = peerId;
+    this._connected.wake();
   }
   send(message) {
     const peer = this._peers.get(message.targetId);
     invariant10(peer, "Peer not found.", {
       F: __dxlog_file14,
-      L: 114,
+      L: 165,
       S: this,
       A: [
         "peer",
@@ -2837,7 +2911,7 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
     return new Stream2(({ next, close }) => {
       invariant10(!this._peers.has(peerId), "Peer already connected.", {
         F: __dxlog_file14,
-        L: 132,
+        L: 183,
         S: this,
         A: [
           "!this._peers.has(peerId)",
@@ -2859,19 +2933,35 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
           });
         }
       });
-      this.emit("peer-candidate", {
-        peerId
-      });
+      this._connected.wait({
+        timeout: 1e3
+      }).then(() => {
+        this.emit("peer-candidate", {
+          peerMetadata: {},
+          peerId
+        });
+      }).catch((err) => log13.catch(err, void 0, {
+        F: __dxlog_file14,
+        L: 208,
+        S: this,
+        C: (f, a) => f(...a)
+      }));
     });
   }
   async sendSyncMessage({ id, syncMessage }) {
+    await this._connected.wait({
+      timeout: 1e3
+    });
     const message = cbor.decode(syncMessage);
     this.emit("message", message);
   }
-  getHostInfo() {
+  async getHostInfo() {
+    await this._connected.wait({
+      timeout: 1e3
+    });
     invariant10(this.peerId, "Peer id not set.", {
       F: __dxlog_file14,
-      L: 161,
+      L: 220,
       S: this,
       A: [
         "this.peerId",
@@ -2907,7 +2997,7 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
     const extension = this._extensions.get(receiverId);
     invariant10(extension, "Extension not found.", {
       F: __dxlog_file14,
-      L: 196,
+      L: 255,
       S: this,
       A: [
         "extension",
@@ -2918,7 +3008,7 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
       payload: cbor.encode(message)
     }).catch((err) => log13.catch(err, void 0, {
       F: __dxlog_file14,
-      L: 197,
+      L: 256,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -2928,7 +3018,7 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
   createExtension() {
     invariant10(this.peerId, "Peer id not set.", {
       F: __dxlog_file14,
-      L: 205,
+      L: 264,
       S: this,
       A: [
         "this.peerId",
@@ -2939,13 +3029,17 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
     const extension = new AutomergeReplicator({
       peerId: this.peerId
     }, {
-      onStartReplication: async (info) => {
+      onStartReplication: async (info, remotePeerId) => {
         if (this._extensions.has(info.id)) {
           return;
         }
         peerInfo = info;
         this._extensions.set(info.id, extension);
         this.emit("peer-candidate", {
+          // TODO(mykola): Hack, stop abusing `peerMetadata` field.
+          peerMetadata: {
+            dxos_deviceKey: remotePeerId.toHex()
+          },
           peerId: info.id
         });
       },
@@ -2954,9 +3048,13 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
         this.emit("message", message);
       },
       onClose: async () => {
-        peerInfo && this.emit("peer-disconnected", {
+        if (!peerInfo) {
+          return;
+        }
+        this.emit("peer-disconnected", {
           peerId: peerInfo.id
         });
+        this._extensions.delete(peerInfo.id);
       }
     });
     return extension;
@@ -2966,8 +3064,12 @@ var AutomergeStorageAdapter = class extends StorageAdapter {
   constructor(_directory) {
     super();
     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();
@@ -2978,6 +3080,9 @@ var AutomergeStorageAdapter = class extends StorageAdapter {
     return 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, arrayToBuffer2(data));
@@ -2985,11 +3090,17 @@ var AutomergeStorageAdapter = class extends StorageAdapter {
     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.truncate?.(0);
+    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) => {
@@ -3003,13 +3114,19 @@ var AutomergeStorageAdapter = class extends StorageAdapter {
     }));
   }
   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(filename);
-      await file.truncate?.(0);
+      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("-");
   }
@@ -3043,7 +3160,6 @@ export {
   AuthStatus,
   SpaceProtocolSession,
   SpaceManager,
-  AutomergeHost,
-  AutomergeStorageAdapter
+  AutomergeHost
 };
-//# sourceMappingURL=chunk-44D2XTQP.mjs.map
+//# sourceMappingURL=chunk-JBCUDOBI.mjs.map