@dxos/client-services 0.4.10-main.fa5a270 → 0.4.10-main.fe71b4c

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

@@ -6,7 +6,15 @@ import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { createCredentialSignerWithChain, CredentialGenerator } from '@dxos/credentials';
 import { failUndefined } from '@dxos/debug';
-import { AutomergeHost, MetadataStore, SnapshotStore, SpaceManager, valueEncoding } from '@dxos/echo-pipeline';
+import {
+  AutomergeHost,
+  MetadataStore,
+  type LevelDB,
+  SnapshotStore,
+  SpaceManager,
+  valueEncoding,
+} from '@dxos/echo-pipeline';
+import { createTestLevel } from '@dxos/echo-pipeline/testing';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
@@ -29,7 +37,7 @@ export const createServiceHost = (config: Config, signalManagerContext: MemorySi
   });
 };
 
-export const createServiceContext = ({
+export const createServiceContext = async ({
   signalContext = new MemorySignalManagerContext(),
   storage = createStorage({ type: StorageType.RAM }),
 }: {
@@ -41,8 +49,10 @@ export const createServiceContext = ({
     signalManager,
     transportFactory: MemoryTransportFactory,
   });
+  const level = createTestLevel();
+  await level.open();
 
-  return new ServiceContext(storage, networkManager, signalManager);
+  return new ServiceContext(storage, level, networkManager, signalManager);
 };
 
 export const createPeers = async (numPeers: number) => {
@@ -50,7 +60,7 @@ export const createPeers = async (numPeers: number) => {
 
   return await Promise.all(
     Array.from(Array(numPeers)).map(async () => {
-      const peer = createServiceContext({ signalContext });
+      const peer = await createServiceContext({ signalContext });
       await peer.open(new Context());
       return peer;
     }),
@@ -83,6 +93,7 @@ export type TestPeerOpts = {
 
 export type TestPeerProps = {
   storage?: Storage;
+  level?: LevelDB;
   feedStore?: FeedStore<any>;
   metadataStore?: MetadataStore;
   keyring?: Keyring;
@@ -115,6 +126,10 @@ export class TestPeer {
     return (this._props.keyring ??= new Keyring(this.storage.createDirectory('keyring')));
   }
 
+  get level() {
+    return (this._props.level ??= createTestLevel());
+  }
+
   get feedStore() {
     return (this._props.feedStore ??= new FeedStore({
       factory: new FeedFactory({
@@ -161,7 +176,9 @@ export class TestPeer {
   }
 
   get automergeHost() {
-    return (this._props.automergeHost ??= new AutomergeHost({ directory: this.storage.createDirectory('automerge') }));
+    return (this._props.automergeHost ??= new AutomergeHost({
+      db: this.level.sublevel('automerge'),
+    }));
   }
 
   get dataSpaceManager() {
@@ -180,6 +197,7 @@ export class TestPeer {
   }
 
   async destroy() {
+    await this.level.close();
     await this.storage.reset();
   }
 }

package/src/packlets/vault/shared-worker-connection.ts

@@ -57,12 +57,7 @@ export class SharedWorkerConnection {
     return this._shellRuntime;
   }
 
-  async open(
-    /**
-     * @deprecated Only used with iframes.
-     */
-    origin: string,
-  ) {
+  async open(params: { origin: string; observabilityGroup?: string; signalTelemetryEnabled?: boolean }) {
     this._config = await getAsyncValue(this._configProvider);
 
     this._transportService = new SimplePeerTransportService({
@@ -83,7 +78,7 @@ export class SharedWorkerConnection {
 
     let lockKey: string | undefined;
     if (typeof navigator !== 'undefined') {
-      lockKey = this._lockKey(origin);
+      lockKey = this._lockKey(params.origin);
       this._release = new Trigger();
       const ready = new Trigger();
       void navigator.locks.request(lockKey, async () => {
@@ -95,7 +90,7 @@ export class SharedWorkerConnection {
 
     try {
       await this._systemRpc.open();
-      await this._systemRpc.rpc.WorkerService.start({ origin, lockKey });
+      await this._systemRpc.rpc.WorkerService.start({ lockKey, ...params });
     } catch (err) {
       log.catch(err);
       throw new RemoteServiceConnectionError('Failed to connect to worker');

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

@@ -5,8 +5,14 @@
 import { Trigger } from '@dxos/async';
 import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
+import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
-import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from '@dxos/messaging';
+import {
+  MemorySignalManager,
+  MemorySignalManagerContext,
+  WebsocketSignalManager,
+  setIdentityTags,
+} from '@dxos/messaging';
 import { SimplePeerTransportProxyFactory } from '@dxos/network-manager';
 import { type RpcPort } from '@dxos/rpc';
 import { type MaybePromise } from '@dxos/util';
@@ -41,6 +47,8 @@ export class WorkerRuntime {
   private readonly _clientServices!: ClientServicesHost;
   private _sessionForNetworking?: WorkerSession; // TODO(burdon): Expose to client QueryStatusResponse.
   private _config!: Config;
+  private _signalMetadataTags: any = { runtime: 'worker-runtime' };
+  private _signalTelemetryEnabled: boolean = false;
 
   constructor(
     private readonly _configProvider: () => MaybePromise<Config>,
@@ -68,7 +76,7 @@ export class WorkerRuntime {
       this._clientServices.initialize({
         config: this._config,
         signalManager: signals
-          ? new WebsocketSignalManager(signals)
+          ? new WebsocketSignalManager(signals, () => (this._signalTelemetryEnabled ? this._signalMetadataTags : {}))
           : new MemorySignalManager(new MemorySignalManagerContext()), // TODO(dmaretskyi): Inject this context.
         transportFactory: this._transportFactory,
       });
@@ -76,6 +84,13 @@ export class WorkerRuntime {
       await this._clientServices.open(new Context());
       this._ready.wake(undefined);
       log('started');
+      setIdentityTags({
+        identityService: this._clientServices.services.IdentityService!,
+        devicesService: this._clientServices.services.DevicesService!,
+        setTag: (k: string, v: string) => {
+          this._signalMetadataTags[k] = v;
+        },
+      });
     } catch (err: any) {
       this._ready.wake(err);
       log.error('starting', err);
@@ -112,6 +127,16 @@ export class WorkerRuntime {
     });
 
     await session.open();
+    // A worker can only service one origin currently
+    invariant(
+      !this._signalMetadataTags.origin || this._signalMetadataTags.origin === session.origin,
+      `worker origin changed from ${this._signalMetadataTags.origin} to ${session.origin}?`,
+    );
+    if (session.observabilityGroup) {
+      this._signalMetadataTags.group = session.observabilityGroup;
+    }
+    this._signalTelemetryEnabled = session.signalTelemetryEnabled ?? false;
+    this._signalMetadataTags.origin = session.origin;
     this._sessions.add(session);
 
     this._reconnectWebrtc();

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

@@ -41,6 +41,10 @@ export class WorkerSession {
   @logInfo
   public origin?: string;
 
+  // TODO(nf): factor out?
+  public observabilityGroup?: string;
+  public signalTelemetryEnabled?: boolean;
+
   @logInfo
   public lockKey?: string;
 
@@ -91,6 +95,8 @@ export class WorkerSession {
           start: async (request) => {
             this.origin = request.origin;
             this.lockKey = request.lockKey;
+            this.observabilityGroup = request.observabilityGroup;
+            this.signalTelemetryEnabled = request.signalTelemetryEnabled;
             this._startTrigger.wake();
           },
 

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.4.10-main.fa5a270";
+export const DXOS_VERSION = "0.4.10-main.fe71b4c";