@dxos/client-services 0.1.56-main.e47dfd1 → 0.1.56-main.e79d64a

package/src/packlets/services/service-host.ts

@@ -2,13 +2,13 @@
 // Copyright 2021 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
 import { Event, synchronized } from '@dxos/async';
 import { clientServiceBundle, ClientServices } from '@dxos/client-protocol';
 import { Config } from '@dxos/config';
+import { Context } from '@dxos/context';
 import { DocumentModel } from '@dxos/document-model';
 import { DataServiceImpl } from '@dxos/echo-pipeline';
+import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { SignalManager, WebsocketSignalManager } from '@dxos/messaging';
@@ -18,6 +18,7 @@ import { trace } from '@dxos/protocols';
 import { SystemStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { Storage } from '@dxos/random-access-storage';
 import { TextModel } from '@dxos/text-model';
+import { TRACE_PROCESSOR, trace as Trace } from '@dxos/tracing';
 
 import { DevicesServiceImpl } from '../devices';
 import { DevtoolsServiceImpl, DevtoolsHostEvents } from '../devtools';
@@ -29,6 +30,7 @@ import { NetworkServiceImpl } from '../network';
 import { SpacesServiceImpl } from '../spaces';
 import { createStorageObjects } from '../storage';
 import { SystemServiceImpl } from '../system';
+import { createDiagnostics } from './diagnostics';
 import { ServiceContext } from './service-context';
 import { ServiceRegistry } from './service-registry';
 
@@ -65,11 +67,13 @@ export type InitializeOptions = {
 /**
  * Remote service implementation.
  */
+@Trace.resource()
 export class ClientServicesHost {
   private readonly _resourceLock?: ResourceLock;
   private readonly _serviceRegistry: ServiceRegistry<ClientServices>;
   private readonly _systemService: SystemServiceImpl;
   private readonly _loggingService: LoggingServiceImpl;
+  private readonly _tracingService = TRACE_PROCESSOR.createTraceSender();
 
   private _config?: Config;
   private readonly _statusUpdate = new Event<void>();
@@ -79,17 +83,19 @@ export class ClientServicesHost {
   private _storage?: Storage;
   private _callbacks?: ClientServicesHostCallbacks;
 
-  _serviceContext!: ServiceContext;
+  private _serviceContext!: ServiceContext;
+
+  @Trace.info()
   private _opening = false;
+
+  @Trace.info()
   private _open = false;
 
   constructor({
     config,
     modelFactory = createDefaultModelFactory(),
-    // TODO(burdon): Create ApolloLink abstraction (see Client).
     transportFactory,
     signalManager,
-    connectionLog,
     storage,
     // TODO(wittjosiah): Turn this on by default.
     lockKey,
@@ -108,7 +114,7 @@ export class ClientServicesHost {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open();
+            void this.open(new Context());
           }
         },
         onRelease: () => this.close(),
@@ -117,11 +123,11 @@ export class ClientServicesHost {
 
     this._systemService = new SystemServiceImpl({
       config: this._config,
-
       statusUpdate: this._statusUpdate,
-
       getCurrentStatus: () => (this.isOpen ? SystemStatus.ACTIVE : SystemStatus.INACTIVE),
-
+      getDiagnostics: () => {
+        return createDiagnostics(this._serviceRegistry.services, this._serviceContext, this._config!);
+      },
       onUpdateStatus: async (status: SystemStatus) => {
         if (!this.isOpen && status === SystemStatus.ACTIVE) {
           await this._resourceLock?.acquire();
@@ -129,7 +135,6 @@ export class ClientServicesHost {
           await this._resourceLock?.release();
         }
       },
-
       onReset: async () => {
         await this.reset();
       },
@@ -137,9 +142,9 @@ export class ClientServicesHost {
 
     this._loggingService = new LoggingServiceImpl();
 
-    // TODO(burdon): Start to think of DMG (dynamic services).
     this._serviceRegistry = new ServiceRegistry<ClientServices>(clientServiceBundle, {
       SystemService: this._systemService,
+      TracingService: this._tracingService,
     });
   }
 
@@ -147,6 +152,14 @@ export class ClientServicesHost {
     return this._open;
   }
 
+  get config() {
+    return this._config;
+  }
+
+  get context() {
+    return this._serviceContext;
+  }
+
   get serviceRegistry() {
     return this._serviceRegistry;
   }
@@ -166,10 +179,10 @@ export class ClientServicesHost {
    */
   initialize({ config, ...options }: InitializeOptions) {
     invariant(!this._open, 'service host is open');
+    log('initializing...');
 
     if (config) {
       invariant(!this._config, 'config already set');
-
       this._config = config;
       if (!this._storage) {
         this._storage = createStorageObjects(config.get('runtime.client.storage', {})!).storage;
@@ -191,16 +204,19 @@ export class ClientServicesHost {
       transportFactory,
       signalManager,
     });
+
+    log('initialized');
   }
 
   @synchronized
-  async open() {
+  @Trace.span()
+  async open(ctx: Context) {
     if (this._open) {
       return;
     }
 
     const traceId = PublicKey.random().toHex();
-    log.trace('dxos.sdk.client-services-host.open', trace.begin({ id: traceId }));
+    log.trace('dxos.client-services.host.open', trace.begin({ id: traceId }));
 
     invariant(this._config, 'config not set');
     invariant(this._storage, 'storage not set');
@@ -213,8 +229,6 @@ export class ClientServicesHost {
 
     await this._loggingService.open();
 
-    // TODO(wittjosiah): Make re-entrant.
-    // TODO(burdon): Break into components.
     this._serviceContext = new ServiceContext(
       this._storage,
       this._networkManager,
@@ -222,11 +236,14 @@ export class ClientServicesHost {
       this._modelFactory,
     );
 
-    // TODO(burdon): Start to think of DMG (dynamic services).
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
 
-      IdentityService: new IdentityServiceImpl(this._serviceContext),
+      IdentityService: new IdentityServiceImpl(
+        (params) => this._serviceContext.createIdentity(params),
+        this._serviceContext.identityManager,
+        this._serviceContext.keyring,
+      ),
 
       InvitationsService: new InvitationsServiceImpl(this._serviceContext.invitations, (invitation) =>
         this._serviceContext.getInvitationHandler(invitation),
@@ -249,6 +266,7 @@ export class ClientServicesHost {
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
 
       LoggingService: this._loggingService,
+      TracingService: this._tracingService,
 
       // TODO(burdon): Move to new protobuf definitions.
       DevtoolsHost: new DevtoolsServiceImpl({
@@ -258,16 +276,17 @@ export class ClientServicesHost {
       }),
     });
 
-    await this._serviceContext.open();
+    await this._serviceContext.open(ctx);
     this._opening = false;
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
     log('opened', { deviceKey });
-    log.trace('dxos.sdk.client-services-host.open', trace.end({ id: traceId }));
+    log.trace('dxos.client-services.host.open', trace.end({ id: traceId }));
   }
 
   @synchronized
+  @Trace.span()
   async close() {
     if (!this._open) {
       return;

package/src/packlets/services/service-registry.test.ts

@@ -7,6 +7,7 @@ import { expect } from 'chai';
 import { Event } from '@dxos/async';
 import { ClientServices } from '@dxos/client-protocol';
 import { Config } from '@dxos/config';
+import { Context } from '@dxos/context';
 import { log } from '@dxos/log';
 import { schema } from '@dxos/protocols';
 import { SystemService, SystemStatus } from '@dxos/protocols/proto/dxos/client/services';
@@ -31,12 +32,13 @@ describe('service registry', () => {
   test('builds a service registry', async () => {
     const remoteSource = 'https://remote.source';
     const serviceContext = createServiceContext();
-    await serviceContext.open();
+    await serviceContext.open(new Context());
 
     const serviceRegistry = new ServiceRegistry(serviceBundle, {
       SystemService: new SystemServiceImpl({
         config: new Config({ runtime: { client: { remoteSource } } }),
         getCurrentStatus: () => SystemStatus.ACTIVE,
+        getDiagnostics: async () => ({}),
         onReset: () => {},
         onUpdateStatus: () => {},
         statusUpdate: new Event(),

package/src/packlets/services/util.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { PublicKey } from '@dxos/keys';
+import { humanize } from '@dxos/util';
+
+// TODO(burdon): Move to util.
+
+export type JsonStringifyOptions = {
+  truncate?: boolean;
+  humanize?: boolean;
+};
+
+export const jsonStringify = <T>(data: T, options: JsonStringifyOptions) => {
+  if (options.humanize || options.truncate) {
+    return JSON.parse(JSON.stringify(data, jsonKeyReplacer(options)));
+  }
+
+  return data;
+};
+
+const jsonKeyReplacer = (options: JsonStringifyOptions) => (key: string, value: any) => {
+  if (typeof value === 'string') {
+    // Infer if key.
+    const key = PublicKey.fromHex(value);
+    if (key.toHex() === value) {
+      return options.humanize ? humanize(key) : key.truncate();
+    }
+  }
+
+  return value;
+};

package/src/packlets/spaces/data-space-manager.test.ts

@@ -13,9 +13,11 @@ import { writeMessages } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { SpaceState } from '@dxos/protocols/proto/dxos/client/services';
+import { SpaceSnapshot } from '@dxos/protocols/proto/dxos/echo/snapshot';
 import { Epoch } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { StorageType } from '@dxos/random-access-storage';
 import { afterTest, describe, openAndClose, test } from '@dxos/test';
+import { Timeframe } from '@dxos/timeframe';
 import { range } from '@dxos/util';
 
 import { TestBuilder, syncItemsLocal } from '../testing';
@@ -156,33 +158,34 @@ describe('DataSpaceManager', () => {
   });
 
   describe('Epochs', () => {
-    test('Epoch truncates feeds', async () => {
-      const builder = new TestBuilder();
-      afterTest(async () => builder.destroy());
+    test
+      .skip('Epoch truncates feeds', async () => {
+        const builder = new TestBuilder();
+        afterTest(async () => builder.destroy());
 
-      const peer = builder.createPeer({
-        storageType: typeof window === 'undefined' ? StorageType.NODE : StorageType.WEBFS,
-      });
-      await peer.createIdentity();
-      await openAndClose(peer.dataSpaceManager);
-      const space = await peer.dataSpaceManager.createSpace();
-      await space.inner.controlPipeline.state.waitUntilTimeframe(space.inner.controlPipeline.state.endTimeframe);
+        const peer = builder.createPeer({
+          storageType: typeof window === 'undefined' ? StorageType.NODE : StorageType.WEBFS,
+        });
+        await peer.createIdentity();
+        await openAndClose(peer.dataSpaceManager);
+        const space = await peer.dataSpaceManager.createSpace();
+        await space.inner.controlPipeline.state.waitUntilTimeframe(space.inner.controlPipeline.state.endTimeframe);
 
-      const feedDataPath = path.join(space.inner.dataPipeline.pipelineState!.feeds[0].key.toHex(), 'data');
-      const directory = peer.storage.createDirectory('feeds');
-      const file = directory.getOrCreateFile(feedDataPath);
-      afterTest(() => file.close());
+        const feedDataPath = path.join(space.inner.dataPipeline.pipelineState!.feeds[0].key.toHex(), 'data');
+        const directory = peer.storage.createDirectory('feeds');
+        const file = directory.getOrCreateFile(feedDataPath);
+        afterTest(() => file.close());
 
-      expect((await file.stat()).size === 0).to.be.true;
+        expect((await file.stat()).size === 0).to.be.true;
 
-      for (const _ in range(10)) {
-        await testLocalDatabase(space.dataPipeline);
-      }
+        for (const _ in range(10)) {
+          await testLocalDatabase(space.dataPipeline);
+        }
 
-      expect((await file.stat()).size !== 0).to.be.true;
-      await space.createEpoch();
-      expect((await file.stat()).size === 0).to.be.true;
-    })
+        expect((await file.stat()).size !== 0).to.be.true;
+        await space.createEpoch();
+        expect((await file.stat()).size === 0).to.be.true;
+      })
       .onlyEnvironments('nodejs', 'chromium', 'firefox')
       .tag('flaky');
 
@@ -228,6 +231,61 @@ describe('DataSpaceManager', () => {
         expect(epochs).to.deep.equal([epochsNumber]);
       }
     });
+
+    test('Items are cleared before epoch applied', async () => {
+      const builder = new TestBuilder();
+      afterTest(async () => builder.destroy());
+      const peer = builder.createPeer();
+      await peer.createIdentity();
+      await openAndClose(peer.dataSpaceManager);
+
+      // Create space and fill it with Items.
+      const space = await peer.dataSpaceManager.createSpace();
+      await space.inner.controlPipeline.state.waitUntilTimeframe(space.inner.controlPipeline.state.endTimeframe);
+      const itemsNumber = 2;
+      for (const _ of range(itemsNumber)) {
+        await testLocalDatabase(space.dataPipeline);
+      }
+
+      // Create empty Epoch and check if it clears items.
+      {
+        const processedFirstEpoch = space.dataPipeline.onNewEpoch.waitFor(
+          (epoch) => epoch.subject.assertion.number === 1,
+        );
+
+        // Empty snapshot.
+        const snapshot: SpaceSnapshot = {
+          spaceKey: space.key.asUint8Array(),
+          timeframe: space.inner.dataPipeline.pipelineState!.timeframe,
+          database: {},
+        };
+
+        const snapshotCid = await peer.snapshotStore.saveSnapshot(snapshot);
+
+        const epoch: Epoch = {
+          previousId: space.dataPipeline.currentEpoch?.id,
+          timeframe: space.inner.dataPipeline.pipelineState!.timeframe,
+          number: (space.dataPipeline.currentEpoch?.subject.assertion as Epoch).number + 1,
+          snapshotCid,
+        };
+
+        const receipt = await space.inner.controlPipeline.writer.write({
+          credential: {
+            credential: await peer.props.signingContext!.credentialSigner.createCredential({
+              subject: space.key,
+              assertion: {
+                '@type': 'dxos.halo.credentials.Epoch',
+                ...epoch,
+              },
+            }),
+          },
+        });
+        await space.inner.controlPipeline.state.waitUntilTimeframe(new Timeframe([[receipt.feedKey, receipt.seq]]));
+        await processedFirstEpoch;
+      }
+
+      expect(Array.from(space.dataPipeline.itemManager.entities.keys()).length).to.equal(0);
+    });
   });
 
   describe('activation', () => {

package/src/packlets/spaces/data-space-manager.ts

@@ -2,13 +2,12 @@
 // Copyright 2022 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
 import { Event, synchronized, trackLeaks } from '@dxos/async';
 import { cancelWithContext, Context } from '@dxos/context';
 import { CredentialSigner, getCredentialAssertion } from '@dxos/credentials';
 import { DataServiceSubscriptions, MetadataStore, Space, SpaceManager } from '@dxos/echo-pipeline';
 import { FeedStore } from '@dxos/feed-store';
+import { invariant } from '@dxos/invariant';
 import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -185,7 +184,7 @@ export class DataSpaceManager {
       localPeerId: this._signingContext.deviceKey,
     });
     const presence = new Presence({
-      announceInterval: 500,
+      announceInterval: 1_000,
       offlineTimeout: 5_000, // TODO(burdon): Config.
       identityKey: this._signingContext.identityKey,
       gossip,
@@ -194,7 +193,11 @@ export class DataSpaceManager {
     const controlFeed =
       metadata.controlFeedKey && (await this._feedStore.openFeed(metadata.controlFeedKey, { writable: true }));
     const dataFeed =
-      metadata.dataFeedKey && (await this._feedStore.openFeed(metadata.dataFeedKey, { writable: true, sparse: true }));
+      metadata.dataFeedKey &&
+      (await this._feedStore.openFeed(metadata.dataFeedKey, {
+        writable: true,
+        sparse: true,
+      }));
 
     const space: Space = await this._spaceManager.constructSpace({
       metadata,

package/src/packlets/spaces/data-space.ts

@@ -55,6 +55,12 @@ export type DataSpaceParams = {
   cache?: SpaceCache;
 };
 
+/**
+ * Delete feed blocks after an epoch is created.
+ */
+// TODO(dmaretskyi): Disabled till better times https://github.com/dxos/dxos/issues/3949.
+const ENABLE_FEED_PURGE = false;
+
 @trackLeaks('open', 'close')
 export class DataSpace {
   private _ctx = new Context();
@@ -145,7 +151,7 @@ export class DataSpace {
   private async _open() {
     await this._notarizationPlugin.open();
     await this._inner.spaceState.addCredentialProcessor(this._notarizationPlugin);
-    await this._inner.open();
+    await this._inner.open(new Context());
     this._state = SpaceState.CONTROL_ONLY;
     this.stateUpdate.emit();
     this.metrics = {};
@@ -323,10 +329,16 @@ export class DataSpace {
     });
 
     await this.inner.controlPipeline.state.waitUntilTimeframe(new Timeframe([[receipt.feedKey, receipt.seq]]));
-    for (const feed of this.inner.dataPipeline.pipelineState?.feeds ?? []) {
-      const indexBeforeEpoch = epoch.timeframe.get(feed.key);
-      if (indexBeforeEpoch) {
-        await feed.clear(0, indexBeforeEpoch + 1);
+
+    // Clear feed blocks before epoch.
+    if (ENABLE_FEED_PURGE) {
+      for (const feed of this.inner.dataPipeline.pipelineState?.feeds ?? []) {
+        const indexBeforeEpoch = epoch.timeframe.get(feed.key);
+        if (indexBeforeEpoch === undefined) {
+          continue;
+        }
+
+        await feed.safeClear(0, indexBeforeEpoch + 1);
       }
     }
   }

package/src/packlets/spaces/notarization-plugin.ts

@@ -2,12 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
 import { DeferredTask, Event, scheduleTask, sleep, TimeoutError, Trigger } from '@dxos/async';
 import { Context, rejectOnDispose } from '@dxos/context';
 import { CredentialProcessor } from '@dxos/credentials';
 import { FeedWriter } from '@dxos/feed-store';
+import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { schema } from '@dxos/protocols';

package/src/packlets/spaces/spaces-service.test.ts

@@ -6,6 +6,7 @@ import chai, { expect } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 
 import { Trigger } from '@dxos/async';
+import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
 import { Space, SpacesService } from '@dxos/protocols/proto/dxos/client/services';
 import { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
@@ -22,7 +23,7 @@ describe('SpacesService', () => {
 
   beforeEach(async () => {
     serviceContext = createServiceContext();
-    await serviceContext.open();
+    await serviceContext.open(new Context());
     spacesService = new SpacesServiceImpl(
       serviceContext.identityManager,
       serviceContext.spaceManager,

package/src/packlets/spaces/spaces-service.ts

@@ -78,7 +78,7 @@ export class SpacesServiceImpl implements SpacesService {
           log('update', { spaces });
           next({ spaces });
         },
-        { maxFrequency: 2 },
+        { maxFrequency: process.env.NODE_ENV === 'test' ? undefined : 2 },
       );
 
       scheduleTask(ctx, async () => {
@@ -185,19 +185,25 @@ export class SpacesServiceImpl implements SpacesService {
         targetDataTimeframe: space.dataPipeline.pipelineState?.targetTimeframe,
         totalDataTimeframe: space.dataPipeline.pipelineState?.endTimeframe,
       },
-      members: Array.from(space.inner.spaceState.members.values()).map((member) => ({
-        identity: {
-          identityKey: member.key,
-          profile: {
-            displayName: member.assertion.profile?.displayName ?? humanize(member.key),
+      members: Array.from(space.inner.spaceState.members.values()).map((member) => {
+        const peers = space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key));
+        const isMe = this._identityManager.identity?.identityKey.equals(member.key);
+
+        if (isMe) {
+          peers.push(space.presence.getLocalState());
+        }
+
+        return {
+          identity: {
+            identityKey: member.key,
+            profile: {
+              displayName: member.assertion.profile?.displayName ?? humanize(member.key),
+            },
           },
-        },
-        presence:
-          this._identityManager.identity?.identityKey.equals(member.key) ||
-          space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0
-            ? SpaceMember.PresenceState.ONLINE
-            : SpaceMember.PresenceState.OFFLINE,
-      })),
+          presence: isMe || peers.length > 0 ? SpaceMember.PresenceState.ONLINE : SpaceMember.PresenceState.OFFLINE,
+          peerStates: peers,
+        };
+      }),
       creator: space.inner.spaceState.creator?.key,
       cache: space.cache,
       metrics: space.metrics,

package/src/packlets/system/system-service.test.ts

@@ -35,6 +35,7 @@ describe('SystemService', () => {
       config,
       statusUpdate,
       getCurrentStatus: () => currentStatus,
+      getDiagnostics: async () => ({}),
       onUpdateStatus: (status) => {
         updateStatus.wake(status);
       },

package/src/packlets/system/system-service.ts

@@ -6,18 +6,22 @@ import { Event } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
 import { Config } from '@dxos/config';
 import {
+  GetDiagnosticsRequest,
   SystemService,
   SystemStatus,
   UpdateStatusRequest,
   QueryStatusRequest,
   QueryStatusResponse,
 } from '@dxos/protocols/proto/dxos/client/services';
-import { MaybePromise } from '@dxos/util';
+import { jsonKeyReplacer, MaybePromise } from '@dxos/util';
+
+import { Diagnostics } from '../services';
 
 export type SystemServiceOptions = {
   config?: Config;
   statusUpdate: Event<void>;
   getCurrentStatus: () => SystemStatus;
+  getDiagnostics: () => Promise<Partial<Diagnostics>>;
   onUpdateStatus: (status: SystemStatus) => MaybePromise<void>;
   onReset: () => MaybePromise<void>;
 };
@@ -28,11 +32,20 @@ export class SystemServiceImpl implements SystemService {
   private readonly _getCurrentStatus: SystemServiceOptions['getCurrentStatus'];
   private readonly _onUpdateStatus: SystemServiceOptions['onUpdateStatus'];
   private readonly _onReset: SystemServiceOptions['onReset'];
+  private readonly _getDiagnostics: SystemServiceOptions['getDiagnostics'];
 
-  constructor({ config, statusUpdate, onUpdateStatus, getCurrentStatus, onReset }: SystemServiceOptions) {
+  constructor({
+    config,
+    statusUpdate,
+    getDiagnostics,
+    onUpdateStatus,
+    getCurrentStatus,
+    onReset,
+  }: SystemServiceOptions) {
     this._config = config;
     this._statusUpdate = statusUpdate;
     this._getCurrentStatus = getCurrentStatus;
+    this._getDiagnostics = getDiagnostics;
     this._onUpdateStatus = onUpdateStatus;
     this._onReset = onReset;
   }
@@ -41,6 +54,25 @@ export class SystemServiceImpl implements SystemService {
     return this._config?.values ?? {};
   }
 
+  /**
+   * NOTE: Since this is serialized as a JSON object, we allow the option to serialize keys.
+   */
+  async getDiagnostics({ keys }: GetDiagnosticsRequest = {}) {
+    const diagnostics = await this._getDiagnostics();
+    return {
+      timestamp: new Date(),
+      diagnostics: JSON.parse(
+        JSON.stringify(
+          diagnostics,
+          jsonKeyReplacer({
+            truncate: keys === GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
+            humanize: keys === GetDiagnosticsRequest.KEY_OPTION.HUMANIZE,
+          }),
+        ),
+      ),
+    };
+  }
+
   async updateStatus({ status }: UpdateStatusRequest) {
     await this._onUpdateStatus(status);
   }

package/src/packlets/testing/invitation-utils.ts

@@ -2,10 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
 import { Trigger } from '@dxos/async';
 import { AuthenticatingInvitationObservable, CancellableInvitationObservable } from '@dxos/client-protocol';
+import { invariant } from '@dxos/invariant';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 
 import { ServiceContext } from '../services';

package/src/packlets/testing/test-builder.ts

@@ -60,7 +60,7 @@ export const createPeers = async (numPeers: number) => {
   return await Promise.all(
     Array.from(Array(numPeers)).map(async () => {
       const peer = createServiceContext({ signalContext });
-      await peer.open();
+      await peer.open(new Context());
       return peer;
     }),
   );