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

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

@@ -2,21 +2,20 @@
 // Copyright 2022 DXOS.org
 //
 
-import { onTestFinished, describe, expect, test } from 'vitest';
+import { expect } from 'chai';
 
 import { asyncChain, Trigger } from '@dxos/async';
 import { raise } from '@dxos/debug';
 import { AlreadyJoinedError } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
+import { afterTest, describe, test } from '@dxos/test';
 
 import { type ServiceContext } from '../services';
 import { createIdentity, createPeers } from '../testing';
 import { acceptInvitation, createInvitation, performInvitation } from '../testing/invitation-utils';
 
 const closeAfterTest = async (peer: ServiceContext) => {
-  onTestFinished(async () => {
-    await peer.close();
-  });
+  afterTest(() => peer.close());
   return peer;
 };
 

package/src/packlets/logging/logging.test.ts

@@ -2,11 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
-import { afterEach, beforeEach, describe, expect, test } from 'vitest';
+import { expect } from 'chai';
 
 import { Trigger } from '@dxos/async';
 import { log, LogLevel } from '@dxos/log';
 import { type LogEntry } from '@dxos/protocols/proto/dxos/client/services';
+import { beforeEach, describe, test } from '@dxos/test';
 
 import { LoggingServiceImpl } from './logging-service';
 

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

@@ -2,11 +2,12 @@
 // 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 { type NetworkService, ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
