@dxos/messaging 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/messaging",
-  "version": "0.8.4-main.bc674ce",
+  "version": "0.8.4-main.bcb3aa67d6",
   "description": "Messaging",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -16,14 +16,12 @@
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
     },
     "./testing": {
       "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
-      "browser": "./dist/lib/browser/testing/index.mjs",
-      "node": "./dist/lib/node-esm/testing/index.mjs"
+      "default": "./dist/lib/neutral/testing/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -41,24 +39,24 @@
   ],
   "dependencies": {
     "isomorphic-ws": "^5.0.0",
-    "ws": "^8.14.2",
-    "@dxos/async": "0.8.4-main.bc674ce",
-    "@dxos/codec-protobuf": "0.8.4-main.bc674ce",
-    "@dxos/context": "0.8.4-main.bc674ce",
-    "@dxos/edge-client": "0.8.4-main.bc674ce",
-    "@dxos/invariant": "0.8.4-main.bc674ce",
-    "@dxos/log": "0.8.4-main.bc674ce",
-    "@dxos/node-std": "0.8.4-main.bc674ce",
-    "@dxos/keys": "0.8.4-main.bc674ce",
-    "@dxos/tracing": "0.8.4-main.bc674ce",
-    "@dxos/rpc": "0.8.4-main.bc674ce",
-    "@dxos/protocols": "0.8.4-main.bc674ce",
-    "@dxos/util": "0.8.4-main.bc674ce"
+    "ws": "^8.17.1",
+    "@dxos/codec-protobuf": "0.8.4-main.bcb3aa67d6",
+    "@dxos/async": "0.8.4-main.bcb3aa67d6",
+    "@dxos/context": "0.8.4-main.bcb3aa67d6",
+    "@dxos/edge-client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/keys": "0.8.4-main.bcb3aa67d6",
+    "@dxos/node-std": "0.8.4-main.bcb3aa67d6",
+    "@dxos/invariant": "0.8.4-main.bcb3aa67d6",
+    "@dxos/log": "0.8.4-main.bcb3aa67d6",
+    "@dxos/protocols": "0.8.4-main.bcb3aa67d6",
+    "@dxos/tracing": "0.8.4-main.bcb3aa67d6",
+    "@dxos/util": "0.8.4-main.bcb3aa67d6",
+    "@dxos/rpc": "0.8.4-main.bcb3aa67d6"
   },
   "devDependencies": {
-    "@dxos/keyring": "0.8.4-main.bc674ce",
-    "@dxos/signal": "0.8.4-main.bc674ce",
-    "@dxos/test-utils": "0.8.4-main.bc674ce"
+    "@dxos/keyring": "0.8.4-main.bcb3aa67d6",
+    "@dxos/signal": "0.8.4-main.bcb3aa67d6",
+    "@dxos/test-utils": "0.8.4-main.bcb3aa67d6"
   },
   "publishConfig": {
     "access": "public"

package/src/messenger.blueprint-test.ts

@@ -5,6 +5,7 @@
 import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { asyncTimeout, latch, sleep } from '@dxos/async';
+import { Context } from '@dxos/context';
 import { range } from '@dxos/util';
 
 import { WebsocketSignalManager } from './signal-manager';
@@ -30,7 +31,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
 
     const promise = peer2.waitTillReceive(message);
 
-    await peer1.messenger.sendMessage(message);
+    await peer1.messenger.sendMessage(Context.default(), message);
 
     await promise;
   });
@@ -52,7 +53,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
       };
 
       const promise = peer2.waitTillReceive(message);
-      await peer1.messenger.sendMessage(message);
+      await peer1.messenger.sendMessage(Context.default(), message);
       await asyncTimeout(promise, 1_000);
     }
 
@@ -64,7 +65,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
       };
 
       const promise = peer3.waitTillReceive(message);
