@dxos/client-services 0.8.3 → 0.8.4-main.28f8d3d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.8.3",
+  "version": "0.8.4-main.28f8d3d",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,11 +10,13 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
     "./testing": {
+      "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
       "browser": "./dist/lib/browser/testing/index.mjs",
       "node": "./dist/lib/node-esm/testing/index.mjs"
@@ -41,52 +43,52 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.0.0-beta.4",
-    "@automerge/automerge-repo": "2.0.1",
+    "@automerge/automerge": "3.1.1",
+    "@automerge/automerge-repo": "2.3.0-alpha.0",
     "@obsidize/tar-browserify": "^5.2.0",
     "cbor-x": "^1.5.4",
     "platform": "^1.3.6",
-    "@dxos/async": "0.8.3",
-    "@dxos/client-protocol": "0.8.3",
-    "@dxos/codec-protobuf": "0.8.3",
-    "@dxos/config": "0.8.3",
-    "@dxos/credentials": "0.8.3",
-    "@dxos/context": "0.8.3",
-    "@dxos/crypto": "0.8.3",
-    "@dxos/echo-db": "0.8.3",
-    "@dxos/echo-pipeline": "0.8.3",
-    "@dxos/debug": "0.8.3",
-    "@dxos/echo-protocol": "0.8.3",
-    "@dxos/edge-client": "0.8.3",
-    "@dxos/echo-schema": "0.8.3",
-    "@dxos/feed-store": "0.8.3",
-    "@dxos/indexing": "0.8.3",
-    "@dxos/invariant": "0.8.3",
-    "@dxos/keyring": "0.8.3",
-    "@dxos/keys": "0.8.3",
-    "@dxos/kv-store": "0.8.3",
-    "@dxos/lock-file": "0.8.3",
-    "@dxos/log": "0.8.3",
-    "@dxos/messaging": "0.8.3",
-    "@dxos/network-manager": "0.8.3",
-    "@dxos/random-access-storage": "0.8.3",
-    "@dxos/protocols": "0.8.3",
-    "@dxos/node-std": "0.8.3",
-    "@dxos/rpc": "0.8.3",
-    "@dxos/teleport-extension-gossip": "0.8.3",
-    "@dxos/teleport-extension-object-sync": "0.8.3",
-    "@dxos/teleport": "0.8.3",
-    "@dxos/tracing": "0.8.3",
-    "@dxos/util": "0.8.3",
-    "@dxos/timeframe": "0.8.3",
-    "@dxos/websocket-rpc": "0.8.3"
+    "@dxos/async": "0.8.4-main.28f8d3d",
+    "@dxos/client-protocol": "0.8.4-main.28f8d3d",
+    "@dxos/codec-protobuf": "0.8.4-main.28f8d3d",
+    "@dxos/config": "0.8.4-main.28f8d3d",
+    "@dxos/credentials": "0.8.4-main.28f8d3d",
+    "@dxos/crypto": "0.8.4-main.28f8d3d",
+    "@dxos/debug": "0.8.4-main.28f8d3d",
+    "@dxos/echo-db": "0.8.4-main.28f8d3d",
+    "@dxos/context": "0.8.4-main.28f8d3d",
+    "@dxos/echo-pipeline": "0.8.4-main.28f8d3d",
+    "@dxos/echo-protocol": "0.8.4-main.28f8d3d",
+    "@dxos/echo-schema": "0.8.4-main.28f8d3d",
+    "@dxos/edge-client": "0.8.4-main.28f8d3d",
+    "@dxos/indexing": "0.8.4-main.28f8d3d",
+    "@dxos/invariant": "0.8.4-main.28f8d3d",
+    "@dxos/keyring": "0.8.4-main.28f8d3d",
+    "@dxos/keys": "0.8.4-main.28f8d3d",
+    "@dxos/kv-store": "0.8.4-main.28f8d3d",
+    "@dxos/lock-file": "0.8.4-main.28f8d3d",
+    "@dxos/messaging": "0.8.4-main.28f8d3d",
+    "@dxos/node-std": "0.8.4-main.28f8d3d",
+    "@dxos/network-manager": "0.8.4-main.28f8d3d",
+    "@dxos/log": "0.8.4-main.28f8d3d",
+    "@dxos/protocols": "0.8.4-main.28f8d3d",
+    "@dxos/feed-store": "0.8.4-main.28f8d3d",
+    "@dxos/random-access-storage": "0.8.4-main.28f8d3d",
+    "@dxos/rpc": "0.8.4-main.28f8d3d",
+    "@dxos/teleport": "0.8.4-main.28f8d3d",
+    "@dxos/teleport-extension-gossip": "0.8.4-main.28f8d3d",
+    "@dxos/teleport-extension-object-sync": "0.8.4-main.28f8d3d",
+    "@dxos/timeframe": "0.8.4-main.28f8d3d",
+    "@dxos/tracing": "0.8.4-main.28f8d3d",
+    "@dxos/util": "0.8.4-main.28f8d3d",
+    "@dxos/websocket-rpc": "0.8.4-main.28f8d3d"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
     "get-port-please": "^3.1.1",
-    "@dxos/signal": "0.8.3",
-    "@dxos/test-utils": "0.8.3"
+    "@dxos/test-utils": "0.8.4-main.28f8d3d",
+    "@dxos/signal": "0.8.4-main.28f8d3d"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/agents/edge-agent-service.ts

@@ -6,10 +6,10 @@ import { Stream } from '@dxos/codec-protobuf/stream';
 import { type EdgeConnection } from '@dxos/edge-client';
 import { EdgeAgentStatus } from '@dxos/protocols';
 import {
-  QueryAgentStatusResponse,
+  type EdgeAgentService,
   EdgeStatus,
+  QueryAgentStatusResponse,
   type QueryEdgeStatusResponse,
-  type EdgeAgentService,
 } from '@dxos/protocols/proto/dxos/client/services';
 
 import { type EdgeAgentManager } from './edge-agent-manager';

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

@@ -2,17 +2,18 @@
 // Copyright 2023 DXOS.org
 //
 
-import { afterEach, onTestFinished, beforeEach, describe, expect, test } from 'vitest';
+import { afterEach, beforeEach, describe, expect, onTestFinished, test } from 'vitest';
 
 import { Trigger } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { log } from '@dxos/log';
-import { type DevicesService, type Device } from '@dxos/protocols/proto/dxos/client/services';
+import { type Device, type DevicesService } from '@dxos/protocols/proto/dxos/client/services';
 
-import { DevicesServiceImpl } from './devices-service';
 import { type ServiceContext } from '../services';
 import { createServiceContext } from '../testing';
 
+import { DevicesServiceImpl } from './devices-service';
+
 describe('DevicesService', () => {
   let serviceContext: ServiceContext;
   let devicesService: DevicesService;

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

@@ -9,8 +9,8 @@ import { invariant } from '@dxos/invariant';
 import {
   Device,
   DeviceKind,
-  EdgeStatus,
   type DevicesService,
+  EdgeStatus,
   type QueryDevicesResponse,
 } from '@dxos/protocols/proto/dxos/client/services';
 import { type DeviceProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';

package/src/packlets/devtools/devtools.ts

@@ -11,14 +11,18 @@ import {
   type EnableDebugLoggingRequest,
   type EnableDebugLoggingResponse,
   type Event,
+  type GetBlobsResponse,
   type GetConfigResponse,
   type GetNetworkPeersRequest,
   type GetNetworkPeersResponse,
+  type GetSnapshotsResponse,
   type GetSpaceSnapshotRequest,
   type GetSpaceSnapshotResponse,
   type ResetStorageRequest,
   type SaveSpaceSnapshotRequest,
   type SaveSpaceSnapshotResponse,
+  type SignalResponse,
+  type StorageInfo,
   type SubscribeToCredentialMessagesRequest,
   type SubscribeToCredentialMessagesResponse,
   type SubscribeToFeedBlocksRequest,
@@ -29,24 +33,21 @@ import {
   type SubscribeToItemsResponse,
   type SubscribeToKeyringKeysRequest,
   type SubscribeToKeyringKeysResponse,
+  type SubscribeToMetadataResponse,
   type SubscribeToNetworkTopicsResponse,
+  type SubscribeToSignalStatusResponse,
   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 { type ServiceContext } from '../services';
+
 import { subscribeToFeedBlocks, subscribeToFeeds } from './feeds';
 import { subscribeToKeyringKeys } from './keys';
 import { subscribeToMetadata } from './metadata';
 import { subscribeToNetworkStatus, subscribeToSignal, subscribeToSwarmInfo } from './network';
 import { subscribeToSpaces } from './spaces';
-import { type ServiceContext } from '../services';
 
 export class DevtoolsHostEvents {
   readonly ready = new AsyncEvent();
@@ -64,7 +65,7 @@ export type DevtoolsServiceParams = {
 export class DevtoolsServiceImpl implements DevtoolsHost {
   constructor(private readonly params: DevtoolsServiceParams) {}
 
-  events(request: void): Stream<Event> {
+  events(_request: void): Stream<Event> {
     return new Stream<Event>(({ next }) => {
       this.params.events.ready.on(() => {
         next({ ready: {} });
@@ -72,7 +73,7 @@ export class DevtoolsServiceImpl implements DevtoolsHost {
     });
   }
 
-  async getConfig(request: void): Promise<GetConfigResponse> {
+  async getConfig(_request: void): Promise<GetConfigResponse> {
     return { config: JSON.stringify(this.params.config.values) }; // 😨
   }
 
@@ -101,65 +102,65 @@ export class DevtoolsServiceImpl implements DevtoolsHost {
     };
   }
 
-  resetStorage(request: ResetStorageRequest): Promise<void> {
+  resetStorage(_request: ResetStorageRequest): Promise<void> {
     throw new Error();
   }
 
-  enableDebugLogging(request: EnableDebugLoggingRequest): Promise<EnableDebugLoggingResponse> {
+  enableDebugLogging(_request: EnableDebugLoggingRequest): Promise<EnableDebugLoggingResponse> {
     throw new Error();
   }
 
-  disableDebugLogging(request: EnableDebugLoggingRequest): Promise<EnableDebugLoggingResponse> {
+  disableDebugLogging(_request: EnableDebugLoggingRequest): Promise<EnableDebugLoggingResponse> {
     throw new Error();
   }
 
-  subscribeToKeyringKeys(request: SubscribeToKeyringKeysRequest): Stream<SubscribeToKeyringKeysResponse> {
+  subscribeToKeyringKeys(_request: SubscribeToKeyringKeysRequest): Stream<SubscribeToKeyringKeysResponse> {
     return subscribeToKeyringKeys({ keyring: this.params.context.keyring });
   }
 
   subscribeToCredentialMessages(
-    request: SubscribeToCredentialMessagesRequest,
+    _request: SubscribeToCredentialMessagesRequest,
   ): Stream<SubscribeToCredentialMessagesResponse> {
     throw new Error();
   }
 
-  subscribeToSpaces(request: SubscribeToSpacesRequest): Stream<SubscribeToSpacesResponse> {
-    return subscribeToSpaces(this.params.context, request);
+  subscribeToSpaces(_request: SubscribeToSpacesRequest): Stream<SubscribeToSpacesResponse> {
+    return subscribeToSpaces(this.params.context, _request);
   }
 
-  subscribeToItems(request: SubscribeToItemsRequest): Stream<SubscribeToItemsResponse> {
+  subscribeToItems(_request: SubscribeToItemsRequest): Stream<SubscribeToItemsResponse> {
     throw new Error();
   }
 
-  subscribeToFeeds(request: SubscribeToFeedsRequest): Stream<SubscribeToFeedsResponse> {
-    return subscribeToFeeds(this.params.context, request);
+  subscribeToFeeds(_request: SubscribeToFeedsRequest): Stream<SubscribeToFeedsResponse> {
+    return subscribeToFeeds(this.params.context, _request);
   }
 
-  subscribeToFeedBlocks(request: SubscribeToFeedBlocksRequest): Stream<SubscribeToFeedBlocksResponse> {
-    return subscribeToFeedBlocks({ feedStore: this.params.context.feedStore }, request);
+  subscribeToFeedBlocks(_request: SubscribeToFeedBlocksRequest): Stream<SubscribeToFeedBlocksResponse> {
+    return subscribeToFeedBlocks({ feedStore: this.params.context.feedStore }, _request);
   }
 
-  getSpaceSnapshot(request: GetSpaceSnapshotRequest): Promise<GetSpaceSnapshotResponse> {
+  getSpaceSnapshot(_request: GetSpaceSnapshotRequest): Promise<GetSpaceSnapshotResponse> {
     throw new Error();
   }
 
-  saveSpaceSnapshot(request: SaveSpaceSnapshotRequest): Promise<SaveSpaceSnapshotResponse> {
+  saveSpaceSnapshot(_request: SaveSpaceSnapshotRequest): Promise<SaveSpaceSnapshotResponse> {
     throw new Error();
   }
 
-  clearSnapshots(request: ClearSnapshotsRequest): Promise<void> {
+  clearSnapshots(_request: ClearSnapshotsRequest): Promise<void> {
     throw new Error();
   }
 
-  getNetworkPeers(request: GetNetworkPeersRequest): Promise<GetNetworkPeersResponse> {
+  getNetworkPeers(_request: GetNetworkPeersRequest): Promise<GetNetworkPeersResponse> {
     throw new Error();
   }
 
-  subscribeToNetworkTopics(request: void): Stream<SubscribeToNetworkTopicsResponse> {
+  subscribeToNetworkTopics(_request: void): Stream<SubscribeToNetworkTopicsResponse> {
     throw new Error();
   }
 
-  subscribeToSignalStatus(request: void): Stream<SubscribeToSignalStatusResponse> {
+  subscribeToSignalStatus(_request: void): Stream<SubscribeToSignalStatusResponse> {
     return subscribeToNetworkStatus({ signalManager: this.params.context.signalManager });
   }
 

package/src/packlets/devtools/feeds.ts

@@ -9,10 +9,10 @@ import { FeedIterator, type FeedStore, type FeedWrapper } from '@dxos/feed-store
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import {
-  type SubscribeToFeedsRequest,
-  type SubscribeToFeedsResponse,
   type SubscribeToFeedBlocksRequest,
   type SubscribeToFeedBlocksResponse,
+  type SubscribeToFeedsRequest,
+  type SubscribeToFeedsResponse,
 } from '@dxos/protocols/proto/dxos/devtools/host';
 import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { ComplexMap } from '@dxos/util';

package/src/packlets/devtools/network.ts

@@ -10,9 +10,9 @@ import { type SwarmNetworkManager } from '@dxos/network-manager';
 import {
   type GetNetworkPeersRequest,
   type GetNetworkPeersResponse,
+  type SignalResponse,
   type SubscribeToNetworkTopicsResponse,
   type SubscribeToSignalStatusResponse,
-  type SignalResponse,
   type SubscribeToSwarmInfoResponse,
 } from '@dxos/protocols/proto/dxos/devtools/host';
 

package/src/packlets/diagnostics/browser-diagnostics-broadcast.ts

@@ -7,8 +7,8 @@ import { log } from '@dxos/log';
 import { type SystemService } from '@dxos/protocols/proto/dxos/client/services';
 
 import {
-  type CollectDiagnosticsBroadcastSender,
   type CollectDiagnosticsBroadcastHandler,
+  type CollectDiagnosticsBroadcastSender,
 } from './diagnostics-collector';
 
 const CHANNEL_NAME = 'dxos.diagnostics.broadcast';

package/src/packlets/diagnostics/diagnostics-broadcast.ts

@@ -5,8 +5,8 @@
 import { type SystemService } from '@dxos/protocols/proto/dxos/client/services';
 
 import {
-  type CollectDiagnosticsBroadcastSender,
   type CollectDiagnosticsBroadcastHandler,
+  type CollectDiagnosticsBroadcastSender,
 } from './diagnostics-collector';
 
 export const createCollectDiagnosticsBroadcastSender = (): CollectDiagnosticsBroadcastSender => {

package/src/packlets/diagnostics/diagnostics-collector.ts

@@ -6,7 +6,7 @@ import { type ClientServicesProvider, ClientServicesProviderResource } from '@dx
 import { type Config, ConfigResource } from '@dxos/config';
 import { GetDiagnosticsRequest } from '@dxos/protocols/proto/dxos/client/services';
 import { TRACE_PROCESSOR } from '@dxos/tracing';
-import { type JsonKeyOptions, jsonKeyReplacer, isNonNullable } from '@dxos/util';
+import { type JsonKeyOptions, isNonNullable, jsonKeyReplacer } from '@dxos/util';
 
 import { createCollectDiagnosticsBroadcastSender } from './diagnostics-broadcast';
 

package/src/packlets/diagnostics/diagnostics.ts

@@ -11,13 +11,13 @@ import { invariant } from '@dxos/invariant';
 import { type PublicKey } from '@dxos/keys';
 import { STORAGE_VERSION } from '@dxos/protocols';
 import {
-  SpaceMember,
   type Device,
   type Identity,
   type LogEntry,
   type Metrics,
   type NetworkStatus,
   type Platform,
+  SpaceMember,
   type Space as SpaceProto,
 } from '@dxos/protocols/proto/dxos/client/services';
 import { type SubscribeToFeedsResponse } from '@dxos/protocols/proto/dxos/devtools/host';

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

@@ -11,7 +11,7 @@ import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { ComplexSet } from '@dxos/util';
 
-import { createAuthProvider, TrustedKeySetAuthVerifier } from './authenticator';
+import { TrustedKeySetAuthVerifier, createAuthProvider } from './authenticator';
 
 describe('identity/authenticator', () => {
   test('verifies credentials', async () => {

package/src/packlets/identity/authenticator.ts

@@ -4,7 +4,7 @@
 
 import { type Event, Trigger } from '@dxos/async';
 import { Context } from '@dxos/context';
-import { verifyCredential, type CredentialSigner } from '@dxos/credentials';
+import { type CredentialSigner, verifyCredential } from '@dxos/credentials';
 import { type AuthProvider, type AuthVerifier } from '@dxos/echo-pipeline';
 import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';

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

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { scheduleTask, UpdateScheduler, SubscriptionList } from '@dxos/async';
+import { SubscriptionList, UpdateScheduler, scheduleTask } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf/stream';
 import { type MemberInfo } from '@dxos/credentials';
 import { type SpaceManager } from '@dxos/echo-pipeline';
@@ -10,9 +10,10 @@ import { PublicKey } from '@dxos/keys';
 import { type Contact, type ContactBook, type ContactsService } from '@dxos/protocols/proto/dxos/client/services';
 import { ComplexMap, ComplexSet } from '@dxos/util';
 
-import { type IdentityManager } from './identity-manager';
 import { type DataSpaceManager } from '../spaces';
 
+import { type IdentityManager } from './identity-manager';
+
 export class ContactsServiceImpl implements ContactsService {
   constructor(
     private readonly _identityManager: IdentityManager,

package/src/packlets/identity/default-space-state-machine.ts

@@ -3,7 +3,7 @@
 //
 
 import { type CredentialProcessor, getCredentialAssertion } from '@dxos/credentials';
-import { SpaceId, type PublicKey } from '@dxos/keys';
+import { type PublicKey, SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 

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

@@ -2,16 +2,16 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test, onTestFinished } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { Context } from '@dxos/context';
-import { valueEncoding, MetadataStore, SpaceManager, AuthStatus } from '@dxos/echo-pipeline';
+import { AuthStatus, MetadataStore, SpaceManager, valueEncoding } from '@dxos/echo-pipeline';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
 import { MemoryTransportFactory, SwarmNetworkManager } from '@dxos/network-manager';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
-import { createStorage, type Storage, StorageType } from '@dxos/random-access-storage';
+import { type Storage, StorageType, createStorage } from '@dxos/random-access-storage';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
 
 import { IdentityManager } from './identity-manager';

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

@@ -5,7 +5,7 @@ import platform from 'platform';
 
 import { Event } from '@dxos/async';
 import { Context } from '@dxos/context';
-import { createCredentialSignerWithKey, createDidFromIdentityKey, CredentialGenerator } from '@dxos/credentials';
+import { CredentialGenerator, createCredentialSignerWithKey, createDidFromIdentityKey } from '@dxos/credentials';
 import { type MetadataStore, type SpaceManager, type SwarmIdentity } from '@dxos/echo-pipeline';
 import { type EdgeConnection } from '@dxos/edge-client';
 import { type FeedStore } from '@dxos/feed-store';
@@ -20,15 +20,15 @@ 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 Credential,
   type DeviceProfileDocument,
   DeviceType,
   type ProfileDocument,
-  type Credential,
 } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { Gossip, Presence } from '@dxos/teleport-extension-gossip';
 import { Timeframe } from '@dxos/timeframe';
 import { trace as Trace } from '@dxos/tracing';
-import { isNode, deferFunction } from '@dxos/util';
+import { deferFunction, isNode } from '@dxos/util';
 
 import { createAuthProvider } from './authenticator';
 import { Identity } from './identity';

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

@@ -2,17 +2,18 @@
 // Copyright 2023 DXOS.org
 //
 
-import { afterEach, onTestFinished, beforeEach, describe, expect, test } from 'vitest';
+import { afterEach, beforeEach, describe, expect, onTestFinished, test } from 'vitest';
 
 import { Trigger } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
 import { type Identity, type IdentityService } from '@dxos/protocols/proto/dxos/client/services';
 
-import { IdentityServiceImpl } from './identity-service';
 import { type ServiceContext } from '../services';
 import { createServiceContext } from '../testing';
 
+import { IdentityServiceImpl } from './identity-service';
+
 describe('IdentityService', () => {
   let serviceContext: ServiceContext;
   let identityService: IdentityService;

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

@@ -22,10 +22,11 @@ import {
 import { type Presentation, type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { safeAwaitAll } from '@dxos/util';
 
+import { type DataSpaceManager } from '../spaces';
+
 import { type Identity } from './identity';
 import { type CreateIdentityOptions, type IdentityManager } from './identity-manager';
 import { type EdgeIdentityRecoveryManager } from './identity-recovery-manager';
-import { type DataSpaceManager } from '../spaces';
 
 const DEFAULT_SPACE_SEARCH_TIMEOUT = 10_000;
 

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

@@ -2,18 +2,18 @@
 // Copyright 2022 DXOS.org
 //
 
-import { onTestFinished, describe, expect, test } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { Event } from '@dxos/async';
 import { Context } from '@dxos/context';
-import { createDidFromIdentityKey, CredentialGenerator, verifyCredential } from '@dxos/credentials';
+import { CredentialGenerator, createDidFromIdentityKey, verifyCredential } from '@dxos/credentials';
 import {
-  createIdFromSpaceKey,
-  MetadataStore,
   MOCK_AUTH_PROVIDER,
   MOCK_AUTH_VERIFIER,
+  MetadataStore,
   Space,
   SpaceProtocol,
+  createIdFromSpaceKey,
   valueEncoding,
 } from '@dxos/echo-pipeline';
 import { type EdgeConnection, type MessageListener } from '@dxos/edge-client';
@@ -26,7 +26,7 @@ import { MemoryTransportFactory, SwarmNetworkManager } from '@dxos/network-manag
 import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
 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 { StorageType, createStorage } from '@dxos/random-access-storage';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
 
 import { Identity } from './identity';

package/src/packlets/identity/identity.ts

@@ -6,16 +6,16 @@ import { Event } from '@dxos/async';
 import { AUTH_TIMEOUT, LOAD_CONTROL_FEEDS_TIMEOUT } from '@dxos/client-protocol';
 import { type Context } from '@dxos/context';
 import {
-  DeviceStateMachine,
   type CredentialSigner,
-  createCredentialSignerWithKey,
-  createCredentialSignerWithChain,
+  DeviceStateMachine,
   ProfileStateMachine,
+  createCredentialSignerWithChain,
+  createCredentialSignerWithKey,
 } from '@dxos/credentials';
 import { type Signer } from '@dxos/crypto';
 import { type Space } from '@dxos/echo-pipeline';
 import { type EdgeConnection } from '@dxos/edge-client';
-import { writeMessages, type FeedWrapper } from '@dxos/feed-store';
+import { type FeedWrapper, writeMessages } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
 import { type IdentityDid, PublicKey, type SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -23,9 +23,9 @@ import { type Runtime } from '@dxos/protocols/proto/dxos/config';
 import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import {
   AdmittedFeed,
+  type Credential,
   type DeviceProfileDocument,
   type ProfileDocument,
-  type Credential,
 } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type DeviceAdmissionRequest } from '@dxos/protocols/proto/dxos/halo/invitations';
 import { type Presence } from '@dxos/teleport-extension-gossip';
@@ -33,9 +33,10 @@ import { Timeframe } from '@dxos/timeframe';
 import { trace } from '@dxos/tracing';
 import { type ComplexMap, ComplexSet } from '@dxos/util';
 
+import { EdgeFeedReplicator } from '../spaces';
+
 import { TrustedKeySetAuthVerifier } from './authenticator';
 import { DefaultSpaceStateMachine } from './default-space-state-machine';
-import { EdgeFeedReplicator } from '../spaces';
 
 export type IdentityParams = {
   did: IdentityDid;

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

@@ -2,9 +2,9 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test, onTestFinished } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
-import { asyncChain } from '@dxos/async';
+import { chain } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { AlreadyJoinedError } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
@@ -32,7 +32,7 @@ describe('services/device', () => {
   });
 
   test('creates and accepts invitation', async () => {
-    const [host, guest] = await asyncChain<ServiceContext>([closeAfterTest])(createPeers(2));
+    const [host, guest] = await chain<ServiceContext>([closeAfterTest])(createPeers(2));
 
     const identity1 = await host.createIdentity();
     expect(host.identityManager.identity).to.eq(identity1);
@@ -42,7 +42,7 @@ describe('services/device', () => {
   });
 
   test('invitation when already joined', async () => {
-    const [host, guest] = await asyncChain<ServiceContext>([closeAfterTest])(createPeers(2));
+    const [host, guest] = await chain<ServiceContext>([closeAfterTest])(createPeers(2));
 
     const identity1 = await host.createIdentity();
     expect(host.identityManager.identity).to.eq(identity1);

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

@@ -15,9 +15,10 @@ import {
   type IntroductionRequest,
 } from '@dxos/protocols/proto/dxos/halo/invitations';
 
-import { type InvitationProtocol } from './invitation-protocol';
 import { type Identity, type JoinIdentityParams } from '../identity';
 
+import { type InvitationProtocol } from './invitation-protocol';
+
 export class DeviceInvitationProtocol implements InvitationProtocol {
   constructor(
     private readonly _keyring: Keyring,