@dxos/client-services 0.1.51-main.0e88376 → 0.1.51-main.10d68b7

package/dist/lib/browser/{chunk-YPN5TDAA.mjs → chunk-U74HTJWV.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));
@@ -3106,6 +3110,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));
@@ -3176,21 +3181,23 @@ var SpacesServiceImpl = class {
     await space.createEpoch();
   }
   _transformSpace(space) {
-    var _a, _b, _c, _d, _e, _f;
+    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;
@@ -3204,7 +3211,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: (_f = space.inner.spaceState.creator) == null ? void 0 : _f.key,
+      creator: (_g = space.inner.spaceState.creator) == null ? void 0 : _g.key,
       cache: space.cache,
       metrics: space.metrics
     };
@@ -3566,7 +3573,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() {
@@ -3583,31 +3591,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";
@@ -3964,4 +4001,4 @@ export {
   ClientServicesHost,
   LocalClientServices
 };
-//# sourceMappingURL=chunk-YPN5TDAA.mjs.map
+//# sourceMappingURL=chunk-U74HTJWV.mjs.map