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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.1.56-main.e47dfd1",
+  "version": "0.1.56-main.e79d64a",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -21,41 +21,42 @@
     "src"
   ],
   "dependencies": {
-    "tiny-invariant": "^1.3.1",
-    "@dxos/async": "0.1.56-main.e47dfd1",
-    "@dxos/client-protocol": "0.1.56-main.e47dfd1",
-    "@dxos/codec-protobuf": "0.1.56-main.e47dfd1",
-    "@dxos/config": "0.1.56-main.e47dfd1",
-    "@dxos/context": "0.1.56-main.e47dfd1",
-    "@dxos/credentials": "0.1.56-main.e47dfd1",
-    "@dxos/crypto": "0.1.56-main.e47dfd1",
-    "@dxos/debug": "0.1.56-main.e47dfd1",
-    "@dxos/document-model": "0.1.56-main.e47dfd1",
-    "@dxos/echo-db": "0.1.56-main.e47dfd1",
-    "@dxos/echo-pipeline": "0.1.56-main.e47dfd1",
-    "@dxos/errors": "0.1.56-main.e47dfd1",
-    "@dxos/feed-store": "0.1.56-main.e47dfd1",
-    "@dxos/keyring": "0.1.56-main.e47dfd1",
-    "@dxos/keys": "0.1.56-main.e47dfd1",
-    "@dxos/lock-file": "0.1.56-main.e47dfd1",
-    "@dxos/log": "0.1.56-main.e47dfd1",
-    "@dxos/messaging": "0.1.56-main.e47dfd1",
-    "@dxos/model-factory": "0.1.56-main.e47dfd1",
-    "@dxos/network-manager": "0.1.56-main.e47dfd1",
-    "@dxos/node-std": "0.1.56-main.e47dfd1",
-    "@dxos/protocols": "0.1.56-main.e47dfd1",
-    "@dxos/random-access-storage": "0.1.56-main.e47dfd1",
-    "@dxos/rpc": "0.1.56-main.e47dfd1",
-    "@dxos/teleport": "0.1.56-main.e47dfd1",
-    "@dxos/teleport-extension-gossip": "0.1.56-main.e47dfd1",
-    "@dxos/teleport-extension-object-sync": "0.1.56-main.e47dfd1",
-    "@dxos/text-model": "0.1.56-main.e47dfd1",
-    "@dxos/timeframe": "0.1.56-main.e47dfd1",
-    "@dxos/util": "0.1.56-main.e47dfd1"
+    "@dxos/async": "0.1.56-main.e79d64a",
+    "@dxos/client-protocol": "0.1.56-main.e79d64a",
+    "@dxos/codec-protobuf": "0.1.56-main.e79d64a",
+    "@dxos/config": "0.1.56-main.e79d64a",
+    "@dxos/context": "0.1.56-main.e79d64a",
+    "@dxos/credentials": "0.1.56-main.e79d64a",
+    "@dxos/crypto": "0.1.56-main.e79d64a",
+    "@dxos/debug": "0.1.56-main.e79d64a",
+    "@dxos/document-model": "0.1.56-main.e79d64a",
+    "@dxos/echo-db": "0.1.56-main.e79d64a",
+    "@dxos/echo-pipeline": "0.1.56-main.e79d64a",
+    "@dxos/errors": "0.1.56-main.e79d64a",
+    "@dxos/feed-store": "0.1.56-main.e79d64a",
+    "@dxos/invariant": "0.1.56-main.e79d64a",
+    "@dxos/keyring": "0.1.56-main.e79d64a",
+    "@dxos/keys": "0.1.56-main.e79d64a",
+    "@dxos/lock-file": "0.1.56-main.e79d64a",
+    "@dxos/log": "0.1.56-main.e79d64a",
+    "@dxos/messaging": "0.1.56-main.e79d64a",
+    "@dxos/model-factory": "0.1.56-main.e79d64a",
+    "@dxos/network-manager": "0.1.56-main.e79d64a",
+    "@dxos/node-std": "0.1.56-main.e79d64a",
+    "@dxos/protocols": "0.1.56-main.e79d64a",
+    "@dxos/random-access-storage": "0.1.56-main.e79d64a",
+    "@dxos/rpc": "0.1.56-main.e79d64a",
+    "@dxos/teleport": "0.1.56-main.e79d64a",
+    "@dxos/teleport-extension-gossip": "0.1.56-main.e79d64a",
+    "@dxos/teleport-extension-object-sync": "0.1.56-main.e79d64a",
+    "@dxos/text-model": "0.1.56-main.e79d64a",
+    "@dxos/timeframe": "0.1.56-main.e79d64a",
+    "@dxos/tracing": "0.1.56-main.e79d64a",
+    "@dxos/util": "0.1.56-main.e79d64a"
   },
   "devDependencies": {
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.1.56-main.e47dfd1"
+    "@dxos/signal": "0.1.56-main.e79d64a"
   },
   "publishConfig": {
     "access": "public"

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

@@ -5,6 +5,7 @@
 import { expect } from 'chai';
 
 import { Trigger } from '@dxos/async';
+import { Context } from '@dxos/context';
 import { DevicesService, Device } from '@dxos/protocols/proto/dxos/client/services';
 import { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
 
@@ -18,7 +19,7 @@ describe('DevicesService', () => {
 
   beforeEach(async () => {
     serviceContext = createServiceContext();
-    await serviceContext.open();
+    await serviceContext.open(new Context());
     devicesService = new DevicesServiceImpl(serviceContext.identityManager);
   });
 

package/src/packlets/identity/authenticator.test.ts

@@ -3,10 +3,10 @@
 //
 
 import expect from 'expect';
-import assert from 'node:assert';
 
 import { Event } from '@dxos/async';
 import { createCredentialSignerWithKey } from '@dxos/credentials';
+import { invariant } from '@dxos/invariant';
 import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { describe, test } from '@dxos/test';
@@ -28,7 +28,7 @@ describe('identity/authenticator', () => {
 
     const nonce = new Uint8Array([2, 1, 3, 7]);
     const credential = await authProvider(nonce);
-    assert(credential);
+    invariant(credential);
     expect(await authVerifier.verifier(nonce, credential)).toBeTruthy();
   }).onlyEnvironments('nodejs');
 });

package/src/packlets/identity/identity-manager.test.ts

@@ -4,6 +4,7 @@
 
 import { expect } from 'chai';
 
+import { Context } from '@dxos/context';
 import { valueEncoding, MetadataStore, SpaceManager, AuthStatus, SnapshotStore } from '@dxos/echo-pipeline';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
@@ -64,7 +65,7 @@ describe('identity/identity-manager', () => {
 
   test('creates identity', async () => {
     const { identityManager } = await setupPeer();
-    await identityManager.open();
+    await identityManager.open(new Context());
     afterTest(() => identityManager.close());
 
     const identity = await identityManager.createIdentity();
@@ -75,13 +76,13 @@ describe('identity/identity-manager', () => {
     const storage = createStorage({ type: StorageType.RAM });
 
     const peer1 = await setupPeer({ storage });
-    await peer1.identityManager.open();
+    await peer1.identityManager.open(new Context());
     const identity1 = await peer1.identityManager.createIdentity();
     await peer1.identityManager.close();
     await peer1.feedStore.close();
 
     const peer2 = await setupPeer({ storage });
-    await peer2.identityManager.open();
+    await peer2.identityManager.open(new Context());
 
     expect(peer2.identityManager.identity).to.exist;
     expect(peer2.identityManager.identity!.identityKey).to.deep.eq(identity1.identityKey);
@@ -90,6 +91,17 @@ describe('identity/identity-manager', () => {
     // TODO(dmaretskyi): Check that identity is "alive" (space is working and can write mutations).
   });
 
+  test('update profile', async () => {
+    const { identityManager } = await setupPeer();
+    await identityManager.open(new Context());
+    afterTest(() => identityManager.close());
+
+    const identity = await identityManager.createIdentity();
+    expect(identity.profileDocument?.displayName).to.be.undefined;
+    await identityManager.updateProfile({ displayName: 'Example' });
+    expect(identity.profileDocument?.displayName).to.equal('Example');
+  });
+
   test('admit another device', async () => {
     const signalContext = new MemorySignalManagerContext();
 

package/src/packlets/identity/identity-manager.ts

@@ -2,20 +2,21 @@
 // Copyright 2022 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
 import { Event } from '@dxos/async';
+import { Context } from '@dxos/context';
 import { createCredentialSignerWithKey, CredentialGenerator } from '@dxos/credentials';
 import { MetadataStore, SpaceManager, SwarmIdentity } 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';
 import { trace } from '@dxos/protocols';
 import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { IdentityRecord, SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
-import { AdmittedFeed } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { AdmittedFeed, ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { Timeframe } from '@dxos/timeframe';
+import { trace as Trace } from '@dxos/tracing';
 import { deferFunction } from '@dxos/util';
 
 import { createAuthProvider } from './authenticator';
@@ -47,6 +48,7 @@ export type CreateIdentityOptions = {
 };
 
 // TODO(dmaretskyi): Rename: represents the peer's state machine.
+@Trace.resource()
 export class IdentityManager {
   readonly stateUpdate = new Event();
 
@@ -65,7 +67,8 @@ export class IdentityManager {
     return this._identity;
   }
 
-  async open() {
+  @Trace.span()
+  async open(ctx: Context) {
     const traceId = PublicKey.random().toHex();
     log.trace('dxos.halo.identity-manager.open', trace.begin({ id: traceId }));
     await this._metadataStore.load();
@@ -74,7 +77,7 @@ export class IdentityManager {
     log('identity record', { identityRecord });
     if (identityRecord) {
       this._identity = await this._constructIdentity(identityRecord);
-      await this._identity.open();
+      await this._identity.open(ctx);
       await this._identity.ready();
       log.trace('dxos.halo.identity', {
         identityKey: identityRecord.identityKey,
@@ -86,7 +89,7 @@ export class IdentityManager {
   }
 
   async close() {
-    await this._identity?.close();
+    await this._identity?.close(new Context());
   }
 
   async createIdentity({ displayName }: CreateIdentityOptions = {}) {
@@ -106,7 +109,7 @@ export class IdentityManager {
     };
 
     const identity = await this._constructIdentity(identityRecord);
-    await identity.open();
+    await identity.open(new Context());
 
     {
       const generator = new CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
@@ -176,7 +179,7 @@ export class IdentityManager {
     };
     const identity = await this._constructIdentity(identityRecord);
 
-    await identity.open();
+    await identity.open(new Context());
     this._identity = identity;
     await this._metadataStore.setIdentityRecord(identityRecord);
     await this._identity.ready();
@@ -190,6 +193,23 @@ export class IdentityManager {
     return identity;
   }
 
+  /**
+   * Update the profile document of an existing identity.
+   */
+  async updateProfile(profile: ProfileDocument) {
+    invariant(this._identity, 'Identity not initialized.');
+    // TODO(wittjosiah): Use CredentialGenerator.
+    const credential = await this._identity.getIdentityCredentialSigner().createCredential({
+      subject: this._identity.identityKey,
+      assertion: {
+        '@type': 'dxos.halo.credentials.IdentityProfile',
+        profile,
+      },
+    });
+    const receipt = await this._identity.controlPipeline.writer.write({ credential: { credential } });
+    await this._identity.controlPipeline.state.waitUntilTimeframe(new Timeframe([[receipt.feedKey, receipt.seq]]));
+  }
+
   private async _constructIdentity(identityRecord: IdentityRecord) {
     invariant(!this._identity);
     log('constructing identity', { identityRecord });

package/src/packlets/identity/identity-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 { Identity, IdentityService } from '@dxos/protocols/proto/dxos/client/services';
 import { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
@@ -22,8 +23,12 @@ describe('IdentityService', () => {
 
   beforeEach(async () => {
     serviceContext = createServiceContext();
-    await serviceContext.open();
-    identityService = new IdentityServiceImpl(serviceContext);
+    await serviceContext.open(new Context());
+    identityService = new IdentityServiceImpl(
+      (options) => serviceContext.createIdentity(options),
+      serviceContext.identityManager,
+      serviceContext.keyring,
+    );
   });
 
   afterEach(async () => {
@@ -54,6 +59,16 @@ describe('IdentityService', () => {
 
   describe.skip('recoverIdentity', () => {});
 
+  describe('updateProfile', () => {
+    test('updates profile', async () => {
+      const identity = await identityService.createIdentity({});
+      expect(identity.profile?.displayName).to.be.undefined;
+
+      const updatedIdentity = await identityService.updateProfile({ displayName: 'Example' });
+      expect(updatedIdentity.profile?.displayName).to.equal('Example');
+    });
+  });
+
   describe('queryIdentity', () => {
     test('returns undefined if no identity is available', async () => {
       const query = identityService.queryIdentity();

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

@@ -2,11 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
 import { Stream } from '@dxos/codec-protobuf';
 import { signPresentation } from '@dxos/credentials';
 import { todo } from '@dxos/debug';
+import { invariant } from '@dxos/invariant';
+import { Keyring } from '@dxos/keyring';
 import {
   Identity,
   IdentityService,
@@ -16,15 +16,17 @@ import {
 } from '@dxos/protocols/proto/dxos/client/services';
 import { Presentation, ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 
-import { ServiceContext } from '../services';
+import { CreateIdentityOptions, IdentityManager } from './identity-manager';
 
 export class IdentityServiceImpl implements IdentityService {
-  // TODO(wittjosiah): Remove dependency on service context.
-  constructor(private readonly _serviceContext: ServiceContext) {}
+  constructor(
+    private readonly _createIdentity: (params?: CreateIdentityOptions) => Promise<Identity>,
+    private readonly _identityManager: IdentityManager,
+    private readonly _keyring: Keyring,
+  ) {}
 
   async createIdentity(request: ProfileDocument): Promise<Identity> {
-    await this._serviceContext.createIdentity(request);
-
+    await this._createIdentity(request);
     return this._getIdentity()!;
   }
 
@@ -37,30 +39,36 @@ export class IdentityServiceImpl implements IdentityService {
       const emitNext = () => next({ identity: this._getIdentity() });
 
       emitNext();
-      return this._serviceContext.identityManager.stateUpdate.on(emitNext);
+      return this._identityManager.stateUpdate.on(emitNext);
     });
   }
 
   private _getIdentity(): Identity | undefined {
-    if (!this._serviceContext.identityManager.identity) {
+    if (!this._identityManager.identity) {
       return undefined;
     }
 
     return {
-      identityKey: this._serviceContext.identityManager.identity.identityKey,
-      spaceKey: this._serviceContext.identityManager.identity.space.key,
-      profile: this._serviceContext.identityManager.identity.profileDocument,
+      identityKey: this._identityManager.identity.identityKey,
+      spaceKey: this._identityManager.identity.space.key,
+      profile: this._identityManager.identity.profileDocument,
     };
   }
 
+  async updateProfile(profile: ProfileDocument): Promise<Identity> {
+    invariant(this._identityManager.identity, 'Identity not initialized.');
+    await this._identityManager.updateProfile(profile);
+    return this._getIdentity()!;
+  }
+
   async signPresentation({ presentation, nonce }: SignPresentationRequest): Promise<Presentation> {
-    invariant(this._serviceContext.identityManager.identity, 'Identity not initialized.');
+    invariant(this._identityManager.identity, 'Identity not initialized.');
 
     return await signPresentation({
       presentation,
-      signer: this._serviceContext.keyring,
-      signerKey: this._serviceContext.identityManager.identity.deviceKey,
-      chain: this._serviceContext.identityManager.identity.deviceCredentialChain,
+      signer: this._keyring,
+      signerKey: this._identityManager.identity.deviceKey,
+      chain: this._identityManager.identity.deviceCredentialChain,
       nonce,
     });
   }

package/src/packlets/identity/identity.test.ts

@@ -4,6 +4,7 @@
 
 import expect from 'expect';
 
+import { Context } from '@dxos/context';
 import { CredentialGenerator, verifyCredential } from '@dxos/credentials';
 import {
   MetadataStore,
@@ -106,8 +107,8 @@ describe('identity/identity', () => {
       space,
     });
 
-    await identity.open();
-    afterTest(() => identity.close());
+    await identity.open(new Context());
+    afterTest(() => identity.close(new Context()));
 
     //
     // Identity genesis
@@ -219,8 +220,8 @@ describe('identity/identity', () => {
         space,
       }));
 
-      await identity.open();
-      afterTest(() => identity.close());
+      await identity.open(new Context());
+      afterTest(() => identity.close(new Context()));
 
       //
       // Identity genesis
@@ -310,8 +311,8 @@ describe('identity/identity', () => {
         space,
       }));
 
-      await identity.open();
-      afterTest(() => identity.close());
+      await identity.open(new Context());
+      afterTest(() => identity.close(new Context()));
     }
 
     //

package/src/packlets/identity/identity.ts

@@ -2,10 +2,9 @@
 // Copyright 2022 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
 import { Event } from '@dxos/async';
 import { AUTH_TIMEOUT, LOAD_CONTROL_FEEDS_TIMEOUT } from '@dxos/client-protocol';
+import { Context } from '@dxos/context';
 import {
   DeviceStateMachine,
   CredentialSigner,
@@ -17,11 +16,13 @@ import { Signer } from '@dxos/crypto';
 import { failUndefined } from '@dxos/debug';
 import { Space } from '@dxos/echo-pipeline';
 import { writeMessages } from '@dxos/feed-store';
+import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { AdmittedFeed, ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { DeviceAdmissionRequest } from '@dxos/protocols/proto/dxos/halo/invitations';
+import { trace } from '@dxos/tracing';
 import { ComplexSet } from '@dxos/util';
 
 import { TrustedKeySetAuthVerifier } from './authenticator';
@@ -36,6 +37,7 @@ export type IdentityParams = {
 /**
  * Agent identity manager, which includes the agent's Halo space.
  */
+@trace.resource()
 export class Identity {
   public readonly space: Space;
   private readonly _signer: Signer;
@@ -77,13 +79,15 @@ export class Identity {
     return this._deviceStateMachine.authorizedDeviceKeys;
   }
 
-  async open() {
+  @trace.span()
+  async open(ctx: Context) {
     await this.space.spaceState.addCredentialProcessor(this._deviceStateMachine);
     await this.space.spaceState.addCredentialProcessor(this._profileStateMachine);
-    await this.space.open();
+    await this.space.open(ctx);
   }
 
-  async close() {
+  @trace.span()
+  async close(ctx: Context) {
     await this.authVerifier.close();
     await this.space.spaceState.removeCredentialProcessor(this._profileStateMachine);
     await this.space.spaceState.removeCredentialProcessor(this._deviceStateMachine);

package/src/packlets/invitations/device-invitation-protocol.test.ts

@@ -5,6 +5,7 @@
 import { expect } from 'chai';
 
 import { asyncChain } from '@dxos/async';
+import { Context } from '@dxos/context';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { describe, test, afterTest } from '@dxos/test';
 
@@ -19,7 +20,7 @@ const closeAfterTest = async (peer: ServiceContext) => {
 describe('services/device', () => {
   test('creates identity', async () => {
     const peer = createServiceContext();
-    await peer.open();
+    await peer.open(new Context());
     afterTest(() => peer.close());
 
     const identity = await peer.createIdentity();

package/src/packlets/invitations/device-invitation-protocol.ts

@@ -2,8 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
+import { invariant } from '@dxos/invariant';
 import { Keyring } from '@dxos/keyring';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { AdmissionRequest, AdmissionResponse, IntroductionRequest } from '@dxos/protocols/proto/dxos/halo/invitations';

package/src/packlets/invitations/invitation-extension.ts

@@ -2,11 +2,10 @@
 // Copyright 2022 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
 import { Trigger } from '@dxos/async';
 import { cancelWithContext, Context } from '@dxos/context';
 import { InvalidInvitationExtensionRoleError } from '@dxos/errors';
+import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { schema, trace } from '@dxos/protocols';

package/src/packlets/invitations/invitations-handler.ts

@@ -2,8 +2,6 @@
 // Copyright 2022 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
 import { PushStream, scheduleTask, TimeoutError, Trigger } from '@dxos/async';
 import {
   AuthenticatingInvitationObservable,
@@ -14,6 +12,7 @@ import {
 import { Context } from '@dxos/context';
 import { generatePasscode } from '@dxos/credentials';
 import { InvalidInvitationExtensionRoleError } from '@dxos/errors';
+import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { createTeleportProtocolFactory, NetworkManager, StarTopology, SwarmConnection } from '@dxos/network-manager';
@@ -187,6 +186,7 @@ export class InvitationsHandler {
           teleport.addExtension('dxos.halo.invitations', createExtension());
         }),
         topology: new StarTopology(topic),
+        label: 'invitation host',
       });
       ctx.onDispose(() => swarmConnection.close());
 
@@ -363,6 +363,7 @@ export class InvitationsHandler {
           teleport.addExtension('dxos.halo.invitations', createExtension());
         }),
         topology: new StarTopology(topic),
+        label: 'invitation guest',
       });
       ctx.onDispose(() => swarmConnection.close());
 

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

@@ -2,11 +2,10 @@
 // Copyright 2022 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
 import { Event } from '@dxos/async';
 import { AuthenticatingInvitationObservable, CancellableInvitationObservable } from '@dxos/client-protocol';
 import { Stream } from '@dxos/codec-protobuf';
+import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import {
   AuthenticationRequest,

package/src/packlets/invitations/space-invitation-protocol.ts

@@ -2,10 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
 import { createAdmissionCredentials, getCredentialAssertion } from '@dxos/credentials';
 import { writeMessages } from '@dxos/feed-store';
+import { invariant } from '@dxos/invariant';
 import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';

package/src/packlets/locks/node.ts

@@ -3,8 +3,8 @@
 //
 
 import { FileHandle } from 'node:fs/promises';
-import invariant from 'tiny-invariant';
 
+import { invariant } from '@dxos/invariant';
 import { LockFile } from '@dxos/lock-file';
 import { log, logInfo } from '@dxos/log';
 

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

@@ -13,6 +13,7 @@ import {
   ControlMetricsRequest,
   ControlMetricsResponse,
   QueryMetricsRequest,
+  QueryMetricsResponse,
 } from '@dxos/protocols/proto/dxos/client/services';
 import { jsonify, numericalValues, tracer } from '@dxos/util';
 
@@ -21,6 +22,7 @@ import { jsonify, numericalValues, tracer } from '@dxos/util';
  */
 export class LoggingServiceImpl implements LoggingService {
   private readonly _logs = new Event<NaturalLogEntry>();
+  private readonly _started = new Date();
 
   async open() {
     log.runtimeConfig.processors.push(this._logProcessor);
@@ -45,11 +47,14 @@ export class LoggingServiceImpl implements LoggingService {
     return { recording: tracer.recording };
   }
 
-  queryMetrics({ interval }: QueryMetricsRequest): Stream<Metrics> {
+  /**
+   * @deprecated (Move to diagnostics).
+   */
+  queryMetrics({ interval = 5_000 }: QueryMetricsRequest): Stream<QueryMetricsResponse> {
     // TODO(burdon): Map all traces; how to bind to reducer/metrics shape (e.g., numericalValues)?
-    const createNumericalValues = (key: string) => {
-      const consume = tracer.get(key) ?? [];
-      return { key, stats: numericalValues(consume, 'duration') };
+    const getNumericalValues = (key: string) => {
+      const events = tracer.get(key) ?? [];
+      return { key, stats: numericalValues(events, 'duration') };
     };
 
     return new Stream(({ next }) => {
@@ -57,16 +62,19 @@ export class LoggingServiceImpl implements LoggingService {
         const metrics: Metrics = {
           timestamp: new Date(),
           values: [
-            createNumericalValues('dxos.echo.pipeline.control'),
-            createNumericalValues('dxos.echo.pipeline.data'),
-          ],
+            getNumericalValues('dxos.echo.pipeline.control'),
+            getNumericalValues('dxos.echo.pipeline.data'),
+          ].filter(Boolean) as Metrics.KeyPair[],
         };
 
-        next(metrics);
+        next({
+          timestamp: new Date(),
+          metrics,
+        });
       };
 
       update();
-      const i = setInterval(update, interval);
+      const i = setInterval(update, Math.max(interval, 1_000));
       return () => {
         clearInterval(i);
       };