@dxos/client-services 0.3.2-main.d77d2bc → 0.3.2-main.e5374ab

package/src/packlets/devtools/devtools.ts

@@ -4,41 +4,41 @@
 
 import { Event as AsyncEvent } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
-import { Config } from '@dxos/config';
+import { type Config } from '@dxos/config';
 import {
-  ClearSnapshotsRequest,
-  DevtoolsHost, // TODO(burdon): Rename DevtoolsService
-  EnableDebugLoggingRequest,
-  EnableDebugLoggingResponse,
-  Event,
-  GetConfigResponse,
-  GetNetworkPeersRequest,
-  GetNetworkPeersResponse,
-  GetSpaceSnapshotRequest,
-  GetSpaceSnapshotResponse,
-  ResetStorageRequest,
-  SaveSpaceSnapshotRequest,
-  SaveSpaceSnapshotResponse,
-  SubscribeToCredentialMessagesRequest,
-  SubscribeToCredentialMessagesResponse,
-  SubscribeToFeedBlocksRequest,
-  SubscribeToFeedBlocksResponse,
-  SubscribeToFeedsRequest,
-  SubscribeToFeedsResponse,
-  SubscribeToItemsRequest,
-  SubscribeToItemsResponse,
-  SubscribeToKeyringKeysRequest,
-  SubscribeToKeyringKeysResponse,
-  SubscribeToNetworkTopicsResponse,
-  SubscribeToSpacesRequest,
-  SubscribeToSpacesResponse,
-  SubscribeToSignalStatusResponse,
-  SignalResponse,
-  SubscribeToSwarmInfoResponse,
-  StorageInfo,
-  GetSnapshotsResponse,
-  SubscribeToMetadataResponse,
-  GetBlobsResponse,
+  type ClearSnapshotsRequest,
+  type DevtoolsHost, // TODO(burdon): Rename DevtoolsService
+  type EnableDebugLoggingRequest,
+  type EnableDebugLoggingResponse,
+  type Event,
+  type GetConfigResponse,
+  type GetNetworkPeersRequest,
+  type GetNetworkPeersResponse,
+  type GetSpaceSnapshotRequest,
+  type GetSpaceSnapshotResponse,
+  type ResetStorageRequest,
+  type SaveSpaceSnapshotRequest,
+  type SaveSpaceSnapshotResponse,
+  type SubscribeToCredentialMessagesRequest,
+  type SubscribeToCredentialMessagesResponse,
+  type SubscribeToFeedBlocksRequest,
+  type SubscribeToFeedBlocksResponse,
+  type SubscribeToFeedsRequest,
+  type SubscribeToFeedsResponse,
+  type SubscribeToItemsRequest,
+  type SubscribeToItemsResponse,
+  type SubscribeToKeyringKeysRequest,
+  type SubscribeToKeyringKeysResponse,
+  type SubscribeToNetworkTopicsResponse,
+  type SubscribeToSpacesRequest,
+  type SubscribeToSpacesResponse,
+  type SubscribeToSignalStatusResponse,
+  type SignalResponse,
+  type SubscribeToSwarmInfoResponse,
+  type StorageInfo,
+  type GetSnapshotsResponse,
+  type SubscribeToMetadataResponse,
+  type GetBlobsResponse,
 } from '@dxos/protocols/proto/dxos/devtools/host';
 
 import { subscribeToFeedBlocks, subscribeToFeeds } from './feeds';
@@ -46,7 +46,7 @@ import { subscribeToKeyringKeys } from './keys';
 import { subscribeToMetadata } from './metadata';
 import { subscribeToNetworkStatus, subscribeToSignal, subscribeToSwarmInfo } from './network';
 import { subscribeToSpaces } from './spaces';
