@dxos/client-services 0.1.51-main.109284c → 0.1.51-main.21571d3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -20,11 +20,15 @@ var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
20
20
  }
21
21
  });
22
22
  next({
23
- feeds: Array.from(feedMap.values()).map((feed) => ({
24
- feedKey: feed.key,
25
- length: feed.properties.length,
26
- bytes: feed.core.byteLength
27
- }))
23
+ feeds: Array.from(feedMap.values()).map((feed) => {
24
+ var _a, _b;
25
+ return {
26
+ feedKey: feed.key,
27
+ length: feed.properties.length,
28
+ bytes: feed.core.byteLength,
29
+ downloaded: (_b = (_a = feed.core.bitfield) == null ? void 0 : _a.data.toBuffer()) != null ? _b : new Uint8Array()
30
+ };
31
+ })
28
32
  });
29
33
  };
30
34
  subscriptions.add(feedStore.feedOpened.on(update));
@@ -800,7 +804,8 @@ var IdentityManager = class {
800
804
  });
801
805
  assert2(identityRecord.haloSpace.dataFeedKey);
802
806
  const dataFeed = await this._feedStore.openFeed(identityRecord.haloSpace.dataFeedKey, {
803
- writable: true
807
+ writable: true,
808
+ sparse: true
804
809
  });
