@dxos/client-services 0.8.3 → 0.8.4-main.05e74ebcff

package/package.json

@@ -1,92 +1,109 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.8.3",
+  "version": "0.8.4-main.05e74ebcff",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
-  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
-  "sideEffects": true,
+  "sideEffects": false,
   "type": "module",
+  "imports": {
+    "#locks-platform": {
+      "source": {
+        "browser": "./src/packlets/locks/browser.ts",
+        "default": "./src/packlets/locks/node.ts"
+      },
+      "types": "./dist/types/src/packlets/locks/node.d.ts",
+      "browser": "./dist/lib/browser/packlets/locks/browser.mjs",
+      "default": "./dist/lib/node-esm/packlets/locks/node.mjs"
+    },
+    "#diagnostics-broadcast": {
+      "source": {
+        "browser": "./src/packlets/diagnostics/browser-diagnostics-broadcast.ts",
+        "default": "./src/packlets/diagnostics/diagnostics-broadcast.ts"
+      },
+      "types": "./dist/types/src/packlets/diagnostics/diagnostics-broadcast.d.ts",
+      "browser": "./dist/lib/browser/packlets/diagnostics/browser-diagnostics-broadcast.mjs",
+      "default": "./dist/lib/node-esm/packlets/diagnostics/diagnostics-broadcast.mjs"
+    }
+  },
   "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"
     }
   },
-  "browser": {
-    "jsondown": false,
-    "./src/packlets/locks/node.ts": "./src/packlets/locks/browser.ts",
-    "./src/packlets/diagnostics/diagnostics-broadcast.ts": "./src/packlets/diagnostics/browser-diagnostics-broadcast.ts",
-    "./testing.js": "./dist/lib/browser/packlets/testing/index.mjs"
-  },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "testing": [
-        "dist/types/src/testing/index.d.ts"
-      ]
-    }
-  },
   "files": [
-    "testing.d.ts",
-    "testing.js",
     "dist",
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.0.0-beta.4",
-    "@automerge/automerge-repo": "2.0.1",
+    "@automerge/automerge": "3.2.6",
+    "@automerge/automerge-repo": "2.6.0-subduction.17",
+    "@effect/experimental": "0.58.0",
+    "@effect/sql": "0.49.0",
+    "@effect/sql-sqlite-node": "0.50.1",
     "@obsidize/tar-browserify": "^5.2.0",
     "cbor-x": "^1.5.4",
+    "effect": "3.20.0",
     "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/codec-protobuf": "0.8.4-main.05e74ebcff",
+    "@dxos/async": "0.8.4-main.05e74ebcff",
+    "@dxos/client-protocol": "0.8.4-main.05e74ebcff",
+    "@dxos/config": "0.8.4-main.05e74ebcff",
+    "@dxos/credentials": "0.8.4-main.05e74ebcff",
+    "@dxos/crypto": "0.8.4-main.05e74ebcff",
+    "@dxos/context": "0.8.4-main.05e74ebcff",
+    "@dxos/debug": "0.8.4-main.05e74ebcff",
+    "@dxos/echo-db": "0.8.4-main.05e74ebcff",
+    "@dxos/echo-pipeline": "0.8.4-main.05e74ebcff",
+    "@dxos/echo": "0.8.4-main.05e74ebcff",
+    "@dxos/effect": "0.8.4-main.05e74ebcff",
+    "@dxos/feed-store": "0.8.4-main.05e74ebcff",
+    "@dxos/feed": "0.8.4-main.05e74ebcff",
+    "@dxos/edge-client": "0.8.4-main.05e74ebcff",
+    "@dxos/echo-protocol": "0.8.4-main.05e74ebcff",
+    "@dxos/keyring": "0.8.4-main.05e74ebcff",
+    "@dxos/kv-store": "0.8.4-main.05e74ebcff",
+    "@dxos/invariant": "0.8.4-main.05e74ebcff",
+    "@dxos/log": "0.8.4-main.05e74ebcff",
+    "@dxos/lock-file": "0.8.4-main.05e74ebcff",
+    "@dxos/keys": "0.8.4-main.05e74ebcff",
+    "@dxos/messaging": "0.8.4-main.05e74ebcff",
+    "@dxos/network-manager": "0.8.4-main.05e74ebcff",
+    "@dxos/node-std": "0.8.4-main.05e74ebcff",
+    "@dxos/protocols": "0.8.4-main.05e74ebcff",
+    "@dxos/random-access-storage": "0.8.4-main.05e74ebcff",
+    "@dxos/rpc": "0.8.4-main.05e74ebcff",
+    "@dxos/teleport": "0.8.4-main.05e74ebcff",
+    "@dxos/sql-sqlite": "0.8.4-main.05e74ebcff",
+    "@dxos/teleport-extension-gossip": "0.8.4-main.05e74ebcff",
+    "@dxos/teleport-extension-object-sync": "0.8.4-main.05e74ebcff",
+    "@dxos/timeframe": "0.8.4-main.05e74ebcff",
+    "@dxos/tracing": "0.8.4-main.05e74ebcff",
+    "@dxos/util": "0.8.4-main.05e74ebcff",
+    "@dxos/websocket-rpc": "0.8.4-main.05e74ebcff"
   },
   "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/signal": "0.8.4-main.05e74ebcff",
