@dxos/echo-pipeline 0.1.31-next.ea8f0bc → 0.1.32-next.77d513e

package/dist/lib/browser/{chunk-L44NG4N6.mjs → chunk-EM5HSJ7J.mjs}

@@ -55,7 +55,7 @@ var MetadataStore = class {
         size: dataSize
       }, {
         file: "metadata-store.ts",
-        line: 68,
+        line: 67,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -71,7 +71,7 @@ var MetadataStore = class {
         err
       }, {
         file: "metadata-store.ts",
-        line: 80,
+        line: 79,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -96,7 +96,7 @@ var MetadataStore = class {
         size: encoded.length
       }, {
         file: "metadata-store.ts",
-        line: 103,
+        line: 102,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -111,7 +111,7 @@ var MetadataStore = class {
   async clear() {
     log("clearing all metadata", {}, {
       file: "metadata-store.ts",
-      line: 116,
+      line: 115,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -257,6 +257,7 @@ __decorate2([
 // packages/core/echo/echo-pipeline/src/pipeline/pipeline.ts
 import assert4 from "@dxos/node-std/assert";
 import { sleep, Trigger } from "@dxos/async";
+import { Context, rejectOnDispose } from "@dxos/context";
 import { FeedSetIterator } from "@dxos/feed-store";
 import { PublicKey } from "@dxos/keys";
 import { log as log4 } from "@dxos/log";
@@ -301,7 +302,7 @@ var PipelineState = class {
     return this._timeframeClock.timeframe;
   }
   get targetTimeframe() {
-    return this._targetTimeframe ? Timeframe2.merge(this.endTimeframe, this._targetTimeframe) : this.endTimeframe;
+    return this._targetTimeframe ? this._targetTimeframe : new Timeframe2();
   }
   async waitUntilTimeframe(target) {
     await this._timeframeClock.waitUntilReached(target);
@@ -316,7 +317,7 @@ var PipelineState = class {
   *
   * @param timeout Timeout in milliseconds to specify the maximum wait time.
   */
-  async waitUntilReachedTargetTimeframe({ timeout } = {}) {
+  async waitUntilReachedTargetTimeframe({ ctx = new Context(), timeout, breakOnStall = true } = {}) {
     var _a;
     log4("waitUntilReachedTargetTimeframe", {
       timeout,
@@ -324,7 +325,7 @@ var PipelineState = class {
       target: this.targetTimeframe
     }, {
       file: "pipeline.ts",
-      line: 82,
+      line: 96,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -332,11 +333,14 @@ var PipelineState = class {
       this._timeframeClock.update.waitForCondition(() => {
         return Timeframe2.dependencies(this.targetTimeframe, this.timeframe).isEmpty();
       }),
-      this._iterator.stalled.discardParameter().waitForCount(1)
+      ...breakOnStall ? [
+        this._iterator.stalled.discardParameter().waitForCount(1)
+      ] : []
     ]);
     let done = false;
     if (timeout) {
       return Promise.race([
+        rejectOnDispose(ctx),
         this._reachedTargetPromise.then(() => {
           done = true;
         }),
@@ -351,7 +355,7 @@ var PipelineState = class {
             dependencies: Timeframe2.dependencies(this.targetTimeframe, this.timeframe)
           }, {
             file: "pipeline.ts",
-            line: 107,
+            line: 122,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -377,7 +381,7 @@ var Pipeline = class {
     this._feedSetIterator.stalled.on((iterator) => {
       log4.warn(`Stalled after ${iterator.options.stallTimeout}ms with ${iterator.size} feeds.`, {}, {
         file: "pipeline.ts",
-        line: 183,
+        line: 198,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -407,14 +411,14 @@ var Pipeline = class {
   async start() {
     log4("starting...", {}, {
       file: "pipeline.ts",
-      line: 218,
+      line: 233,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await this._feedSetIterator.open();
     log4("started", {}, {
       file: "pipeline.ts",
-      line: 220,
+      line: 235,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -422,7 +426,7 @@ var Pipeline = class {
   async stop() {
     log4("stopping...", {}, {
       file: "pipeline.ts",
-      line: 224,
+      line: 239,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -430,7 +434,7 @@ var Pipeline = class {
     await this._processingTrigger.wait();
     log4("stopped", {}, {
       file: "pipeline.ts",
-      line: 227,
+      line: 242,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -455,7 +459,7 @@ var Pipeline = class {
 // packages/core/echo/echo-pipeline/src/space/auth.ts
 import assert5 from "@dxos/node-std/assert";
 import { runInContext, scheduleTask } from "@dxos/async";
-import { Context } from "@dxos/context";
+import { Context as Context2 } from "@dxos/context";
 import { randomBytes } from "@dxos/crypto";
 import { log as log5 } from "@dxos/log";
 import { schema as schema3 } from "@dxos/protocols";
@@ -473,7 +477,7 @@ var AuthExtension = class extends RpcExtension {
       // Long timeout because auth can wait for sync in certain cases.
     });
     this._authParams = _authParams;
-    this._ctx = new Context({
+    this._ctx = new Context2({
       onError: (err) => {
         log5.catch(err, {}, {
           file: "auth.ts",
@@ -702,7 +706,7 @@ var Space = class Space2 {
         credential
       }, {
         file: "space.ts",
-        line: 74,
+        line: 79,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -765,7 +769,7 @@ var Space = class Space2 {
   async open() {
     log7("opening...", {}, {
       file: "space.ts",
-      line: 145,
+      line: 149,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -777,18 +781,17 @@ var Space = class Space2 {
     this._isOpen = true;
     log7("opened", {}, {
       file: "space.ts",
-      line: 155,
+      line: 159,
       scope: this,
       callSite: (f, a) => f(...a)
     });
   }
   async close() {
-    var _a;
     log7("closing...", {
       key: this._key
     }, {
       file: "space.ts",
-      line: 160,
+      line: 164,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -796,37 +799,30 @@ var Space = class Space2 {
       return;
     }
     await this.protocol.stop();
-    await ((_a = this._dataPipelineController) == null ? void 0 : _a.close());
     await this._controlPipeline.stop();
     this._isOpen = false;
     log7("closed", {}, {
       file: "space.ts",
-      line: 171,
+      line: 174,
       scope: this,
       callSite: (f, a) => f(...a)
     });
   }
-  async initDataPipeline(controller) {
+  // TODO(dmaretskyi): Make reusable.
+  async createDataPipeline({ start }) {
     assert6(this._isOpen, "Space must be open to initialize data pipeline.");
-    assert6(!this._dataPipelineController, "Data pipeline already initialized.");
     assert6(!this._dataPipeline, "Data pipeline already initialized.");
-    this._dataPipelineController = controller;
-    await this._dataPipelineController.open({
-      openPipeline: async (start) => {
-        assert6(!this._dataPipeline, "Data pipeline already initialized.");
-        this._dataPipeline = new Pipeline(start);
-        if (this._dataFeed) {
-          this._dataPipeline.setWriteFeed(this._dataFeed);
-        }
-        for (const feed of this._controlPipeline.spaceState.feeds.values()) {
-          if (feed.assertion.designation === AdmittedFeed2.Designation.DATA) {
-            await this._dataPipeline.addFeed(await this._feedProvider(feed.key));
-          }
-        }
-        await this._dataPipeline.start();
-        return this._dataPipeline;
+    const pipeline = new Pipeline(start);
+    if (this._dataFeed) {
+      pipeline.setWriteFeed(this._dataFeed);
+    }
+    this._dataPipeline = pipeline;
+    for (const feed of this._controlPipeline.spaceState.feeds.values()) {
+      if (feed.assertion.designation === AdmittedFeed2.Designation.DATA) {
+        await pipeline.addFeed(await this._feedProvider(feed.key));
       }
-    });
+    }
+    return pipeline;
   }
 };
 __decorate3([
@@ -1099,15 +1095,53 @@ SpaceManager = __decorate5([
 ], SpaceManager);
 
 // packages/core/echo/echo-pipeline/src/space/genesis.ts
-import { CredentialGenerator } from "@dxos/credentials";
+import { createCredential } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
-import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { AdmittedFeed as AdmittedFeed3, SpaceMember } from "@dxos/protocols/proto/dxos/halo/credentials";
 var spaceGenesis = async (keyring, signingContext, space) => {
-  var _a, _b;
-  const generator = new CredentialGenerator(keyring, signingContext.identityKey, signingContext.deviceKey);
+  var _a, _b, _c;
   const credentials = [
-    ...await generator.createSpaceGenesis(space.key, (_a = space.controlFeedKey) != null ? _a : failUndefined2(), signingContext.profile),
-    await generator.createFeedAdmission(space.key, (_b = space.dataFeedKey) != null ? _b : failUndefined2(), AdmittedFeed3.Designation.DATA)
+    await createCredential({
+      signer: keyring,
+      issuer: space.key,
+      subject: space.key,
+      assertion: {
+        "@type": "dxos.halo.credentials.SpaceGenesis",
+        spaceKey: space.key
+      }
+    }),
+    await createCredential({
+      signer: keyring,
+      issuer: space.key,
+      subject: signingContext.identityKey,
+      assertion: {
+        "@type": "dxos.halo.credentials.SpaceMember",
+        spaceKey: space.key,
+        role: SpaceMember.Role.ADMIN,
+        profile: signingContext.profile,
+        genesisFeedKey: (_a = space.controlFeedKey) != null ? _a : failUndefined2()
+      }
+    }),
+    await signingContext.credentialSigner.createCredential({
+      subject: (_b = space.controlFeedKey) != null ? _b : failUndefined2(),
+      assertion: {
+        "@type": "dxos.halo.credentials.AdmittedFeed",
+        spaceKey: space.key,
+        identityKey: signingContext.identityKey,
+        deviceKey: signingContext.deviceKey,
+        designation: AdmittedFeed3.Designation.CONTROL
+      }
+    }),
+    await signingContext.credentialSigner.createCredential({
+      subject: (_c = space.dataFeedKey) != null ? _c : failUndefined2(),
+      assertion: {
+        "@type": "dxos.halo.credentials.AdmittedFeed",
+        spaceKey: space.key,
+        identityKey: signingContext.identityKey,
+        deviceKey: signingContext.deviceKey,
+        designation: AdmittedFeed3.Designation.DATA
+      }
+    })
   ];
   for (const credential of credentials) {
     await space.controlPipeline.writer.write({
@@ -1122,7 +1156,7 @@ var spaceGenesis = async (keyring, signingContext, space) => {
 // packages/core/echo/echo-pipeline/src/dbhost/data-service-host.ts
 import assert7 from "@dxos/node-std/assert";
 import { Stream } from "@dxos/codec-protobuf";
-import { tagMutationsInBatch } from "@dxos/echo-db";
+import { tagMutationsInBatch, setMetadataOnObject } from "@dxos/echo-db";
 import { log as log10 } from "@dxos/log";
 import { ComplexMap as ComplexMap3 } from "@dxos/util";
 var DataServiceHost = class {
@@ -1143,56 +1177,53 @@ var DataServiceHost = class {
           objects
         }
       });
-      this._itemDemuxer.mutation.on(ctx, (mutation) => {
+      this._itemDemuxer.mutation.on(ctx, (message) => {
         var _a;
+        const { batch, meta } = message;
         log10("Object update", {
-          mutation
+          batch,
+          meta
         }, {
           file: "data-service-host.ts",
-          line: 49,
+          line: 50,
           scope: this,
           callSite: (f, a) => f(...a)
         });
         const clientTag = this._clientTagMap.get([
-          mutation.meta.feedKey,
-          mutation.meta.seq
+          message.meta.feedKey,
+          message.meta.seq
         ]);
-        const batch = {
-          objects: [
-            {
-              ...mutation.data,
-              mutations: (_a = mutation.data.mutations) == null ? void 0 : _a.map((m, mutationIdx) => ({
-                ...m,
-                meta: mutation.meta
-              })),
-              meta: mutation.meta
-            }
-          ]
-        };
+        (_a = batch.objects) == null ? void 0 : _a.forEach((object) => {
+          setMetadataOnObject(object, meta);
+        });
         if (clientTag) {
           tagMutationsInBatch(batch, clientTag);
         }
         next({
           clientTag,
-          feedKey: mutation.meta.feedKey,
-          seq: mutation.meta.seq,
+          feedKey: message.meta.feedKey,
+          seq: message.meta.seq,
           batch
         });
       });
     });
   }
   async write(request) {
-    var _a, _b;
+    var _a;
     assert7(this._writeStream, "Cannot write mutations in readonly mode");
-    assert7(((_a = request.batch.objects) == null ? void 0 : _a.length) === 1, "Only single object mutations are supported");
     const receipt = await this._writeStream.write({
-      object: {
-        ...request.batch.objects[0],
-        mutations: (_b = request.batch.objects[0].mutations) == null ? void 0 : _b.map((m) => ({
-          ...m,
-          meta: void 0
-        })),
-        meta: void 0
+      batch: {
+        objects: (_a = request.batch.objects) == null ? void 0 : _a.map((object) => {
+          var _a2;
+          return {
+            ...object,
+            mutations: (_a2 = object.mutations) == null ? void 0 : _a2.map((m) => ({
+              ...m,
+              meta: void 0
+            })),
+            meta: void 0
+          };
+        })
       }
     });
     if (request.clientTag) {
@@ -1395,10 +1426,10 @@ var DataServiceImpl = class {
   }
 };
 
-// packages/core/echo/echo-pipeline/src/space/data-pipeline-controller.ts
+// packages/core/echo/echo-pipeline/src/space/data-pipeline.ts
 import assert9 from "@dxos/node-std/assert";
-import { Event as Event3, scheduleTask as scheduleTask2, trackLeaks as trackLeaks4 } from "@dxos/async";
-import { Context as Context2 } from "@dxos/context";
+import { Event as Event3, scheduleTask as scheduleTask2, synchronized as synchronized4, trackLeaks as trackLeaks4 } from "@dxos/async";
+import { Context as Context3 } from "@dxos/context";
 import { failUndefined as failUndefined3 } from "@dxos/debug";
 import { ItemManager } from "@dxos/echo-db";
 import { log as log12 } from "@dxos/log";
@@ -1413,22 +1444,21 @@ var __decorate7 = function(decorators, target, key, desc) {
         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 NoopDataPipelineController = class {
-  async open(context) {
-  }
-  async close() {
-  }
-};
 var MESSAGES_PER_SNAPSHOT = 10;
 var AUTOMATIC_SNAPSHOT_DEBOUNCE_INTERVAL = 5e3;
 var TIMEFRAME_SAVE_DEBOUNCE_INTERVAL = 500;
-var DataPipelineControllerImpl = class DataPipelineControllerImpl2 {
+var DISABLE_SNAPSHOT_CACHE = false;
+var DataPipeline = class DataPipeline2 {
   constructor(_params) {
     this._params = _params;
-    this._ctx = new Context2();
+    this._ctx = new Context3();
     this._lastAutomaticSnapshotTimeframe = new Timeframe3();
+    this._isOpen = false;
     this.onTimeframeReached = new Event3();
   }
+  get isOpen() {
+    return this._isOpen;
+  }
   get pipelineState() {
     var _a;
     return (_a = this._pipeline) == null ? void 0 : _a.state;
@@ -1441,14 +1471,25 @@ var DataPipelineControllerImpl = class DataPipelineControllerImpl2 {
     var _a;
     return snapshotTimeframeToStartingTimeframe((_a = this.snapshotTimeframe) != null ? _a : new Timeframe3());
   }
+  setTargetTimeframe(timeframe) {
+    var _a;
+    this._targetTimeframe = timeframe;
+    (_a = this._pipeline) == null ? void 0 : _a.state.setTargetTimeframe(timeframe);
+  }
   async open(spaceContext) {
     var _a, _b, _c, _d;
+    if (this._isOpen) {
+      return;
+    }
     this._spaceContext = spaceContext;
     if (this._params.snapshotId) {
       this._snapshot = await this._params.snapshotManager.load(this._params.snapshotId);
       this._lastAutomaticSnapshotTimeframe = (_b = (_a = this._snapshot) == null ? void 0 : _a.timeframe) != null ? _b : new Timeframe3();
     }
     this._pipeline = await this._spaceContext.openPipeline(this.getStartTimeframe());
+    if (this._targetTimeframe) {
+      this._pipeline.state.setTargetTimeframe(this._targetTimeframe);
+    }
     const feedWriter = createMappedFeedWriter((data) => ({
       data
     }), (_c = this._pipeline.writer) != null ? _c : failUndefined3());
@@ -1459,30 +1500,33 @@ var DataPipelineControllerImpl = class DataPipelineControllerImpl2 {
       await this._consumePipeline();
     });
     this._createPeriodicSnapshots();
+    this._isOpen = true;
   }
   _createPeriodicSnapshots() {
     this.onTimeframeReached.debounce(TIMEFRAME_SAVE_DEBOUNCE_INTERVAL).on(this._ctx, async () => {
       await this._saveLatestTimeframe();
     });
-    this.onTimeframeReached.debounce(AUTOMATIC_SNAPSHOT_DEBOUNCE_INTERVAL).on(this._ctx, async () => {
-      var _a, _b;
-      const latestTimeframe = (_a = this._pipeline) == null ? void 0 : _a.state.timeframe;
-      if (!latestTimeframe) {
-        return;
-      }
-      if (latestTimeframe.totalMessages() - this._lastAutomaticSnapshotTimeframe.totalMessages() > MESSAGES_PER_SNAPSHOT) {
-        const snapshot = await this._saveSnapshot();
-        this._lastAutomaticSnapshotTimeframe = (_b = snapshot.timeframe) != null ? _b : failUndefined3();
-        log12("save", {
-          snapshot
-        }, {
-          file: "data-pipeline-controller.ts",
-          line: 149,
-          scope: this,
-          callSite: (f, a) => f(...a)
-        });
-      }
-    });
+    if (!DISABLE_SNAPSHOT_CACHE) {
+      this.onTimeframeReached.debounce(AUTOMATIC_SNAPSHOT_DEBOUNCE_INTERVAL).on(this._ctx, async () => {
+        var _a, _b;
+        const latestTimeframe = (_a = this._pipeline) == null ? void 0 : _a.state.timeframe;
+        if (!latestTimeframe) {
+          return;
+        }
+        if (latestTimeframe.totalMessages() - this._lastAutomaticSnapshotTimeframe.totalMessages() > MESSAGES_PER_SNAPSHOT) {
+          const snapshot = await this._saveSnapshot();
+          this._lastAutomaticSnapshotTimeframe = (_b = snapshot.timeframe) != null ? _b : failUndefined3();
+          log12("save", {
+            snapshot
+          }, {
+            file: "data-pipeline.ts",
+            line: 161,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+        }
+      });
+    }
   }
   async _saveSnapshot() {
     const snapshot = await this.createSnapshot();
@@ -1491,21 +1535,41 @@ var DataPipelineControllerImpl = class DataPipelineControllerImpl2 {
     return snapshot;
   }
   async _saveLatestTimeframe() {
-    var _a;
+    var _a, _b;
     const latestTimeframe = (_a = this._pipeline) == null ? void 0 : _a.state.timeframe;
+    log12("save latest timeframe", {
+      latestTimeframe,
+      spaceKey: this._params.spaceKey
+    }, {
+      file: "data-pipeline.ts",
+      line: 176,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
     if (latestTimeframe) {
-      await this._params.metadataStore.setSpaceLatestTimeframe(this._params.spaceKey, latestTimeframe);
+      const newTimeframe = Timeframe3.merge((_b = this._targetTimeframe) != null ? _b : new Timeframe3(), latestTimeframe);
+      await this._params.metadataStore.setSpaceLatestTimeframe(this._params.spaceKey, newTimeframe);
     }
   }
   async close() {
     var _a, _b, _c;
+    if (!this._isOpen) {
+      return;
+    }
+    log12("close", {}, {
+      file: "data-pipeline.ts",
+      line: 188,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    this._isOpen = false;
     try {
       await this._saveLatestTimeframe();
       await this._saveSnapshot();
     } catch (err) {
       log12.catch(err, {}, {
-        file: "data-pipeline-controller.ts",
-        line: 173,
+        file: "data-pipeline.ts",
+        line: 195,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1518,6 +1582,7 @@ var DataPipelineControllerImpl = class DataPipelineControllerImpl2 {
   }
   createSnapshot() {
     var _a, _b;
+    assert9(this.databaseBackend, "Database backend is not initialized.");
     return {
       spaceKey: this._params.spaceKey.asUint8Array(),
       timeframe: (_b = (_a = this._pipeline) == null ? void 0 : _a.state.timeframe) != null ? _b : new Timeframe3(),
@@ -1531,8 +1596,8 @@ var DataPipelineControllerImpl = class DataPipelineControllerImpl2 {
       log12("processing message", {
         msg
       }, {
-        file: "data-pipeline-controller.ts",
-        line: 194,
+        file: "data-pipeline.ts",
+        line: 217,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1543,15 +1608,15 @@ var DataPipelineControllerImpl = class DataPipelineControllerImpl2 {
             log12.error("Could not find feed.", {
               feedKey
             }, {
-              file: "data-pipeline-controller.ts",
-              line: 200,
+              file: "data-pipeline.ts",
+              line: 223,
               scope: this,
               callSite: (f, a) => f(...a)
             });
             continue;
           }
           await this.databaseBackend.echoProcessor({
-            data: data.payload.data.object,
+            batch: data.payload.data.batch,
             meta: {
               feedKey,
               seq,
@@ -1563,8 +1628,8 @@ var DataPipelineControllerImpl = class DataPipelineControllerImpl2 {
         }
       } catch (err) {
         log12.catch(err, {}, {
-          file: "data-pipeline-controller.ts",
-          line: 216,
+          file: "data-pipeline.ts",
+          line: 239,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -1576,9 +1641,15 @@ var DataPipelineControllerImpl = class DataPipelineControllerImpl2 {
     await this._pipeline.state.waitUntilTimeframe(timeframe);
   }
 };
-DataPipelineControllerImpl = __decorate7([
+__decorate7([
+  synchronized4
+], DataPipeline.prototype, "open", null);
+__decorate7([
+  synchronized4
+], DataPipeline.prototype, "close", null);
+DataPipeline = __decorate7([
   trackLeaks4("open", "close")
-], DataPipelineControllerImpl);
+], DataPipeline);
 var snapshotTimeframeToStartingTimeframe = (snapshotTimeframe) => {
   return snapshotTimeframe.map(([key, seq]) => [
     key,
@@ -1611,7 +1682,6 @@ export {
   SnapshotStore,
   DataServiceSubscriptions,
   DataServiceImpl,
-  NoopDataPipelineController,
-  DataPipelineControllerImpl
+  DataPipeline
 };
-//# sourceMappingURL=chunk-L44NG4N6.mjs.map
+//# sourceMappingURL=chunk-EM5HSJ7J.mjs.map