-      await peer1.messenger.sendMessage(message);
+      await peer1.messenger.sendMessage(Context.default(), message);
       await asyncTimeout(promise, 1_000);
     }
 
@@ -76,7 +77,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
       };
 
       const promise = peer1.waitTillReceive(message);
-      await peer2.messenger.sendMessage(message);
+      await peer2.messenger.sendMessage(Context.default(), message);
       await asyncTimeout(promise, 1_000);
     }
   });
@@ -128,7 +129,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
       };
       const promise = peer2.waitTillReceive(message);
 
-      await peer1.messenger.sendMessage(message);
+      await peer1.messenger.sendMessage(Context.default(), message);
 
       // 3 listeners (default one that was returned by setupPeer() and 2 that listen for type "1") should receive message.
       await asyncTimeout(promise, 1_000);
@@ -175,7 +176,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
       };
 
       const receivePromise = peer2.waitTillReceive(message);
-      await peer1.messenger.sendMessage(message);
+      await peer1.messenger.sendMessage(Context.default(), message);
 
       // 2 subscribed listeners should receive message.
       await asyncTimeout(receivePromise, 1_000);
@@ -195,7 +196,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
       };
 
       const receivePromise = peer2.waitTillReceive(message);
-      await peer1.messenger.sendMessage(message);
+      await peer1.messenger.sendMessage(Context.default(), message);
 
       // 1 listener that was not unsubscribed should receive message.
       await asyncTimeout(receivePromise, 1_000);
@@ -221,7 +222,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
 
     {
       const receivePromise = peer2.waitTillReceive(message);
-      await peer1.messenger.sendMessage(message);
+      await peer1.messenger.sendMessage(Context.default(), message);
       await asyncTimeout(receivePromise, 1_000);
     }
 
@@ -236,7 +237,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
 
     {
       const receivePromise = peer2.waitTillReceive(message);
-      await peer1.messenger.sendMessage(message);
+      await peer1.messenger.sendMessage(Context.default(), message);
       await asyncTimeout(receivePromise, 1_000);
     }
   });
@@ -275,7 +276,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
       Array(3)
         .fill(0)
         .forEach(async () => {
-          await peer2.messenger.sendMessage(message);
+          await peer2.messenger.sendMessage(Context.default(), message);
         });
 
       // expect to receive 3 messages.
@@ -302,7 +303,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
         count = inc();
       });
       // sending message.
