@dxos/client-services 0.6.12-main.ed7cda7 → 0.6.12-staging.0b4bb48

package/package.json

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

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

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

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

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

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

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

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

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

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

@@ -7,7 +7,6 @@ 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';
@@ -15,7 +14,6 @@ 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 {
@@ -65,20 +63,9 @@ export type CreateIdentityOptions = {
   deviceProfile?: DeviceProfileDocument;
 };
 
-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;
+export type IdentityManagerRuntimeParams = {
   devicePresenceAnnounceInterval?: number;
   devicePresenceOfflineTimeout?: number;
-  callbacks?: IdentityManagerCallbacks;
 };
 
 // TODO(dmaretskyi): Rename: represents the peer's state machine.
@@ -86,29 +73,28 @@ export type IdentityManagerParams = {
 export class IdentityManager {
   readonly stateUpdate = new Event();
 
-  private readonly _metadataStore: MetadataStore;
-  private readonly _keyring: Keyring;
-  private readonly _feedStore: FeedStore<FeedMessage>;
-  private readonly _spaceManager: SpaceManager;
+  private _identity?: Identity;
   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(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;
+  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;
   }
 
   get identity() {
@@ -374,8 +360,6 @@ 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,17 +2,21 @@
 // Copyright 2023 DXOS.org
 //
 
-import { afterEach, onTestFinished, beforeEach, describe, expect, test } from 'vitest';
+import chai, { expect } from 'chai';
+import chaiAsPromised from 'chai-as-promised';
 
 import { Trigger } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
 import { 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;
@@ -45,7 +49,7 @@ describe('IdentityService', () => {
 
     test('fails to create identity if one already exists', async () => {
       await identityService.createIdentity({});
-      await expect(identityService.createIdentity({})).rejects.toThrowError('Identity already exists');
+      await expect(identityService.createIdentity({})).to.be.rejectedWith('Identity already exists');
     });
   });
 
@@ -68,7 +72,7 @@ describe('IdentityService', () => {
       query.subscribe(({ identity }) => {
         result.wake(identity);
       });
-      onTestFinished(() => query.close());
+      afterTest(() => query.close());
       expect(await result.wait()).to.be.undefined;
     });
 
@@ -78,7 +82,7 @@ describe('IdentityService', () => {
       query.subscribe(({ identity }) => {
         result.wake(identity);
       });
-      onTestFinished(() => query.close());
+      afterTest(() => query.close());
       expect(await result.wait()).to.be.undefined;
 
       result = new Trigger<Identity | undefined>();