@dxos/client-services 0.6.12 → 0.6.13-main.548ca8d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.6.12",
+  "version": "0.6.13-main.548ca8d",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,14 +10,16 @@
     ".": {
       "browser": "./dist/lib/browser/index.mjs",
       "node": {
-        "default": "./dist/lib/node/index.cjs"
+        "require": "./dist/lib/node/index.cjs",
+        "default": "./dist/lib/node-esm/index.mjs"
       },
       "types": "./dist/types/src/index.d.ts"
     },
     "./testing": {
       "browser": "./dist/lib/browser/testing/index.mjs",
       "node": {
-        "default": "./dist/lib/node/testing/index.cjs"
+        "require": "./dist/lib/node/testing/index.cjs",
+        "default": "./dist/lib/node-esm/testing/index.mjs"
       },
       "types": "./dist/types/src/testing/index.d.ts"
     }
@@ -45,46 +47,48 @@
   "dependencies": {
     "cbor-x": "^1.5.4",
     "platform": "^1.3.6",
-    "@dxos/async": "0.6.12",
-    "@dxos/automerge": "0.6.12",
-    "@dxos/codec-protobuf": "0.6.12",
-    "@dxos/config": "0.6.12",
-    "@dxos/client-protocol": "0.6.12",
-    "@dxos/context": "0.6.12",
-    "@dxos/credentials": "0.6.12",
-    "@dxos/debug": "0.6.12",
-    "@dxos/crypto": "0.6.12",
-    "@dxos/echo-db": "0.6.12",
-    "@dxos/echo-pipeline": "0.6.12",
-    "@dxos/echo-protocol": "0.6.12",
-    "@dxos/echo-schema": "0.6.12",
-    "@dxos/edge-client": "0.6.12",
-    "@dxos/feed-store": "0.6.12",
-    "@dxos/indexing": "0.6.12",
-    "@dxos/invariant": "0.6.12",
-    "@dxos/keyring": "0.6.12",
-    "@dxos/keys": "0.6.12",
-    "@dxos/kv-store": "0.6.12",
-    "@dxos/lock-file": "0.6.12",
-    "@dxos/messaging": "0.6.12",
-    "@dxos/log": "0.6.12",
-    "@dxos/network-manager": "0.6.12",
-    "@dxos/node-std": "0.6.12",
-    "@dxos/protocols": "0.6.12",
-    "@dxos/rpc": "0.6.12",
-    "@dxos/random-access-storage": "0.6.12",
-    "@dxos/teleport": "0.6.12",
-    "@dxos/teleport-extension-gossip": "0.6.12",
-    "@dxos/timeframe": "0.6.12",
-    "@dxos/teleport-extension-object-sync": "0.6.12",
-    "@dxos/tracing": "0.6.12",
-    "@dxos/util": "0.6.12",
-    "@dxos/websocket-rpc": "0.6.12"
+    "@dxos/async": "0.6.13-main.548ca8d",
+    "@dxos/automerge": "0.6.13-main.548ca8d",
+    "@dxos/client-protocol": "0.6.13-main.548ca8d",
+    "@dxos/codec-protobuf": "0.6.13-main.548ca8d",
+    "@dxos/config": "0.6.13-main.548ca8d",
+    "@dxos/credentials": "0.6.13-main.548ca8d",
+    "@dxos/crypto": "0.6.13-main.548ca8d",
+    "@dxos/context": "0.6.13-main.548ca8d",
+    "@dxos/debug": "0.6.13-main.548ca8d",
+    "@dxos/echo-db": "0.6.13-main.548ca8d",
+    "@dxos/echo-pipeline": "0.6.13-main.548ca8d",
+    "@dxos/echo-schema": "0.6.13-main.548ca8d",
+    "@dxos/edge-client": "0.6.13-main.548ca8d",
+    "@dxos/feed-store": "0.6.13-main.548ca8d",
+    "@dxos/echo-protocol": "0.6.13-main.548ca8d",
+    "@dxos/indexing": "0.6.13-main.548ca8d",
+    "@dxos/invariant": "0.6.13-main.548ca8d",
+    "@dxos/keys": "0.6.13-main.548ca8d",
+    "@dxos/keyring": "0.6.13-main.548ca8d",
+    "@dxos/kv-store": "0.6.13-main.548ca8d",
+    "@dxos/lock-file": "0.6.13-main.548ca8d",
+    "@dxos/log": "0.6.13-main.548ca8d",
+    "@dxos/messaging": "0.6.13-main.548ca8d",
+    "@dxos/node-std": "0.6.13-main.548ca8d",
+    "@dxos/network-manager": "0.6.13-main.548ca8d",
+    "@dxos/protocols": "0.6.13-main.548ca8d",
+    "@dxos/rpc": "0.6.13-main.548ca8d",
+    "@dxos/random-access-storage": "0.6.13-main.548ca8d",
+    "@dxos/teleport": "0.6.13-main.548ca8d",
+    "@dxos/teleport-extension-gossip": "0.6.13-main.548ca8d",
+    "@dxos/teleport-extension-object-sync": "0.6.13-main.548ca8d",
+    "@dxos/timeframe": "0.6.13-main.548ca8d",
+    "@dxos/tracing": "0.6.13-main.548ca8d",
+    "@dxos/util": "0.6.13-main.548ca8d",
+    "@dxos/websocket-rpc": "0.6.13-main.548ca8d"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.6.12"
+    "get-port-please": "^3.1.1",
+    "@dxos/test-utils": "0.6.13-main.548ca8d",
+    "@dxos/signal": "0.6.13-main.548ca8d"
   },
   "publishConfig": {
     "access": "public"

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

@@ -2,13 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
-import { expect } from 'chai';
+import { afterEach, onTestFinished, beforeEach, describe, expect, 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 { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
 
 import { DevicesServiceImpl } from './devices-service';
 import { type ServiceContext } from '../services';
@@ -36,7 +35,7 @@ describe('DevicesService', () => {
       query.subscribe(({ devices }) => {
         result.wake(devices);
       });
-      afterTest(() => query.close());
+      onTestFinished(() => query.close());
       expect(device.profile?.label).to.equal('test-device');
     });
   });
@@ -51,7 +50,7 @@ describe('DevicesService', () => {
         },
         (err) => log.catch(err),
       );
-      afterTest(() => query.close().catch((err) => log.catch(err)));
+      onTestFinished(() => query.close().catch((err) => log.catch(err)));
       expect(await result.wait()).to.be.length(0);
     });
 
