@dxos/client-services 0.6.8-main.3be982f → 0.6.8-staging.63bcb81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.6.8-main.3be982f",
+  "version": "0.6.8-staging.63bcb81",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -45,46 +45,46 @@
   "dependencies": {
     "cbor-x": "^1.5.4",
     "platform": "^1.3.6",
-    "@dxos/automerge": "0.6.8-main.3be982f",
-    "@dxos/client-protocol": "0.6.8-main.3be982f",
-    "@dxos/codec-protobuf": "0.6.8-main.3be982f",
-    "@dxos/context": "0.6.8-main.3be982f",
-    "@dxos/config": "0.6.8-main.3be982f",
-    "@dxos/credentials": "0.6.8-main.3be982f",
-    "@dxos/crypto": "0.6.8-main.3be982f",
-    "@dxos/debug": "0.6.8-main.3be982f",
-    "@dxos/echo-pipeline": "0.6.8-main.3be982f",
-    "@dxos/echo-db": "0.6.8-main.3be982f",
-    "@dxos/echo-protocol": "0.6.8-main.3be982f",
-    "@dxos/echo-schema": "0.6.8-main.3be982f",
-    "@dxos/indexing": "0.6.8-main.3be982f",
-    "@dxos/edge-client": "0.6.8-main.3be982f",
-    "@dxos/feed-store": "0.6.8-main.3be982f",
-    "@dxos/async": "0.6.8-main.3be982f",
-    "@dxos/keyring": "0.6.8-main.3be982f",
-    "@dxos/invariant": "0.6.8-main.3be982f",
-    "@dxos/kv-store": "0.6.8-main.3be982f",
-    "@dxos/keys": "0.6.8-main.3be982f",
-    "@dxos/lock-file": "0.6.8-main.3be982f",
-    "@dxos/log": "0.6.8-main.3be982f",
-    "@dxos/network-manager": "0.6.8-main.3be982f",
-    "@dxos/node-std": "0.6.8-main.3be982f",
-    "@dxos/protocols": "0.6.8-main.3be982f",
-    "@dxos/messaging": "0.6.8-main.3be982f",
-    "@dxos/random-access-storage": "0.6.8-main.3be982f",
-    "@dxos/rpc": "0.6.8-main.3be982f",
-    "@dxos/teleport-extension-gossip": "0.6.8-main.3be982f",
-    "@dxos/teleport": "0.6.8-main.3be982f",
-    "@dxos/teleport-extension-object-sync": "0.6.8-main.3be982f",
-    "@dxos/timeframe": "0.6.8-main.3be982f",
-    "@dxos/tracing": "0.6.8-main.3be982f",
-    "@dxos/util": "0.6.8-main.3be982f",
-    "@dxos/websocket-rpc": "0.6.8-main.3be982f"
+    "@dxos/async": "0.6.8-staging.63bcb81",
+    "@dxos/automerge": "0.6.8-staging.63bcb81",
+    "@dxos/client-protocol": "0.6.8-staging.63bcb81",
+    "@dxos/codec-protobuf": "0.6.8-staging.63bcb81",
+    "@dxos/credentials": "0.6.8-staging.63bcb81",
+    "@dxos/config": "0.6.8-staging.63bcb81",
+    "@dxos/debug": "0.6.8-staging.63bcb81",
+    "@dxos/context": "0.6.8-staging.63bcb81",
+    "@dxos/crypto": "0.6.8-staging.63bcb81",
+    "@dxos/echo-pipeline": "0.6.8-staging.63bcb81",
+    "@dxos/echo-protocol": "0.6.8-staging.63bcb81",
+    "@dxos/echo-db": "0.6.8-staging.63bcb81",
+    "@dxos/echo-schema": "0.6.8-staging.63bcb81",
+    "@dxos/feed-store": "0.6.8-staging.63bcb81",
+    "@dxos/edge-client": "0.6.8-staging.63bcb81",
+    "@dxos/indexing": "0.6.8-staging.63bcb81",
+    "@dxos/invariant": "0.6.8-staging.63bcb81",
+    "@dxos/keyring": "0.6.8-staging.63bcb81",
+    "@dxos/keys": "0.6.8-staging.63bcb81",
+    "@dxos/lock-file": "0.6.8-staging.63bcb81",
+    "@dxos/kv-store": "0.6.8-staging.63bcb81",
+    "@dxos/log": "0.6.8-staging.63bcb81",
+    "@dxos/messaging": "0.6.8-staging.63bcb81",
+    "@dxos/network-manager": "0.6.8-staging.63bcb81",
+    "@dxos/node-std": "0.6.8-staging.63bcb81",
+    "@dxos/protocols": "0.6.8-staging.63bcb81",
+    "@dxos/random-access-storage": "0.6.8-staging.63bcb81",
+    "@dxos/teleport": "0.6.8-staging.63bcb81",
+    "@dxos/rpc": "0.6.8-staging.63bcb81",
+    "@dxos/teleport-extension-gossip": "0.6.8-staging.63bcb81",
+    "@dxos/teleport-extension-object-sync": "0.6.8-staging.63bcb81",
+    "@dxos/timeframe": "0.6.8-staging.63bcb81",
+    "@dxos/tracing": "0.6.8-staging.63bcb81",
+    "@dxos/util": "0.6.8-staging.63bcb81",
+    "@dxos/websocket-rpc": "0.6.8-staging.63bcb81"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.6.8-main.3be982f"
+    "@dxos/signal": "0.6.8-staging.63bcb81"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/devtools/network.ts

@@ -20,14 +20,14 @@ export const subscribeToNetworkStatus = ({ signalManager }: { signalManager: Sig
   new Stream<SubscribeToSignalStatusResponse>(({ next, close }) => {
     const update = () => {
       try {
-        const status = signalManager.getStatus();
+        const status = signalManager.getStatus?.();
         next({ servers: status });
       } catch (err: any) {
         close(err);
       }
     };
 
-    signalManager.statusChanged.on(() => update());
+    signalManager.statusChanged?.on(() => update());
     update();
   });
 
@@ -37,8 +37,8 @@ export const subscribeToSignal = ({ signalManager }: { signalManager: SignalMana
     signalManager.onMessage.on(ctx, (message) => {
       next({
         message: {
-          author: message.author.asUint8Array(),
-          recipient: message.recipient.asUint8Array(),
+          author: PublicKey.from(message.author.peerKey).asUint8Array(),
+          recipient: PublicKey.from(message.recipient.peerKey).asUint8Array(),
           payload: message.payload,
         },
         receivedAt: new Date(),
@@ -46,7 +46,14 @@ export const subscribeToSignal = ({ signalManager }: { signalManager: SignalMana
     });
     signalManager.swarmEvent.on(ctx, (swarmEvent) => {
       next({
-        swarmEvent: swarmEvent.swarmEvent,
+        swarmEvent: swarmEvent.peerAvailable
+          ? {
+              peerAvailable: {
+                peer: PublicKey.from(swarmEvent.peerAvailable.peer.peerKey).asUint8Array(),
+                since: swarmEvent.peerAvailable.since,
+              },
+            }
+          : { peerLeft: { peer: PublicKey.from(swarmEvent.peerLeft!.peer.peerKey).asUint8Array() } },
         topic: swarmEvent.topic.asUint8Array(),
         receivedAt: new Date(),
       });

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

@@ -85,6 +85,9 @@ export class IdentityManager {
     private readonly _feedStore: FeedStore<FeedMessage>,
     private readonly _spaceManager: SpaceManager,
     params?: IdentityManagerRuntimeParams,
+    private readonly _callbacks?: {
+      onIdentityConstruction?: (identity: Identity) => void;
+    },
   ) {
     const {
       devicePresenceAnnounceInterval = DEVICE_PRESENCE_ANNOUNCE_INTERVAL,
@@ -340,6 +343,7 @@ export class IdentityManager {
     const space = await this._constructSpace({
       spaceRecord: identityRecord.haloSpace,
       swarmIdentity: {
+        identityKey: identityRecord.identityKey,
         peerKey: identityRecord.deviceKey,
         credentialProvider: createAuthProvider(createCredentialSignerWithKey(this._keyring, identityRecord.deviceKey)),
         credentialAuthenticator: deferFunction(() => identity.authVerifier.verifier),
@@ -358,6 +362,7 @@ export class IdentityManager {
       deviceKey: identityRecord.deviceKey,
     });
     log('done', { identityKey: identityRecord.identityKey });
+    this._callbacks?.onIdentityConstruction?.(identity);
 
     // TODO(mykola): Set new timeframe on a write to a feed.
     if (identityRecord.haloSpace.controlTimeframe) {

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

@@ -71,6 +71,7 @@ describe('identity/identity', () => {
       topic: spaceKey,
       swarmIdentity: {
         peerKey: deviceKey,
+        identityKey,
         credentialProvider: MOCK_AUTH_PROVIDER,
         credentialAuthenticator: MOCK_AUTH_VERIFIER,
       },
@@ -186,6 +187,7 @@ describe('identity/identity', () => {
         topic: spaceKey,
         swarmIdentity: {
           peerKey: deviceKey,
+          identityKey,
           credentialProvider: MOCK_AUTH_PROVIDER, // createHaloAuthProvider(createCredentialSignerWithKey(keyring, device_key)),
           credentialAuthenticator: MOCK_AUTH_VERIFIER, // createHaloAuthVerifier(() => identity.authorizedDeviceKeys),
         },
@@ -274,6 +276,7 @@ describe('identity/identity', () => {
         topic: spaceKey,
         swarmIdentity: {
           peerKey: deviceKey,
+          identityKey,
           credentialProvider: MOCK_AUTH_PROVIDER, // createHaloAuthProvider(createCredentialSignerWithKey(keyring, device_key)),
           credentialAuthenticator: MOCK_AUTH_VERIFIER, // createHaloAuthVerifier(() => identity.authorizedDeviceKeys),
         },

package/src/packlets/invitations/invitations-handler.ts

@@ -387,7 +387,6 @@ export class InvitationsHandler {
     }
     const swarmConnection = await this._networkManager.joinSwarm({
       topic: invitation.swarmKey,
-      peerId: PublicKey.random(),
       protocolProvider: createTeleportProtocolFactory(async (teleport) => {
         teleport.addExtension('dxos.halo.invitations', extensionFactory());
       }, this._defaultTeleportParams),

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

@@ -23,17 +23,17 @@ export class NetworkServiceImpl implements NetworkService {
         next({
           swarm: this.networkManager.connectionState,
           connectionInfo: this.networkManager.connectionLog?.swarms,
-          signaling: this.signalManager.getStatus().map(({ host, state }) => ({ server: host, state })),
+          signaling: this.signalManager.getStatus?.().map(({ host, state }) => ({ server: host, state })),
         });
       };
 
       const unsubscribeSwarm = this.networkManager.connectionStateChanged.on(() => update());
-      const unsubscribeSignal = this.signalManager.statusChanged.on(() => update());
+      const unsubscribeSignal = this.signalManager.statusChanged?.on(() => update());
       update();
 
       return () => {
         unsubscribeSwarm();
-        unsubscribeSignal();
+        unsubscribeSignal?.();
       };
     });
   }

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

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { MemorySignalManagerContext } from '@dxos/messaging';
+import { MemorySignalManagerContext, MemorySignalManager } from '@dxos/messaging';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { describe, openAndClose, test } from '@dxos/test';
 
@@ -48,7 +48,9 @@ describe('services/ServiceContext', () => {
   });
 
   const createOpenServiceContext = async (networkContext: MemorySignalManagerContext) => {
-    const serviceContext = await createServiceContext({ signalContext: networkContext });
+    const serviceContext = await createServiceContext({
+      signalManagerFactory: async () => new MemorySignalManager(networkContext),
+    });
     await openAndClose(serviceContext);
     return serviceContext;
   };

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

@@ -19,6 +19,7 @@ import { type SignalManager } from '@dxos/messaging';
 import { type SwarmNetworkManager } from '@dxos/network-manager';
 import { InvalidStorageVersionError, STORAGE_VERSION, trace } from '@dxos/protocols';
 import { Invitation } 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 Credential, type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type Storage } from '@dxos/random-access-storage';
@@ -87,6 +88,7 @@ export class ServiceContext extends Resource {
     public readonly signalManager: SignalManager,
     private readonly _edgeConnection: EdgeConnection | undefined,
     public readonly _runtimeParams?: ServiceContextRuntimeParams,
+    private readonly _edgeFeatures?: Runtime.Client.EdgeFeatures,
   ) {
     super();
 
@@ -120,11 +122,35 @@ export class ServiceContext extends Resource {
       this.feedStore,
       this.spaceManager,
       this._runtimeParams as IdentityManagerRuntimeParams,
+      {
+        onIdentityConstruction: (identity) => {
+          if (this._edgeConnection) {
+            log.info('Setting identity on edge connection', {
+              identity: identity.identityKey.toHex(),
+              oldIdentity: this._edgeConnection.identityKey.toHex(),
+              swarms: this.networkManager.topics,
+            });
+            this._edgeConnection.setIdentity({
+              deviceKey: identity.deviceKey,
+              identityKey: identity.identityKey,
+            });
+            this.networkManager.setPeerInfo({
+              identityKey: identity.identityKey.toHex(),
+              peerKey: identity.deviceKey.toHex(),
+            });
+          }
+        },
+      },
     );
 
     this.echoHost = new EchoHost({ kv: this.level });
 
-    this.invitations = new InvitationsHandler(this.networkManager, _runtimeParams?.invitationConnectionDefaultParams);
+    this._meshReplicator = new MeshEchoReplicator();
+
+    this.invitations = new InvitationsHandler(
+      this.networkManager, //
+      _runtimeParams?.invitationConnectionDefaultParams,
+    );
     this.invitationsManager = new InvitationsManager(
       this.invitations,
       (invitation) => this.getInvitationHandler(invitation),
@@ -146,7 +172,7 @@ export class ServiceContext extends Resource {
     if (!this._runtimeParams?.disableP2pReplication) {
       this._meshReplicator = new MeshEchoReplicator();
     }
-    if (this._edgeConnection) {
+    if (this._edgeConnection && this._edgeFeatures?.echoReplicator) {
       this._echoEdgeReplicator = new EchoEdgeReplicator({
         edgeConnection: this._edgeConnection,
       });
@@ -159,9 +185,9 @@ export class ServiceContext extends Resource {
 
     log('opening...');
     log.trace('dxos.sdk.service-context.open', trace.begin({ id: this._instanceId }));
+    await this._edgeConnection?.open();
     await this.signalManager.open();
     await this.networkManager.open();
-    await this._edgeConnection?.open();
 
     await this.echoHost.open(ctx);
 
@@ -175,6 +201,7 @@ export class ServiceContext extends Resource {
     await this.metadataStore.load();
     await this.spaceManager.open();
     await this.identityManager.open(ctx);
+
     if (this.identityManager.identity) {
       await this._initialize(ctx);
     }
@@ -268,6 +295,7 @@ export class ServiceContext extends Resource {
       echoEdgeReplicator: this._echoEdgeReplicator,
       meshReplicator: this._meshReplicator,
       runtimeParams: this._runtimeParams as DataSpaceManagerRuntimeParams,
+      edgeFeatures: this._edgeFeatures,
     });
     await this.dataSpaceManager.open();
 

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

@@ -11,7 +11,7 @@ import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { type LevelDB } from '@dxos/kv-store';
 import { log } from '@dxos/log';
-import { WebsocketSignalManager, type SignalManager } from '@dxos/messaging';
+import { EdgeSignalManager, WebsocketSignalManager, type SignalManager } from '@dxos/messaging';
 import {
   SwarmNetworkManager,
   createIceProvider,
@@ -209,6 +209,14 @@ export class ClientServicesHost {
     if (!options.signalManager) {
       log.warn('running signaling without telemetry metadata.');
     }
+
+    const edgeEndpoint = config?.get('runtime.services.edge.url');
+    if (edgeEndpoint) {
+      this._edgeConnection = new EdgeClient(PublicKey.random(), PublicKey.random(), {
+        socketEndpoint: edgeEndpoint,
+      });
+    }
+
     const {
       connectionLog = true,
       transportFactory = createSimplePeerTransportFactory(
@@ -216,25 +224,25 @@ export class ClientServicesHost {
         this._config?.get('runtime.services.iceProviders') &&
           createIceProvider(this._config!.get('runtime.services.iceProviders')!),
       ),
-      signalManager = new WebsocketSignalManager(this._config?.get('runtime.services.signaling') ?? []),
+      signalManager = this._edgeConnection && this._config?.get('runtime.client.edgeFeatures')?.signaling
+        ? new EdgeSignalManager({ edgeConnection: this._edgeConnection })
+        : new WebsocketSignalManager(this._config?.get('runtime.services.signaling') ?? []),
     } = options;
     this._signalManager = signalManager;
 
     invariant(!this._networkManager, 'network manager already set');
     this._networkManager = new SwarmNetworkManager({
-      log: connectionLog,
+      enableDevtoolsLogging: connectionLog,
       transportFactory,
       signalManager,
+      peerInfo: this._edgeConnection
+        ? {
+            identityKey: this._edgeConnection.identityKey.toHex(),
+            peerKey: this._edgeConnection.deviceKey.toHex(),
+          }
+        : undefined,
     });
 
-    const edgeEndpoint = config?.get('runtime.services.edge.url');
-    if (edgeEndpoint) {
-      // TODO(dmaretskyi): Use actual identity instead of random keys.
-      this._edgeConnection = new EdgeClient(PublicKey.random(), PublicKey.random(), {
-        socketEndpoint: edgeEndpoint,
-      });
-    }
-
     log('initialized');
   }
 
@@ -272,6 +280,7 @@ export class ClientServicesHost {
       this._signalManager,
       this._edgeConnection,
       this._runtimeParams,
+      this._config.get('runtime.client.edgeFeatures'),
     );
 
     const dataSpaceManagerProvider = async () => {

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

@@ -41,6 +41,7 @@ import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { AlreadyJoinedError, trace as Trace } from '@dxos/protocols';
 import { Invitation, SpaceState } 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 SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { SpaceMember, type Credential, type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
@@ -109,11 +110,13 @@ export type DataSpaceManagerParams = {
   meshReplicator?: MeshEchoReplicator;
   echoEdgeReplicator?: EchoEdgeReplicator;
   runtimeParams?: DataSpaceManagerRuntimeParams;
+  edgeFeatures?: Runtime.Client.EdgeFeatures;
 };
 
 export type DataSpaceManagerRuntimeParams = {
   spaceMemberPresenceAnnounceInterval?: number;
   spaceMemberPresenceOfflineTimeout?: number;
+  disableP2pReplication?: boolean;
 };
 
 @trackLeaks('open', 'close')
@@ -132,6 +135,7 @@ export class DataSpaceManager extends Resource {
   private readonly _echoHost: EchoHost;
   private readonly _invitationsManager: InvitationsManager;
   private readonly _edgeConnection?: EdgeConnection = undefined;
+  private readonly _edgeFeatures?: Runtime.Client.EdgeFeatures = undefined;
   private readonly _meshReplicator?: MeshEchoReplicator = undefined;
   private readonly _echoEdgeReplicator?: EchoEdgeReplicator = undefined;
   private readonly _runtimeParams?: DataSpaceManagerRuntimeParams = undefined;
@@ -148,6 +152,7 @@ export class DataSpaceManager extends Resource {
     this._meshReplicator = params.meshReplicator;
     this._invitationsManager = params.invitationsManager;
     this._edgeConnection = params.edgeConnection;
+    this._edgeFeatures = params.edgeFeatures;
     this._echoEdgeReplicator = params.echoEdgeReplicator;
     this._runtimeParams = params.runtimeParams;
 
@@ -375,6 +380,7 @@ export class DataSpaceManager extends Resource {
       identityKey: this._signingContext.identityKey,
       timeout: 15_000,
       swarmIdentity: {
+        identityKey: this._signingContext.identityKey,
         peerKey: this._signingContext.deviceKey,
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: async () => true,
@@ -406,6 +412,7 @@ export class DataSpaceManager extends Resource {
     const space: Space = await this._spaceManager.constructSpace({
       metadata,
       swarmIdentity: {
+        identityKey: this._signingContext.identityKey,
         peerKey: this._signingContext.deviceKey,
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: deferFunction(() => dataSpace.authVerifier.verifier),
@@ -472,6 +479,7 @@ export class DataSpaceManager extends Resource {
       },
       cache: metadata.cache,
       edgeConnection: this._edgeConnection,
+      edgeFeatures: this._edgeFeatures,
     });
     dataSpace.postOpen.append(async () => {
       await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);

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

@@ -22,6 +22,7 @@ import {
   SpaceState,
   type Space as SpaceProto,
 } 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 SpaceCache } from '@dxos/protocols/proto/dxos/echo/metadata';
 import {
@@ -74,6 +75,7 @@ export type DataSpaceParams = {
   callbacks?: DataSpaceCallbacks;
   cache?: SpaceCache;
   edgeConnection?: EdgeConnection;
+  edgeFeatures?: Runtime.Client.EdgeFeatures;
 };
 
 export type CreateEpochOptions = {
@@ -149,7 +151,7 @@ export class DataSpace {
 
     this._cache = params.cache;
 
-    if (params.edgeConnection) {
+    if (params.edgeConnection && params.edgeFeatures?.feedReplicator) {
       this._edgeFeedReplicator = new EdgeFeedReplicator({ messenger: params.edgeConnection, spaceId: this.id });
     }
 

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

@@ -8,11 +8,12 @@ import { createCredentialSignerWithChain, CredentialGenerator } from '@dxos/cred
 import { failUndefined } from '@dxos/debug';
 import { EchoHost } from '@dxos/echo-db';
 import { MetadataStore, SpaceManager, valueEncoding, MeshEchoReplicator } from '@dxos/echo-pipeline';
+import { type EdgeConnection } from '@dxos/edge-client';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { type LevelDB } from '@dxos/kv-store';
 import { createTestLevel } from '@dxos/kv-store/testing';
-import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
+import { MemorySignalManager, MemorySignalManagerContext, type SignalManager } from '@dxos/messaging';
 import { MemoryTransportFactory, SwarmNetworkManager } from '@dxos/network-manager';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { createStorage, StorageType, type Storage } from '@dxos/random-access-storage';
@@ -35,15 +36,20 @@ export const createServiceHost = (config: Config, signalManagerContext: MemorySi
 };
 
 export const createServiceContext = async ({
-  signalContext = new MemorySignalManagerContext(),
+  signalManagerFactory = async () => {
+    const signalContext = new MemorySignalManagerContext();
+    return new MemorySignalManager(signalContext);
+  },
   storage = createStorage({ type: StorageType.RAM }),
   runtimeParams,
+  edgeConnection,
 }: {
-  signalContext?: MemorySignalManagerContext;
+  signalManagerFactory?: () => Promise<SignalManager>;
   storage?: Storage;
   runtimeParams?: ServiceContextRuntimeParams;
+  edgeConnection?: EdgeConnection;
 } = {}) => {
-  const signalManager = new MemorySignalManager(signalContext);
+  const signalManager = await signalManagerFactory();
   const networkManager = new SwarmNetworkManager({
     signalManager,
     transportFactory: MemoryTransportFactory,
@@ -51,18 +57,24 @@ export const createServiceContext = async ({
   const level = createTestLevel();
   await level.open();
 
-  return new ServiceContext(storage, level, networkManager, signalManager, undefined, {
+  return new ServiceContext(storage, level, networkManager, signalManager, edgeConnection, {
     invitationConnectionDefaultParams: { controlHeartbeatInterval: 200 },
     ...runtimeParams,
   });
 };
 
-export const createPeers = async (numPeers: number) => {
-  const signalContext = new MemorySignalManagerContext();
-
+export const createPeers = async (
+  numPeers: number,
+  signalManagerFactory?: () => Promise<SignalManager>,
+  edgeConnection?: EdgeConnection,
+) => {
+  if (!signalManagerFactory) {
+    const signalContext = new MemorySignalManagerContext();
+    signalManagerFactory = async () => new MemorySignalManager(signalContext);
+  }
   return await Promise.all(
     Array.from(Array(numPeers)).map(async () => {
-      const peer = await createServiceContext({ signalContext });
+      const peer = await createServiceContext({ signalManagerFactory, edgeConnection });
       await peer.open(new Context());
       return peer;
     }),

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

@@ -96,9 +96,11 @@ export class WorkerRuntime {
       const signals = this._config.get('runtime.services.signaling');
       this._clientServices.initialize({
         config: this._config,
-        signalManager: signals
-          ? new WebsocketSignalManager(signals, () => (this._signalTelemetryEnabled ? this._signalMetadataTags : {}))
-          : new MemorySignalManager(new MemorySignalManagerContext()), // TODO(dmaretskyi): Inject this context.
+        signalManager: this._config.get('runtime.client.edgeFeatures')?.signaling
+          ? undefined
+          : signals
+            ? new WebsocketSignalManager(signals, () => (this._signalTelemetryEnabled ? this._signalMetadataTags : {}))
+            : new MemorySignalManager(new MemorySignalManagerContext()), // TODO(dmaretskyi): Inject this context.
         transportFactory: this._transportFactory,
       });
 

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.6.8-main.3be982f";
+export const DXOS_VERSION = "0.6.8-staging.63bcb81";