@dxos/client-services 0.3.11-main.e19f39d → 0.3.11-main.e26c0a5

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.
@@ -31,7 +31,7 @@ __export(testing_exports, {
31
31
  syncItemsLocal: () => syncItemsLocal
32
32
  });
33
33
  module.exports = __toCommonJS(testing_exports);
34
- var import_chunk_45NL4DNZ = require("../../chunk-45NL4DNZ.cjs");
34
+ var import_chunk_NDK3LMHN = require("../../chunk-NDK3LMHN.cjs");
35
35
  var import_credentials = require("@dxos/credentials");
36
36
  var import_keys = require("@dxos/keys");
37
37
  var import_async = require("@dxos/async");
@@ -209,7 +209,7 @@ var createInvitation = (host, options) => {
209
209
  authMethod: import_services.Invitation.AuthMethod.NONE,
210
210
  ...options ?? {}
211
211
  };
212
- if (host instanceof import_chunk_45NL4DNZ.ServiceContext) {
212
+ if (host instanceof import_chunk_NDK3LMHN.ServiceContext) {
213
213
  const hostHandler = host.getInvitationHandler({
214
214
  kind: import_services.Invitation.Kind.SPACE,
215
215
  ...options
@@ -220,7 +220,7 @@ var createInvitation = (host, options) => {
220
220
  };
221
221
  var acceptInvitation = (guest, invitation) => {
222
222
  invitation = sanitizeInvitation(invitation);
223
- if (guest instanceof import_chunk_45NL4DNZ.ServiceContext) {
223
+ if (guest instanceof import_chunk_NDK3LMHN.ServiceContext) {
224
224
  const guestHandler = guest.getInvitationHandler({
225
225
  kind: invitation.kind
226
226
  });
@@ -229,7 +229,7 @@ var acceptInvitation = (guest, invitation) => {
229
229
  return guest.join(invitation);
230
230
  };
231
231
  var createServiceHost = (config, signalManagerContext) => {
232
- return new import_chunk_45NL4DNZ.ClientServicesHost({
232
+ return new import_chunk_NDK3LMHN.ClientServicesHost({
233
233
  config,
234
234
  signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
235
235
  transportFactory: import_network_manager.MemoryTransportFactory
@@ -243,8 +243,8 @@ var createServiceContext = ({ signalContext = new import_messaging.MemorySignalM
243
243
  signalManager,
244
244
  transportFactory: import_network_manager.MemoryTransportFactory
245
245
  });
246
- const modelFactory = (0, import_chunk_45NL4DNZ.createDefaultModelFactory)();
247
- return new import_chunk_45NL4DNZ.ServiceContext(storage, networkManager, signalManager, modelFactory);
246
+ const modelFactory = (0, import_chunk_NDK3LMHN.createDefaultModelFactory)();
247
+ return new import_chunk_NDK3LMHN.ServiceContext(storage, networkManager, signalManager, modelFactory);
248
248
  };
249
249
  var createPeers = async (numPeers) => {
250
250
  const signalContext = new import_messaging.MemorySignalManagerContext();
@@ -328,7 +328,7 @@ var TestPeer = class {
328
328
  feedStore: this.feedStore,
329
329
  networkManager: this.networkManager,
330
330
  metadataStore: this.metadataStore,
331
- modelFactory: (0, import_chunk_45NL4DNZ.createDefaultModelFactory)(),
331
+ modelFactory: (0, import_chunk_NDK3LMHN.createDefaultModelFactory)(),
332
332
  snapshotStore: this.snapshotStore,
333
333
  blobStore: this.blobStore
334
334
  });
@@ -340,7 +340,7 @@ var TestPeer = class {
340
340
  return this._props.automergeHost ??= new import_echo_pipeline.AutomergeHost(this.storage.createDirectory("automerge"));
341
341
  }
342
342
  get dataSpaceManager() {
343
- return this._props.dataSpaceManager ??= new import_chunk_45NL4DNZ.DataSpaceManager(this.spaceManager, this.metadataStore, new import_echo_pipeline.DataServiceSubscriptions(), this.keyring, this.identity, this.feedStore, this.automergeHost);
343
+ return this._props.dataSpaceManager ??= new import_chunk_NDK3LMHN.DataSpaceManager(this.spaceManager, this.metadataStore, new import_echo_pipeline.DataServiceSubscriptions(), this.keyring, this.identity, this.feedStore, this.automergeHost);
344
344
  }
345
345
  async createIdentity() {
346
346
  this._props.signingContext ??= await createSigningContext(this.keyring);
@@ -1 +1 @@
1
- {"version":3,"file":"network-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/network/network-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACzB,MAAM,4CAA4C,CAAC;AAEpD,qBAAa,kBAAmB,YAAW,cAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,cAAc;IAAkB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAA9D,cAAc,EAAE,cAAc,EAAmB,aAAa,EAAE,aAAa;IAE1G,WAAW;IAqBL,YAAY,CAAC,OAAO,EAAE,mBAAmB;CAGhD"}
1
+ {"version":3,"file":"network-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/network/network-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACzB,MAAM,4CAA4C,CAAC;AAEpD,qBAAa,kBAAmB,YAAW,cAAc;IAErD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,aAAa;gBADb,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa;IAG/C,WAAW;IAqBL,YAAY,CAAC,OAAO,EAAE,mBAAmB;CAGhD"}
@@ -1,32 +1,45 @@
1
1
  import { type ClientServices } from '@dxos/client-protocol';
2
2
  import { type Config, type ConfigProto } from '@dxos/config';
3
3
  import { type PublicKey } from '@dxos/keys';
4
- import { type Device, type Identity, type Metrics, type NetworkStatus, type Space as SpaceProto, type Platform, SpaceMember } from '@dxos/protocols/proto/dxos/client/services';
4
+ import { type Device, type Identity, type Metrics, type NetworkStatus, type Space as SpaceProto, type Platform, SpaceMember, type LogEntry } from '@dxos/protocols/proto/dxos/client/services';
5
5
  import { type SubscribeToFeedsResponse } from '@dxos/protocols/proto/dxos/devtools/host';
6
6
  import { type SwarmInfo } from '@dxos/protocols/proto/dxos/devtools/swarm';
7
7
  import { type Epoch } from '@dxos/protocols/proto/dxos/halo/credentials';
8
+ import { type Resource, type Span } from '@dxos/protocols/proto/dxos/tracing';
8
9
  import { type ServiceContext } from './service-context';
9
10
  export type Diagnostics = {
10
- created: string;
11
- platform: Platform;
12
- config?: ConfigProto;
13
11
  client: {
14
- version: string;
15
- storage: {
16
- version: number;
12
+ config: ConfigProto;
13
+ trace: TraceDiagnostic;
14
+ };
15
+ services: {
16
+ trace: TraceDiagnostic;
17
+ created: string;
18
+ platform: Platform;
19
+ config?: ConfigProto;
20
+ client: {
21
+ version: string;
22
+ storage: {
23
+ version: number;
24
+ };
17
25
  };
26
+ identity?: Identity;
27
+ devices?: Device[];
28
+ spaces?: SpaceStats[];
29
+ networkStatus?: NetworkStatus;
30
+ swarms?: SwarmInfo[];
31
+ feeds?: Partial<SubscribeToFeedsResponse.Feed>[];
32
+ metrics?: Metrics;
33
+ storage?: {
34
+ file: string;
35
+ count: number;
36
+ }[];
18
37
  };
19
- identity?: Identity;
20
- devices?: Device[];
21
- spaces?: SpaceStats[];
22
- networkStatus?: NetworkStatus;
23
- swarms?: SwarmInfo[];
24
- feeds?: Partial<SubscribeToFeedsResponse.Feed>[];
25
- metrics?: Metrics;
26
- storage?: {
27
- file: string;
28
- count: number;
29
- }[];
38
+ };
39
+ export type TraceDiagnostic = {
40
+ resources: Record<string, Resource>;
41
+ spans: Span[];
42
+ logs: LogEntry[];
30
43
  };
31
44
  export type SpaceStats = {
32
45
  key: PublicKey;
@@ -48,5 +61,5 @@ export type SpaceStats = {
48
61
  /**
49
62
  * Create diagnostics to provide snapshot of current system state.
50
63
  */
51
- export declare const createDiagnostics: (clientServices: Partial<ClientServices>, serviceContext: ServiceContext, config: Config) => Promise<Diagnostics>;
64
+ export declare const createDiagnostics: (clientServices: Partial<ClientServices>, serviceContext: ServiceContext, config: Config) => Promise<Diagnostics['services']>;
52
65
  //# sourceMappingURL=diagnostics.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/diagnostics.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAK7D,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAG5C,OAAO,EACL,KAAK,MAAM,EACX,KAAK,QAAQ,EACb,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,KAAK,IAAI,UAAU,EACxB,KAAK,QAAQ,EACb,WAAW,EACZ,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACzF,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,6CAA6C,CAAC;AAGzE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAMxD,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE;YACP,OAAO,EAAE,MAAM,CAAC;SACjB,CAAC;KACH,CAAC;IACF,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,CAAC;IACjD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC7C,CAAC;AAGF,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,SAAS,CAAC;IACf,UAAU,CAAC,EAAE;QACX,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,EAAE,CAAC,EAAE;QACH,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,GAAG;QAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,MAAM,CAAC,EAAE,CAAC,KAAK,GAAG;QAAE,EAAE,CAAC,EAAE,SAAS,CAAA;KAAE,CAAC,EAAE,CAAC;IACxC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,UAAU,CAAC,aAAa,CAAC;CACrC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,mBACZ,QAAQ,cAAc,CAAC,kBACvB,cAAc,UACtB,MAAM,KACb,QAAQ,WAAW,CAqFrB,CAAC"}
1
+ {"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/diagnostics.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAK7D,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAG5C,OAAO,EACL,KAAK,MAAM,EACX,KAAK,QAAQ,EACb,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,KAAK,IAAI,UAAU,EACxB,KAAK,QAAQ,EACb,WAAW,EACX,KAAK,QAAQ,EACd,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACzF,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,6CAA6C,CAAC;AACzE,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAI9E,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAMxD,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE;QACN,MAAM,EAAE,WAAW,CAAC;QACpB,KAAK,EAAE,eAAe,CAAC;KACxB,CAAC;IACF,QAAQ,EAAE;QACR,KAAK,EAAE,eAAe,CAAC;QACvB,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,MAAM,EAAE;YACN,OAAO,EAAE,MAAM,CAAC;YAChB,OAAO,EAAE;gBACP,OAAO,EAAE,MAAM,CAAC;aACjB,CAAC;SACH,CAAC;QACF,QAAQ,CAAC,EAAE,QAAQ,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;QACtB,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;QACrB,KAAK,CAAC,EAAE,OAAO,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,CAAC;QACjD,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,OAAO,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KAC7C,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACpC,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,IAAI,EAAE,QAAQ,EAAE,CAAC;CAClB,CAAC;AAGF,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,SAAS,CAAC;IACf,UAAU,CAAC,EAAE;QACX,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,EAAE,CAAC,EAAE;QACH,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,GAAG;QAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,MAAM,CAAC,EAAE,CAAC,KAAK,GAAG;QAAE,EAAE,CAAC,EAAE,SAAS,CAAA;KAAE,CAAC,EAAE,CAAC;IACxC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,UAAU,CAAC,aAAa,CAAC;CACrC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,mBACZ,QAAQ,cAAc,CAAC,kBACvB,cAAc,UACtB,MAAM,KACb,QAAQ,WAAW,CAAC,UAAU,CAAC,CAsFjC,CAAC"}
@@ -72,6 +72,7 @@ export declare class DataSpace {
72
72
  get notarizationPlugin(): NotarizationPlugin;
73
73
  get cache(): SpaceCache | undefined;
74
74
  get automergeSpaceState(): AutomergeSpaceState;
75
+ private get _automergeInfo();
75
76
  open(): Promise<void>;
76
77
  private _open;
77
78
  close(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"data-space.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-space.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space.ts"],"names":[],"mappings":"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"}
@@ -8,7 +8,7 @@ export type SystemServiceOptions = {
8
8
  config?: Config;
9
9
  statusUpdate: Event<void>;
10
10
  getCurrentStatus: () => SystemStatus;
11
- getDiagnostics: () => Promise<Partial<Diagnostics>>;
11
+ getDiagnostics: () => Promise<Partial<Diagnostics['services']>>;
12
12
  onUpdateStatus: (status: SystemStatus) => MaybePromise<void>;
13
13
  onReset: () => MaybePromise<void>;
14
14
  };
@@ -1 +1 @@
1
- {"version":3,"file":"system-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/system/system-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EACL,qBAAqB,EACrB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,QAAQ,EACd,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAEhE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/C,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,cAAc,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;IACpD,cAAc,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7D,OAAO,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;CACnC,CAAC;AAEF,qBAAa,iBAAkB,YAAW,aAAa;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAiC;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAuC;IACrE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA2C;IAC7E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyC;IACzE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAC3D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyC;gBAE7D,EACV,MAAM,EACN,YAAY,EACZ,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,OAAO,GACR,EAAE,oBAAoB;IASjB,SAAS;IAIf;;OAEG;IACG,cAAc,CAAC,EAAE,IAAI,EAAE,GAAE,qBAA0B;;;;IAgBnD,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIhC,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,mBAAmB;IAKlD,WAAW,CAAC,EAAE,QAAgB,EAAE,GAAE,kBAAuB,GAAG,MAAM,CAAC,mBAAmB,CAAC;IAgBjF,KAAK;CAGZ"}
1
+ {"version":3,"file":"system-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/system/system-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EACL,qBAAqB,EACrB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,QAAQ,EACd,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAEhE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/C,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,cAAc,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAChE,cAAc,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7D,OAAO,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;CACnC,CAAC;AAEF,qBAAa,iBAAkB,YAAW,aAAa;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAiC;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAuC;IACrE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA2C;IAC7E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyC;IACzE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAC3D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyC;gBAE7D,EACV,MAAM,EACN,YAAY,EACZ,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,OAAO,GACR,EAAE,oBAAoB;IASjB,SAAS;IAIf;;OAEG;IACG,cAAc,CAAC,EAAE,IAAI,EAAE,GAAE,qBAA0B;;;;IAgBnD,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIhC,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,mBAAmB;IAKlD,WAAW,CAAC,EAAE,QAAgB,EAAE,GAAE,kBAAuB,GAAG,MAAM,CAAC,mBAAmB,CAAC;IAgBjF,KAAK;CAGZ"}
@@ -1,2 +1,2 @@
1
- export declare const DXOS_VERSION = "0.3.11-main.e19f39d";
1
+ export declare const DXOS_VERSION = "0.3.11-main.e26c0a5";
2
2
  //# sourceMappingURL=version.d.ts.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/client-services",
3
- "version": "0.3.11-main.e19f39d",
3
+ "version": "0.3.11-main.e26c0a5",
4
4
  "description": "DXOS client services implementation",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -22,44 +22,44 @@
22
22
  ],
23
23
  "dependencies": {
24
24
  "platform": "^1.3.6",
25
- "@dxos/async": "0.3.11-main.e19f39d",
26
- "@dxos/codec-protobuf": "0.3.11-main.e19f39d",
27
- "@dxos/client-protocol": "0.3.11-main.e19f39d",
28
- "@dxos/credentials": "0.3.11-main.e19f39d",
29
- "@dxos/config": "0.3.11-main.e19f39d",
30
- "@dxos/context": "0.3.11-main.e19f39d",
31
- "@dxos/crypto": "0.3.11-main.e19f39d",
32
- "@dxos/debug": "0.3.11-main.e19f39d",
33
- "@dxos/document-model": "0.3.11-main.e19f39d",
34
- "@dxos/echo-db": "0.3.11-main.e19f39d",
35
- "@dxos/echo-pipeline": "0.3.11-main.e19f39d",
36
- "@dxos/echo-schema": "0.3.11-main.e19f39d",
37
- "@dxos/feed-store": "0.3.11-main.e19f39d",
38
- "@dxos/invariant": "0.3.11-main.e19f39d",
39
- "@dxos/keys": "0.3.11-main.e19f39d",
40
- "@dxos/lock-file": "0.3.11-main.e19f39d",
41
- "@dxos/log": "0.3.11-main.e19f39d",
42
- "@dxos/keyring": "0.3.11-main.e19f39d",
43
- "@dxos/messaging": "0.3.11-main.e19f39d",
44
- "@dxos/network-manager": "0.3.11-main.e19f39d",
45
- "@dxos/model-factory": "0.3.11-main.e19f39d",
46
- "@dxos/node-std": "0.3.11-main.e19f39d",
47
- "@dxos/protocols": "0.3.11-main.e19f39d",
48
- "@dxos/random-access-storage": "0.3.11-main.e19f39d",
49
- "@dxos/rpc": "0.3.11-main.e19f39d",
50
- "@dxos/teleport": "0.3.11-main.e19f39d",
51
- "@dxos/teleport-extension-gossip": "0.3.11-main.e19f39d",
52
- "@dxos/teleport-extension-object-sync": "0.3.11-main.e19f39d",
53
- "@dxos/text-model": "0.3.11-main.e19f39d",
54
- "@dxos/timeframe": "0.3.11-main.e19f39d",
55
- "@dxos/tracing": "0.3.11-main.e19f39d",
56
- "@dxos/util": "0.3.11-main.e19f39d",
57
- "@dxos/websocket-rpc": "0.3.11-main.e19f39d"
25
+ "@dxos/async": "0.3.11-main.e26c0a5",
26
+ "@dxos/client-protocol": "0.3.11-main.e26c0a5",
27
+ "@dxos/codec-protobuf": "0.3.11-main.e26c0a5",
28
+ "@dxos/config": "0.3.11-main.e26c0a5",
29
+ "@dxos/credentials": "0.3.11-main.e26c0a5",
30
+ "@dxos/context": "0.3.11-main.e26c0a5",
31
+ "@dxos/crypto": "0.3.11-main.e26c0a5",
32
+ "@dxos/debug": "0.3.11-main.e26c0a5",
33
+ "@dxos/document-model": "0.3.11-main.e26c0a5",
34
+ "@dxos/echo-db": "0.3.11-main.e26c0a5",
35
+ "@dxos/echo-pipeline": "0.3.11-main.e26c0a5",
36
+ "@dxos/echo-schema": "0.3.11-main.e26c0a5",
37
+ "@dxos/invariant": "0.3.11-main.e26c0a5",
38
+ "@dxos/keyring": "0.3.11-main.e26c0a5",
39
+ "@dxos/lock-file": "0.3.11-main.e26c0a5",
40
+ "@dxos/keys": "0.3.11-main.e26c0a5",
41
+ "@dxos/feed-store": "0.3.11-main.e26c0a5",
42
+ "@dxos/messaging": "0.3.11-main.e26c0a5",
43
+ "@dxos/log": "0.3.11-main.e26c0a5",
44
+ "@dxos/network-manager": "0.3.11-main.e26c0a5",
45
+ "@dxos/protocols": "0.3.11-main.e26c0a5",
46
+ "@dxos/node-std": "0.3.11-main.e26c0a5",
47
+ "@dxos/model-factory": "0.3.11-main.e26c0a5",
48
+ "@dxos/random-access-storage": "0.3.11-main.e26c0a5",
49
+ "@dxos/rpc": "0.3.11-main.e26c0a5",
50
+ "@dxos/teleport-extension-gossip": "0.3.11-main.e26c0a5",
51
+ "@dxos/teleport": "0.3.11-main.e26c0a5",
52
+ "@dxos/teleport-extension-object-sync": "0.3.11-main.e26c0a5",
53
+ "@dxos/text-model": "0.3.11-main.e26c0a5",
54
+ "@dxos/timeframe": "0.3.11-main.e26c0a5",
55
+ "@dxos/util": "0.3.11-main.e26c0a5",
56
+ "@dxos/websocket-rpc": "0.3.11-main.e26c0a5",
57
+ "@dxos/tracing": "0.3.11-main.e26c0a5"
58
58
  },
59
59
  "devDependencies": {
60
60
  "@types/platform": "^1.3.4",
61
61
  "@types/readable-stream": "^2.3.9",
62
- "@dxos/signal": "0.3.11-main.e19f39d"
62
+ "@dxos/signal": "0.3.11-main.e26c0a5"
63
63
  },
64
64
  "publishConfig": {
65
65
  "access": "public"
@@ -12,7 +12,10 @@ import {
12
12
  } from '@dxos/protocols/proto/dxos/client/services';
13
13
 
14
14
  export class NetworkServiceImpl implements NetworkService {
15
- constructor(private readonly networkManager: NetworkManager, private readonly signalManager: SignalManager) {}
15
+ constructor(
16
+ private readonly networkManager: NetworkManager,
17
+ private readonly signalManager: SignalManager,
18
+ ) {}
16
19
 
17
20
  queryStatus() {
18
21
  return new Stream<NetworkStatus>(({ next }) => {
@@ -20,10 +20,13 @@ import {
20
20
  type Space as SpaceProto,
21
21
  type Platform,
22
22
  SpaceMember,
23
+ type LogEntry,
23
24
  } from '@dxos/protocols/proto/dxos/client/services';
24
25
  import { type SubscribeToFeedsResponse } from '@dxos/protocols/proto/dxos/devtools/host';
25
26
  import { type SwarmInfo } from '@dxos/protocols/proto/dxos/devtools/swarm';
26
27
  import { type Epoch } from '@dxos/protocols/proto/dxos/halo/credentials';
28
+ import { type Resource, type Span } from '@dxos/protocols/proto/dxos/tracing';
29
+ import { TRACE_PROCESSOR } from '@dxos/tracing';
27
30
 
28
31
  import { getPlatform } from './platform';
29
32
  import { type ServiceContext } from './service-context';
@@ -33,23 +36,36 @@ import { type DataSpace } from '../spaces';
33
36
  const DEFAULT_TIMEOUT = 1_000;
34
37
 
35
38
  export type Diagnostics = {
36
- created: string;
37
- platform: Platform;
38
- config?: ConfigProto;
39
39
  client: {
40
- version: string;
41
- storage: {
42
- version: number;
40
+ config: ConfigProto;
41
+ trace: TraceDiagnostic;
42
+ };
43
+ services: {
44
+ trace: TraceDiagnostic;
45
+ created: string;
46
+ platform: Platform;
47
+ config?: ConfigProto;
48
+ client: {
49
+ version: string;
50
+ storage: {
51
+ version: number;
52
+ };
43
53
  };
54
+ identity?: Identity;
55
+ devices?: Device[];
56
+ spaces?: SpaceStats[];
57
+ networkStatus?: NetworkStatus;
58
+ swarms?: SwarmInfo[];
59
+ feeds?: Partial<SubscribeToFeedsResponse.Feed>[];
60
+ metrics?: Metrics;
61
+ storage?: { file: string; count: number }[];
44
62
  };
45
- identity?: Identity;
46
- devices?: Device[];
47
- spaces?: SpaceStats[];
48
- networkStatus?: NetworkStatus;
49
- swarms?: SwarmInfo[];
50
- feeds?: Partial<SubscribeToFeedsResponse.Feed>[];
51
- metrics?: Metrics;
52
- storage?: { file: string; count: number }[];
63
+ };
64
+
65
+ export type TraceDiagnostic = {
66
+ resources: Record<string, Resource>;
67
+ spans: Span[];
68
+ logs: LogEntry[];
53
69
  };
54
70
 
55
71
  // TODO(burdon): Normalize for ECHO/HALO.
@@ -76,8 +92,8 @@ export const createDiagnostics = async (
76
92
  clientServices: Partial<ClientServices>,
77
93
  serviceContext: ServiceContext,
78
94
  config: Config,
79
- ): Promise<Diagnostics> => {
80
- const diagnostics: Diagnostics = {
95
+ ): Promise<Diagnostics['services']> => {
96
+ const diagnostics: Diagnostics['services'] = {
81
97
  created: new Date().toISOString(),
82
98
  platform: getPlatform(),
83
99
  client: {
@@ -86,6 +102,7 @@ export const createDiagnostics = async (
86
102
  version: STORAGE_VERSION,
87
103
  },
88
104
  },
105
+ trace: TRACE_PROCESSOR.getDiagnostics(),
89
106
  };
90
107
 
91
108
  // Trace metrics.
@@ -78,9 +78,12 @@ export type DataSpaceParams = {
78
78
  const ENABLE_FEED_PURGE = false;
79
79
 
80
80
  @trackLeaks('open', 'close')
81
+ @trace.resource()
81
82
  export class DataSpace {
82
83
  private _ctx = new Context();
84
+ @trace.info()
83
85
  private readonly _inner: Space;
86
+
84
87
  private readonly _gossip: Gossip;
85
88
  private readonly _presence: Presence;
86
89
  private readonly _keyring: Keyring;
@@ -138,6 +141,7 @@ export class DataSpace {
138
141
  log('new state', { state: SpaceState[this._state] });
139
142
  }
140
143
 
144
+ @trace.info()
141
145
  get key() {
142
146
  return this._inner.key;
143
147
  }
@@ -146,6 +150,7 @@ export class DataSpace {
146
150
  return this._inner.isOpen;
147
151
  }
148
152
 
153
+ @trace.info({ enum: SpaceState })
149
154
  get state(): SpaceState {
150
155
  return this._state;
151
156
  }
@@ -175,6 +180,14 @@ export class DataSpace {
175
180
  return this._automergeSpaceState;
176
181
  }
177
182
 
183
+ @trace.info({ depth: null })
184
+ private get _automergeInfo() {
185
+ return {
186
+ rootUrl: this._automergeSpaceState.rootUrl,
187
+ lastEpoch: this._automergeSpaceState.lastEpoch,
188
+ };
189
+ }
190
+
178
191
  @synchronized
179
192
  async open() {
180
193
  await this._open();
@@ -222,8 +222,8 @@ export class SpacesServiceImpl implements SpacesService {
222
222
  presence: member.removed
223
223
  ? SpaceMember.PresenceState.REMOVED
224
224
  : isMe || peers.length > 0
225
- ? SpaceMember.PresenceState.ONLINE
226
- : SpaceMember.PresenceState.OFFLINE,
225
+ ? SpaceMember.PresenceState.ONLINE
226
+ : SpaceMember.PresenceState.OFFLINE,
227
227
  peerStates: peers,
228
228
  };
229
229
  }),
@@ -23,7 +23,7 @@ export type SystemServiceOptions = {
23
23
  config?: Config;
24
24
  statusUpdate: Event<void>;
25
25
  getCurrentStatus: () => SystemStatus;
26
- getDiagnostics: () => Promise<Partial<Diagnostics>>;
26
+ getDiagnostics: () => Promise<Partial<Diagnostics['services']>>;
27
27
  onUpdateStatus: (status: SystemStatus) => MaybePromise<void>;
28
28
  onReset: () => MaybePromise<void>;
29
29
  };
package/src/version.ts CHANGED
@@ -1 +1 @@
1
- export const DXOS_VERSION = "0.3.11-main.e19f39d";
1
+ export const DXOS_VERSION = "0.3.11-main.e26c0a5";