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

package/dist/lib/node/{chunk-37RERU2L.cjs → chunk-CZ5KWO66.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_37RERU2L_exports = {};
-__export(chunk_37RERU2L_exports, {
+var chunk_CZ5KWO66_exports = {};
+__export(chunk_CZ5KWO66_exports, {
   AuthExtension: () => AuthExtension,
   AuthStatus: () => AuthStatus,
   AutomergeHost: () => AutomergeHost,
@@ -57,7 +57,7 @@ __export(chunk_37RERU2L_exports, {
   startAfter: () => startAfter,
   valueEncoding: () => valueEncoding
 });
-module.exports = __toCommonJS(chunk_37RERU2L_exports);
+module.exports = __toCommonJS(chunk_CZ5KWO66_exports);
 var import_hypercore = require("@dxos/hypercore");
 var import_protocols = require("@dxos/protocols");
 var import_invariant = require("@dxos/invariant");
@@ -2059,7 +2059,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() {
@@ -2070,7 +2071,7 @@ var ControlPipeline = class {
       tf: snapshot?.timeframe
     }, {
       F: __dxlog_file10,
-      L: 110,
+      L: 111,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2079,7 +2080,7 @@ var ControlPipeline = class {
     }
     (0, import_log10.log)("starting...", void 0, {
       F: __dxlog_file10,
-      L: 115,
+      L: 116,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2089,7 +2090,7 @@ var ControlPipeline = class {
     await this._pipeline.start();
     (0, import_log10.log)("started", void 0, {
       F: __dxlog_file10,
-      L: 121,
+      L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2106,7 +2107,7 @@ var ControlPipeline = class {
           message
         }, {
           F: __dxlog_file10,
-          L: 134,
+          L: 135,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2128,7 +2129,7 @@ var ControlPipeline = class {
       snapshot
     }, {
       F: __dxlog_file10,
-      L: 150,
+      L: 151,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2143,7 +2144,7 @@ var ControlPipeline = class {
       } catch (err) {
         import_log10.log.catch(err, void 0, {
           F: __dxlog_file10,
-          L: 163,
+          L: 164,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2157,7 +2158,7 @@ var ControlPipeline = class {
       seq: msg.seq
     }, {
       F: __dxlog_file10,
-      L: 173,
+      L: 174,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2172,7 +2173,7 @@ var ControlPipeline = class {
           msg
         }, {
           F: __dxlog_file10,
-          L: 182,
+          L: 183,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2191,7 +2192,7 @@ var ControlPipeline = class {
   async stop() {
     (0, import_log10.log)("stopping...", void 0, {
       F: __dxlog_file10,
-      L: 202,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2200,7 +2201,7 @@ var ControlPipeline = class {
     await this._saveTargetTimeframe(this._pipeline.state.timeframe);
     (0, import_log10.log)("stopped", void 0, {
       F: __dxlog_file10,
-      L: 206,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2213,7 +2214,7 @@ var ControlPipeline = class {
     } catch (err) {
       (0, import_log10.log)(err, void 0, {
         F: __dxlog_file10,
-        L: 215,
+        L: 216,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2366,7 +2367,7 @@ var Space = class {
   get snapshotManager() {
     return this._snapshotManager;
   }
-  setControlFeed(feed) {
+  async setControlFeed(feed) {
     (0, import_invariant9.invariant)(!this._controlFeed, "Control feed already set.", {
       F: __dxlog_file11,
       L: 191,
@@ -2377,10 +2378,10 @@ var Space = class {
       ]
     });
     this._controlFeed = feed;
-    this._controlPipeline.setWriteFeed(feed);
+    await this._controlPipeline.setWriteFeed(feed);
     return this;
   }
-  setDataFeed(feed) {
+  async setDataFeed(feed) {
     (0, import_invariant9.invariant)(!this._dataFeed, "Data feed already set.", {
       F: __dxlog_file11,
       L: 198,
@@ -2391,6 +2392,7 @@ var Space = class {
       ]
     });
     this._dataFeed = feed;
+    await this._dataPipeline.pipeline?.addFeed(feed);
     this._dataPipeline.pipeline?.setWriteFeed(feed);
     return this;
   }
@@ -2409,7 +2411,7 @@ var Space = class {
   async open(ctx) {
     (0, import_log9.log)("opening...", void 0, {
       F: __dxlog_file11,
-      L: 220,
+      L: 221,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2422,7 +2424,7 @@ var Space = class {
     this._isOpen = true;
     (0, import_log9.log)("opened", void 0, {
       F: __dxlog_file11,
-      L: 231,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2432,7 +2434,7 @@ var Space = class {
       key: this._key
     }, {
       F: __dxlog_file11,
-      L: 236,
+      L: 237,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2446,7 +2448,7 @@ var Space = class {
     this._isOpen = false;
     (0, import_log9.log)("closed", void 0, {
       F: __dxlog_file11,
-      L: 249,
+      L: 250,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2454,13 +2456,13 @@ var Space = class {
   async initializeDataPipeline() {
     (0, import_log9.log)("initializeDataPipeline", void 0, {
       F: __dxlog_file11,
-      L: 254,
+      L: 255,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant9.invariant)(this._isOpen, "Space must be open to initialize data pipeline.", {
       F: __dxlog_file11,
-      L: 255,
+      L: 256,
       S: this,
       A: [
         "this._isOpen",
@@ -3102,9 +3104,9 @@ var AutomergeHost = class {
     this._meshNetwork = new MeshNetworkAdapter();
     this._clientNetwork = new LocalHostNetworkAdapter();
     this._storage = storageDirectory.type === import_random_access_storage.StorageType.IDB ? new import_automerge_repo_storage_indexeddb.IndexedDBStorageAdapter(storageDirectory.path, "data") : new AutomergeStorageAdapter(storageDirectory);
-    const localPeerId = `host-${import_keys8.PublicKey.random().toHex()}`;
+    this._peerId = `host-${import_keys8.PublicKey.random().toHex()}`;
     this._repo = new import_automerge_repo4.Repo({
-      peerId: localPeerId,
+      peerId: this._peerId,
       network: [
         this._clientNetwork,
         this._meshNetwork
@@ -3128,26 +3130,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) {
             (0, import_log15.log)("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 = import_keys8.PublicKey.from(doc.experimental_spaceKey);
+          const spaceKey = import_keys8.PublicKey.from(rawSpaceKey);
           const authorizedDevices = this._authorizedDevices.get(spaceKey);
           const deviceKeyHex = this.repo.peerMetadataByPeerId[peerId]?.dxos_deviceKey;
           if (!deviceKeyHex) {
@@ -3156,7 +3159,7 @@ var AutomergeHost = class {
               documentId
             }, {
               F: __dxlog_file16,
-              L: 82,
+              L: 87,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3165,7 +3168,7 @@ var AutomergeHost = class {
           const deviceKey = import_keys8.PublicKey.from(deviceKeyHex);
           const isAuthorized = authorizedDevices?.has(deviceKey) ?? false;
           (0, import_log15.log)("share policy check", {
-            localPeer: localPeerId,
+            localPeer: this._peerId,
             remotePeer: peerId,
             documentId,
             deviceKey,
@@ -3173,7 +3176,7 @@ var AutomergeHost = class {
             isAuthorized
           }, {
             F: __dxlog_file16,
-            L: 88,
+            L: 93,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3181,7 +3184,7 @@ var AutomergeHost = class {
         } catch (err) {
           import_log15.log.catch(err, void 0, {
             F: __dxlog_file16,
-            L: 98,
+            L: 103,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3199,7 +3202,22 @@ var AutomergeHost = class {
     return (0, import_util11.mapValues)(this._repo.handles, (handle) => ({
       state: handle.state,
       hasDoc: !!handle.docSync(),
-      heads: handle.docSync() ? import_automerge.next.getHeads(handle.docSync()) : null
+      heads: handle.docSync() ? import_automerge.next.getHeads(handle.docSync()) : null,
+      data: handle.docSync()?.doc && (0, import_util11.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() {
@@ -3233,13 +3251,16 @@ var AutomergeHost = class {
       deviceKey
     }, {
       F: __dxlog_file16,
-      L: 155,
+      L: 177,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_util11.defaultMap)(this._authorizedDevices, spaceKey, () => new import_util11.ComplexSet(import_keys8.PublicKey.hash)).add(deviceKey);
   }
 };
+_ts_decorate9([
+  import_tracing5.trace.info()
+], AutomergeHost.prototype, "_peerId", void 0);
 _ts_decorate9([
   import_tracing5.trace.info({
     depth: null
@@ -3284,4 +3305,4 @@ AutomergeHost = _ts_decorate9([
   startAfter,
   valueEncoding
 });
-//# sourceMappingURL=chunk-37RERU2L.cjs.map
+//# sourceMappingURL=chunk-CZ5KWO66.cjs.map