@@ -61,7 +60,7 @@ describe('DevicesService', () => {
       query.subscribe(({ devices }) => {
         result.wake(devices);
       });
-      afterTest(() => query.close());
+      onTestFinished(() => query.close());
       expect(await result.wait()).to.be.length(0);
 
       result = new Trigger<Device[] | undefined>();

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

@@ -1,6 +1,7 @@
 //
 // Copyright 2024 DXOS.org
 //
+
 import { type SystemService } from '@dxos/protocols/proto/dxos/client/services';
 
 import {

package/src/packlets/identity/{authenticator.test.ts → authenticator.node.test.ts}

@@ -2,14 +2,13 @@
 // Copyright 2022 DXOS.org
 //
 
-import expect from 'expect';
+import { describe, expect, test } from 'vitest';
 
 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';
 import { ComplexSet } from '@dxos/util';
 
 import { createAuthProvider, TrustedKeySetAuthVerifier } from './authenticator';
@@ -30,5 +29,5 @@ describe('identity/authenticator', () => {
     const credential = await authProvider(nonce);
     invariant(credential);
     expect(await authVerifier.verifier(nonce, credential)).toBeTruthy();
-  }).onlyEnvironments('nodejs');
+  });
 });

package/src/packlets/identity/authenticator.ts

@@ -67,7 +67,7 @@ export class TrustedKeySetAuthVerifier {
       }
 
       if (this._isTrustedKey(credential.issuer)) {
-        log('key is not currently in trusted set, waiting...', { key: credential.issuer });
+        log('key is trusted -- auth success', { key: credential.issuer });
         return true;
       }
 
@@ -81,7 +81,10 @@ export class TrustedKeySetAuthVerifier {
           log('auth success', { key: credential.issuer });
           trigger.wake(true);
         } else {
-          log('key is not currently in trusted set, waiting...', { key: credential.issuer });
+          log('key is not currently in trusted set, waiting...', {
+            key: credential.issuer,
+            trusted: [...this._params.trustedKeysProvider()],
+          });
         }
       });
 

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

