@dxos/client-services 0.1.53-main.f5aedb7 → 0.1.53-next.3ab34c0

package/src/packlets/testing/test-builder.ts

@@ -5,7 +5,15 @@
 import { Config } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { createCredentialSignerWithChain, CredentialGenerator } from '@dxos/credentials';
-import { SnapshotStore, DataPipeline, MetadataStore, SpaceManager, valueEncoding } from '@dxos/echo-pipeline';
+import { failUndefined } from '@dxos/debug';
+import {
+  SnapshotStore,
+  DataPipeline,
+  MetadataStore,
+  SpaceManager,
+  valueEncoding,
+  DataServiceSubscriptions,
+} from '@dxos/echo-pipeline';
 import { testLocalDatabase } from '@dxos/echo-pipeline/testing';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
@@ -15,7 +23,7 @@ import { createStorage, Storage, StorageType } from '@dxos/random-access-storage
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
 
 import { ClientServicesHost, createDefaultModelFactory, ServiceContext } from '../services';
-import { SigningContext } from '../spaces';
+import { DataSpaceManager, SigningContext } from '../spaces';
 
 //
 // TODO(burdon): Replace with test builder.
@@ -96,7 +104,9 @@ export type TestPeerProps = {
   keyring?: Keyring;
   networkManager?: NetworkManager;
   spaceManager?: SpaceManager;
+  dataSpaceManager?: DataSpaceManager;
   snapshotStore?: SnapshotStore;
+  signingContext?: SigningContext;
   blobStore?: BlobStore;
 };
 
@@ -108,6 +118,10 @@ export class TestPeer {
     private readonly opts: TestPeerOpts = { storageType: StorageType.RAM },
   ) {}
 
+  get props() {
+    return this._props;
+  }
+
   get storage() {
     return (this._props.storage ??= createStorage({ type: this.opts.storageType }));
   }
@@ -158,6 +172,25 @@ export class TestPeer {
     }));
   }
 
+  get identity() {
+    return this._props.signingContext ?? failUndefined();
+  }
+
+  get dataSpaceManager() {
+    return (this._props.dataSpaceManager ??= new DataSpaceManager(
+      this.spaceManager,
+      this.metadataStore,
+      new DataServiceSubscriptions(),
+      this.keyring,
+      this.identity,
+      this.feedStore,
+    ));
+  }
+
+  async createIdentity() {
+    this._props.signingContext ??= await createSigningContext(this.keyring);
+  }
+
   async destroy() {
     await this.storage.reset();
   }

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

@@ -16,8 +16,7 @@ import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { createProtoRpcPeer, ProtoRpcPeer, RpcPort } from '@dxos/rpc';
 import { Callback, MaybePromise } from '@dxos/util';
 
-import { ClientServicesHost } from '../services';
-import { ClientRpcServer, ClientRpcServerParams } from '../services/client-rpc-server';
+import { ClientServicesHost, ClientRpcServer, ClientRpcServerParams } from '../services';
 
 export type WorkerSessionParams = {
   serviceHost: ClientServicesHost;
@@ -111,17 +110,18 @@ export class WorkerSession {
   }
 
   async open() {
-    log.info('opening..');
+    log.info('opening...');
     await Promise.all([this._clientRpc.open(), this._iframeRpc.open(), this._maybeOpenShell()]);
 
     await this._startTrigger.wait({ timeout: PROXY_CONNECTION_TIMEOUT });
     if (this.lockKey) {
       void this._afterLockReleases(this.lockKey, () => this.close());
     }
+    log.info('opened');
   }
 
   async close() {
-    log.info('closing..');
+    log.info('closing...');
     try {
       await this.onClose.callIfSet();
     } catch (err: any) {
@@ -129,6 +129,7 @@ export class WorkerSession {
     }
 
     await Promise.all([this._clientRpc.close(), this._iframeRpc.close()]);
+    log.info('closed');
   }
 
   private async _maybeOpenShell() {