@dxos/echo-pipeline 0.4.6-main.aeca3cc → 0.4.6-main.b69a2b5

package/dist/lib/browser/{chunk-WIB35LJH.mjs → chunk-2AAHNMOH.mjs}

@@ -2007,7 +2007,8 @@ var ControlPipeline = class {
   get pipeline() {
     return this._pipeline;
   }
-  setWriteFeed(feed) {
+  async setWriteFeed(feed) {
+    await this._pipeline.addFeed(feed);
     this._pipeline.setWriteFeed(feed);
   }
   async start() {
@@ -2018,7 +2019,7 @@ var ControlPipeline = class {
       tf: snapshot?.timeframe
     }, {
       F: __dxlog_file10,
-      L: 110,
+      L: 111,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2027,7 +2028,7 @@ var ControlPipeline = class {
     }
     log9("starting...", void 0, {
       F: __dxlog_file10,
-      L: 115,
+      L: 116,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2037,7 +2038,7 @@ var ControlPipeline = class {
     await this._pipeline.start();
     log9("started", void 0, {
       F: __dxlog_file10,
-      L: 121,
+      L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2054,7 +2055,7 @@ var ControlPipeline = class {
           message
         }, {
           F: __dxlog_file10,
-          L: 134,
+          L: 135,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2076,7 +2077,7 @@ var ControlPipeline = class {
       snapshot
     }, {
       F: __dxlog_file10,
-      L: 150,
+      L: 151,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2091,7 +2092,7 @@ var ControlPipeline = class {
       } catch (err) {
         log9.catch(err, void 0, {
           F: __dxlog_file10,
-          L: 163,
+          L: 164,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2105,7 +2106,7 @@ var ControlPipeline = class {
       seq: msg.seq
     }, {
       F: __dxlog_file10,
-      L: 173,
+      L: 174,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2120,7 +2121,7 @@ var ControlPipeline = class {
           msg
         }, {
           F: __dxlog_file10,
-          L: 182,
+          L: 183,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2139,7 +2140,7 @@ var ControlPipeline = class {
   async stop() {
     log9("stopping...", void 0, {
       F: __dxlog_file10,
-      L: 202,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2148,7 +2149,7 @@ var ControlPipeline = class {
     await this._saveTargetTimeframe(this._pipeline.state.timeframe);
     log9("stopped", void 0, {
       F: __dxlog_file10,
-      L: 206,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2161,7 +2162,7 @@ var ControlPipeline = class {
     } catch (err) {
       log9(err, void 0, {
         F: __dxlog_file10,
-        L: 215,
+        L: 216,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2316,7 +2317,7 @@ var Space = class {
   get snapshotManager() {
     return this._snapshotManager;
   }
-  setControlFeed(feed) {
+  async setControlFeed(feed) {
     invariant9(!this._controlFeed, "Control feed already set.", {
       F: __dxlog_file11,
       L: 191,
@@ -2327,10 +2328,10 @@ var Space = class {
       ]
     });
     this._controlFeed = feed;
-    this._controlPipeline.setWriteFeed(feed);
+    await this._controlPipeline.setWriteFeed(feed);
     return this;
   }
-  setDataFeed(feed) {
+  async setDataFeed(feed) {
     invariant9(!this._dataFeed, "Data feed already set.", {
       F: __dxlog_file11,
       L: 198,
@@ -2341,6 +2342,7 @@ var Space = class {
       ]
     });
     this._dataFeed = feed;
+    await this._dataPipeline.pipeline?.addFeed(feed);
     this._dataPipeline.pipeline?.setWriteFeed(feed);
     return this;
   }
@@ -2359,7 +2361,7 @@ var Space = class {
   async open(ctx) {
     log10("opening...", void 0, {
       F: __dxlog_file11,
-      L: 220,
+      L: 221,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2372,7 +2374,7 @@ var Space = class {
     this._isOpen = true;
     log10("opened", void 0, {
       F: __dxlog_file11,
-      L: 231,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2382,7 +2384,7 @@ var Space = class {
       key: this._key
     }, {
       F: __dxlog_file11,
-      L: 236,
+      L: 237,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2396,7 +2398,7 @@ var Space = class {
     this._isOpen = false;
     log10("closed", void 0, {
       F: __dxlog_file11,
-      L: 249,
+      L: 250,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2404,13 +2406,13 @@ var Space = class {
   async initializeDataPipeline() {
     log10("initializeDataPipeline", void 0, {
       F: __dxlog_file11,
-      L: 254,
+      L: 255,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant9(this._isOpen, "Space must be open to initialize data pipeline.", {
       F: __dxlog_file11,
-      L: 255,
+      L: 256,
       S: this,
       A: [
         "this._isOpen",
@@ -3103,9 +3105,9 @@ var AutomergeHost = class {
     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._peerId = `host-${PublicKey8.random().toHex()}`;
     this._repo = new Repo({
-      peerId: localPeerId,
+      peerId: this._peerId,
       network: [
         this._clientNetwork,
         this._meshNetwork
@@ -3129,26 +3131,27 @@ var AutomergeHost = class {
             isRequested
           }, {
             F: __dxlog_file16,
-            L: 66,
+            L: 69,
             S: this,
             C: (f, a) => f(...a)
           });
           return isRequested;
         }
         try {
-          if (!doc.experimental_spaceKey) {
+          const rawSpaceKey = doc.access?.spaceKey ?? doc.experimental_spaceKey;
+          if (!rawSpaceKey) {
             log15("space key not found for share policy check", {
               peerId,
               documentId
             }, {
               F: __dxlog_file16,
-              L: 72,
+              L: 77,
               S: this,
               C: (f, a) => f(...a)
             });
             return false;
           }
-          const spaceKey = PublicKey8.from(doc.experimental_spaceKey);
+          const spaceKey = PublicKey8.from(rawSpaceKey);
           const authorizedDevices = this._authorizedDevices.get(spaceKey);
           const deviceKeyHex = this.repo.peerMetadataByPeerId[peerId]?.dxos_deviceKey;
           if (!deviceKeyHex) {
@@ -3157,7 +3160,7 @@ var AutomergeHost = class {
               documentId
             }, {
               F: __dxlog_file16,
-              L: 82,
+              L: 87,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3166,7 +3169,7 @@ var AutomergeHost = class {
           const deviceKey = PublicKey8.from(deviceKeyHex);
           const isAuthorized = authorizedDevices?.has(deviceKey) ?? false;
           log15("share policy check", {
-            localPeer: localPeerId,
+            localPeer: this._peerId,
             remotePeer: peerId,
             documentId,
             deviceKey,
@@ -3174,7 +3177,7 @@ var AutomergeHost = class {
             isAuthorized
           }, {
             F: __dxlog_file16,
-            L: 88,
+            L: 93,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3182,7 +3185,7 @@ var AutomergeHost = class {
         } catch (err) {
           log15.catch(err, void 0, {
             F: __dxlog_file16,
-            L: 98,
+            L: 103,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3200,7 +3203,22 @@ var AutomergeHost = class {
     return mapValues(this._repo.handles, (handle) => ({
       state: handle.state,
       hasDoc: !!handle.docSync(),
-      heads: handle.docSync() ? automerge.getHeads(handle.docSync()) : null
+      heads: handle.docSync() ? automerge.getHeads(handle.docSync()) : null,
+      data: handle.docSync()?.doc && mapValues(handle.docSync()?.doc, (value, key) => {
+        try {
+          switch (key) {
+            case "access":
+            case "links":
+              return value;
+            case "objects":
+              return Object.keys(value);
+            default:
+              return `${value}`;
+          }
+        } catch (err) {
+          return `${err}`;
+        }
+      })
     }));
   }
   _automergePeers() {
@@ -3234,13 +3252,16 @@ var AutomergeHost = class {
       deviceKey
     }, {
       F: __dxlog_file16,
-      L: 155,
+      L: 177,
       S: this,
       C: (f, a) => f(...a)
     });
     defaultMap(this._authorizedDevices, spaceKey, () => new ComplexSet(PublicKey8.hash)).add(deviceKey);
   }
 };
+_ts_decorate9([
+  trace6.info()
+], AutomergeHost.prototype, "_peerId", void 0);
 _ts_decorate9([
   trace6.info({
     depth: null
@@ -3285,4 +3306,4 @@ export {
   MeshNetworkAdapter,
   AutomergeHost
 };
-//# sourceMappingURL=chunk-WIB35LJH.mjs.map
+//# sourceMappingURL=chunk-2AAHNMOH.mjs.map