@dxos/client-services 0.1.51-main.e7215ae → 0.1.51-next.03aa1a8

package/dist/lib/browser/{chunk-5W2L64HI.mjs → chunk-ARBZHWMK.mjs}

@@ -20,11 +20,15 @@ var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
         }
       });
       next({
-        feeds: Array.from(feedMap.values()).map((feed) => ({
-          feedKey: feed.key,
-          length: feed.properties.length,
-          bytes: feed.core.byteLength
-        }))
+        feeds: Array.from(feedMap.values()).map((feed) => {
+          var _a, _b;
+          return {
+            feedKey: feed.key,
+            length: feed.properties.length,
+            bytes: feed.core.byteLength,
+            downloaded: (_b = (_a = feed.core.bitfield) == null ? void 0 : _a.data.toBuffer()) != null ? _b : new Uint8Array()
+          };
+        })
       });
     };
     subscriptions.add(feedStore.feedOpened.on(update));
@@ -800,7 +804,8 @@ var IdentityManager = class {
     });
     assert2(identityRecord.haloSpace.dataFeedKey);
     const dataFeed = await this._feedStore.openFeed(identityRecord.haloSpace.dataFeedKey, {
-      writable: true
+      writable: true,
+      sparse: true
     });
     const space = await this._constructSpace({
       spaceRecord: identityRecord.haloSpace,
@@ -823,7 +828,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       file: "identity-manager.ts",
-      line: 223,
+      line: 226,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -844,7 +849,7 @@ var IdentityManager = class {
       onAuthFailure: () => {
         log3.warn("auth failure", {}, {
           file: "identity-manager.ts",
-          line: 242,
+          line: 245,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2198,6 +2203,7 @@ import { PublicKey as PublicKey7 } from "@dxos/keys";
 import { log as log10 } from "@dxos/log";
 import { SpaceState } from "@dxos/protocols/proto/dxos/client/services";
 import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { Timeframe } from "@dxos/timeframe";
 import { ComplexSet as ComplexSet2 } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
@@ -2540,7 +2546,7 @@ var DataSpace = class DataSpace2 {
         if (err instanceof CancelledError) {
           log10("Data pipeline initialization cancelled", err, {
             file: "data-space.ts",
-            line: 172,
+            line: 173,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -2548,7 +2554,7 @@ var DataSpace = class DataSpace2 {
         }
         log10.error("Error initializing data pipeline", err, {
           file: "data-space.ts",
-          line: 176,
+          line: 177,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2629,7 +2635,8 @@ var DataSpace = class DataSpace2 {
     }
     if (!this.inner.dataFeedKey) {
       const dataFeed = await this._feedStore.openFeed(await this._keyring.createKey(), {
-        writable: true
+        writable: true,
+        sparse: true
       });
       this.inner.setDataFeed(dataFeed);
       credentials.push(await this._signingContext.credentialSigner.createCredential({
@@ -2655,7 +2662,7 @@ var DataSpace = class DataSpace2 {
   async createEpoch() {
     var _a, _b;
     const epoch = await this.dataPipeline.createEpoch();
-    await this.inner.controlPipeline.writer.write({
+    const receipt = await this.inner.controlPipeline.writer.write({
       credential: {
         credential: await this._signingContext.credentialSigner.createCredential({
           subject: this.key,
@@ -2666,6 +2673,12 @@ var DataSpace = class DataSpace2 {
         })
       }
     });
+    await this.inner.controlPipeline.state.waitUntilTimeframe(new Timeframe([
+      [
+        receipt.feedKey,
+        receipt.seq
+      ]
+    ]));
     for (const feed of (_b = (_a = this.inner.dataPipeline.pipelineState) == null ? void 0 : _a.feeds) != null ? _b : []) {
       const indexBeforeEpoch = epoch.timeframe.get(feed.key);
       if (indexBeforeEpoch) {
@@ -2697,7 +2710,7 @@ import { ComplexMap as ComplexMap3, deferFunction as deferFunction2 } from "@dxo
 import { createCredential } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { AdmittedFeed as AdmittedFeed4, SpaceMember } from "@dxos/protocols/proto/dxos/halo/credentials";
-import { Timeframe } from "@dxos/timeframe";
+import { Timeframe as Timeframe2 } from "@dxos/timeframe";
 var spaceGenesis = async (keyring, signingContext, space) => {
   var _a, _b, _c, _d;
   const credentials = [
@@ -2748,7 +2761,7 @@ var spaceGenesis = async (keyring, signingContext, space) => {
         "@type": "dxos.halo.credentials.Epoch",
         number: 0,
         previousId: void 0,
-        timeframe: new Timeframe(),
+        timeframe: new Timeframe2(),
         snapshotCid: void 0
       }
     })
@@ -2953,7 +2966,8 @@ var DataSpaceManager = class DataSpaceManager2 {
       writable: true
     });
     const dataFeed = metadata.dataFeedKey && await this._feedStore.openFeed(metadata.dataFeedKey, {
-      writable: true
+      writable: true,
+      sparse: true
     });
     const space = await this._spaceManager.constructSpace({
       metadata,
@@ -2972,7 +2986,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       onAuthFailure: () => {
         log11.warn("auth failure", {}, {
           file: "data-space-manager.ts",
-          line: 212,
+          line: 213,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2995,7 +3009,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             file: "data-space-manager.ts",
-            line: 229,
+            line: 230,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3007,7 +3021,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             open: this._isOpen
           }, {
             file: "data-space-manager.ts",
-            line: 236,
+            line: 237,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3082,7 +3096,7 @@ var SpacesServiceImpl = class {
           spaces
         }, {
           file: "spaces-service.ts",
-          line: 59,
+          line: 60,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -3099,6 +3113,7 @@ var SpacesServiceImpl = class {
           for (const space of dataSpaceManager.spaces.values()) {
             subscriptions.add(space.stateUpdate.on(ctx, onUpdate));
             subscriptions.add(space.presence.updated.on(ctx, onUpdate));
+            subscriptions.add(space.dataPipeline.onNewEpoch.on(ctx, onUpdate));
             space.inner.controlPipeline.state.timeframeUpdate.debounce(TIMEFRAME_UPDATE_DEBOUNCE_TIME).on(ctx, onUpdate);
             if (space.dataPipeline.pipelineState) {
               subscriptions.add(space.dataPipeline.pipelineState.timeframeUpdate.debounce(TIMEFRAME_UPDATE_DEBOUNCE_TIME).on(ctx, onUpdate));
@@ -3169,20 +3184,23 @@ var SpacesServiceImpl = class {
     await space.createEpoch();
   }
   _transformSpace(space) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     return {
       spaceKey: space.key,
       state: space.state,
       error: space.error ? encodeError(space.error) : void 0,
       pipeline: {
+        currentEpoch: space.dataPipeline.currentEpoch,
+        appliedEpoch: space.dataPipeline.appliedEpoch,
         controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
         currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
         targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
         totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe,
         dataFeeds: (_b = (_a = space.dataPipeline.pipelineState) == null ? void 0 : _a.feeds.map((feed) => feed.key)) != null ? _b : [],
-        currentDataTimeframe: (_c = space.dataPipeline.pipelineState) == null ? void 0 : _c.timeframe,
-        targetDataTimeframe: (_d = space.dataPipeline.pipelineState) == null ? void 0 : _d.targetTimeframe,
-        totalDataTimeframe: (_e = space.dataPipeline.pipelineState) == null ? void 0 : _e.endTimeframe
+        startDataTimeframe: (_c = space.dataPipeline.pipelineState) == null ? void 0 : _c.startTimeframe,
+        currentDataTimeframe: (_d = space.dataPipeline.pipelineState) == null ? void 0 : _d.timeframe,
+        targetDataTimeframe: (_e = space.dataPipeline.pipelineState) == null ? void 0 : _e.targetTimeframe,
+        totalDataTimeframe: (_f = space.dataPipeline.pipelineState) == null ? void 0 : _f.endTimeframe
       },
       members: Array.from(space.inner.spaceState.members.values()).map((member) => {
         var _a2, _b2, _c2;
@@ -3196,6 +3214,7 @@ var SpacesServiceImpl = class {
           presence: ((_c2 = this._identityManager.identity) == null ? void 0 : _c2.identityKey.equals(member.key)) || space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? SpaceMember2.PresenceState.ONLINE : SpaceMember2.PresenceState.OFFLINE
         };
       }),
+      creator: (_g = space.inner.spaceState.creator) == null ? void 0 : _g.key,
       cache: space.cache,
       metrics: space.metrics
     };
@@ -3557,7 +3576,8 @@ var DevicesServiceImpl = class {
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
 import { Event as Event7 } from "@dxos/async";
 import { Stream as Stream11 } from "@dxos/codec-protobuf";
-import { log as log14, shouldLog, getContextFromEntry } from "@dxos/log";
+import { getContextFromEntry, log as log14 } from "@dxos/log";
+import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { jsonify } from "@dxos/util";
 var LoggingServiceImpl = class {
   constructor() {
@@ -3574,31 +3594,60 @@ var LoggingServiceImpl = class {
     log14.runtimeConfig.processors.splice(index, 1);
   }
   queryLogs(request) {
-    var _a;
-    const filters = ((_a = request.filters) == null ? void 0 : _a.length) ? request.filters : void 0;
     return new Stream11(({ ctx, next }) => {
       const handler = (entry2) => {
-        var _a2, _b, _c;
-        if (((_a2 = entry2.meta) == null ? void 0 : _a2.file.includes("logging-service")) || entry2.context && Object.values(entry2.context).some((value) => typeof value === "string" && value.includes("LoggingService"))) {
+        var _a, _b, _c, _d, _e;
+        if (LOG_PROCESSING > 0) {
           return;
         }
-        if (shouldLog(entry2, filters)) {
-          const record = {
-            ...entry2,
-            context: jsonify(getContextFromEntry(entry2))
-          };
-          (_b = record.meta) == null ? true : delete _b.bugcheck;
-          (_c = record.meta) == null ? true : delete _c.scope;
+        if (((_a = entry2.meta) == null ? void 0 : _a.file.includes("logging-service")) || entry2.context && Object.values(entry2.context).some((value) => typeof value === "string" && value.includes("LoggingService"))) {
+          return;
+        }
+        if (!shouldLog(entry2, request)) {
+          return;
+        }
+        const record = {
+          ...entry2,
+          context: jsonify(getContextFromEntry(entry2)),
+          timestamp: new Date(),
+          meta: {
+            // TODO(dmaretskyi): Fix proto.
+            file: (_c = (_b = entry2.meta) == null ? void 0 : _b.file) != null ? _c : "",
+            line: (_e = (_d = entry2.meta) == null ? void 0 : _d.line) != null ? _e : 0
+          }
+        };
+        try {
+          LOG_PROCESSING++;
           next(record);
+        } finally {
+          LOG_PROCESSING--;
         }
       };
-      ctx.onDispose(() => {
-        this._logs.off(handler);
-      });
-      this._logs.on(handler);
+      this._logs.on(ctx, handler);
+    });
+  }
+};
+var matchFilter = (filter, level, path, options) => {
+  switch (options) {
+    case QueryLogsRequest.MatchingOptions.INCLUSIVE:
+      return level >= filter.level && (!filter.pattern || path.includes(filter.pattern));
+    case QueryLogsRequest.MatchingOptions.EXPLICIT:
+      return level === filter.level && (!filter.pattern || path.includes(filter.pattern));
+  }
+};
+var shouldLog = (entry2, request) => {
+  var _a;
+  const options = (_a = request.options) != null ? _a : QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  if (request.filters === void 0) {
+    return options === QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  } else {
+    return request.filters.some((filter) => {
+      var _a2, _b;
+      return matchFilter(filter, entry2.level, (_b = (_a2 = entry2.meta) == null ? void 0 : _a2.file) != null ? _b : "", options);
     });
   }
 };
+var LOG_PROCESSING = 0;
 
 // packages/sdk/client-services/src/packlets/network/network-service.ts
 import { Stream as Stream12 } from "@dxos/codec-protobuf";
@@ -3955,4 +4004,4 @@ export {
   ClientServicesHost,
   LocalClientServices
 };
-//# sourceMappingURL=chunk-5W2L64HI.mjs.map
+//# sourceMappingURL=chunk-ARBZHWMK.mjs.map