@dxos/echo-pipeline 0.4.4-main.e05bf88 → 0.4.4-main.e80efb0

package/dist/lib/browser/{chunk-26G7ZQMP.mjs → chunk-WIB35LJH.mjs}

@@ -2763,177 +2763,91 @@ SpaceManager = _ts_decorate8([
   trackLeaks4("open", "close")
 ], SpaceManager);
 
-// packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
-import { Trigger as Trigger2 } from "@dxos/async";
-import { next as automerge } from "@dxos/automerge/automerge";
-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 { trace as trace6 } from "@dxos/tracing";
-import { ComplexMap as ComplexMap7, ComplexSet, arrayToBuffer as arrayToBuffer2, bufferToArray, defaultMap, mapValues } from "@dxos/util";
-function _ts_decorate9(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_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.
-      // 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("doc not found for share policy check", {
-            peerId,
-            documentId
-          }, {
-            F: __dxlog_file14,
-            L: 68,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          return false;
-        }
-        try {
-          if (!doc.experimental_spaceKey) {
-            log13("space key not found for share policy check", {
-              peerId,
-              documentId
-            }, {
-              F: __dxlog_file14,
-              L: 74,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-            return false;
-          }
-          const spaceKey = PublicKey8.from(doc.experimental_spaceKey);
-          const authorizedDevices = this._authorizedDevices.get(spaceKey);
-          const deviceKeyHex = this.repo.peerMetadataByPeerId[peerId]?.dxos_deviceKey;
-          if (!deviceKeyHex) {
-            log13("device key not found for share policy check", {
-              peerId,
-              documentId
-            }, {
-              F: __dxlog_file14,
-              L: 84,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-            return false;
-          }
-          const deviceKey = PublicKey8.from(deviceKeyHex);
-          const isAuthorized = authorizedDevices?.has(deviceKey) ?? false;
-          log13("share policy check", {
-            peerId,
-            documentId,
-            deviceKey,
-            spaceKey,
-            isAuthorized
-          }, {
-            F: __dxlog_file14,
-            L: 90,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          return isAuthorized;
-        } catch (err) {
-          log13.catch(err, void 0, {
-            F: __dxlog_file14,
-            L: 93,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          return false;
-        }
-      }
-    });
-    this._clientNetwork.ready();
-    this._meshNetwork.ready();
-  }
-  get repo() {
-    return this._repo;
+// packages/core/echo/echo-pipeline/src/automerge/automerge-storage-adapter.ts
+import { StorageAdapter } from "@dxos/automerge/automerge-repo";
+import { arrayToBuffer as arrayToBuffer2, bufferToArray } from "@dxos/util";
+var AutomergeStorageAdapter = class extends StorageAdapter {
+  constructor(_directory) {
+    super();
+    this._directory = _directory;
+    this._state = "opened";
   }
-  _automergeDocs() {
-    return mapValues(this._repo.handles, (handle) => ({
-      state: handle.state,
-      hasDoc: !!handle.docSync(),
-      heads: handle.docSync() ? automerge.getHeads(handle.docSync()) : null
-    }));
+  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 bufferToArray(buffer);
   }
-  _automergePeers() {
-    return this._repo.peers;
+  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));
+    await file.truncate?.(data.length);
+    await file.flush?.();
   }
-  async close() {
-    this._storage instanceof AutomergeStorageAdapter && await this._storage.close();
-    await this._clientNetwork.close();
+  async remove(key) {
+    if (this._state !== "opened") {
+      return void 0;
+    }
+    const filename = this._getFilename(key);
+    const file = this._directory.getOrCreateFile(filename);
+    await file.destroy();
   }
-  //
-  // Methods for client-services.
-  //
-  syncRepo(request) {
-    return this._clientNetwork.syncRepo(request);
+  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: bufferToArray(buffer)
+      };
+    }));
   }
-  sendSyncMessage(request) {
-    return this._clientNetwork.sendSyncMessage(request);
+  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 getHostInfo() {
-    return this._clientNetwork.getHostInfo();
+  async close() {
+    this._state = "closed";
   }
-  //
-  // Mesh replication.
-  //
-  createExtension() {
-    return this._meshNetwork.createExtension();
+  _getFilename(key) {
+    return key.map((k) => k.replaceAll("%", "%25").replaceAll("-", "%2D")).join("-");
   }
-  authorizeDevice(spaceKey, deviceKey) {
-    defaultMap(this._authorizedDevices, spaceKey, () => new ComplexSet(PublicKey8.hash)).add(deviceKey);
+  _getKeyFromFilename(filename) {
+    return filename.split("-").map((k) => k.replaceAll("%2D", "-").replaceAll("%25", "%"));
   }
 };
-_ts_decorate9([
-  trace6.info({
-    depth: null
-  })
-], AutomergeHost.prototype, "_automergeDocs", null);
-_ts_decorate9([
-  trace6.info({
-    depth: null
-  })
-], AutomergeHost.prototype, "_automergePeers", null);
-AutomergeHost = _ts_decorate9([
-  trace6.resource()
-], AutomergeHost);
+
+// packages/core/echo/echo-pipeline/src/automerge/local-host-network-adapter.ts
+import { Trigger as Trigger2 } from "@dxos/async";
+import { NetworkAdapter, cbor } from "@dxos/automerge/automerge-repo";
+import { Stream as Stream2 } from "@dxos/codec-protobuf";
+import { invariant as invariant10 } from "@dxos/invariant";
+import { log as log13 } from "@dxos/log";
+var __dxlog_file14 = "/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);
@@ -2956,7 +2870,7 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
     const peer = this._peers.get(message.targetId);
     invariant10(peer, "Peer not found.", {
       F: __dxlog_file14,
-      L: 187,
+      L: 45,
       S: this,
       A: [
         "peer",
@@ -2976,7 +2890,7 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
     return new Stream2(({ next, close }) => {
       invariant10(!this._peers.has(peerId), "Peer already connected.", {
         F: __dxlog_file14,
-        L: 205,
+        L: 63,
         S: this,
         A: [
           "!this._peers.has(peerId)",
@@ -3007,7 +2921,7 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
         });
       }).catch((err) => log13.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 230,
+        L: 88,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -3026,7 +2940,7 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
     });
     invariant10(this.peerId, "Peer id not set.", {
       F: __dxlog_file14,
-      L: 242,
+      L: 100,
       S: this,
       A: [
         "this.peerId",
@@ -3041,11 +2955,19 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
     return id;
   }
 };
-var MeshNetworkAdapter = class extends NetworkAdapter {
+
+// packages/core/echo/echo-pipeline/src/automerge/mesh-network-adapter.ts
+import { Trigger as Trigger3 } from "@dxos/async";
+import { NetworkAdapter as NetworkAdapter2, cbor as cbor2 } from "@dxos/automerge/automerge-repo";
+import { invariant as invariant11 } from "@dxos/invariant";
+import { log as log14 } from "@dxos/log";
+import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
+var __dxlog_file15 = "/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 Trigger2();
+    this._connected = new Trigger3();
   }
   /**
   * Emits `ready` event. That signals to `Repo` that it can start using the adapter.
@@ -3062,9 +2984,9 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
   send(message) {
     const receiverId = message.targetId;
     const extension = this._extensions.get(receiverId);
-    invariant10(extension, "Extension not found.", {
-      F: __dxlog_file14,
-      L: 279,
+    invariant11(extension, "Extension not found.", {
+      F: __dxlog_file15,
+      L: 38,
       S: this,
       A: [
         "extension",
@@ -3072,10 +2994,10 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
       ]
     });
     extension.sendSyncMessage({
-      payload: cbor.encode(message)
-    }).catch((err) => log13.catch(err, void 0, {
-      F: __dxlog_file14,
-      L: 280,
+      payload: cbor2.encode(message)
+    }).catch((err) => log14.catch(err, void 0, {
+      F: __dxlog_file15,
+      L: 39,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -3083,9 +3005,9 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
   disconnect() {
   }
   createExtension() {
-    invariant10(this.peerId, "Peer id not set.", {
-      F: __dxlog_file14,
-      L: 288,
+    invariant11(this.peerId, "Peer id not set.", {
+      F: __dxlog_file15,
+      L: 47,
       S: this,
       A: [
         "this.peerId",
@@ -3098,24 +3020,43 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
     }, {
       onStartReplication: async (info, remotePeerId) => {
         await this._connected.wait();
+        log14("onStartReplication", {
+          id: info.id,
+          thisPeerId: this.peerId,
+          remotePeerId: remotePeerId.toHex()
+        }, {
+          F: __dxlog_file15,
+          L: 70,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         if (!this._extensions.has(info.id)) {
           peerInfo = info;
           this._extensions.set(info.id, extension);
-        } else {
-          this.emit("peer-disconnected", {
+          log14("peer-candidate", {
+            id: info.id,
+            thisPeerId: this.peerId,
+            remotePeerId: remotePeerId.toHex()
+          }, {
+            F: __dxlog_file15,
+            L: 76,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          this.emit("peer-candidate", {
+            // TODO(mykola): Hack, stop abusing `peerMetadata` field.
+            peerMetadata: {
+              dxos_deviceKey: remotePeerId.toHex()
+            },
             peerId: info.id
           });
         }
-        this.emit("peer-candidate", {
-          // TODO(mykola): Hack, stop abusing `peerMetadata` field.
-          peerMetadata: {
-            dxos_deviceKey: remotePeerId.toHex()
-          },
-          peerId: info.id
-        });
       },
       onSyncMessage: async ({ payload }) => {
-        const message = cbor.decode(payload);
+        if (!peerInfo) {
+          return;
+        }
+        const message = cbor2.decode(payload);
         this.emit("message", message);
       },
       onClose: async () => {
@@ -3131,80 +3072,188 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
     return extension;
   }
 };
-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();
-    if (!size || size === 0) {
-      return void 0;
-    }
-    const buffer = await file.read(0, size);
-    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));
-    await file.truncate?.(data.length);
-    await file.flush?.();
+
+// packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
+import { next as automerge } from "@dxos/automerge/automerge";
+import { Repo } from "@dxos/automerge/automerge-repo";
+import { IndexedDBStorageAdapter } from "@dxos/automerge/automerge-repo-storage-indexeddb";
+import { PublicKey as PublicKey8 } from "@dxos/keys";
+import { log as log15 } from "@dxos/log";
+import { StorageType } from "@dxos/random-access-storage";
+import { trace as trace6 } from "@dxos/tracing";
+import { ComplexMap as ComplexMap7, ComplexSet, defaultMap, mapValues } from "@dxos/util";
+function _ts_decorate9(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_file16 = "/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._requestedDocs = /* @__PURE__ */ new Set();
+    this._meshNetwork = new MeshNetworkAdapter();
+    this._clientNetwork = new LocalHostNetworkAdapter();
+    this._storage = storageDirectory.type === StorageType.IDB ? new IndexedDBStorageAdapter(storageDirectory.path, "data") : new AutomergeStorageAdapter(storageDirectory);
+    const localPeerId = `host-${PublicKey8.random().toHex()}`;
+    this._repo = new Repo({
+      peerId: localPeerId,
+      network: [
+        this._clientNetwork,
+        this._meshNetwork
+      ],
+      storage: this._storage,
+      // TODO(dmaretskyi): Share based on HALO permissions and space affinity.
+      // 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) {
+          const isRequested = this._requestedDocs.has(`automerge:${documentId}`);
+          log15("doc share policy check", {
+            peerId,
+            documentId,
+            isRequested
+          }, {
+            F: __dxlog_file16,
+            L: 66,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          return isRequested;
+        }
+        try {
+          if (!doc.experimental_spaceKey) {
+            log15("space key not found for share policy check", {
+              peerId,
+              documentId
+            }, {
+              F: __dxlog_file16,
+              L: 72,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            return false;
+          }
+          const spaceKey = PublicKey8.from(doc.experimental_spaceKey);
+          const authorizedDevices = this._authorizedDevices.get(spaceKey);
+          const deviceKeyHex = this.repo.peerMetadataByPeerId[peerId]?.dxos_deviceKey;
+          if (!deviceKeyHex) {
+            log15("device key not found for share policy check", {
+              peerId,
+              documentId
+            }, {
+              F: __dxlog_file16,
+              L: 82,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            return false;
+          }
+          const deviceKey = PublicKey8.from(deviceKeyHex);
+          const isAuthorized = authorizedDevices?.has(deviceKey) ?? false;
+          log15("share policy check", {
+            localPeer: localPeerId,
+            remotePeer: peerId,
+            documentId,
+            deviceKey,
+            spaceKey,
+            isAuthorized
+          }, {
+            F: __dxlog_file16,
+            L: 88,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          return isAuthorized;
+        } catch (err) {
+          log15.catch(err, void 0, {
+            F: __dxlog_file16,
+            L: 98,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          return false;
+        }
+      }
+    });
+    this._clientNetwork.ready();
+    this._meshNetwork.ready();
   }
-  async remove(key) {
-    if (this._state !== "opened") {
-      return void 0;
-    }
-    const filename = this._getFilename(key);
-    const file = this._directory.getOrCreateFile(filename);
-    await file.destroy();
+  get repo() {
+    return this._repo;
   }
-  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: bufferToArray(buffer)
-      };
+  _automergeDocs() {
+    return mapValues(this._repo.handles, (handle) => ({
+      state: handle.state,
+      hasDoc: !!handle.docSync(),
+      heads: handle.docSync() ? automerge.getHeads(handle.docSync()) : null
     }));
   }
-  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();
-    }));
+  _automergePeers() {
+    return this._repo.peers;
   }
   async close() {
-    this._state = "closed";
+    this._storage instanceof AutomergeStorageAdapter && await this._storage.close();
+    await this._clientNetwork.close();
   }
-  _getFilename(key) {
-    return key.map((k) => k.replaceAll("%", "%25").replaceAll("-", "%2D")).join("-");
+  //
+  // Methods for client-services.
+  //
+  syncRepo(request) {
+    return this._clientNetwork.syncRepo(request);
   }
-  _getKeyFromFilename(filename) {
-    return filename.split("-").map((k) => k.replaceAll("%2D", "-").replaceAll("%25", "%"));
+  sendSyncMessage(request) {
+    return this._clientNetwork.sendSyncMessage(request);
+  }
+  async getHostInfo() {
+    return this._clientNetwork.getHostInfo();
+  }
+  //
+  // Mesh replication.
+  //
+  createExtension() {
+    return this._meshNetwork.createExtension();
+  }
+  authorizeDevice(spaceKey, deviceKey) {
+    log15("authorizeDevice", {
+      spaceKey,
+      deviceKey
+    }, {
+      F: __dxlog_file16,
+      L: 155,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    defaultMap(this._authorizedDevices, spaceKey, () => new ComplexSet(PublicKey8.hash)).add(deviceKey);
   }
 };
+_ts_decorate9([
+  trace6.info({
+    depth: null
+  })
+], AutomergeHost.prototype, "_automergeDocs", null);
+_ts_decorate9([
+  trace6.info({
+    depth: null
+  })
+], AutomergeHost.prototype, "_automergePeers", null);
+AutomergeHost = _ts_decorate9([
+  trace6.resource()
+], AutomergeHost);
 
 export {
   codec,
@@ -3231,7 +3280,9 @@ export {
   AuthStatus,
   SpaceProtocolSession,
   SpaceManager,
-  AutomergeHost,
-  AutomergeStorageAdapter
+  AutomergeStorageAdapter,
+  LocalHostNetworkAdapter,
+  MeshNetworkAdapter,
+  AutomergeHost
 };
-//# sourceMappingURL=chunk-26G7ZQMP.mjs.map
+//# sourceMappingURL=chunk-WIB35LJH.mjs.map