-import { ServiceContext } from '../services';
+import { type ServiceContext } from '../services';
 
 export class DevtoolsHostEvents {
   readonly ready = new AsyncEvent();

package/src/packlets/devtools/feeds.ts

@@ -4,15 +4,15 @@
 
 import { EventSubscriptions } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
-import { FeedIterator, FeedStore, FeedWrapper } from '@dxos/feed-store';
+import { FeedIterator, type FeedStore, type FeedWrapper } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
 import {
-  SubscribeToFeedsRequest,
-  SubscribeToFeedsResponse,
-  SubscribeToFeedBlocksRequest,
-  SubscribeToFeedBlocksResponse,
+  type SubscribeToFeedsRequest,
+  type SubscribeToFeedsResponse,
+  type SubscribeToFeedBlocksRequest,
+  type SubscribeToFeedBlocksResponse,
 } from '@dxos/protocols/proto/dxos/devtools/host';
-import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
+import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { ComplexMap } from '@dxos/util';
 
 export const subscribeToFeeds = (

package/src/packlets/devtools/keys.ts

@@ -4,8 +4,8 @@
 
 import { scheduleTask } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
-import { Keyring } from '@dxos/keyring';
-import { SubscribeToKeyringKeysResponse } from '@dxos/protocols/proto/dxos/devtools/host';
+import { type Keyring } from '@dxos/keyring';
+import { type SubscribeToKeyringKeysResponse } from '@dxos/protocols/proto/dxos/devtools/host';
 
 export const subscribeToKeyringKeys = ({ keyring }: { keyring: Keyring }) =>
   new Stream<SubscribeToKeyringKeysResponse>(({ next, ctx }) => {

package/src/packlets/devtools/metadata.ts

@@ -3,9 +3,9 @@
 //
 
 import { Stream } from '@dxos/codec-protobuf';
-import { SubscribeToMetadataResponse } from '@dxos/protocols/proto/dxos/devtools/host';
+import { type SubscribeToMetadataResponse } from '@dxos/protocols/proto/dxos/devtools/host';
 
-import { ServiceContext } from '../services';
+import { type ServiceContext } from '../services';
 
 export const subscribeToMetadata = ({ context }: { context: ServiceContext }) =>
   new Stream<SubscribeToMetadataResponse>(({ next, ctx }) => {

package/src/packlets/devtools/network.ts

@@ -5,15 +5,15 @@
 import { Stream } from '@dxos/codec-protobuf';
 import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
-import { SignalManager } from '@dxos/messaging';
-import { NetworkManager } from '@dxos/network-manager';
+import { type SignalManager } from '@dxos/messaging';
+import { type NetworkManager } from '@dxos/network-manager';
 import {
-  GetNetworkPeersRequest,
-  GetNetworkPeersResponse,
-  SubscribeToNetworkTopicsResponse,
-  SubscribeToSignalStatusResponse,
-  SignalResponse,
-  SubscribeToSwarmInfoResponse,
+  type GetNetworkPeersRequest,
+  type GetNetworkPeersResponse,
+  type SubscribeToNetworkTopicsResponse,
+  type SubscribeToSignalStatusResponse,
+  type SignalResponse,
+  type SubscribeToSwarmInfoResponse,
 } from '@dxos/protocols/proto/dxos/devtools/host';
 
 export const subscribeToNetworkStatus = ({ signalManager }: { signalManager: SignalManager }) =>

package/src/packlets/devtools/spaces.ts

@@ -3,11 +3,14 @@
 //
 
 import { Stream } from '@dxos/codec-protobuf';
-import { Space } from '@dxos/echo-pipeline';
-import { SubscribeToSpacesRequest, SubscribeToSpacesResponse } from '@dxos/protocols/proto/dxos/devtools/host';
-import { SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
-
-import { ServiceContext } from '../services';
+import { type Space } from '@dxos/echo-pipeline';
+import {
+  type SubscribeToSpacesRequest,
+  type SubscribeToSpacesResponse,
+} from '@dxos/protocols/proto/dxos/devtools/host';
+import { type SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
+
+import { type ServiceContext } from '../services';
 
 export const subscribeToSpaces = (context: ServiceContext, { spaceKeys = [] }: SubscribeToSpacesRequest) => {
   return new Stream<SubscribeToSpacesResponse>(({ next }) => {

package/src/packlets/identity/authenticator.ts

@@ -2,14 +2,14 @@
 // Copyright 2022 DXOS.org
 //
 
-import { Event, Trigger } from '@dxos/async';
+import { type Event, Trigger } from '@dxos/async';
 import { Context } from '@dxos/context';
-import { verifyCredential, CredentialSigner } from '@dxos/credentials';
-import { AuthProvider, AuthVerifier } from '@dxos/echo-pipeline';
-import { PublicKey } from '@dxos/keys';
+import { verifyCredential, type CredentialSigner } from '@dxos/credentials';
+import { type AuthProvider, type AuthVerifier } from '@dxos/echo-pipeline';
+import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { schema } from '@dxos/protocols';
-import { ComplexSet } from '@dxos/util';
+import { type ComplexSet } from '@dxos/util';
 
 const Credential = schema.getCodecForType('dxos.halo.credentials.Credential');
 

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

@@ -11,7 +11,7 @@ import { Keyring } from '@dxos/keyring';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
 import { MemoryTransportFactory, NetworkManager } from '@dxos/network-manager';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
-import { createStorage, Storage, StorageType } from '@dxos/random-access-storage';
+import { createStorage, type Storage, StorageType } from '@dxos/random-access-storage';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
 import { describe, test, afterTest } from '@dxos/test';
 
@@ -152,14 +152,15 @@ describe('identity/identity-manager', () => {
     expect(identity2.space.protocol.sessions.get(identity1.deviceKey)?.authStatus).to.equal(AuthStatus.SUCCESS);
   });
 
-  test('set device profile', async () => {
+  test('sets device profile', async () => {
     const signalContext = new MemorySignalManagerContext();
 
-    const peer1 = await setupPeer({ signalContext });
-    const identity1 = await peer1.identityManager.createIdentity();
+    const peer = await setupPeer({ signalContext });
+    const identity = await peer.identityManager.createIdentity();
 
-    await peer1.identityManager.updateDevice({ deviceKey: identity1.deviceKey, profile: { displayName: 'Peer1' } });
+    // Note: Waiting for device profile credential to be processed.
+    await identity.stateUpdate.waitForCount(1);
 
-    expect(identity1.authorizedDeviceKeys.get(identity1.deviceKey)?.displayName).to.equal('Peer1');
+    expect(!!identity.authorizedDeviceKeys.get(identity.deviceKey)?.platform).is.true;
   });
 });

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

@@ -2,19 +2,21 @@
 // Copyright 2022 DXOS.org
 //
 
+import platform from 'platform';
+
 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 { type MetadataStore, type SpaceManager, type SwarmIdentity } from '@dxos/echo-pipeline';
+import { type FeedStore } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
-import { Keyring } from '@dxos/keyring';
+import { type 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, ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
+import { type IdentityRecord, type SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
+import { AdmittedFeed, type 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';
@@ -134,6 +136,16 @@ export class IdentityManager {
       // NOTE: This credential is written last. This is a hack to make sure that display name is set before identity is "ready".
       credentials.push(await generator.createDeviceAuthorization(identityRecord.deviceKey));
 
+      // Write device metadata to profile.
+      credentials.push(
+        await generator.createDeviceProfile({
+          platform: platform.name,
+          platformVersion: platform.version,
+          architecture: typeof platform.os?.architecture === 'number' ? String(platform.os.architecture) : undefined,
+          os: platform.os?.family,
+          osVersion: platform.os?.version,
+        }),
+      );
       for (const credential of credentials) {
         await identity.controlPipeline.writer.write({
           credential: { credential },
@@ -212,26 +224,6 @@ export class IdentityManager {
     return profile;
   }
 
-  async updateDevice({ deviceKey, profile }: { deviceKey: PublicKey; profile: ProfileDocument }) {
-    invariant(this._identity, 'Identity not initialized.');
-
-    invariant(this._identity.authorizedDeviceKeys.has(deviceKey), 'Device not authorized.');
-
-    const credential = await this._identity.getIdentityCredentialSigner().createCredential({
-      subject: this._identity.identityKey,
-      assertion: {
-        '@type': 'dxos.halo.credentials.DeviceProfile',
-        deviceKey,
-        profile,
-      },
-    });
-
-    const receipt = await this._identity.controlPipeline.writer.write({ credential: { credential } });
-    await this._identity.controlPipeline.state.waitUntilTimeframe(new Timeframe([[receipt.feedKey, receipt.seq]]));
-    this.stateUpdate.emit();
-    return profile;
-  }
-
   private async _constructIdentity(identityRecord: IdentityRecord) {
     invariant(!this._identity);
     log('constructing identity', { identityRecord });

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

@@ -8,11 +8,11 @@ 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 { type Identity, type IdentityService } from '@dxos/protocols/proto/dxos/client/services';
 import { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
 
 import { IdentityServiceImpl } from './identity-service';
-import { ServiceContext } from '../services';
+import { type ServiceContext } from '../services';
 import { createServiceContext } from '../testing';
 
 chai.use(chaiAsPromised);

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

@@ -6,17 +6,17 @@ 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 { type Keyring } from '@dxos/keyring';
 import {
-  Identity,
-  IdentityService,
-  QueryIdentityResponse,
-  RecoverIdentityRequest,
-  SignPresentationRequest,
+  type Identity,
+  type IdentityService,
+  type QueryIdentityResponse,
+  type RecoverIdentityRequest,
+  type SignPresentationRequest,
 } from '@dxos/protocols/proto/dxos/client/services';
-import { Presentation, ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { type Presentation, type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 
-import { CreateIdentityOptions, IdentityManager } from './identity-manager';
+import { type CreateIdentityOptions, type IdentityManager } from './identity-manager';
 
 export class IdentityServiceImpl implements IdentityService {
   constructor(

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

@@ -18,10 +18,10 @@ import {
 } from '@dxos/echo-pipeline';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
-import { PublicKey } from '@dxos/keys';
+import { type PublicKey } from '@dxos/keys';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
 import { MemoryTransportFactory, NetworkManager } from '@dxos/network-manager';
-import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
+import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { AdmittedFeed } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { createStorage, StorageType } from '@dxos/random-access-storage';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';

package/src/packlets/identity/identity.ts

@@ -4,26 +4,30 @@
 
 import { Event } from '@dxos/async';
 import { AUTH_TIMEOUT, LOAD_CONTROL_FEEDS_TIMEOUT } from '@dxos/client-protocol';
-import { Context } from '@dxos/context';
+import { type Context } from '@dxos/context';
 import {
   DeviceStateMachine,
-  CredentialSigner,
+  type CredentialSigner,
   createCredentialSignerWithKey,
   createCredentialSignerWithChain,
   ProfileStateMachine,
 } from '@dxos/credentials';
-import { Signer } from '@dxos/crypto';
+import { type Signer } from '@dxos/crypto';
 import { failUndefined } from '@dxos/debug';
-import { Space } from '@dxos/echo-pipeline';
+import { type 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 { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
+import {
+  AdmittedFeed,
+  type DeviceProfileDocument,
+  type ProfileDocument,
+} from '@dxos/protocols/proto/dxos/halo/credentials';
+import { type DeviceAdmissionRequest } from '@dxos/protocols/proto/dxos/halo/invitations';
 import { trace } from '@dxos/tracing';
-import { ComplexMap, ComplexSet } from '@dxos/util';
+import { type ComplexMap, ComplexSet } from '@dxos/util';
 
 import { TrustedKeySetAuthVerifier } from './authenticator';
 
@@ -77,7 +81,7 @@ export class Identity {
   }
 
   // TODO(burdon): Expose state object?
-  get authorizedDeviceKeys(): ComplexMap<PublicKey, ProfileDocument> {
+  get authorizedDeviceKeys(): ComplexMap<PublicKey, DeviceProfileDocument> {
     return this._deviceStateMachine.authorizedDeviceKeys;
   }
 

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

@@ -9,7 +9,7 @@ import { Context } from '@dxos/context';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { describe, test, afterTest } from '@dxos/test';
 
-import { ServiceContext } from '../services';
+import { type ServiceContext } from '../services';
 import { createPeers, createServiceContext, performInvitation } from '../testing';
 
 const closeAfterTest = async (peer: ServiceContext) => {

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

@@ -3,12 +3,16 @@
 //
 
 import { invariant } from '@dxos/invariant';
-import { Keyring } from '@dxos/keyring';
+import { type Keyring } from '@dxos/keyring';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
-import { AdmissionRequest, AdmissionResponse, IntroductionRequest } from '@dxos/protocols/proto/dxos/halo/invitations';
+import {
+  type AdmissionRequest,
+  type AdmissionResponse,
+  type IntroductionRequest,
+} from '@dxos/protocols/proto/dxos/halo/invitations';
 
-import { InvitationProtocol } from './invitation-protocol';
-import { Identity, JoinIdentityParams } from '../identity';
+import { type InvitationProtocol } from './invitation-protocol';
+import { type Identity, type JoinIdentityParams } from '../identity';
 
 export class DeviceInvitationProtocol implements InvitationProtocol {
   constructor(

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

@@ -9,16 +9,16 @@ import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { InvalidInvitationExtensionRoleError, schema, trace } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
-import { ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 import {
-  AdmissionRequest,
-  AdmissionResponse,
+  type AdmissionRequest,
+  type AdmissionResponse,
   AuthenticationResponse,
-  IntroductionRequest,
-  InvitationHostService,
+  type IntroductionRequest,
+  type InvitationHostService,
   Options,
 } from '@dxos/protocols/proto/dxos/halo/invitations';
-import { ExtensionContext, RpcExtension } from '@dxos/teleport';
+import { type ExtensionContext, RpcExtension } from '@dxos/teleport';
 
 /// Timeout for the options exchange.
 const OPTIONS_TIMEOUT = 10_000;

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

@@ -2,9 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
-import { ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
-import { AdmissionRequest, AdmissionResponse, IntroductionRequest } from '@dxos/protocols/proto/dxos/halo/invitations';
+import { type Invitation } from '@dxos/protocols/proto/dxos/client/services';
+import { type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
+import {
+  type AdmissionRequest,
+  type AdmissionResponse,
+  type IntroductionRequest,
+} from '@dxos/protocols/proto/dxos/halo/invitations';
 
 export interface InvitationProtocol {
   // Debugging

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

@@ -14,7 +14,12 @@ import { generatePasscode } from '@dxos/credentials';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { createTeleportProtocolFactory, NetworkManager, StarTopology, SwarmConnection } from '@dxos/network-manager';
+import {
+  createTeleportProtocolFactory,
+  type NetworkManager,
+  StarTopology,
+  type SwarmConnection,
+} from '@dxos/network-manager';
 import { InvalidInvitationExtensionRoleError, trace } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { AuthenticationResponse } from '@dxos/protocols/proto/dxos/halo/invitations';
@@ -25,7 +30,7 @@ import {
   isAuthenticationRequired,
   MAX_OTP_ATTEMPTS,
 } from './invitation-extension';
-import { InvitationProtocol } from './invitation-protocol';
+import { type InvitationProtocol } from './invitation-protocol';
 
 /**
  * Generic handler for Halo and Space invitations.

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

@@ -3,19 +3,19 @@
 //
 
 import { Event } from '@dxos/async';
-import { AuthenticatingInvitation, CancellableInvitation } from '@dxos/client-protocol';
+import { type AuthenticatingInvitation, type CancellableInvitation } from '@dxos/client-protocol';
 import { Stream } from '@dxos/codec-protobuf';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import {
-  AuthenticationRequest,
+  type AuthenticationRequest,
   Invitation,
-  InvitationsService,
+  type InvitationsService,
   QueryInvitationsResponse,
 } from '@dxos/protocols/proto/dxos/client/services';
 
-import { InvitationProtocol } from './invitation-protocol';
-import { InvitationsHandler } from './invitations-handler';
+import { type InvitationProtocol } from './invitation-protocol';
+import { type InvitationsHandler } from './invitations-handler';
 
 /**
  * Adapts invitation service observable to client/service stream.

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

@@ -10,7 +10,7 @@ import { testLocalDatabase } from '@dxos/echo-pipeline/testing';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { afterTest, describe, test } from '@dxos/test';
 
-import { ServiceContext } from '../services';
+import { type ServiceContext } from '../services';
 import { createIdentity, createPeers, syncItemsLocal } from '../testing';
 import { performInvitation } from '../testing/invitation-utils';
 

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

@@ -5,16 +5,20 @@
 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 { type Keyring } from '@dxos/keyring';
+import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
-import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
-import { ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
-import { AdmissionRequest, AdmissionResponse, IntroductionRequest } from '@dxos/protocols/proto/dxos/halo/invitations';
-
-import { InvitationProtocol } from './invitation-protocol';
-import { DataSpaceManager, SigningContext } from '../spaces';
+import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
+import { type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
+import {
+  type AdmissionRequest,
+  type AdmissionResponse,
+  type IntroductionRequest,
+} from '@dxos/protocols/proto/dxos/halo/invitations';
+
+import { type InvitationProtocol } from './invitation-protocol';
+import { type DataSpaceManager, type SigningContext } from '../spaces';
 
 export class SpaceInvitationProtocol implements InvitationProtocol {
   constructor(

package/src/packlets/locks/browser.ts

@@ -6,7 +6,7 @@ import { asyncTimeout, Trigger } from '@dxos/async';
 import { RESOURCE_LOCK_TIMEOUT } from '@dxos/client-protocol';
 import { log, logInfo } from '@dxos/log';
 
-import { ResourceLock, ResourceLockOptions } from './resource-lock';
+import { type ResourceLock, type ResourceLockOptions } from './resource-lock';
 
 enum Message {
   ACQUIRING = 'acquiring',

package/src/packlets/locks/node.ts

@@ -2,13 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
-import { FileHandle } from 'node:fs/promises';
+import { type FileHandle } from 'node:fs/promises';
 
 import { invariant } from '@dxos/invariant';
 import { LockFile } from '@dxos/lock-file';
 import { log, logInfo } from '@dxos/log';
 
-import { ResourceLock, ResourceLockOptions } from './resource-lock';
+import { type ResourceLock, type ResourceLockOptions } from './resource-lock';
 
 // TODO(mykola): Factor out.
 export class Lock implements ResourceLock {

package/src/packlets/locks/resource-lock.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { MaybePromise } from '@dxos/util';
+import { type MaybePromise } from '@dxos/util';
 
 export type ResourceLockOptions = {
   lockKey: string;

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

@@ -4,16 +4,22 @@
 
 import { Event } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
-import { LogLevel, LogProcessor, LogEntry as NaturalLogEntry, getContextFromEntry, log } from '@dxos/log';
 import {
-  LogEntry,
-  LoggingService,
-  Metrics,
+  type LogLevel,
+  type LogProcessor,
+  type LogEntry as NaturalLogEntry,
+  getContextFromEntry,
+  log,
+} from '@dxos/log';
+import {
+  type LogEntry,
+  type LoggingService,
+  type Metrics,
   QueryLogsRequest,
-  ControlMetricsRequest,
-  ControlMetricsResponse,
-  QueryMetricsRequest,
-  QueryMetricsResponse,
+  type ControlMetricsRequest,
+  type ControlMetricsResponse,
+  type QueryMetricsRequest,
+  type QueryMetricsResponse,
 } from '@dxos/protocols/proto/dxos/client/services';
 import { jsonify, numericalValues, tracer } from '@dxos/util';