+    "@dxos/test-utils": "0.8.4-main.05e74ebcff"
   },
   "publishConfig": {
     "access": "public"

package/src/index.ts

@@ -8,6 +8,7 @@ export * from './packlets/identity';
 export * from './packlets/invitations';
 export * from './packlets/locks';
 export * from './packlets/services';
+export * from './packlets/space-export';
 export * from './packlets/spaces';
 export * from './packlets/storage';
 export * from './packlets/worker';

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

@@ -3,6 +3,7 @@
 //
 
 import { DeferredTask, Event, scheduleTask, synchronized } from '@dxos/async';
+import { Context } from '@dxos/context';
 import { Resource } from '@dxos/context';
 import { type EdgeHttpClient } from '@dxos/edge-client';
 import { invariant } from '@dxos/invariant';
@@ -50,12 +51,12 @@ export class EdgeAgentManager extends Resource {
   }
 
   @synchronized
-  public async createAgent(): Promise<void> {
+  public async createAgent(ctx: Context): Promise<void> {
     invariant(this.isOpen);
     invariant(this._edgeHttpClient);
     invariant(this._edgeFeatures?.agents);
 
-    const response = await this._edgeHttpClient.createAgent({
+    const response = await this._edgeHttpClient.createAgent(ctx, {
       identityKey: this._identity.identityKey.toHex(),
       haloSpaceId: this._identity.haloSpaceId,
       haloSpaceKey: this._identity.haloSpaceKey.toHex(),
@@ -92,7 +93,7 @@ export class EdgeAgentManager extends Resource {
 
     this._lastKnownDeviceCount = this._identity.authorizedDeviceKeys.size;
     this._fetchAgentStatusTask = new DeferredTask(this._ctx, async () => {
-      await this._fetchAgentStatus();
+      await this._fetchAgentStatus(this._ctx);
     });
     this._fetchAgentStatusTask.schedule();
 
@@ -117,11 +118,13 @@ export class EdgeAgentManager extends Resource {
     this._lastKnownDeviceCount = 0;
   }
 
-  protected async _fetchAgentStatus(): Promise<void> {
+  protected async _fetchAgentStatus(ctx: Context): Promise<void> {
     invariant(this._edgeHttpClient);
     try {
       log('fetching agent status');
-      const { agent } = await this._edgeHttpClient.getAgentStatus({ ownerIdentityKey: this._identity.identityKey });
+      const { agent } = await this._edgeHttpClient.getAgentStatus(ctx, {
+        ownerIdentityKey: this._identity.identityKey,
+      });
       const wasAgentCreatedDuringQuery = this._agentStatus === EdgeAgentStatus.ACTIVE;
       if (!wasAgentCreatedDuringQuery) {
         const deviceKey = agent.deviceKey ? PublicKey.fromHex(agent.deviceKey) : undefined;
@@ -162,7 +165,7 @@ export class EdgeAgentManager extends Resource {
       space.notarizationPlugin.setActiveEdgePollingEnabled(agentFeedNeedsNotarization);
       activePollingEnabled = activePollingEnabled || agentFeedNeedsNotarization;
 
-      log.info('set active edge polling', { enabled: agentFeedNeedsNotarization, spaceId: space.id });
+      log.verbose('set active edge polling', { enabled: agentFeedNeedsNotarization, spaceId: space.id });
     }
 
     if (activePollingEnabled) {
@@ -178,6 +181,6 @@ export class EdgeAgentManager extends Resource {
     if (deviceKey) {
       this._ensureAgentIsInSpaces(deviceKey);
     }
-    log.info('agent status update', { status });
+    log.verbose('agent status update', { status });
   }
 }

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

@@ -2,14 +2,16 @@
 // Copyright 2024 DXOS.org
 //
 
+import { type RequestOptions } from '@dxos/codec-protobuf';
 import { Stream } from '@dxos/codec-protobuf/stream';
+import { Context } from '@dxos/context';
 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';
@@ -25,7 +27,17 @@ export class EdgeAgentServiceImpl implements EdgeAgentService {
   queryEdgeStatus(): Stream<QueryEdgeStatusResponse> {
     return new Stream(({ ctx, next }) => {
       const update = () => {
-        next({ status: this._edgeConnection?.status ?? EdgeStatus.NOT_CONNECTED });
+        next({
+          status: this._edgeConnection?.status ?? {
+            state: EdgeStatus.ConnectionState.NOT_CONNECTED,
+            rtt: 0,
+            uptime: 0,
+            rateBytesUp: 0,
+            rateBytesDown: 0,
+            messagesSent: 0,
+            messagesReceived: 0,
+          },
+        });
       };
 
       this._edgeConnection?.statusChanged.on(ctx, update);
@@ -33,8 +45,8 @@ export class EdgeAgentServiceImpl implements EdgeAgentService {
     });
   }
 
-  async createAgent(): Promise<void> {
-    return (await this._agentManagerProvider()).createAgent();
+  async createAgent(_request: void, options?: RequestOptions): Promise<void> {
+    return (await this._agentManagerProvider()).createAgent(options?.ctx ?? Context.default());
   }
 
   queryAgentStatus(): Stream<QueryAgentStatusResponse> {

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

@@ -2,16 +2,16 @@
 // 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;

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';
@@ -44,7 +44,7 @@ export class DevicesServiceImpl implements DevicesService {
                 presence = Device.PresenceState.ONLINE;
               } else if (profile.os?.toUpperCase() === 'EDGE') {
                 presence =
-                  this._edgeConnection?.status === EdgeStatus.CONNECTED
+                  this._edgeConnection?.status.state === EdgeStatus.ConnectionState.CONNECTED
                     ? Device.PresenceState.ONLINE
                     : Device.PresenceState.OFFLINE;
               } else {

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,30 +33,26 @@ 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();
 }
 
-export type DevtoolsServiceParams = {
+export type DevtoolsServiceProps = {
   events: DevtoolsHostEvents;
   config: Config;
   context: ServiceContext;
@@ -62,9 +62,9 @@ export type DevtoolsServiceParams = {
  * @deprecated
  */
 export class DevtoolsServiceImpl implements DevtoolsHost {
-  constructor(private readonly params: DevtoolsServiceParams) {}
+  constructor(private readonly params: DevtoolsServiceProps) {}
 
-  events(request: void): Stream<Event> {
+  events(_request: void): Stream<Event> {
     return new Stream<Event>(({ next }) => {
       this.params.events.ready.on(() => {
         next({ ready: {} });
@@ -72,7 +72,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 +101,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,19 +11,19 @@ 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';
 import { type SwarmInfo } from '@dxos/protocols/proto/dxos/devtools/swarm';
 import { type Epoch } from '@dxos/protocols/proto/dxos/halo/credentials';
-import { type Resource, type Span } from '@dxos/protocols/proto/dxos/tracing';
+import { type Resource } from '@dxos/protocols/proto/dxos/tracing';
 import { TRACE_PROCESSOR } from '@dxos/tracing';
 
 import { DXOS_VERSION } from '../../version';
@@ -62,7 +62,6 @@ export type Diagnostics = {
 
 export type TraceDiagnostic = {
   resources: Record<string, Resource>;
-  spans: Span[];
   logs: LogEntry[];
 };
 

package/src/packlets/diagnostics/index.ts

@@ -4,4 +4,4 @@
 
 export * from './diagnostics';
 export * from './diagnostics-collector';
-export * from './diagnostics-broadcast';
+export * from '#diagnostics-broadcast';

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';
@@ -27,7 +27,7 @@ export const createAuthProvider =
     return Credential.encode(credential);
   };
 
-export type TrustedKeySetAuthVerifierParams = {
+export type TrustedKeySetAuthVerifierProps = {
   // TODO(dmaretskyi): Change to `isTrusted: (key) => bool`.
   trustedKeysProvider: () => ComplexSet<PublicKey>;
   update: Event<void>;
@@ -44,7 +44,7 @@ export type TrustedKeySetAuthVerifierParams = {
 export class TrustedKeySetAuthVerifier {
   private _ctx = new Context();
 
-  constructor(private readonly _params: TrustedKeySetAuthVerifierParams) {}
+  constructor(private readonly _params: TrustedKeySetAuthVerifierProps) {}
 
   async close(): Promise<void> {
     await this._ctx.dispose();

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,8 +10,8 @@ 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(