805
810
  const space = await this._constructSpace({
806
811
  spaceRecord: identityRecord.haloSpace,
@@ -823,7 +828,7 @@ var IdentityManager = class {
823
828
  identityKey: identityRecord.identityKey
824
829
  }, {
825
830
  file: "identity-manager.ts",
826
- line: 223,
831
+ line: 226,
827
832
  scope: this,
828
833
  callSite: (f, a) => f(...a)
829
834
  });
@@ -844,7 +849,7 @@ var IdentityManager = class {
844
849
  onAuthFailure: () => {
845
850
  log3.warn("auth failure", {}, {
846
851
  file: "identity-manager.ts",
847
- line: 242,
852
+ line: 245,
848
853
  scope: this,
849
854
  callSite: (f, a) => f(...a)
850
855
  });
@@ -2630,7 +2635,8 @@ var DataSpace = class DataSpace2 {
2630
2635
  }
2631
2636
  if (!this.inner.dataFeedKey) {
2632
2637
  const dataFeed = await this._feedStore.openFeed(await this._keyring.createKey(), {
2633
- writable: true
2638
+ writable: true,
2639
+ sparse: true
2634
2640
  });
2635
2641
  this.inner.setDataFeed(dataFeed);
2636
2642
  credentials.push(await this._signingContext.credentialSigner.createCredential({
@@ -2960,7 +2966,8 @@ var DataSpaceManager = class DataSpaceManager2 {
2960
2966
  writable: true
2961
2967
  });
2962
2968
  const dataFeed = metadata.dataFeedKey && await this._feedStore.openFeed(metadata.dataFeedKey, {
2963
- writable: true
2969
+ writable: true,
2970
+ sparse: true
2964
2971
  });
2965
2972
  const space = await this._spaceManager.constructSpace({
2966
2973
  metadata,
@@ -2979,7 +2986,7 @@ var DataSpaceManager = class DataSpaceManager2 {
2979
2986
  onAuthFailure: () => {
2980
2987
  log11.warn("auth failure", {}, {
2981
2988
  file: "data-space-manager.ts",
2982
- line: 212,
2989
+ line: 213,
2983
2990
  scope: this,
2984
2991
  callSite: (f, a) => f(...a)
2985
2992
  });
@@ -3002,7 +3009,7 @@ var DataSpaceManager = class DataSpaceManager2 {
3002
3009
  space: space.key
3003
3010
  }, {
3004
3011
  file: "data-space-manager.ts",
3005
- line: 229,
3012
+ line: 230,
3006
3013
  scope: this,
3007
3014
  callSite: (f, a) => f(...a)
3008
3015
  });
@@ -3014,7 +3021,7 @@ var DataSpaceManager = class DataSpaceManager2 {
3014
3021
  open: this._isOpen
3015
3022
  }, {
3016
3023
  file: "data-space-manager.ts",
3017
- line: 236,
3024
+ line: 237,
3018
3025
  scope: this,
3019
3026
  callSite: (f, a) => f(...a)
3020
3027
  });
@@ -3106,6 +3113,7 @@ var SpacesServiceImpl = class {
3106
3113
  for (const space of dataSpaceManager.spaces.values()) {
3107
3114
  subscriptions.add(space.stateUpdate.on(ctx, onUpdate));
3108
3115
  subscriptions.add(space.presence.updated.on(ctx, onUpdate));
3116
+ subscriptions.add(space.dataPipeline.onNewEpoch.on(ctx, onUpdate));
3109
3117
  space.inner.controlPipeline.state.timeframeUpdate.debounce(TIMEFRAME_UPDATE_DEBOUNCE_TIME).on(ctx, onUpdate);
3110
3118
  if (space.dataPipeline.pipelineState) {
3111
3119
  subscriptions.add(space.dataPipeline.pipelineState.timeframeUpdate.debounce(TIMEFRAME_UPDATE_DEBOUNCE_TIME).on(ctx, onUpdate));
@@ -3176,21 +3184,23 @@ var SpacesServiceImpl = class {
3176
3184
  await space.createEpoch();
3177
3185
  }
3178
3186
  _transformSpace(space) {
3179
- var _a, _b, _c, _d, _e, _f;
3187
+ var _a, _b, _c, _d, _e, _f, _g;
3180
3188
  return {
3181
3189
  spaceKey: space.key,
3182
3190
  state: space.state,
3183
3191
  error: space.error ? encodeError(space.error) : void 0,
3184
3192
  pipeline: {
3185
3193
  currentEpoch: space.dataPipeline.currentEpoch,
3194
+ appliedEpoch: space.dataPipeline.appliedEpoch,
3186
3195
  controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
3187
3196
  currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
3188
3197
  targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
3189
3198
  totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe,
3190
3199
  dataFeeds: (_b = (_a = space.dataPipeline.pipelineState) == null ? void 0 : _a.feeds.map((feed) => feed.key)) != null ? _b : [],
3191
- currentDataTimeframe: (_c = space.dataPipeline.pipelineState) == null ? void 0 : _c.timeframe,
3192
- targetDataTimeframe: (_d = space.dataPipeline.pipelineState) == null ? void 0 : _d.targetTimeframe,
3193
- totalDataTimeframe: (_e = space.dataPipeline.pipelineState) == null ? void 0 : _e.endTimeframe
3200
+ startDataTimeframe: (_c = space.dataPipeline.pipelineState) == null ? void 0 : _c.startTimeframe,
3201
+ currentDataTimeframe: (_d = space.dataPipeline.pipelineState) == null ? void 0 : _d.timeframe,
3202
+ targetDataTimeframe: (_e = space.dataPipeline.pipelineState) == null ? void 0 : _e.targetTimeframe,
3203
+ totalDataTimeframe: (_f = space.dataPipeline.pipelineState) == null ? void 0 : _f.endTimeframe
3194
3204
  },
3195
3205
  members: Array.from(space.inner.spaceState.members.values()).map((member) => {
3196
3206
  var _a2, _b2, _c2;
@@ -3204,7 +3214,7 @@ var SpacesServiceImpl = class {
3204
3214
  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
3205
3215
  };
3206
3216
  }),
3207
- creator: (_f = space.inner.spaceState.creator) == null ? void 0 : _f.key,
3217
+ creator: (_g = space.inner.spaceState.creator) == null ? void 0 : _g.key,
3208
3218
  cache: space.cache,
3209
3219
  metrics: space.metrics
3210
3220
  };
@@ -3566,7 +3576,8 @@ var DevicesServiceImpl = class {
3566
3576
  // packages/sdk/client-services/src/packlets/logging/logging-service.ts
3567
3577
  import { Event as Event7 } from "@dxos/async";
3568
3578
  import { Stream as Stream11 } from "@dxos/codec-protobuf";
3569
- import { log as log14, shouldLog, getContextFromEntry } from "@dxos/log";
3579
+ import { getContextFromEntry, log as log14 } from "@dxos/log";
3580
+ import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
3570
3581
  import { jsonify } from "@dxos/util";
3571
3582
  var LoggingServiceImpl = class {
3572
3583
  constructor() {
@@ -3583,31 +3594,60 @@ var LoggingServiceImpl = class {
3583
3594
  log14.runtimeConfig.processors.splice(index, 1);
3584
3595
  }
3585
3596
  queryLogs(request) {
3586
- var _a;
3587
- const filters = ((_a = request.filters) == null ? void 0 : _a.length) ? request.filters : void 0;
3588
3597
  return new Stream11(({ ctx, next }) => {
3589
3598
  const handler = (entry2) => {
3590
- var _a2, _b, _c;
3591
- 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"))) {
3599
+ var _a, _b, _c, _d, _e;
3600
+ if (LOG_PROCESSING > 0) {
3592
3601
  return;
3593
3602
  }
3594
- if (shouldLog(entry2, filters)) {
3595
- const record = {
3596
- ...entry2,
3597
- context: jsonify(getContextFromEntry(entry2))
3598
- };
3599
- (_b = record.meta) == null ? true : delete _b.bugcheck;
3600
- (_c = record.meta) == null ? true : delete _c.scope;
3603
+ 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"))) {
3604
+ return;
3605
+ }
3606
+ if (!shouldLog(entry2, request)) {
3607
+ return;
3608
+ }
3609
+ const record = {
3610
+ ...entry2,
3611
+ context: jsonify(getContextFromEntry(entry2)),
3612
+ timestamp: new Date(),
3613
+ meta: {
3614
+ // TODO(dmaretskyi): Fix proto.
3615
+ file: (_c = (_b = entry2.meta) == null ? void 0 : _b.file) != null ? _c : "",
3616
+ line: (_e = (_d = entry2.meta) == null ? void 0 : _d.line) != null ? _e : 0
3617
+ }
3618
+ };
3619
+ try {
3620
+ LOG_PROCESSING++;
3601
3621
  next(record);
3622
+ } finally {
3623
+ LOG_PROCESSING--;
3602
3624
  }
3603
3625
  };
3604
- ctx.onDispose(() => {
3605
- this._logs.off(handler);
3606
- });
3607
- this._logs.on(handler);
3626
+ this._logs.on(ctx, handler);
3627
+ });
3628
+ }
3629
+ };
3630
+ var matchFilter = (filter, level, path, options) => {
3631
+ switch (options) {
3632
+ case QueryLogsRequest.MatchingOptions.INCLUSIVE:
3633
+ return level >= filter.level && (!filter.pattern || path.includes(filter.pattern));
3634
+ case QueryLogsRequest.MatchingOptions.EXPLICIT:
3635
+ return level === filter.level && (!filter.pattern || path.includes(filter.pattern));
3636
+ }
3637
+ };
3638
+ var shouldLog = (entry2, request) => {
3639
+ var _a;
3640
+ const options = (_a = request.options) != null ? _a : QueryLogsRequest.MatchingOptions.INCLUSIVE;
3641
+ if (request.filters === void 0) {
3642
+ return options === QueryLogsRequest.MatchingOptions.INCLUSIVE;
3643
+ } else {
3644
+ return request.filters.some((filter) => {
3645
+ var _a2, _b;
3646
+ return matchFilter(filter, entry2.level, (_b = (_a2 = entry2.meta) == null ? void 0 : _a2.file) != null ? _b : "", options);
3608
3647
  });
3609
3648
  }
3610
3649
  };
3650
+ var LOG_PROCESSING = 0;
3611
3651
 
3612
3652
  // packages/sdk/client-services/src/packlets/network/network-service.ts
3613
3653
  import { Stream as Stream12 } from "@dxos/codec-protobuf";
@@ -3964,4 +4004,4 @@ export {
3964
4004
  ClientServicesHost,
3965
4005
  LocalClientServices
3966
4006
  };
3967
- //# sourceMappingURL=chunk-YPN5TDAA.mjs.map
4007
+ //# sourceMappingURL=chunk-ARBZHWMK.mjs.map