@dxos/client-services 0.1.53-main.528b72b → 0.1.53-main.52ca4e9

package/dist/types/src/packlets/services/service-host.d.ts

@@ -18,6 +18,10 @@ export type ClientServicesHostParams = {
     connectionLog?: boolean;
     storage?: Storage;
     lockKey?: string;
+    callbacks?: ClientServicesHostCallbacks;
+};
+export type ClientServicesHostCallbacks = {
+    onReset?: () => Promise<void>;
 };
 export type InitializeOptions = {
     config?: Config;
@@ -39,10 +43,11 @@ export declare class ClientServicesHost {
     private _signalManager?;
     private _networkManager?;
     private _storage?;
+    private _callbacks?;
     _serviceContext: ServiceContext;
     private _opening;
     private _open;
-    constructor({ config, modelFactory, transportFactory, signalManager, connectionLog, storage, lockKey, }?: ClientServicesHostParams);
+    constructor({ config, modelFactory, transportFactory, signalManager, connectionLog, storage, lockKey, callbacks, }?: ClientServicesHostParams);
     get isOpen(): boolean;
     get serviceRegistry(): ServiceRegistry<ClientServices>;
     get descriptors(): import("@dxos/rpc").ServiceBundle<ClientServices>;

package/dist/types/src/packlets/services/service-host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-host.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"AAOA,OAAO,EAAuB,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAKtC,OAAO,EAAE,aAAa,EAA0B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAgD,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGvG,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAatD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,eAAO,MAAM,yBAAyB,oBAErC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IAErD,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,CAAU;IAE3B,eAAe,EAAG,cAAc,CAAC;IACjC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAS;gBAEV,EACV,MAAM,EACN,YAA0C,EAE1C,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,OAAO,EAEP,OAAO,GACR,GAAE,wBAA6B;IAgDhC,IAAI,MAAM,YAET;IAED,IAAI,eAAe,oCAElB;IAED,IAAI,WAAW,sDAEd;IAED,IAAI,QAAQ,4BAEX;IAED;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,iBAAiB;IA8B9C,IAAI;IA0EJ,KAAK;IAeL,KAAK;CAUZ"}
+{"version":3,"file":"service-host.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"AAOA,OAAO,EAAuB,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAKtC,OAAO,EAAE,aAAa,EAA0B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAgD,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGvG,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAatD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,eAAO,MAAM,yBAAyB,oBAErC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,2BAA2B,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IAErD,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,UAAU,CAAC,CAA8B;IAEjD,eAAe,EAAG,cAAc,CAAC;IACjC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAS;gBAEV,EACV,MAAM,EACN,YAA0C,EAE1C,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,OAAO,EAEP,OAAO,EACP,SAAS,GACV,GAAE,wBAA6B;IAiDhC,IAAI,MAAM,YAET;IAED,IAAI,eAAe,oCAElB;IAED,IAAI,WAAW,sDAEd;IAED,IAAI,QAAQ,4BAEX;IAED;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,iBAAiB;IA8B9C,IAAI;IA0EJ,KAAK;IAeL,KAAK;CAWZ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.1.53-main.528b72b",
+  "version": "0.1.53-main.52ca4e9",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -22,40 +22,40 @@
   ],
   "dependencies": {
     "tiny-invariant": "^1.3.1",
-    "@dxos/async": "0.1.53-main.528b72b",
-    "@dxos/client-protocol": "0.1.53-main.528b72b",
-    "@dxos/codec-protobuf": "0.1.53-main.528b72b",
-    "@dxos/config": "0.1.53-main.528b72b",
-    "@dxos/context": "0.1.53-main.528b72b",
-    "@dxos/credentials": "0.1.53-main.528b72b",
-    "@dxos/crypto": "0.1.53-main.528b72b",
-    "@dxos/debug": "0.1.53-main.528b72b",
-    "@dxos/document-model": "0.1.53-main.528b72b",
-    "@dxos/echo-db": "0.1.53-main.528b72b",
-    "@dxos/echo-pipeline": "0.1.53-main.528b72b",
-    "@dxos/errors": "0.1.53-main.528b72b",
-    "@dxos/feed-store": "0.1.53-main.528b72b",
-    "@dxos/keyring": "0.1.53-main.528b72b",
-    "@dxos/keys": "0.1.53-main.528b72b",
-    "@dxos/lock-file": "0.1.53-main.528b72b",
-    "@dxos/log": "0.1.53-main.528b72b",
-    "@dxos/messaging": "0.1.53-main.528b72b",
-    "@dxos/model-factory": "0.1.53-main.528b72b",
-    "@dxos/network-manager": "0.1.53-main.528b72b",
-    "@dxos/node-std": "0.1.53-main.528b72b",
-    "@dxos/protocols": "0.1.53-main.528b72b",
-    "@dxos/random-access-storage": "0.1.53-main.528b72b",
-    "@dxos/rpc": "0.1.53-main.528b72b",
-    "@dxos/teleport": "0.1.53-main.528b72b",
-    "@dxos/teleport-extension-gossip": "0.1.53-main.528b72b",
-    "@dxos/teleport-extension-object-sync": "0.1.53-main.528b72b",
-    "@dxos/text-model": "0.1.53-main.528b72b",
-    "@dxos/timeframe": "0.1.53-main.528b72b",
-    "@dxos/util": "0.1.53-main.528b72b"
+    "@dxos/async": "0.1.53-main.52ca4e9",
+    "@dxos/client-protocol": "0.1.53-main.52ca4e9",
+    "@dxos/codec-protobuf": "0.1.53-main.52ca4e9",
+    "@dxos/config": "0.1.53-main.52ca4e9",
+    "@dxos/context": "0.1.53-main.52ca4e9",
+    "@dxos/credentials": "0.1.53-main.52ca4e9",
+    "@dxos/crypto": "0.1.53-main.52ca4e9",
+    "@dxos/debug": "0.1.53-main.52ca4e9",
+    "@dxos/document-model": "0.1.53-main.52ca4e9",
+    "@dxos/echo-db": "0.1.53-main.52ca4e9",
+    "@dxos/echo-pipeline": "0.1.53-main.52ca4e9",
+    "@dxos/errors": "0.1.53-main.52ca4e9",
+    "@dxos/feed-store": "0.1.53-main.52ca4e9",
+    "@dxos/keyring": "0.1.53-main.52ca4e9",
+    "@dxos/keys": "0.1.53-main.52ca4e9",
+    "@dxos/lock-file": "0.1.53-main.52ca4e9",
+    "@dxos/log": "0.1.53-main.52ca4e9",
+    "@dxos/messaging": "0.1.53-main.52ca4e9",
+    "@dxos/model-factory": "0.1.53-main.52ca4e9",
+    "@dxos/network-manager": "0.1.53-main.52ca4e9",
+    "@dxos/node-std": "0.1.53-main.52ca4e9",
+    "@dxos/protocols": "0.1.53-main.52ca4e9",
+    "@dxos/random-access-storage": "0.1.53-main.52ca4e9",
+    "@dxos/rpc": "0.1.53-main.52ca4e9",
+    "@dxos/teleport": "0.1.53-main.52ca4e9",
+    "@dxos/teleport-extension-gossip": "0.1.53-main.52ca4e9",
+    "@dxos/teleport-extension-object-sync": "0.1.53-main.52ca4e9",
+    "@dxos/text-model": "0.1.53-main.52ca4e9",
+    "@dxos/timeframe": "0.1.53-main.52ca4e9",
+    "@dxos/util": "0.1.53-main.52ca4e9"
   },
   "devDependencies": {
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.1.53-main.528b72b"
+    "@dxos/signal": "0.1.53-main.52ca4e9"
   },
   "publishConfig": {
     "access": "public"

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

@@ -2,19 +2,32 @@
 // Copyright 2023 DXOS.org
 //
 
-import { expect } from 'chai';
+import chai, { expect } from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import { rmSync } from 'node:fs';
 
-import { latch, Trigger } from '@dxos/async';
+import { asyncTimeout, latch, Trigger } from '@dxos/async';
 import { Config } from '@dxos/config';
 import { verifyPresentation } from '@dxos/credentials';
 import { PublicKey } from '@dxos/keys';
 import { MemorySignalManagerContext } from '@dxos/messaging';
+import { Identity } from '@dxos/protocols/proto/dxos/client/services';
 import { 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 persistentStoragePath = '/tmp/dxos/client-services/service-host/storage';
+
+  afterEach(async () => {
+    // Clean up.
+    isNode() && rmSync(persistentStoragePath, { recursive: true, force: true });
+  });
+
   test('queryCredentials', async () => {
     const host = createServiceHost(new Config(), new MemorySignalManagerContext());
     await host.open();
@@ -97,4 +110,39 @@ describe('ClientServicesHost', () => {
       kind: 'pass',
     });
   });
+
+  test('storage reset', async () => {
+    const config = new Config({
+      runtime: { client: { storage: { persistent: true, path: persistentStoragePath } } },
+    });
+    {
+      const host = createServiceHost(config, new MemorySignalManagerContext());
+      await host.open();
+
+      await host.services.IdentityService?.createIdentity({});
+
+      expect(host._serviceContext.storage.size).to.exist;
+
+      await asyncTimeout(host.reset(), 1000);
+      await host.close();
+    }
+
+    {
+      const host = createServiceHost(config, new MemorySignalManagerContext());
+      await host.open();
+      const trigger = new Trigger<Identity>();
+
+      const stream = host.services.IdentityService?.queryIdentity();
+      await stream?.waitUntilReady();
+
+      stream?.subscribe((identity) => {
+        if (identity.identity) {
+          trigger.wake(identity.identity);
+        }
+      });
+      await expect(asyncTimeout(trigger.wait(), 200)).to.be.rejectedWith();
+      stream?.close();
+      await host.close();
+    }
+  }).onlyEnvironments('nodejs', 'chromium', 'firefox');
 });

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

@@ -48,6 +48,11 @@ export type ClientServicesHostParams = {
   connectionLog?: boolean;
   storage?: Storage;
   lockKey?: string;
+  callbacks?: ClientServicesHostCallbacks;
+};
+
+export type ClientServicesHostCallbacks = {
+  onReset?: () => Promise<void>;
 };
 
 export type InitializeOptions = {
@@ -72,6 +77,7 @@ export class ClientServicesHost {
   private _signalManager?: SignalManager;
   private _networkManager?: NetworkManager;
   private _storage?: Storage;
+  private _callbacks?: ClientServicesHostCallbacks;
 
   _serviceContext!: ServiceContext;
   private _opening = false;
@@ -87,9 +93,11 @@ export class ClientServicesHost {
     storage,
     // TODO(wittjosiah): Turn this on by default.
     lockKey,
+    callbacks,
   }: ClientServicesHostParams = {}) {
     this._storage = storage;
     this._modelFactory = modelFactory;
+    this._callbacks = callbacks;
 
     if (config) {
       this.initialize({ config, transportFactory, signalManager });
@@ -284,5 +292,6 @@ export class ClientServicesHost {
     await this._storage!.reset();
     log('reset');
     log.trace('dxos.sdk.client-services-host.reset', trace.end({ id: traceId }));
+    await this._callbacks?.onReset?.();
   }
 }

package/src/packlets/vault/worker-runtime.ts

@@ -37,7 +37,7 @@ export class WorkerRuntime {
   constructor(
     private readonly _configProvider: () => MaybePromise<Config>
   ) {
-    this._clientServices = new ClientServicesHost();
+    this._clientServices = new ClientServicesHost({ callbacks: { onReset: async () => { self.close(); } } });
   }
 
   get host() {