+import { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
 
 import { NetworkServiceImpl } from './network-service';
 import { type ServiceContext } from '../services';
@@ -40,7 +41,7 @@ describe('NetworkService', () => {
     query.subscribe(({ swarm }) => {
       result.wake(swarm);
     });
-    onTestFinished(() => query.close());
+    afterTest(() => query.close());
     expect(await result.wait()).to.equal(ConnectionState.ONLINE);
 
     result = new Trigger<ConnectionState | undefined>();

package/src/packlets/services/automerge-host.test.ts

@@ -0,0 +1,60 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { expect } from 'chai';
+
+import { asyncTimeout } from '@dxos/async';
+import { AutomergeContext } from '@dxos/echo-db';
+import { AutomergeHost, DataServiceImpl } from '@dxos/echo-pipeline';
+import { IndexMetadataStore } from '@dxos/indexing';
+import { createTestLevel } from '@dxos/kv-store/testing';
+import { afterTest, describe, openAndClose, test } from '@dxos/test';
+
+describe('AutomergeHost', () => {
+  test('automerge context is being synced with host', async () => {
+    //
+    // Setup:
+    // client-services           | <-------------> | client
+    // AutomergeHost             | DataServiceImpl | AutomergeContext
+    // creates repo and document | replicates repo | finds document in repo
+    //
+
+    const level = createTestLevel();
+    await level.open();
+    afterTest(() => level.close());
+
+    const host = new AutomergeHost({
+      db: level,
+      indexMetadataStore: new IndexMetadataStore({ db: level.sublevel('index-metadata') }),
+    });
+    await host.open();
+    afterTest(() => host.close());
+
+    const dataService = new DataServiceImpl({ automergeHost: host, updateIndexes: async () => {} });
+    const client = new AutomergeContext(dataService);
+    await openAndClose(client);
+
+    // Create document in repo.
+    const handle = host.repo.create();
+    const text = 'Hello World!';
+    handle.change((doc: any) => {
+      doc.text = text;
+    });
+
+    // Find document in repo.
+    const doc = client.repo.find<{ text: string }>(handle.url);
+    await asyncTimeout(doc.whenReady(), 1_000);
+    expect(doc.docSync().text).to.equal(text);
+
+    // Changes from client are replicated to host.
+    const newText = 'Goodbye World!!!';
+    doc.change((doc: any) => {
+      doc.text = newText;
+    });
+    await client.flush({ documentIds: [doc.documentId] });
+
+    await asyncTimeout(handle.whenReady(), 1_000);
+    expect(handle.docSync().text).to.equal(newText);
+  });
+});

package/src/packlets/services/service-context.test.ts

@@ -2,11 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import { describe, test } from 'vitest';
-
 import { MemorySignalManagerContext, MemorySignalManager } from '@dxos/messaging';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
-import { openAndClose } from '@dxos/test-utils';
+import { describe, openAndClose, test } from '@dxos/test';
 
 import { createServiceContext, performInvitation } from '../testing';
 

package/src/packlets/services/service-context.ts

@@ -6,14 +6,8 @@ import { Trigger } from '@dxos/async';
 import { Context, Resource } from '@dxos/context';
 import { getCredentialAssertion, type CredentialProcessor } from '@dxos/credentials';
 import { failUndefined } from '@dxos/debug';
-import {
-  EchoEdgeReplicator,
-  EchoHost,
-  MeshEchoReplicator,
-  MetadataStore,
-  SpaceManager,
-  valueEncoding,
-} from '@dxos/echo-pipeline';
+import { EchoEdgeReplicator, EchoHost } from '@dxos/echo-db';
+import { MeshEchoReplicator, MetadataStore, SpaceManager, valueEncoding } from '@dxos/echo-pipeline';
 import type { EdgeConnection } from '@dxos/edge-client';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
@@ -37,8 +31,8 @@ import { safeInstanceof } from '@dxos/util';
 import {
   IdentityManager,
   type CreateIdentityOptions,
+  type IdentityManagerRuntimeParams,
   type JoinIdentityParams,
-  type IdentityManagerParams,
 } from '../identity';
 import {
   DeviceInvitationProtocol,
@@ -49,10 +43,7 @@ import {
 } from '../invitations';
 import { DataSpaceManager, type DataSpaceManagerRuntimeParams, type SigningContext } from '../spaces';
 
-export type ServiceContextRuntimeParams = Pick<
-  IdentityManagerParams,
-  'devicePresenceOfflineTimeout' | 'devicePresenceAnnounceInterval'
-> &
+export type ServiceContextRuntimeParams = IdentityManagerRuntimeParams &
   DataSpaceManagerRuntimeParams & {
     invitationConnectionDefaultParams?: Partial<TeleportParams>;
     disableP2pReplication?: boolean;
@@ -125,16 +116,13 @@ export class ServiceContext extends Resource {
       disableP2pReplication: this._runtimeParams?.disableP2pReplication,
     });
 
-    this.identityManager = new IdentityManager({
-      metadataStore: this.metadataStore,
-      keyring: this.keyring,
-      feedStore: this.feedStore,
-      spaceManager: this.spaceManager,
-      devicePresenceOfflineTimeout: this._runtimeParams?.devicePresenceOfflineTimeout,
-      devicePresenceAnnounceInterval: this._runtimeParams?.devicePresenceAnnounceInterval,
-      edgeConnection: this._edgeConnection,
-      edgeFeatures: this._edgeFeatures,
-      callbacks: {
+    this.identityManager = new IdentityManager(
+      this.metadataStore,
+      this.keyring,
+      this.feedStore,
+      this.spaceManager,
+      this._runtimeParams as IdentityManagerRuntimeParams,
+      {
         onIdentityConstruction: (identity) => {
           if (this._edgeConnection) {
             log.info('Setting identity on edge connection', {
@@ -153,7 +141,7 @@ export class ServiceContext extends Resource {
           }
         },
       },
-    });
+    );
 
     this.echoHost = new EchoHost({ kv: this.level });
 

package/src/packlets/services/service-host.test.ts

@@ -2,8 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
+import chai, { expect } from 'chai';
+import chaiAsPromised from 'chai-as-promised';
 import { rmSync } from 'node:fs';
-import { afterEach, onTestFinished, describe, expect, test } from 'vitest';
 
 import { asyncTimeout, latch, Trigger } from '@dxos/async';
 import { Config } from '@dxos/config';
@@ -13,10 +14,13 @@ import { type PublicKey } from '@dxos/keys';
 import { MemorySignalManagerContext } from '@dxos/messaging';
 import { type Identity } from '@dxos/protocols/proto/dxos/client/services';
 import { type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { afterTest, describe, test } from '@dxos/test';
 import { isNode } from '@dxos/util';
 
 import { createMockCredential, createServiceHost } from '../testing';
 
+chai.use(chaiAsPromised);
+
 describe('ClientServicesHost', () => {
   const dataRoot = '/tmp/dxos/client-services/service-host/storage';
 
@@ -34,7 +38,7 @@ describe('ClientServicesHost', () => {
   test('queryCredentials', async () => {
     const host = createServiceHost(new Config(), new MemorySignalManagerContext());
     await host.open(new Context());
-    onTestFinished(() => host.close());
+    afterTest(() => host.close());
 
     await host.services.IdentityService!.createIdentity({});
     const { spaceKey } = await host.services.SpacesService!.createSpace();
@@ -45,7 +49,7 @@ describe('ClientServicesHost', () => {
       tick();
       // console.log(credential);
     });
-    onTestFinished(() => stream.close());
+    afterTest(() => stream.close());
 
     await done();
   });
@@ -53,7 +57,7 @@ describe('ClientServicesHost', () => {
   test('write and query credentials', async () => {
     const host = createServiceHost(new Config(), new MemorySignalManagerContext());
     await host.open(new Context());
-    onTestFinished(() => host.close());
+    afterTest(() => host.close());
 
     await host.services.IdentityService!.createIdentity({});
 
@@ -82,7 +86,7 @@ describe('ClientServicesHost', () => {
         queriedCredential.wake(credential);
       }
     });
-    onTestFinished(() => credentials.close());
+    afterTest(() => credentials.close());
 
     await queriedCredential.wait();
   });
@@ -90,7 +94,7 @@ describe('ClientServicesHost', () => {
   test('sign presentation', async () => {
     const host = createServiceHost(new Config(), new MemorySignalManagerContext());
     await host.open(new Context());
-    onTestFinished(() => host.close());
+    afterTest(() => host.close());
 
     await host.services.IdentityService!.createIdentity({});
 
@@ -143,9 +147,9 @@ describe('ClientServicesHost', () => {
           trigger.wake(identity.identity);
         }
       });
-      await expect(asyncTimeout(trigger.wait(), 200)).rejects.toBeInstanceOf(Error);
+      await expect(asyncTimeout(trigger.wait(), 200)).to.be.rejectedWith();
       await stream?.close();
       await host.close();
     }
-  });
+  }).onlyEnvironments('nodejs', 'chromium', 'firefox');
 });

package/src/packlets/services/service-host.ts

@@ -15,8 +15,8 @@ import { EdgeSignalManager, WebsocketSignalManager, type SignalManager } from '@
 import {
   SwarmNetworkManager,
   createIceProvider,
+  createSimplePeerTransportFactory,
   type TransportFactory,
-  createRtcTransportFactory,
 } from '@dxos/network-manager';
 import { trace } from '@dxos/protocols';
 import { SystemStatus } from '@dxos/protocols/proto/dxos/client/services';
@@ -218,7 +218,7 @@ export class ClientServicesHost {
 
     const {
       connectionLog = true,
-      transportFactory = createRtcTransportFactory(
+      transportFactory = createSimplePeerTransportFactory(
         { iceServers: this._config?.get('runtime.services.ice') },
         this._config?.get('runtime.services.iceProviders') &&
           createIceProvider(this._config!.get('runtime.services.iceProviders')!),

package/src/packlets/services/service-registry.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test } from 'vitest';
+import { expect } from 'chai';
 
 import { Event } from '@dxos/async';
 import { type ClientServices } from '@dxos/client-protocol';
@@ -12,6 +12,7 @@ import { log } from '@dxos/log';
 import { schema } from '@dxos/protocols/proto';
 import { type SystemService, SystemStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { createLinkedPorts, createProtoRpcPeer, createServiceBundle } from '@dxos/rpc';
+import { describe, test } from '@dxos/test';
 
 import { ServiceRegistry } from './service-registry';
 import { SystemServiceImpl } from '../system';

package/src/packlets/spaces/data-space-manager.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test } from 'vitest';
+import { expect } from 'chai';
 
 import { asyncTimeout, latch } from '@dxos/async';
 import { createAdmissionCredentials } from '@dxos/credentials';
@@ -10,7 +10,7 @@ import { AuthStatus } from '@dxos/echo-pipeline';
 import { writeMessages } from '@dxos/feed-store';
 import { log } from '@dxos/log';
 import { SpaceState } from '@dxos/protocols/proto/dxos/client/services';
-import { openAndClose } from '@dxos/test-utils';
+import { describe, openAndClose, test } from '@dxos/test';
 
 import { TestBuilder, type TestPeer } from '../testing';
 

package/src/packlets/spaces/data-space-manager.ts

@@ -14,11 +14,8 @@ import {
   type DelegateInvitationCredential,
   type MemberInfo,
 } from '@dxos/credentials';
+import { convertLegacyReferences, findInlineObjectOfType, type EchoEdgeReplicator, type EchoHost } from '@dxos/echo-db';
 import {
-  convertLegacyReferences,
-  findInlineObjectOfType,
-  type EchoEdgeReplicator,
-  type EchoHost,
   AuthStatus,
   CredentialServerExtension,
   type MeshEchoReplicator,

package/src/packlets/spaces/data-space.ts

@@ -7,13 +7,8 @@ import { AUTH_TIMEOUT } from '@dxos/client-protocol';
 import { Context, ContextDisposedError, cancelWithContext } from '@dxos/context';
 import type { SpecificCredential } from '@dxos/credentials';
 import { timed, warnAfterTimeout } from '@dxos/debug';
-import {
-  type EchoHost,
-  type DatabaseRoot,
-  createMappedFeedWriter,
-  type MetadataStore,
-  type Space,
-} from '@dxos/echo-pipeline';
+import { type EchoHost, type DatabaseRoot } from '@dxos/echo-db';
+import { createMappedFeedWriter, type MetadataStore, type Space } from '@dxos/echo-pipeline';
 import { SpaceDocVersion } from '@dxos/echo-protocol';
 import type { EdgeConnection } from '@dxos/edge-client';
 import { type FeedStore, type FeedWrapper } from '@dxos/feed-store';

package/src/packlets/spaces/edge-feed-replicator.ts

@@ -5,19 +5,15 @@
 import { decode as decodeCbor, encode as encodeCbor } from 'cbor-x';
 
 import { Event, Mutex, scheduleMicroTask } from '@dxos/async';
-import { Context, Resource } from '@dxos/context';
+import { Resource, type Context } from '@dxos/context';
 import { type EdgeConnection } from '@dxos/edge-client';
-import { EdgeConnectionClosedError, EdgeIdentityChangedError } from '@dxos/edge-client';
 import { type FeedWrapper } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
 import { PublicKey, type SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { EdgeService } from '@dxos/protocols';
 import { buf } from '@dxos/protocols/buf';
-import {
-  MessageSchema as RouterMessageSchema,
-  type Message as RouterMessage,
-} from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import { MessageSchema as RouterMessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
 import type { FeedBlock, ProtocolMessage } from '@dxos/protocols/feed-replication';
 import { ComplexMap, arrayToBuffer, bufferToArray, defaultMap, rangeFromTo } from '@dxos/util';
 
@@ -52,7 +48,7 @@ export class EdgeFeedReplicator extends Resource {
   protected override async _open(): Promise<void> {
     // TODO: handle reconnects
     this._ctx.onDispose(
-      this._messenger.addListener((message: RouterMessage) => {
+      this._messenger.addListener(async (message) => {
         if (!message.serviceId) {
           return;
         }
@@ -68,43 +64,21 @@ export class EdgeFeedReplicator extends Resource {
         }
 
         const payload = decodeCbor(message.payload!.value) as ProtocolMessage;
-        log.info('receive', { from: message.source, feedKey: payload.feedKey, type: payload.type });
+        log.info('recv', { from: message.source, payload });
         this._onMessage(payload);
       }),
     );
 
-    this._messenger.connected.on(this._ctx, async () => {
-      await this._resetConnection();
-
-      this._connected = true;
-      const connectionCtx = new Context({
-        onError: async (err: any) => {
-          if (connectionCtx !== this._connectionCtx) {
-            return;
-          }
-          if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
-            log('resetting on reconnect');
-            await this._resetConnection();
-          } else {
-            this._ctx.raise(err);
-          }
-        },
-      });
-      this._connectionCtx = connectionCtx;
-      log('connection context created');
-      scheduleMicroTask(connectionCtx, async () => {
-        for (const feed of this._feeds.values()) {
-          await this._replicateFeed(connectionCtx, feed);
-        }
-      });
-    });
+    this._connected = true;
+    this._connectionCtx = this._ctx.derive();
+    for (const feed of this._feeds.values()) {
+      await this._replicateFeed(feed);
+    }
   }
 
   protected override async _close(): Promise<void> {
-    await this._resetConnection();
-  }
+    this._connected = false;
 
-  private async _resetConnection() {
     this._connected = false;
     await this._connectionCtx?.dispose();
     this._connectionCtx = undefined;
@@ -115,8 +89,8 @@ export class EdgeFeedReplicator extends Resource {
     log.info('addFeed', { key: feed.key });
     this._feeds.set(feed.key, feed);
 
-    if (this._connected && this._connectionCtx) {
-      await this._replicateFeed(this._connectionCtx, feed);
+    if (this._connected) {
+      await this._replicateFeed(feed);
     }
   }
 
@@ -124,26 +98,21 @@ export class EdgeFeedReplicator extends Resource {
     return defaultMap(this._pushMutex, key, () => new Mutex());
   }
 
-  private async _replicateFeed(ctx: Context, feed: FeedWrapper<any>) {
+  private async _replicateFeed(feed: FeedWrapper<any>) {
+    invariant(this._connectionCtx);
+
     await this._sendMessage({
       type: 'get-metadata',
       feedKey: feed.key.toHex(),
     });
 
-    Event.wrap(feed.core as any, 'append').on(ctx, async () => {
+    Event.wrap(feed.core as any, 'append').on(this._connectionCtx, async () => {
       await this._pushBlocksIfNeeded(feed);
     });
   }
 
   private async _sendMessage(message: ProtocolMessage) {
-    if (!this._connectionCtx) {
-      log.info('message dropped because connection was disposed');
-      return;
-    }
-
-    const logPayload =
-      message.type === 'data' ? { feedKey: message.feedKey, blocks: message.blocks.map((b) => b.index) } : { message };
-    log.info('sending message', logPayload);
+    log.info('sending message', { message });
 
     invariant(message.feedKey);
     const payloadValue = bufferToArray(encodeCbor(message));
@@ -161,15 +130,11 @@ export class EdgeFeedReplicator extends Resource {
   }
 
   private _onMessage(message: ProtocolMessage) {
-    if (!this._connectionCtx) {
-      log.warn('received message after connection context was disposed');
-      return;
-    }
-    scheduleMicroTask(this._connectionCtx, async () => {
+    log.info('received message', { message });
+
+    scheduleMicroTask(this._ctx, async () => {
       switch (message.type) {
         case 'metadata': {
-          log.info('received metadata', { message });
-
           const feedKey = PublicKey.fromHex(message.feedKey);
           const feed = this._feeds.get(feedKey);
           if (!feed) {
@@ -195,8 +160,6 @@ export class EdgeFeedReplicator extends Resource {
         }
 
         case 'data': {
-          log.info('received data', { feed: message.feedKey, blocks: message.blocks.map((b) => b.index) });
-
           const feedKey = PublicKey.fromHex(message.feedKey);
           const feed = this._feeds.get(feedKey);
           if (!feed) {
@@ -260,10 +223,9 @@ export class EdgeFeedReplicator extends Resource {
   }
 
   private async _pushBlocksIfNeeded(feed: FeedWrapper<any>) {
-    using _ = await this._getPushMutex(feed.key).acquire();
+    using _guard = await this._getPushMutex(feed.key).acquire();
 
     if (!this._remoteLength.has(feed.key)) {
-      log('blocks not pushed because remote length is unknown');
       return;
     }
 

package/src/packlets/spaces/epoch-migrations.ts

@@ -4,13 +4,13 @@
 
 import type { AutomergeUrl } from '@dxos/automerge/automerge-repo';
 import { type Context } from '@dxos/context';
-import { migrateDocument } from '@dxos/echo-db';
 import {
   convertLegacyReferences,
   convertLegacySpaceRootDoc,
   findInlineObjectOfType,
+  migrateDocument,
   type EchoHost,
-} from '@dxos/echo-pipeline';
+} from '@dxos/echo-db';
 import { SpaceDocVersion, type SpaceDoc } from '@dxos/echo-protocol';
 import { TYPE_PROPERTIES } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';

package/src/packlets/spaces/notarization-plugin.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { onTestFinished, describe, expect, test } from 'vitest';
+import { expect } from 'chai';
 
 import { Context } from '@dxos/context';
 import { CredentialGenerator } from '@dxos/credentials';
@@ -11,6 +11,7 @@ import { Keyring } from '@dxos/keyring';
 import { log } from '@dxos/log';
 import { AdmittedFeed, type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { TestBuilder, type TestConnection, TestPeer } from '@dxos/teleport/testing';
+import { afterTest, describe, test } from '@dxos/test';
 
 import { NotarizationPlugin } from './notarization-plugin';
 
@@ -48,7 +49,7 @@ class TestAgent extends TestPeer {
 describe('NotarizationPlugin', () => {
   test('notarize single credential', async () => {
     const testBuilder = new TestBuilder();
-    onTestFinished(() => testBuilder.destroy());
+    afterTest(() => testBuilder.destroy());
 
     // peer0 is there to test retries.
     const [_peer0, peer1, peer2] = await testBuilder.createPeers({ factory: () => new TestAgent() });

package/src/packlets/spaces/spaces-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 Space, type SpacesService } from '@dxos/protocols/proto/dxos/client/services';
+import { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
 
 import { SpacesServiceImpl } from './spaces-service';
 import { type ServiceContext } from '../services';
 import { createServiceContext } from '../testing';
 
+chai.use(chaiAsPromised);
+
 describe('SpacesService', () => {
   let serviceContext: ServiceContext;
   let spacesService: SpacesService;
@@ -32,7 +36,7 @@ describe('SpacesService', () => {
 
   describe('createSpace', () => {
     test('fails if no identity is available', async () => {
-      await expect(spacesService.createSpace()).rejects.toBeInstanceOf(Error);
+      await expect(spacesService.createSpace()).to.be.rejectedWith();
     });
 
     test('creates a new space', async () => {
@@ -52,7 +56,7 @@ describe('SpacesService', () => {
       query.subscribe(({ spaces }) => {
         result.wake(spaces);
       });
-      onTestFinished(() => query.close());
+      afterTest(() => query.close());
       expect(await result.wait()).to.be.length(0);
     });
 
@@ -69,7 +73,7 @@ describe('SpacesService', () => {
       query.subscribe(({ spaces }) => {
         result.wake(spaces);
       });
-      onTestFinished(() => query.close());
+      afterTest(() => query.close());
 
       const spaces = await result.wait();
       expect(spaces).to.be.length(3);
@@ -83,7 +87,7 @@ describe('SpacesService', () => {
       query.subscribe(({ spaces }) => {
         result.wake(spaces);
       });
-      onTestFinished(() => query.close());
+      afterTest(() => query.close());
       expect(await result.wait()).to.be.length(0);
 
       result.reset();

package/src/packlets/storage/storage.ts

@@ -14,6 +14,7 @@ import { getRootPath } from './util';
 // TODO(burdon): Factor out.
 export const createStorageObjects = (config: Runtime.Client.Storage) => {
   const { persistent = false, keyStore, dataStore } = config ?? {};
+
   if (persistent && dataStore === StorageDriver.RAM) {
     throw new InvalidConfigError('RAM storage cannot be used in persistent mode.');
   }

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

@@ -2,11 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
-import { beforeEach, describe, expect, test } from 'vitest';
+import { expect } from 'chai';
 
 import { Event, Trigger } from '@dxos/async';
 import { Config } from '@dxos/config';
 import { type SystemService, SystemStatus, type QueryStatusResponse } from '@dxos/protocols/proto/dxos/client/services';
+import { beforeEach, describe, test } from '@dxos/test';
 
 import { SystemServiceImpl } from './system-service';