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

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

@@ -1602,22 +1602,23 @@ var DataPipeline = class {
     this._epochCtx = void 0;
   }
   async _consumePipeline() {
+    const pipeline = this._pipeline;
     if (this.currentEpoch) {
       const waitForOneEpoch = this.onNewEpoch.waitForCount(1);
       await this._processEpochInSeparateTask(this.currentEpoch);
       await waitForOneEpoch;
     }
     let messageCounter = 0;
-    invariant8(this._pipeline, "Pipeline is not initialized.", {
+    invariant8(pipeline, "Pipeline is not initialized.", {
       F: __dxlog_file9,
-      L: 228,
+      L: 229,
       S: this,
       A: [
-        "this._pipeline",
+        "pipeline",
         "'Pipeline is not initialized.'"
       ]
     });
-    for await (const msg of this._pipeline.consume()) {
+    for await (const msg of pipeline.consume()) {
       const span = this._usage.beginRecording();
       this._mutations.inc();
       const { feedKey, seq, data } = msg;
@@ -1626,7 +1627,7 @@ var DataPipeline = class {
         seq
       }, {
         F: __dxlog_file9,
-        L: 234,
+        L: 235,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1638,7 +1639,7 @@ var DataPipeline = class {
               feedKey
             }, {
               F: __dxlog_file9,
-              L: 240,
+              L: 241,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1661,16 +1662,16 @@ var DataPipeline = class {
             spaceKey: this._params.spaceKey.toHex()
           }, {
             F: __dxlog_file9,
-            L: 257,
+            L: 258,
             S: this,
             C: (f, a) => f(...a)
           });
-          await this._noteTargetStateIfNeeded(this._pipeline.state.pendingTimeframe);
+          await this._noteTargetStateIfNeeded(pipeline.state.pendingTimeframe);
         }
       } catch (err) {
         log8.catch(err, void 0, {
           F: __dxlog_file9,
-          L: 267,
+          L: 268,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1685,7 +1686,7 @@ var DataPipeline = class {
   _createSnapshot() {
     invariant8(this.databaseHost, "Database backend is not initialized.", {
       F: __dxlog_file9,
-      L: 281,
+      L: 282,
       S: this,
       A: [
         "this.databaseHost",
@@ -1714,7 +1715,7 @@ var DataPipeline = class {
     } catch (err) {
       log8.warn("Failed to cache properties", err, {
         F: __dxlog_file9,
-        L: 310,
+        L: 311,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1743,14 +1744,14 @@ var DataPipeline = class {
         if (err instanceof CancelledError) {
           log8("Epoch processing cancelled.", void 0, {
             F: __dxlog_file9,
-            L: 346,
+            L: 347,
             S: this,
             C: (f, a) => f(...a)
           });
         } else {
           log8.catch(err, void 0, {
             F: __dxlog_file9,
-            L: 348,
+            L: 349,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1773,7 +1774,7 @@ var DataPipeline = class {
   async _processEpoch(ctx, epoch) {
     invariant8(this._isOpen, "Space is closed.", {
       F: __dxlog_file9,
-      L: 372,
+      L: 373,
       S: this,
       A: [
         "this._isOpen",
@@ -1782,7 +1783,7 @@ var DataPipeline = class {
     });
     invariant8(this._pipeline, void 0, {
       F: __dxlog_file9,
-      L: 373,
+      L: 374,
       S: this,
       A: [
         "this._pipeline",
@@ -1794,7 +1795,7 @@ var DataPipeline = class {
       epoch: omit(epoch, "proof")
     }, {
       F: __dxlog_file9,
-      L: 376,
+      L: 377,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1804,7 +1805,7 @@ var DataPipeline = class {
     }
     log8("restarting pipeline from epoch", void 0, {
       F: __dxlog_file9,
-      L: 382,
+      L: 383,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1815,7 +1816,7 @@ var DataPipeline = class {
   async waitUntilTimeframe(timeframe) {
     invariant8(this._pipeline, "Pipeline is not initialized.", {
       F: __dxlog_file9,
-      L: 389,
+      L: 390,
       S: this,
       A: [
         "this._pipeline",
@@ -1827,7 +1828,7 @@ var DataPipeline = class {
   async createEpoch() {
     invariant8(this._pipeline, void 0, {
       F: __dxlog_file9,
-      L: 395,
+      L: 396,
       S: this,
       A: [
         "this._pipeline",
@@ -1836,7 +1837,7 @@ var DataPipeline = class {
     });
     invariant8(this.currentEpoch, void 0, {
       F: __dxlog_file9,
-      L: 396,
+      L: 397,
       S: this,
       A: [
         "this.currentEpoch",
@@ -1867,7 +1868,7 @@ var DataPipeline = class {
     } catch (err) {
       log8.catch(err, void 0, {
         F: __dxlog_file9,
-        L: 426,
+        L: 427,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1924,7 +1925,7 @@ var idle = async (timeout) => {
 };
 
 // packages/core/echo/echo-pipeline/src/space/space.ts
-import { Event as Event5, synchronized as synchronized4, trackLeaks as trackLeaks3, Lock } from "@dxos/async";
+import { Event as Event5, synchronized as synchronized4, trackLeaks as trackLeaks3, Mutex } from "@dxos/async";
 import { invariant as invariant9 } from "@dxos/invariant";
 import { log as log10, logInfo } from "@dxos/log";
 import { AdmittedFeed as AdmittedFeed2 } from "@dxos/protocols/proto/dxos/halo/credentials";
@@ -2203,13 +2204,13 @@ function _ts_decorate6(decorators, target, key, desc) {
 var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space.ts";
 var Space = class {
   constructor(params) {
-    this._addFeedLock = new Lock();
+    this._addFeedMutex = new Mutex();
     this.onCredentialProcessed = new Callback2();
     this.stateUpdate = new Event5();
     this._isOpen = false;
     invariant9(params.spaceKey && params.feedProvider, void 0, {
       F: __dxlog_file11,
-      L: 73,
+      L: 78,
       S: this,
       A: [
         "params.spaceKey && params.feedProvider",
@@ -2253,7 +2254,7 @@ var Space = class {
         credential
       }, {
         F: __dxlog_file11,
-        L: 111,
+        L: 116,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2273,7 +2274,7 @@ var Space = class {
         if (this._dataFeed) {
           pipeline.setWriteFeed(this._dataFeed);
         }
-        await this._addFeedLock.executeSynchronized(async () => {
+        await this._addFeedMutex.executeSynchronized(async () => {
           for (const feed of this._controlPipeline.spaceState.feeds.values()) {
             if (feed.assertion.designation === AdmittedFeed2.Designation.DATA && !pipeline.hasFeed(feed.key)) {
               await pipeline.addFeed(await this._feedProvider(feed.key, {
@@ -2318,7 +2319,7 @@ var Space = class {
   setControlFeed(feed) {
     invariant9(!this._controlFeed, "Control feed already set.", {
       F: __dxlog_file11,
-      L: 186,
+      L: 191,
       S: this,
       A: [
         "!this._controlFeed",
@@ -2332,7 +2333,7 @@ var Space = class {
   setDataFeed(feed) {
     invariant9(!this._dataFeed, "Data feed already set.", {
       F: __dxlog_file11,
-      L: 193,
+      L: 198,
       S: this,
       A: [
         "!this._dataFeed",
@@ -2358,7 +2359,7 @@ var Space = class {
   async open(ctx) {
     log10("opening...", void 0, {
       F: __dxlog_file11,
-      L: 215,
+      L: 220,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2371,7 +2372,7 @@ var Space = class {
     this._isOpen = true;
     log10("opened", void 0, {
       F: __dxlog_file11,
-      L: 226,
+      L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2381,7 +2382,7 @@ var Space = class {
       key: this._key
     }, {
       F: __dxlog_file11,
-      L: 231,
+      L: 236,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2395,7 +2396,7 @@ var Space = class {
     this._isOpen = false;
     log10("closed", void 0, {
       F: __dxlog_file11,
-      L: 244,
+      L: 249,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2403,13 +2404,13 @@ var Space = class {
   async initializeDataPipeline() {
     log10("initializeDataPipeline", void 0, {
       F: __dxlog_file11,
-      L: 249,
+      L: 254,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant9(this._isOpen, "Space must be open to initialize data pipeline.", {
       F: __dxlog_file11,
-      L: 250,
+      L: 255,
       S: this,
       A: [
         "this._isOpen",
@@ -2419,6 +2420,15 @@ var Space = class {
     await this._dataPipeline.open();
   }
 };
+_ts_decorate6([
+  trace3.info()
+], Space.prototype, "protocol", void 0);
+_ts_decorate6([
+  trace3.info()
+], Space.prototype, "_controlPipeline", void 0);
+_ts_decorate6([
+  trace3.info()
+], Space.prototype, "_dataPipeline", void 0);
 _ts_decorate6([
   logInfo,
   trace3.info()
@@ -2446,6 +2456,7 @@ import { MMSTTopology } from "@dxos/network-manager";
 import { Teleport } from "@dxos/teleport";
 import { BlobSync } from "@dxos/teleport-extension-object-sync";
 import { ReplicatorExtension } from "@dxos/teleport-extension-replicator";
+import { trace as trace4 } from "@dxos/tracing";
 import { ComplexMap as ComplexMap5 } from "@dxos/util";
 function _ts_decorate7(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -2489,7 +2500,7 @@ var SpaceProtocol = class {
       key: feed.key
     }, {
       F: __dxlog_file12,
-      L: 99,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2512,7 +2523,7 @@ var SpaceProtocol = class {
     await this.blobSync.open();
     log11("starting...", void 0, {
       F: __dxlog_file12,
-      L: 125,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2526,7 +2537,7 @@ var SpaceProtocol = class {
     });
     log11("started", void 0, {
       F: __dxlog_file12,
-      L: 135,
+      L: 139,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2536,14 +2547,14 @@ var SpaceProtocol = class {
     if (this._connection) {
       log11("stopping...", void 0, {
         F: __dxlog_file12,
-        L: 142,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._connection.close();
       log11("stopped", void 0, {
         F: __dxlog_file12,
-        L: 144,
+        L: 148,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2567,11 +2578,18 @@ var SpaceProtocol = class {
   }
 };
 _ts_decorate7([
-  logInfo2
+  logInfo2,
+  trace4.info()
 ], SpaceProtocol.prototype, "_topic", void 0);
+_ts_decorate7([
+  trace4.info()
+], SpaceProtocol.prototype, "_spaceKey", void 0);
 _ts_decorate7([
   logInfo2
 ], SpaceProtocol.prototype, "_ownPeerKey", null);
+SpaceProtocol = _ts_decorate7([
+  trace4.resource()
+], SpaceProtocol);
 var AuthStatus;
 (function(AuthStatus2) {
   AuthStatus2["INITIAL"] = "INITIAL";
@@ -2610,7 +2628,7 @@ var SpaceProtocolSession = class {
       onAuthSuccess: () => {
         log11("Peer authenticated", void 0, {
           F: __dxlog_file12,
-          L: 241,
+          L: 245,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2628,7 +2646,7 @@ var SpaceProtocolSession = class {
   async close() {
     log11("close", void 0, {
       F: __dxlog_file12,
-      L: 257,
+      L: 261,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2650,7 +2668,7 @@ import { synchronized as synchronized5, trackLeaks as trackLeaks4 } from "@dxos/
 import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
 import { log as log12 } from "@dxos/log";
-import { trace as trace4 } from "@dxos/protocols";
+import { trace as trace5 } from "@dxos/protocols";
 import { ComplexMap as ComplexMap6 } from "@dxos/util";
 function _ts_decorate8(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -2686,7 +2704,7 @@ var SpaceManager = class {
     ].map((space) => space.close()));
   }
   async constructSpace({ metadata, swarmIdentity, onAuthorizedConnection, onAuthFailure, memberKey }) {
-    log12.trace("dxos.echo.space-manager.construct-space", trace4.begin({
+    log12.trace("dxos.echo.space-manager.construct-space", trace5.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
@@ -2724,7 +2742,7 @@ var SpaceManager = class {
       memberKey
     });
     this._spaces.set(space.key, space);
-    log12.trace("dxos.echo.space-manager.construct-space", trace4.end({
+    log12.trace("dxos.echo.space-manager.construct-space", trace5.end({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
@@ -2747,6 +2765,7 @@ SpaceManager = _ts_decorate8([
 
 // 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";
@@ -2755,7 +2774,18 @@ 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 { ComplexMap as ComplexMap7, ComplexSet, arrayToBuffer as arrayToBuffer2, bufferToArray, defaultMap } from "@dxos/util";
+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) {
@@ -2784,28 +2814,40 @@ var AutomergeHost = class {
         }
         const doc = this._repo.handles[documentId]?.docSync();
         if (!doc) {
-          log13.warn("doc not found for share policy check", {
+          log13("doc not found for share policy check", {
             peerId,
             documentId
           }, {
             F: __dxlog_file14,
-            L: 65,
+            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.warn("device key not found for share policy check", {
+            log13("device key not found for share policy check", {
               peerId,
               documentId
             }, {
               F: __dxlog_file14,
-              L: 76,
+              L: 84,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2813,7 +2855,7 @@ var AutomergeHost = class {
           }
           const deviceKey = PublicKey8.from(deviceKeyHex);
           const isAuthorized = authorizedDevices?.has(deviceKey) ?? false;
-          log13.info("share policy check", {
+          log13("share policy check", {
             peerId,
             documentId,
             deviceKey,
@@ -2821,7 +2863,7 @@ var AutomergeHost = class {
             isAuthorized
           }, {
             F: __dxlog_file14,
-            L: 82,
+            L: 90,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2829,7 +2871,7 @@ var AutomergeHost = class {
         } catch (err) {
           log13.catch(err, void 0, {
             F: __dxlog_file14,
-            L: 85,
+            L: 93,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2843,6 +2885,16 @@ var AutomergeHost = class {
   get repo() {
     return this._repo;
   }
+  _automergeDocs() {
+    return mapValues(this._repo.handles, (handle) => ({
+      state: handle.state,
+      hasDoc: !!handle.docSync(),
+      heads: handle.docSync() ? automerge.getHeads(handle.docSync()) : null
+    }));
+  }
+  _automergePeers() {
+    return this._repo.peers;
+  }
   async close() {
     this._storage instanceof AutomergeStorageAdapter && await this._storage.close();
     await this._clientNetwork.close();
@@ -2869,6 +2921,19 @@ var AutomergeHost = class {
     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);
 var LocalHostNetworkAdapter = class extends NetworkAdapter {
   constructor() {
     super(...arguments);
@@ -2891,7 +2956,7 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
     const peer = this._peers.get(message.targetId);
     invariant10(peer, "Peer not found.", {
       F: __dxlog_file14,
-      L: 165,
+      L: 187,
       S: this,
       A: [
         "peer",
@@ -2911,7 +2976,7 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
     return new Stream2(({ next, close }) => {
       invariant10(!this._peers.has(peerId), "Peer already connected.", {
         F: __dxlog_file14,
-        L: 183,
+        L: 205,
         S: this,
         A: [
           "!this._peers.has(peerId)",
@@ -2942,7 +3007,7 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
         });
       }).catch((err) => log13.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 208,
+        L: 230,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -2961,7 +3026,7 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
     });
     invariant10(this.peerId, "Peer id not set.", {
       F: __dxlog_file14,
-      L: 220,
+      L: 242,
       S: this,
       A: [
         "this.peerId",
@@ -2980,6 +3045,7 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
   constructor() {
     super(...arguments);
     this._extensions = /* @__PURE__ */ new Map();
+    this._connected = new Trigger2();
   }
   /**
   * Emits `ready` event. That signals to `Repo` that it can start using the adapter.
@@ -2991,13 +3057,14 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
   }
   connect(peerId) {
     this.peerId = peerId;
+    this._connected.wake();
   }
   send(message) {
     const receiverId = message.targetId;
     const extension = this._extensions.get(receiverId);
     invariant10(extension, "Extension not found.", {
       F: __dxlog_file14,
-      L: 255,
+      L: 279,
       S: this,
       A: [
         "extension",
@@ -3008,7 +3075,7 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
       payload: cbor.encode(message)
     }).catch((err) => log13.catch(err, void 0, {
       F: __dxlog_file14,
-      L: 256,
+      L: 280,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -3018,7 +3085,7 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
   createExtension() {
     invariant10(this.peerId, "Peer id not set.", {
       F: __dxlog_file14,
-      L: 264,
+      L: 288,
       S: this,
       A: [
         "this.peerId",
@@ -3030,11 +3097,15 @@ var MeshNetworkAdapter = class extends NetworkAdapter {
       peerId: this.peerId
     }, {
       onStartReplication: async (info, remotePeerId) => {
-        if (this._extensions.has(info.id)) {
-          return;
+        await this._connected.wait();
+        if (!this._extensions.has(info.id)) {
+          peerInfo = info;
+          this._extensions.set(info.id, extension);
+        } else {
+          this.emit("peer-disconnected", {
+            peerId: info.id
+          });
         }
-        peerInfo = info;
-        this._extensions.set(info.id, extension);
         this.emit("peer-candidate", {
           // TODO(mykola): Hack, stop abusing `peerMetadata` field.
           peerMetadata: {
@@ -3162,4 +3233,4 @@ export {
   SpaceManager,
   AutomergeHost
 };
-//# sourceMappingURL=chunk-JBCUDOBI.mjs.map
+//# sourceMappingURL=chunk-IOUMNVGJ.mjs.map