@dxos/echo-pipeline 0.1.56-main.8d1cf70 → 0.1.56-main.96bcef8

package/dist/lib/browser/{chunk-FCDYN74V.mjs → chunk-GDF4DQU2.mjs}

@@ -87,7 +87,7 @@ var DataServiceHost = class {
           ]
         });
         log("message", {
-          batch,
+          batch: batch.objects?.length,
           meta
         }, {
           F: __dxlog_file2,
@@ -725,7 +725,7 @@ import { invariant as invariant6 } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
 import { log as log6 } from "@dxos/log";
 import { Timeframe as Timeframe2 } from "@dxos/timeframe";
-import { ComplexMap as ComplexMap3, getPrototypeSpecificInstanceId } from "@dxos/util";
+import { ComplexMap as ComplexMap3 } from "@dxos/util";
 
 // packages/core/echo/echo-pipeline/src/pipeline/message-selector.ts
 import { invariant as invariant5 } from "@dxos/invariant";
@@ -876,6 +876,8 @@ var Pipeline = class {
     // Waits for the message consumer to process the message and yield control back to the pipeline.
     this._processingTrigger = new Trigger().wake();
     this._pauseTrigger = new Trigger().wake();
+    // Pending downloads.
+    this._downloads = new ComplexMap3((value) => PublicKey3.hash(value.key));
     this._isStopping = false;
     this._isStarted = false;
     this._isBeingConsumed = false;
@@ -887,7 +889,7 @@ var Pipeline = class {
   get writer() {
     invariant6(this._writer, "Writer not set.", {
       F: __dxlog_file7,
-      L: 230,
+      L: 233,
       S: this,
       A: [
         "this._writer",
@@ -916,7 +918,7 @@ var Pipeline = class {
   setWriteFeed(feed) {
     invariant6(!this._writer, "Writer already set.", {
       F: __dxlog_file7,
-      L: 257,
+      L: 260,
       S: this,
       A: [
         "!this._writer",
@@ -925,7 +927,7 @@ var Pipeline = class {
     });
     invariant6(feed.properties.writable, "Feed must be writable.", {
       F: __dxlog_file7,
-      L: 258,
+      L: 261,
       S: this,
       A: [
         "feed.properties.writable",
@@ -940,7 +942,7 @@ var Pipeline = class {
   async start() {
     invariant6(!this._isStarted, "Pipeline is already started.", {
       F: __dxlog_file7,
-      L: 271,
+      L: 274,
       S: this,
       A: [
         "!this._isStarted",
@@ -949,7 +951,7 @@ var Pipeline = class {
     });
     log6("starting...", void 0, {
       F: __dxlog_file7,
-      L: 272,
+      L: 275,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -958,7 +960,7 @@ var Pipeline = class {
     this._isStarted = true;
     log6("started", void 0, {
       F: __dxlog_file7,
-      L: 276,
+      L: 279,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -971,11 +973,15 @@ var Pipeline = class {
   async stop() {
     log6("stopping...", void 0, {
       F: __dxlog_file7,
-      L: 287,
+      L: 290,
       S: this,
       C: (f, a) => f(...a)
     });
     this._isStopping = true;
+    for (const [feed, handle] of this._downloads.entries()) {
+      feed.undownload(handle);
+    }
+    this._downloads.clear();
     await this._feedSetIterator?.close();
     await this._processingTrigger.wait();
     await this._state._ctx.dispose();
@@ -984,7 +990,7 @@ var Pipeline = class {
     this._isStarted = false;
     log6("stopped", void 0, {
       F: __dxlog_file7,
-      L: 295,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -996,7 +1002,7 @@ var Pipeline = class {
   async setCursor(timeframe) {
     invariant6(!this._isStarted || this._isPaused, "Invalid state.", {
       F: __dxlog_file7,
-      L: 304,
+      L: 311,
       S: this,
       A: [
         "!this._isStarted || this._isPaused",
@@ -1025,7 +1031,7 @@ var Pipeline = class {
   async unpause() {
     invariant6(this._isPaused, "Pipeline is not paused.", {
       F: __dxlog_file7,
-      L: 334,
+      L: 340,
       S: this,
       A: [
         "this._isPaused",
@@ -1045,7 +1051,7 @@ var Pipeline = class {
   async *consume() {
     invariant6(!this._isBeingConsumed, "Pipeline is already being consumed.", {
       F: __dxlog_file7,
-      L: 349,
+      L: 355,
       S: this,
       A: [
         "!this._isBeingConsumed",
@@ -1055,7 +1061,7 @@ var Pipeline = class {
     this._isBeingConsumed = true;
     invariant6(this._feedSetIterator, "Iterator not initialized.", {
       F: __dxlog_file7,
-      L: 352,
+      L: 358,
       S: this,
       A: [
         "this._feedSetIterator",
@@ -1069,7 +1075,7 @@ var Pipeline = class {
       if (lastFeedSetIterator !== this._feedSetIterator) {
         invariant6(this._feedSetIterator, "Iterator not initialized.", {
           F: __dxlog_file7,
-          L: 361,
+          L: 367,
           S: this,
           A: [
             "this._feedSetIterator",
@@ -1092,45 +1098,37 @@ var Pipeline = class {
     this._isBeingConsumed = false;
   }
   _setFeedDownloadState(feed) {
+    let handle = this._downloads.get(feed);
+    if (handle) {
+      feed.undownload(handle);
+    }
     const timeframe = this._state._startTimeframe;
     const seq = timeframe.get(feed.key) ?? -1;
-    log6("setFeedDownloadState", {
-      feed: feed.key,
-      feedInstance: getPrototypeSpecificInstanceId(feed),
+    log6.info("download", {
+      feed: feed.key.truncate(),
       seq,
-      isBeingConsumed: this._isBeingConsumed,
-      isStarted: this._isStarted,
-      isPaused: this._isPaused
+      length: feed.length
     }, {
       F: __dxlog_file7,
-      L: 386,
+      L: 396,
       S: this,
       C: (f, a) => f(...a)
     });
-    if (!this._isStarted || this._isPaused) {
-      console.log(new Error().stack);
-    }
-    feed.undownload({
-      callback: () => log6("undownload", void 0, {
-        F: __dxlog_file7,
-        L: 398,
-        S: this,
-        C: (f, a) => f(...a)
-      })
-    });
-    feed.download({
+    handle = feed.download({
       start: seq + 1,
       linear: true
-    }).catch((err) => {
-      log6("failed to download feed", {
-        err
-      }, {
-        F: __dxlog_file7,
-        L: 400,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+    }, (err, data) => {
+      if (err) {
+      } else {
+        log6.info("data", data, {
+          F: __dxlog_file7,
+          L: 401,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
     });
+    this._downloads.set(feed, handle);
   }
   async _initIterator() {
     this._feedSetIterator = new FeedSetIterator(createMessageSelector(this._timeframeClock), {
@@ -1140,7 +1138,7 @@ var Pipeline = class {
     this._feedSetIterator.stalled.on((iterator) => {
       log6.warn(`Stalled after ${iterator.options.stallTimeout}ms with ${iterator.size} feeds.`, void 0, {
         F: __dxlog_file7,
-        L: 411,
+        L: 415,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1274,10 +1272,10 @@ var AuthExtension = class extends RpcExtension {
 import { Event as Event4, scheduleTask as scheduleTask2, synchronized as synchronized3, trackLeaks as trackLeaks2 } from "@dxos/async";
 import { Context as Context4 } from "@dxos/context";
 import { checkCredentialType } from "@dxos/credentials";
-import { getStateMachineFromItem, ItemManager } from "@dxos/echo-db";
+import { getStateMachineFromItem, ItemManager, TYPE_PROPERTIES } from "@dxos/echo-db";
 import { CancelledError } from "@dxos/errors";
 import { invariant as invariant8 } from "@dxos/invariant";
-import { log as log8 } from "@dxos/log";
+import { log as log8, omit } from "@dxos/log";
 import { Timeframe as Timeframe3 } from "@dxos/timeframe";
 import { TimeSeriesCounter, TimeUsageCounter, trace } from "@dxos/tracing";
 import { tracer } from "@dxos/util";
@@ -1516,7 +1514,7 @@ var DataPipeline = class DataPipeline2 {
     const cache = {};
     try {
       const propertiesItem = this.itemManager.items.find((item) => item.modelMeta?.type === "dxos:model/document" && // TODO(burdon): Document?
-      (getStateMachineFromItem(item)?.snapshot()).type === "dxos.sdk.client.Properties");
+      (getStateMachineFromItem(item)?.snapshot()).type === TYPE_PROPERTIES);
       if (propertiesItem) {
         cache.properties = getStateMachineFromItem(propertiesItem)?.snapshot();
       }
@@ -1568,14 +1566,6 @@ var DataPipeline = class DataPipeline2 {
       if (!this._isOpen) {
         return;
       }
-      log8("process epoch", {
-        epoch
-      }, {
-        F: __dxlog_file9,
-        L: 335,
-        S: this,
-        C: (f, a) => f(...a)
-      });
       await this._processEpoch(ctx, epoch.subject.assertion);
       this.appliedEpoch = epoch;
       this.onNewEpoch.emit(epoch);
@@ -1584,7 +1574,7 @@ var DataPipeline = class DataPipeline2 {
   async _processEpoch(ctx, epoch) {
     invariant8(this._isOpen, "Space is closed.", {
       F: __dxlog_file9,
-      L: 345,
+      L: 344,
       S: this,
       A: [
         "this._isOpen",
@@ -1593,7 +1583,7 @@ var DataPipeline = class DataPipeline2 {
     });
     invariant8(this._pipeline, void 0, {
       F: __dxlog_file9,
-      L: 346,
+      L: 345,
       S: this,
       A: [
         "this._pipeline",
@@ -1601,11 +1591,11 @@ var DataPipeline = class DataPipeline2 {
       ]
     });
     this._lastProcessedEpoch = epoch.number;
-    log8("Processing epoch", {
-      epoch
+    log8("processing", {
+      epoch: omit(epoch, "proof")
     }, {
       F: __dxlog_file9,
-      L: 349,
+      L: 348,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1613,9 +1603,9 @@ var DataPipeline = class DataPipeline2 {
       const snapshot = await this._params.snapshotManager.load(ctx, epoch.snapshotCid);
       this.databaseHost._itemDemuxer.restoreFromSnapshot(snapshot.database);
     }
-    log8("restarting pipeline for epoch", void 0, {
+    log8("restarting pipeline from epoch", void 0, {
       F: __dxlog_file9,
-      L: 356,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1626,7 +1616,7 @@ var DataPipeline = class DataPipeline2 {
   async waitUntilTimeframe(timeframe) {
     invariant8(this._pipeline, "Pipeline is not initialized.", {
       F: __dxlog_file9,
-      L: 364,
+      L: 361,
       S: this,
       A: [
         "this._pipeline",
@@ -1638,7 +1628,7 @@ var DataPipeline = class DataPipeline2 {
   async createEpoch() {
     invariant8(this._pipeline, void 0, {
       F: __dxlog_file9,
-      L: 370,
+      L: 367,
       S: this,
       A: [
         "this._pipeline",
@@ -1647,7 +1637,7 @@ var DataPipeline = class DataPipeline2 {
     });
     invariant8(this.currentEpoch, void 0, {
       F: __dxlog_file9,
-      L: 371,
+      L: 368,
       S: this,
       A: [
         "this.currentEpoch",
@@ -2182,7 +2172,7 @@ var SpaceProtocol = class {
       key: feed.key
     }, {
       F: __dxlog_file12,
-      L: 95,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2191,6 +2181,7 @@ var SpaceProtocol = class {
       session.replicator.addFeed(feed);
     }
   }
+  // TODO(burdon): Rename open? Common open/close interfaces for all services?
   async start() {
     if (this._connection) {
       return;
@@ -2204,7 +2195,7 @@ var SpaceProtocol = class {
     await this.blobSync.open();
     log11("starting...", void 0, {
       F: __dxlog_file12,
-      L: 120,
+      L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2214,11 +2205,11 @@ var SpaceProtocol = class {
       peerId: this._swarmIdentity.peerKey,
       topic,
       topology: new MMSTTopology(topologyConfig),
-      label: `Protocol swarm: ${topic}`
+      label: `space swarm ${topic.truncate()}`
     });
     log11("started", void 0, {
       F: __dxlog_file12,
-      L: 130,
+      L: 132,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2228,14 +2219,14 @@ var SpaceProtocol = class {
     if (this._connection) {
       log11("stopping...", void 0, {
         F: __dxlog_file12,
-        L: 137,
+        L: 139,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._connection.close();
       log11("stopped", void 0, {
         F: __dxlog_file12,
-        L: 139,
+        L: 141,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2302,7 +2293,7 @@ var SpaceProtocolSession = class {
       onAuthSuccess: () => {
         log11("Peer authenticated", void 0, {
           F: __dxlog_file12,
-          L: 236,
+          L: 238,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2411,7 +2402,7 @@ var SpaceManager = class SpaceManager2 {
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 125,
+      L: 126,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2454,4 +2445,4 @@ export {
   SpaceProtocolSession,
   SpaceManager
 };
-//# sourceMappingURL=chunk-FCDYN74V.mjs.map
+//# sourceMappingURL=chunk-GDF4DQU2.mjs.map