-      await peer2.messenger.sendMessage({
+      await peer2.messenger.sendMessage(Context.default(), {
         author: peer2.peerInfo,
         recipient: peer1.peerInfo,
         payload: PAYLOAD_1,
@@ -322,7 +323,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
       void range(100).map(async () => {
         const peer = await builder.createPeer();
 
-        void peer.messenger.sendMessage({
+        void peer.messenger.sendMessage(Context.default(), {
           author: peer.peerInfo,
           recipient: peer.peerInfo,
           payload: {

package/src/messenger.ts

@@ -101,7 +101,7 @@ export class Messenger {
     await this._ctx.dispose();
   }
 
-  async sendMessage({ author, recipient, payload }: Message): Promise<void> {
+  async sendMessage(ctx: Context, { author, recipient, payload }: Message): Promise<void> {
     invariant(!this._closed, 'Closed');
     const messageContext = this._ctx.derive();
 
@@ -127,7 +127,7 @@ export class Messenger {
       async () => {
         log('retrying message', { messageId: reliablePayload.messageId });
         sendAttempts++;
-        await this._encodeAndSend({ author, recipient, reliablePayload }).catch((err) =>
+        await this._encodeAndSend(ctx, { author, recipient, reliablePayload }).catch((err) =>
           log('failed to send message', { err }),
         );
       },
@@ -158,7 +158,7 @@ export class Messenger {
       this._monitor.recordReliableMessage({ sendAttempts, sent: true });
     });
 
-    await this._encodeAndSend({ author, recipient, reliablePayload });
+    await this._encodeAndSend(ctx, { author, recipient, reliablePayload });
     return promise;
   }
 
@@ -204,16 +204,19 @@ export class Messenger {
     };
   }
 
-  private async _encodeAndSend({
-    author,
-    recipient,
-    reliablePayload,
-  }: {
-    author: PeerInfo;
-    recipient: PeerInfo;
-    reliablePayload: ReliablePayload;
-  }): Promise<void> {
-    await this._signalManager.sendMessage({
+  private async _encodeAndSend(
+    ctx: Context,
+    {
+      author,
+      recipient,
+      reliablePayload,
+    }: {
+      author: PeerInfo;
+      recipient: PeerInfo;
+      reliablePayload: ReliablePayload;
+    },
+  ): Promise<void> {
+    await this._signalManager.sendMessage(ctx, {
       author,
       recipient,
       payload: {
@@ -243,7 +246,7 @@ export class Messenger {
     log('handling message', { messageId: reliablePayload.messageId });
 
     try {
-      await this._sendAcknowledgement({
+      await this._sendAcknowledgement(this._ctx, {
         author,
         recipient,
         messageId: reliablePayload.messageId,
@@ -272,18 +275,21 @@ export class Messenger {
     this._onAckCallbacks.get(Acknowledgement.decode(payload.value).messageId)?.();
   }
 
-  private async _sendAcknowledgement({
-    author,
-    recipient,
-    messageId,
-  }: {
-    author: PeerInfo;
-    recipient: PeerInfo;
-    messageId: PublicKey;
-  }): Promise<void> {
+  private async _sendAcknowledgement(
+    ctx: Context,
+    {
+      author,
+      recipient,
+      messageId,
+    }: {
+      author: PeerInfo;
+      recipient: PeerInfo;
+      messageId: PublicKey;
+    },
+  ): Promise<void> {
     log('sending ACK', { messageId, from: recipient, to: author });
 
-    await this._signalManager.sendMessage({
+    await this._signalManager.sendMessage(ctx, {
       author: recipient,
       recipient: author,
       payload: {

package/src/signal-client/signal-client.node.test.ts

@@ -6,6 +6,7 @@ import { afterAll, beforeAll, describe, expect, onTestFinished, test } from 'vit
 
 import { asyncTimeout, waitForCondition } from '@dxos/async';
 import { type Any, type TaggedType } from '@dxos/codec-protobuf';
+import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { type TYPES } from '@dxos/protocols/proto';
@@ -43,7 +44,7 @@ describe('SignalClient', () => {
 
     const message = createMessage(peer2, peer1);
     const receivedMessage = peer1.waitForNextMessage();
-    await peer2.client.sendMessage(message);
+    await peer2.client.sendMessage(Context.default(), message);
     expect(await receivedMessage).toEqual(message);
   });
 
@@ -51,8 +52,8 @@ describe('SignalClient', () => {
     const topic = PublicKey.random();
     const [peer1, peer2] = setupPeers({ peerCount: 2 });
 
-    await peer1.client.join({ topic, peer: peer1.peerInfo });
-    await peer2.client.join({ topic, peer: peer2.peerInfo });
+    await peer1.client.join(Context.default(), { topic, peer: peer1.peerInfo });
+    await peer2.client.join(Context.default(), { topic, peer: peer2.peerInfo });
 
     await peer1.waitForPeer(peer2.peerKey);
     await peer2.waitForPeer(peer1.peerKey);
@@ -67,7 +68,7 @@ describe('SignalClient', () => {
     const message = createMessage(peer2, peer1);
     const receivedMessage = peer1.waitForNextMessage();
 
-    await peer1.client.sendMessage(message);
+    await peer1.client.sendMessage(Context.default(), message);
     expect(await receivedMessage).toEqual(message);
   });
 
@@ -82,7 +83,7 @@ describe('SignalClient', () => {
 
     {
       const receivedMessage = peer1.waitForNextMessage({ timeout: 1_000 });
-      await peer2.client.sendMessage(message);
+      await peer2.client.sendMessage(Context.default(), message);
       expect(await receivedMessage).toEqual(message);
     }
 
@@ -91,7 +92,7 @@ describe('SignalClient', () => {
 
     {
       const receivedMessage = peer1.waitForNextMessage({ timeout: 200 });
-      await peer2.client.sendMessage(message);
+      await peer2.client.sendMessage(Context.default(), message);
       await expect(receivedMessage).rejects.toBeDefined();
     }
   });
@@ -106,7 +107,7 @@ describe('SignalClient', () => {
 
     {
       const waitMessage = peer1.waitForNextMessage();
-      await peer2.client.sendMessage(message);
+      await peer2.client.sendMessage(Context.default(), message);
       expect(await waitMessage).toEqual(message);
     }
 
@@ -120,7 +121,7 @@ describe('SignalClient', () => {
 
     {
       const waitMessage = peer1.waitForNextMessage();
-      await peer2.client.sendMessage(message);
+      await peer2.client.sendMessage(Context.default(), message);
       expect(await waitMessage).toEqual(message);
     }
   });

package/src/signal-client/signal-client.ts

@@ -173,24 +173,24 @@ export class SignalClient extends Resource implements SignalClientMethods {
     };
   }
 
-  async join(args: JoinRequest): Promise<void> {
+  async join(_ctx: Context, args: JoinRequest): Promise<void> {
     log('joining', { topic: args.topic, peerId: args.peer.peerKey });
     this._monitor.recordJoin();
     this.localState.join({ topic: args.topic, peerId: PublicKey.from(args.peer.peerKey) });
     this._reconcileTask?.schedule();
   }
 
-  async leave(args: LeaveRequest): Promise<void> {
+  async leave(_ctx: Context, args: LeaveRequest): Promise<void> {
     log('leaving', { topic: args.topic, peerId: args.peer.peerKey });
     this._monitor.recordLeave();
     this.localState.leave({ topic: args.topic, peerId: PublicKey.from(args.peer.peerKey) });
   }
 
-  async query(params: QueryRequest): Promise<SwarmResponse> {
+  async query(_ctx: Context, params: QueryRequest): Promise<SwarmResponse> {
     throw new Error('Not implemented');
   }
 
-  async sendMessage(msg: Message): Promise<void> {
+  async sendMessage(_ctx: Context, msg: Message): Promise<void> {
     return this._monitor.recordMessageSending(msg, async () => {
       await this._clientReady.wait();
       invariant(this._state === SignalState.CONNECTED, 'Not connected to Signal Server');

package/src/signal-manager/edge-signal-manager.ts

@@ -3,7 +3,7 @@
 //
 
 import { Event, scheduleMicroTask } from '@dxos/async';
-import { Resource, cancelWithContext } from '@dxos/context';
+import { type Context, Resource, cancelWithContext } from '@dxos/context';
 import { type EdgeConnection, EdgeIdentityChangedError, protocol } from '@dxos/edge-client';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
@@ -60,7 +60,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
   /**
    * Warning: PeerInfo is inferred from edgeConnection.
    */
-  async join({ topic, peer }: { topic: PublicKey; peer: PeerInfo }): Promise<void> {
+  async join(ctx: Context, { topic, peer }: { topic: PublicKey; peer: PeerInfo }): Promise<void> {
     if (!this._matchSelfPeerInfo(peer)) {
       // NOTE: Could only join swarm with the same peer info as the edge connection.
       log.warn('ignoring peer info on join request', {
@@ -77,6 +77,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
 
     this._swarmPeers.set(topic, { lastState: peer.state, joinedPeers: new ComplexSet<PeerInfo>(PeerInfoHash) });
     await this._edgeConnection.send(
+      ctx,
       protocol.createMessage(SwarmRequestSchema, {
         serviceId: EdgeService.SWARM,
         source: createMessageSource(topic, peer),
@@ -85,10 +86,11 @@ export class EdgeSignalManager extends Resource implements SignalManager {
     );
   }
 
-  async leave({ topic, peer }: { topic: PublicKey; peer: PeerInfo }): Promise<void> {
+  async leave(ctx: Context, { topic, peer }: { topic: PublicKey; peer: PeerInfo }): Promise<void> {
     this._swarmPeers.delete(topic);
     try {
       await this._edgeConnection.send(
+        ctx,
         protocol.createMessage(SwarmRequestSchema, {
           serviceId: EdgeService.SWARM,
           source: createMessageSource(topic, peer),
@@ -105,13 +107,14 @@ export class EdgeSignalManager extends Resource implements SignalManager {
     }
   }
 
-  async query({ topic }: { topic: PublicKey }): Promise<SwarmResponse> {
+  async query(ctx: Context, { topic }: { topic: PublicKey }): Promise<SwarmResponse> {
     const response = cancelWithContext(
       this._ctx,
       this.swarmState.waitFor((state) => state.swarmKey === topic.toHex()),
     );
 
     await this._edgeConnection.send(
+      ctx,
       protocol.createMessage(SwarmRequestSchema, {
         serviceId: EdgeService.SWARM,
         source: createMessageSource(topic, {
@@ -125,7 +128,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
     return response;
   }
 
-  async sendMessage(message: Message): Promise<void> {
+  async sendMessage(ctx: Context, message: Message): Promise<void> {
     if (!this._matchSelfPeerInfo(message.author)) {
       // NOTE: Could only join swarm with the same peer info as the edge connection.
       log.warn('ignoring author on send request', {
@@ -135,6 +138,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
     }
 
     await this._edgeConnection.send(
+      ctx,
       protocol.createMessage(bufWkt.AnySchema, {
         serviceId: EdgeService.SIGNAL,
         source: message.author,
@@ -228,7 +232,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
   private async _rejoinAllSwarms(): Promise<void> {
     log('rejoin swarms', { swarms: Array.from(this._swarmPeers.keys()) });
     for (const [topic, { lastState }] of this._swarmPeers.entries()) {
-      await this.join({
+      await this.join(this._ctx, {
         topic,
         peer: {
           peerKey: this._edgeConnection.peerKey,

package/src/signal-manager/memory-signal-manager.ts

@@ -63,7 +63,7 @@ export class MemorySignalManager implements SignalManager {
     this._ctx = new Context();
     this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
 
-    await Promise.all([...this._joinedSwarms.values()].map((value) => this.join(value)));
+    await Promise.all([...this._joinedSwarms.values()].map((value) => this.join(this._ctx, value)));
   }
 
   async close(): Promise<void> {
@@ -76,7 +76,7 @@ export class MemorySignalManager implements SignalManager {
       [...this._joinedSwarms.values()],
     );
 
-    await Promise.all([...this._joinedSwarms.values()].map((value) => this.leave(value)));
+    await Promise.all([...this._joinedSwarms.values()].map((value) => this.leave(this._ctx, value)));
 
     // assign joined swarms back because .leave() deletes it.
     this._joinedSwarms = joinedSwarmsCopy;
@@ -88,7 +88,7 @@ export class MemorySignalManager implements SignalManager {
     return [];
   }
 
-  async join({ topic, peer }: { topic: PublicKey; peer: PeerInfo }): Promise<void> {
+  async join(_ctx: Context, { topic, peer }: { topic: PublicKey; peer: PeerInfo }): Promise<void> {
     invariant(!this._ctx.disposed, 'Closed');
 
     this._joinedSwarms.add({ topic, peer });
@@ -120,7 +120,7 @@ export class MemorySignalManager implements SignalManager {
     }
   }
 
-  async leave({ topic, peer }: { topic: PublicKey; peer: PeerInfo }): Promise<void> {
+  async leave(_ctx: Context, { topic, peer }: { topic: PublicKey; peer: PeerInfo }): Promise<void> {
     invariant(!this._ctx.disposed, 'Closed');
 
     this._joinedSwarms.delete({ topic, peer });
@@ -141,19 +141,22 @@ export class MemorySignalManager implements SignalManager {
     this._context.swarmEvent.emit(swarmEvent);
   }
 
-  async query(request: QueryRequest): Promise<SwarmResponse> {
+  async query(_ctx: Context, request: QueryRequest): Promise<SwarmResponse> {
     throw new Error('Not implemented');
   }
 
-  async sendMessage({
-    author,
-    recipient,
-    payload,
-  }: {
-    author: PeerInfo;
-    recipient: PeerInfo;
-    payload: Any;
-  }): Promise<void> {
+  async sendMessage(
+    _ctx: Context,
+    {
+      author,
+      recipient,
+      payload,
+    }: {
+      author: PeerInfo;
+      recipient: PeerInfo;
+      payload: Any;
+    },
+  ): Promise<void> {
     log('send message', { author, recipient, ...dec(payload) });
 
     invariant(recipient);

package/src/signal-manager/websocket-signal-manager.node.test.ts

@@ -5,6 +5,7 @@
 import { afterAll, beforeAll, describe, test } from 'vitest';
 
 import { asyncTimeout, sleep } from '@dxos/async';
+import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
 import { type SignalServerRunner, runTestSignalServer } from '@dxos/signal';
 import { openAndClose } from '@dxos/test-utils';
@@ -40,9 +41,9 @@ describe.skip('WebSocketSignalManager', () => {
     const joined21 = expectPeerAvailable(client2, topic, { peerKey: peer1.toHex() });
     const joined31 = expectPeerAvailable(client3, topic, { peerKey: peer1.toHex() });
 
-    await client1.join({ topic, peer: { peerKey: peer1.toHex() } });
-    await client2.join({ topic, peer: { peerKey: peer2.toHex() } });
-    await client3.join({ topic, peer: { peerKey: peer3.toHex() } });
+    await client1.join(Context.default(), { topic, peer: { peerKey: peer1.toHex() } });
+    await client2.join(Context.default(), { topic, peer: { peerKey: peer2.toHex() } });
+    await client3.join(Context.default(), { topic, peer: { peerKey: peer3.toHex() } });
 
     await Promise.all([joined12, joined13, joined21, joined31]);
   });
@@ -57,8 +58,8 @@ describe.skip('WebSocketSignalManager', () => {
     const joined12 = expectPeerAvailable(client1, topic, { peerKey: peer2.toHex() });
     const joined21 = expectPeerAvailable(client2, topic, { peerKey: peer1.toHex() });
 
-    await client1.join({ topic, peer: { peerKey: peer1.toHex() } });
-    await client2.join({ topic, peer: { peerKey: peer2.toHex() } });
+    await client1.join(Context.default(), { topic, peer: { peerKey: peer1.toHex() } });
+    await client2.join(Context.default(), { topic, peer: { peerKey: peer2.toHex() } });
 
     await asyncTimeout(Promise.all([joined12, joined21]), 1_000);
 
@@ -67,7 +68,7 @@ describe.skip('WebSocketSignalManager', () => {
     const received = expectReceivedMessage(client2.onMessage, message);
     await client2.subscribeMessages({ peerKey: peer2.toHex() });
     await sleep(50);
-    await client1.sendMessage(message);
+    await client1.sendMessage(Context.default(), message);
 
     await asyncTimeout(received, 1_000);
   });
@@ -82,8 +83,8 @@ describe.skip('WebSocketSignalManager', () => {
     const joined12 = expectPeerAvailable(client1, topic, { peerKey: peer2.toHex() });
     const joined21 = expectPeerAvailable(client2, topic, { peerKey: peer1.toHex() });
 
-    await client1.join({ topic, peer: { peerKey: peer1.toHex() } });
-    await client2.join({ topic, peer: { peerKey: peer2.toHex() } });
+    await client1.join(Context.default(), { topic, peer: { peerKey: peer1.toHex() } });
+    await client2.join(Context.default(), { topic, peer: { peerKey: peer2.toHex() } });
 
     await Promise.all([joined12, joined21]);
   });
@@ -98,15 +99,15 @@ describe.skip('WebSocketSignalManager', () => {
     const joined112 = expectPeerAvailable(client1, topic1, { peerKey: peer2.toHex() });
     const joined121 = expectPeerAvailable(client2, topic1, { peerKey: peer1.toHex() });
 
-    await client1.join({ topic: topic1, peer: { peerKey: peer1.toHex() } });
-    await client2.join({ topic: topic1, peer: { peerKey: peer2.toHex() } });
+    await client1.join(Context.default(), { topic: topic1, peer: { peerKey: peer1.toHex() } });
+    await client2.join(Context.default(), { topic: topic1, peer: { peerKey: peer2.toHex() } });
     await Promise.all([joined112, joined121]);
 
     const joined212 = expectPeerAvailable(client1, topic2, { peerKey: peer2.toHex() });
     const joined221 = expectPeerAvailable(client2, topic2, { peerKey: peer1.toHex() });
 
-    await client1.join({ topic: topic2, peer: { peerKey: peer1.toHex() } });
-    await client2.join({ topic: topic2, peer: { peerKey: peer2.toHex() } });
+    await client1.join(Context.default(), { topic: topic2, peer: { peerKey: peer1.toHex() } });
+    await client2.join(Context.default(), { topic: topic2, peer: { peerKey: peer2.toHex() } });
     await Promise.all([joined212, joined221]);
   });
 });

package/src/signal-manager/websocket-signal-manager.ts

@@ -3,7 +3,7 @@
 //
 
 import { Event, sleep, synchronized } from '@dxos/async';
-import { LifecycleState, Resource } from '@dxos/context';
+import { type Context, LifecycleState, Resource } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -105,30 +105,30 @@ export class WebsocketSignalManager extends Resource implements SignalManager {
   }
 
   @synchronized
-  async join({ topic, peer }: JoinRequest): Promise<void> {
+  async join(_ctx: Context, { topic, peer }: JoinRequest): Promise<void> {
     log('join', { topic, peer });
     invariant(this._lifecycleState === LifecycleState.OPEN);
-    await this._forEachServer((server) => server.join({ topic, peer }));
+    await this._forEachServer((server) => server.join(_ctx, { topic, peer }));
   }
 
   @synchronized
-  async leave({ topic, peer }: LeaveRequest): Promise<void> {
+  async leave(_ctx: Context, { topic, peer }: LeaveRequest): Promise<void> {
     log('leaving', { topic, peer });
     invariant(this._lifecycleState === LifecycleState.OPEN);
-    await this._forEachServer((server) => server.leave({ topic, peer }));
+    await this._forEachServer((server) => server.leave(_ctx, { topic, peer }));
   }
 
-  async query({ topic }: QueryRequest): Promise<SwarmResponse> {
+  async query(_ctx: Context, { topic }: QueryRequest): Promise<SwarmResponse> {
     throw new Error('Not implemented');
   }
 
-  async sendMessage({ author, recipient, payload }: Message): Promise<void> {
+  async sendMessage(_ctx: Context, { author, recipient, payload }: Message): Promise<void> {
     log('signal', { recipient });
     invariant(this._lifecycleState === LifecycleState.OPEN);
 
     void this._forEachServer(async (server, serverName, index) => {
       void server
-        .sendMessage({ author, recipient, payload })
+        .sendMessage(_ctx, { author, recipient, payload })
         .then(() => this._clearServerFailedFlag(serverName, index))
         .catch((err) => {
           if (err instanceof RateLimitExceededError) {