@@ -5,7 +5,7 @@
 import { EventSubscriptions, scheduleTask, UpdateScheduler } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
 import { type MemberInfo } from '@dxos/credentials';
-import type { SpaceManager } from '@dxos/echo-pipeline';
+import { type SpaceManager } from '@dxos/echo-pipeline';
 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';

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

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { expect } from 'chai';
+import { describe, expect, test, onTestFinished } from 'vitest';
 
 import { Context } from '@dxos/context';
 import { valueEncoding, MetadataStore, SpaceManager, AuthStatus } from '@dxos/echo-pipeline';
@@ -13,7 +13,6 @@ import { MemoryTransportFactory, SwarmNetworkManager } from '@dxos/network-manag
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 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';
 
 import { IdentityManager } from './identity-manager';
 
@@ -39,7 +38,7 @@ describe('identity/identity-manager', () => {
       }),
     });
 
-    afterTest(() => feedStore.close());
+    onTestFinished(() => feedStore.close());
 
     const networkManager = new SwarmNetworkManager({
       signalManager: new MemorySignalManager(signalContext),
@@ -51,7 +50,7 @@ describe('identity/identity-manager', () => {
       blobStore,
       metadataStore,
     });
-    const identityManager = new IdentityManager(metadataStore, keyring, feedStore, spaceManager);
+    const identityManager = new IdentityManager({ metadataStore, keyring, feedStore, spaceManager });
 
     return {
       metadataStore,
@@ -64,7 +63,7 @@ describe('identity/identity-manager', () => {
   test('creates identity', async () => {
     const { identityManager } = await setupPeer();
     await identityManager.open(new Context());
-    afterTest(() => identityManager.close());
+    onTestFinished(() => identityManager.close());
 
     const identity = await identityManager.createIdentity();
     expect(identity).to.exist;
@@ -95,7 +94,7 @@ describe('identity/identity-manager', () => {
   test('update profile', async () => {
     const { identityManager } = await setupPeer();
     await identityManager.open(new Context());
-    afterTest(() => identityManager.close());
+    onTestFinished(() => identityManager.close());
 
     const identity = await identityManager.createIdentity();
     expect(identity.profileDocument?.displayName).to.be.undefined;

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

@@ -7,6 +7,7 @@ import { Event } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { createCredentialSignerWithKey, CredentialGenerator } 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';
 import { invariant } from '@dxos/invariant';
 import { type Keyring } from '@dxos/keyring';
@@ -14,6 +15,7 @@ import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { trace } from '@dxos/protocols';
 import { Device, DeviceKind } from '@dxos/protocols/proto/dxos/client/services';
+import { type Runtime } from '@dxos/protocols/proto/dxos/config';
 import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { type IdentityRecord, type SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
 import {
@@ -63,9 +65,20 @@ export type CreateIdentityOptions = {
   deviceProfile?: DeviceProfileDocument;
 };
 
-export type IdentityManagerRuntimeParams = {
+export type IdentityManagerCallbacks = {
+  onIdentityConstruction?: (identity: Identity) => void;
+};
+
+export type IdentityManagerParams = {
+  metadataStore: MetadataStore;
+  keyring: Keyring;
+  feedStore: FeedStore<FeedMessage>;
+  spaceManager: SpaceManager;
+  edgeConnection?: EdgeConnection;
+  edgeFeatures?: Runtime.Client.EdgeFeatures;
   devicePresenceAnnounceInterval?: number;
   devicePresenceOfflineTimeout?: number;
+  callbacks?: IdentityManagerCallbacks;
 };
 
 // TODO(dmaretskyi): Rename: represents the peer's state machine.
@@ -73,28 +86,29 @@ export type IdentityManagerRuntimeParams = {
 export class IdentityManager {
   readonly stateUpdate = new Event();
 
-  private _identity?: Identity;
+  private readonly _metadataStore: MetadataStore;
+  private readonly _keyring: Keyring;
+  private readonly _feedStore: FeedStore<FeedMessage>;
+  private readonly _spaceManager: SpaceManager;
   private readonly _devicePresenceAnnounceInterval: number;
   private readonly _devicePresenceOfflineTimeout: number;
+  private readonly _edgeConnection: EdgeConnection | undefined;
+  private readonly _edgeFeatures: Runtime.Client.EdgeFeatures | undefined;
+  private readonly _callbacks: IdentityManagerCallbacks | undefined;
+
+  private _identity?: Identity;
 
-  // TODO(burdon): IdentityManagerParams.
   // TODO(dmaretskyi): Perhaps this should take/generate the peerKey outside of an initialized identity.
-  constructor(
-    private readonly _metadataStore: MetadataStore,
-    private readonly _keyring: Keyring,
-    private readonly _feedStore: FeedStore<FeedMessage>,
-    private readonly _spaceManager: SpaceManager,
-    params?: IdentityManagerRuntimeParams,
-    private readonly _callbacks?: {
-      onIdentityConstruction?: (identity: Identity) => void;
-    },
-  ) {
-    const {
-      devicePresenceAnnounceInterval = DEVICE_PRESENCE_ANNOUNCE_INTERVAL,
-      devicePresenceOfflineTimeout = DEVICE_PRESENCE_OFFLINE_TIMEOUT,
-    } = params ?? {};
-    this._devicePresenceAnnounceInterval = devicePresenceAnnounceInterval;
-    this._devicePresenceOfflineTimeout = devicePresenceOfflineTimeout;
+  constructor(params: IdentityManagerParams) {
+    this._metadataStore = params.metadataStore;
+    this._keyring = params.keyring;
+    this._feedStore = params.feedStore;
+    this._spaceManager = params.spaceManager;
+    this._edgeConnection = params.edgeConnection;
+    this._edgeFeatures = params.edgeFeatures;
+    this._devicePresenceAnnounceInterval = params.devicePresenceAnnounceInterval ?? DEVICE_PRESENCE_ANNOUNCE_INTERVAL;
+    this._devicePresenceOfflineTimeout = params.devicePresenceOfflineTimeout ?? DEVICE_PRESENCE_OFFLINE_TIMEOUT;
+    this._callbacks = params.callbacks;
   }
 
   get identity() {
@@ -360,6 +374,8 @@ export class IdentityManager {
       signer: this._keyring,
       identityKey: identityRecord.identityKey,
       deviceKey: identityRecord.deviceKey,
+      edgeConnection: this._edgeConnection,
+      edgeFeatures: this._edgeFeatures,
     });
     log('done', { identityKey: identityRecord.identityKey });
     this._callbacks?.onIdentityConstruction?.(identity);

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

@@ -2,21 +2,17 @@
 // Copyright 2023 DXOS.org
 //
 
-import chai, { expect } from 'chai';
-import chaiAsPromised from 'chai-as-promised';
+import { afterEach, onTestFinished, beforeEach, describe, expect, 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 { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
 
 import { IdentityServiceImpl } from './identity-service';
 import { type ServiceContext } from '../services';
 import { createServiceContext } from '../testing';
 
-chai.use(chaiAsPromised);
-
 describe('IdentityService', () => {
   let serviceContext: ServiceContext;
   let identityService: IdentityService;
@@ -49,7 +45,7 @@ describe('IdentityService', () => {
 
     test('fails to create identity if one already exists', async () => {
       await identityService.createIdentity({});
-      await expect(identityService.createIdentity({})).to.be.rejectedWith('Identity already exists');
+      await expect(identityService.createIdentity({})).rejects.toThrowError('Identity already exists');
     });
   });
 
@@ -72,7 +68,7 @@ describe('IdentityService', () => {
       query.subscribe(({ identity }) => {
         result.wake(identity);
       });
-      afterTest(() => query.close());
+      onTestFinished(() => query.close());
       expect(await result.wait()).to.be.undefined;
     });
 
@@ -82,7 +78,7 @@ describe('IdentityService', () => {
       query.subscribe(({ identity }) => {
         result.wake(identity);
       });
-      afterTest(() => query.close());
+      onTestFinished(() => query.close());
       expect(await result.wait()).to.be.undefined;
 
       result = new Trigger<Identity | undefined>();