@dxos/messaging 0.8.4-main.f5c0578 → 0.8.4-main.fcfe5033a5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (54) hide show
  1. package/dist/lib/neutral/chunk-ZNKR3G44.mjs +694 -0
  2. package/dist/lib/neutral/chunk-ZNKR3G44.mjs.map +7 -0
  3. package/dist/lib/{browser/chunk-TPBTNKLU.mjs → neutral/index.mjs} +345 -1025
  4. package/dist/lib/neutral/index.mjs.map +7 -0
  5. package/dist/lib/{browser → neutral}/meta.json +1 -1
  6. package/dist/lib/{browser → neutral}/testing/index.mjs +9 -11
  7. package/dist/lib/neutral/testing/index.mjs.map +7 -0
  8. package/dist/types/src/messenger.blueprint-test.d.ts.map +1 -1
  9. package/dist/types/src/messenger.d.ts +2 -1
  10. package/dist/types/src/messenger.d.ts.map +1 -1
  11. package/dist/types/src/signal-client/signal-client.d.ts +5 -5
  12. package/dist/types/src/signal-client/signal-client.d.ts.map +1 -1
  13. package/dist/types/src/signal-client/signal-local-state.d.ts.map +1 -1
  14. package/dist/types/src/signal-client/signal-rpc-client.d.ts +2 -2
  15. package/dist/types/src/signal-client/signal-rpc-client.d.ts.map +1 -1
  16. package/dist/types/src/signal-manager/edge-signal-manager.d.ts +5 -5
  17. package/dist/types/src/signal-manager/edge-signal-manager.d.ts.map +1 -1
  18. package/dist/types/src/signal-manager/memory-signal-manager.d.ts +5 -4
  19. package/dist/types/src/signal-manager/memory-signal-manager.d.ts.map +1 -1
  20. package/dist/types/src/signal-manager/websocket-signal-manager.d.ts +5 -5
  21. package/dist/types/src/signal-manager/websocket-signal-manager.d.ts.map +1 -1
  22. package/dist/types/src/signal-methods.d.ts +5 -5
  23. package/dist/types/src/signal-methods.d.ts.map +1 -1
  24. package/dist/types/src/testing/test-builder.d.ts.map +1 -1
  25. package/dist/types/src/testing/test-peer.d.ts.map +1 -1
  26. package/dist/types/src/testing/utils.d.ts.map +1 -1
  27. package/dist/types/tsconfig.tsbuildinfo +1 -1
  28. package/package.json +24 -22
  29. package/src/messenger.blueprint-test.ts +13 -12
  30. package/src/messenger.node.test.ts +7 -38
  31. package/src/messenger.ts +34 -28
  32. package/src/signal-client/signal-client.node.test.ts +9 -9
  33. package/src/signal-client/signal-client.ts +4 -5
  34. package/src/signal-client/signal-local-state.ts +0 -1
  35. package/src/signal-client/signal-rpc-client.ts +2 -2
  36. package/src/signal-manager/edge-signal-manager.ts +27 -15
  37. package/src/signal-manager/memory-signal-manager.ts +17 -15
  38. package/src/signal-manager/websocket-signal-manager.node.test.ts +13 -13
  39. package/src/signal-manager/websocket-signal-manager.ts +8 -9
  40. package/src/signal-methods.ts +5 -5
  41. package/src/testing/test-builder.ts +4 -3
  42. package/src/testing/test-peer.ts +0 -1
  43. package/src/testing/utils.ts +0 -1
  44. package/dist/lib/browser/chunk-TPBTNKLU.mjs.map +0 -7
  45. package/dist/lib/browser/index.mjs +0 -22
  46. package/dist/lib/browser/index.mjs.map +0 -7
  47. package/dist/lib/browser/testing/index.mjs.map +0 -7
  48. package/dist/lib/node-esm/chunk-SHJNQUOF.mjs +0 -2383
  49. package/dist/lib/node-esm/chunk-SHJNQUOF.mjs.map +0 -7
  50. package/dist/lib/node-esm/index.mjs +0 -22
  51. package/dist/lib/node-esm/index.mjs.map +0 -7
  52. package/dist/lib/node-esm/meta.json +0 -1
  53. package/dist/lib/node-esm/testing/index.mjs +0 -151
  54. package/dist/lib/node-esm/testing/index.mjs.map +0 -7
package/package.json CHANGED
@@ -1,25 +1,27 @@
1
1
  {
2
2
  "name": "@dxos/messaging",
3
- "version": "0.8.4-main.f5c0578",
3
+ "version": "0.8.4-main.fcfe5033a5",
4
4
  "description": "Messaging",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
7
+ "repository": {
8
+ "type": "git",
9
+ "url": "https://github.com/dxos/dxos"
10
+ },
7
11
  "license": "MIT",
8
12
  "author": "DXOS.org",
9
- "sideEffects": true,
13
+ "sideEffects": false,
10
14
  "type": "module",
11
15
  "exports": {
12
16
  ".": {
13
17
  "source": "./src/index.ts",
14
18
  "types": "./dist/types/src/index.d.ts",
15
- "browser": "./dist/lib/browser/index.mjs",
16
- "node": "./dist/lib/node-esm/index.mjs"
19
+ "default": "./dist/lib/neutral/index.mjs"
17
20
  },
18
21
  "./testing": {
19
22
  "source": "./src/testing/index.ts",
20
23
  "types": "./dist/types/src/testing/index.d.ts",
21
- "browser": "./dist/lib/browser/testing/index.mjs",
22
- "node": "./dist/lib/node-esm/testing/index.mjs"
24
+ "default": "./dist/lib/neutral/testing/index.mjs"
23
25
  }
24
26
  },
25
27
  "types": "dist/types/src/index.d.ts",
@@ -37,24 +39,24 @@
37
39
  ],
38
40
  "dependencies": {
39
41
  "isomorphic-ws": "^5.0.0",
40
- "ws": "^8.14.2",
41
- "@dxos/async": "0.8.4-main.f5c0578",
42
- "@dxos/codec-protobuf": "0.8.4-main.f5c0578",
43
- "@dxos/context": "0.8.4-main.f5c0578",
44
- "@dxos/edge-client": "0.8.4-main.f5c0578",
45
- "@dxos/invariant": "0.8.4-main.f5c0578",
46
- "@dxos/keys": "0.8.4-main.f5c0578",
47
- "@dxos/log": "0.8.4-main.f5c0578",
48
- "@dxos/node-std": "0.8.4-main.f5c0578",
49
- "@dxos/rpc": "0.8.4-main.f5c0578",
50
- "@dxos/protocols": "0.8.4-main.f5c0578",
51
- "@dxos/tracing": "0.8.4-main.f5c0578",
52
- "@dxos/util": "0.8.4-main.f5c0578"
42
+ "ws": "^8.17.1",
43
+ "@dxos/codec-protobuf": "0.8.4-main.fcfe5033a5",
44
+ "@dxos/async": "0.8.4-main.fcfe5033a5",
45
+ "@dxos/context": "0.8.4-main.fcfe5033a5",
46
+ "@dxos/invariant": "0.8.4-main.fcfe5033a5",
47
+ "@dxos/keys": "0.8.4-main.fcfe5033a5",
48
+ "@dxos/edge-client": "0.8.4-main.fcfe5033a5",
49
+ "@dxos/node-std": "0.8.4-main.fcfe5033a5",
50
+ "@dxos/protocols": "0.8.4-main.fcfe5033a5",
51
+ "@dxos/log": "0.8.4-main.fcfe5033a5",
52
+ "@dxos/tracing": "0.8.4-main.fcfe5033a5",
53
+ "@dxos/rpc": "0.8.4-main.fcfe5033a5",
54
+ "@dxos/util": "0.8.4-main.fcfe5033a5"
53
55
  },
54
56
  "devDependencies": {
55
- "@dxos/keyring": "0.8.4-main.f5c0578",
56
- "@dxos/signal": "0.8.4-main.f5c0578",
57
- "@dxos/test-utils": "0.8.4-main.f5c0578"
57
+ "@dxos/keyring": "0.8.4-main.fcfe5033a5",
58
+ "@dxos/signal": "0.8.4-main.fcfe5033a5",
59
+ "@dxos/test-utils": "0.8.4-main.fcfe5033a5"
58
60
  },
59
61
  "publishConfig": {
60
62
  "access": "public"
@@ -5,6 +5,7 @@
5
5
  import { describe, expect, onTestFinished, test } from 'vitest';
6
6
 
7
7
  import { asyncTimeout, latch, sleep } from '@dxos/async';
8
+ import { Context } from '@dxos/context';
8
9
  import { range } from '@dxos/util';
9
10
 
10
11
  import { WebsocketSignalManager } from './signal-manager';
@@ -30,7 +31,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
30
31
 
31
32
  const promise = peer2.waitTillReceive(message);
32
33
 
33
- await peer1.messenger.sendMessage(message);
34
+ await peer1.messenger.sendMessage(Context.default(), message);
34
35
 
35
36
  await promise;
36
37
  });
@@ -52,7 +53,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
52
53
  };
53
54
 
54
55
  const promise = peer2.waitTillReceive(message);
55
- await peer1.messenger.sendMessage(message);
56
+ await peer1.messenger.sendMessage(Context.default(), message);
56
57
  await asyncTimeout(promise, 1_000);
57
58
  }
58
59
 
@@ -64,7 +65,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
64
65
  };
65
66
 
66
67
  const promise = peer3.waitTillReceive(message);
67
- await peer1.messenger.sendMessage(message);
68
+ await peer1.messenger.sendMessage(Context.default(), message);
68
69
  await asyncTimeout(promise, 1_000);
69
70
  }
70
71
 
@@ -76,7 +77,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
76
77
  };
77
78
 
78
79
  const promise = peer1.waitTillReceive(message);
79
- await peer2.messenger.sendMessage(message);
80
+ await peer2.messenger.sendMessage(Context.default(), message);
80
81
  await asyncTimeout(promise, 1_000);
81
82
  }
82
83
  });
@@ -128,7 +129,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
128
129
  };
129
130
  const promise = peer2.waitTillReceive(message);
130
131
 
131
- await peer1.messenger.sendMessage(message);
132
+ await peer1.messenger.sendMessage(Context.default(), message);
132
133
 
133
134
  // 3 listeners (default one that was returned by setupPeer() and 2 that listen for type "1") should receive message.
134
135
  await asyncTimeout(promise, 1_000);
@@ -175,7 +176,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
175
176
  };
176
177
 
177
178
  const receivePromise = peer2.waitTillReceive(message);
178
- await peer1.messenger.sendMessage(message);
179
+ await peer1.messenger.sendMessage(Context.default(), message);
179
180
 
180
181
  // 2 subscribed listeners should receive message.
181
182
  await asyncTimeout(receivePromise, 1_000);
@@ -195,7 +196,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
195
196
  };
196
197
 
197
198
  const receivePromise = peer2.waitTillReceive(message);
198
- await peer1.messenger.sendMessage(message);
199
+ await peer1.messenger.sendMessage(Context.default(), message);
199
200
 
200
201
  // 1 listener that was not unsubscribed should receive message.
201
202
  await asyncTimeout(receivePromise, 1_000);
@@ -221,7 +222,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
221
222
 
222
223
  {
223
224
  const receivePromise = peer2.waitTillReceive(message);
224
- await peer1.messenger.sendMessage(message);
225
+ await peer1.messenger.sendMessage(Context.default(), message);
225
226
  await asyncTimeout(receivePromise, 1_000);
226
227
  }
227
228
 
@@ -236,7 +237,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
236
237
 
237
238
  {
238
239
  const receivePromise = peer2.waitTillReceive(message);
239
- await peer1.messenger.sendMessage(message);
240
+ await peer1.messenger.sendMessage(Context.default(), message);
240
241
  await asyncTimeout(receivePromise, 1_000);
241
242
  }
242
243
  });
@@ -275,7 +276,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
275
276
  Array(3)
276
277
  .fill(0)
277
278
  .forEach(async () => {
278
- await peer2.messenger.sendMessage(message);
279
+ await peer2.messenger.sendMessage(Context.default(), message);
279
280
  });
280
281
 
281
282
  // expect to receive 3 messages.
@@ -302,7 +303,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
302
303
  count = inc();
303
304
  });
304
305
  // sending message.
305
- await peer2.messenger.sendMessage({
306
+ await peer2.messenger.sendMessage(Context.default(), {
306
307
  author: peer2.peerInfo,
307
308
  recipient: peer1.peerInfo,
308
309
  payload: PAYLOAD_1,
@@ -322,7 +323,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
322
323
  void range(100).map(async () => {
323
324
  const peer = await builder.createPeer();
324
325
 
325
- void peer.messenger.sendMessage({
326
+ void peer.messenger.sendMessage(Context.default(), {
326
327
  author: peer.peerInfo,
327
328
  recipient: peer.peerInfo,
328
329
  payload: {
@@ -2,48 +2,17 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
- import { afterAll, beforeAll, describe, onTestFinished, test } from 'vitest';
6
-
7
- import { asyncTimeout } from '@dxos/async';
8
- import { type SignalServerRunner, runTestSignalServer } from '@dxos/signal';
5
+ import { beforeEach, describe } from 'vitest';
9
6
 
10
7
  import { messengerTests } from './messenger.blueprint-test';
11
- import { WebsocketSignalManager } from './signal-manager';
12
- import { type Message } from './signal-methods';
13
- import { PAYLOAD_1, TestBuilder } from './testing';
8
+ import { MemorySignalManager, MemorySignalManagerContext } from './signal-manager';
14
9
 
10
+ // TODO(mykola): Use EDGE signal server.
15
11
  describe('Messenger with WebsocketSignalManager', () => {
16
- let broker: SignalServerRunner;
17
-
18
- beforeAll(async () => {
19
- broker = await runTestSignalServer();
20
- });
21
-
22
- afterAll(() => {
23
- void broker.stop();
12
+ let context: MemorySignalManagerContext;
13
+ beforeEach(async () => {
14
+ context = new MemorySignalManagerContext();
24
15
  });
25
16
 
26
- messengerTests(async () => new WebsocketSignalManager([{ server: broker.url() }]));
27
-
28
- test('Message with broken signal server', { timeout: 1000 }, async () => {
29
- const builder = new TestBuilder({
30
- signalManagerFactory: async () =>
31
- new WebsocketSignalManager([{ server: 'ws://broken.kube.' }, { server: broker.url() }]),
32
- });
33
- onTestFinished(() => builder.close());
34
- const peer1 = await builder.createPeer();
35
- const peer2 = await builder.createPeer();
36
-
37
- const message: Message = {
38
- author: peer1.peerInfo,
39
- recipient: peer2.peerInfo,
40
- payload: PAYLOAD_1,
41
- };
42
-
43
- {
44
- const receivePromise = peer2.waitTillReceive(message);
45
- await peer1.messenger.sendMessage(message);
46
- await asyncTimeout(receivePromise, 1_000);
47
- }
48
- });
17
+ messengerTests(async () => new MemorySignalManager(context));
49
18
  });
package/src/messenger.ts CHANGED
@@ -101,7 +101,7 @@ export class Messenger {
101
101
  await this._ctx.dispose();
102
102
  }
103
103
 
104
- async sendMessage({ author, recipient, payload }: Message): Promise<void> {
104
+ async sendMessage(ctx: Context, { author, recipient, payload }: Message): Promise<void> {
105
105
  invariant(!this._closed, 'Closed');
106
106
  const messageContext = this._ctx.derive();
107
107
 
@@ -127,7 +127,7 @@ export class Messenger {
127
127
  async () => {
128
128
  log('retrying message', { messageId: reliablePayload.messageId });
129
129
  sendAttempts++;
130
- await this._encodeAndSend({ author, recipient, reliablePayload }).catch((err) =>
130
+ await this._encodeAndSend(ctx, { author, recipient, reliablePayload }).catch((err) =>
131
131
  log('failed to send message', { err }),
132
132
  );
133
133
  },
@@ -140,10 +140,10 @@ export class Messenger {
140
140
  log('message not delivered', { messageId: reliablePayload.messageId });
141
141
  this._onAckCallbacks.delete(reliablePayload.messageId!);
142
142
  timeoutHit(
143
- new ProtocolTimeoutError(
144
- 'signaling message not delivered',
145
- new TimeoutError(MESSAGE_TIMEOUT, 'Message not delivered'),
146
- ),
143
+ new ProtocolTimeoutError({
144
+ message: 'signaling message not delivered',
145
+ cause: new TimeoutError(MESSAGE_TIMEOUT, 'Message not delivered'),
146
+ }),
147
147
  );
148
148
  void messageContext.dispose();
149
149
  this._monitor.recordReliableMessage({ sendAttempts, sent: false });
@@ -158,7 +158,7 @@ export class Messenger {
158
158
  this._monitor.recordReliableMessage({ sendAttempts, sent: true });
159
159
  });
160
160
 
161
- await this._encodeAndSend({ author, recipient, reliablePayload });
161
+ await this._encodeAndSend(ctx, { author, recipient, reliablePayload });
162
162
  return promise;
163
163
  }
164
164
 
@@ -204,16 +204,19 @@ export class Messenger {
204
204
  };
205
205
  }
206
206
 
207
- private async _encodeAndSend({
208
- author,
209
- recipient,
210
- reliablePayload,
211
- }: {
212
- author: PeerInfo;
213
- recipient: PeerInfo;
214
- reliablePayload: ReliablePayload;
215
- }): Promise<void> {
216
- await this._signalManager.sendMessage({
207
+ private async _encodeAndSend(
208
+ ctx: Context,
209
+ {
210
+ author,
211
+ recipient,
212
+ reliablePayload,
213
+ }: {
214
+ author: PeerInfo;
215
+ recipient: PeerInfo;
216
+ reliablePayload: ReliablePayload;
217
+ },
218
+ ): Promise<void> {
219
+ await this._signalManager.sendMessage(ctx, {
217
220
  author,
218
221
  recipient,
219
222
  payload: {
@@ -243,7 +246,7 @@ export class Messenger {
243
246
  log('handling message', { messageId: reliablePayload.messageId });
244
247
 
245
248
  try {
246
- await this._sendAcknowledgement({
249
+ await this._sendAcknowledgement(this._ctx, {
247
250
  author,
248
251
  recipient,
249
252
  messageId: reliablePayload.messageId,
@@ -272,18 +275,21 @@ export class Messenger {
272
275
  this._onAckCallbacks.get(Acknowledgement.decode(payload.value).messageId)?.();
273
276
  }
274
277
 
275
- private async _sendAcknowledgement({
276
- author,
277
- recipient,
278
- messageId,
279
- }: {
280
- author: PeerInfo;
281
- recipient: PeerInfo;
282
- messageId: PublicKey;
283
- }): Promise<void> {
278
+ private async _sendAcknowledgement(
279
+ ctx: Context,
280
+ {
281
+ author,
282
+ recipient,
283
+ messageId,
284
+ }: {
285
+ author: PeerInfo;
286
+ recipient: PeerInfo;
287
+ messageId: PublicKey;
288
+ },
289
+ ): Promise<void> {
284
290
  log('sending ACK', { messageId, from: recipient, to: author });
285
291
 
286
- await this._signalManager.sendMessage({
292
+ await this._signalManager.sendMessage(ctx, {
287
293
  author: recipient,
288
294
  recipient: author,
289
295
  payload: {
@@ -6,6 +6,7 @@ import { afterAll, beforeAll, describe, expect, onTestFinished, test } from 'vit
6
6
 
7
7
  import { asyncTimeout, waitForCondition } from '@dxos/async';
8
8
  import { type Any, type TaggedType } from '@dxos/codec-protobuf';
9
+ import { Context } from '@dxos/context';
9
10
  import { PublicKey } from '@dxos/keys';
10
11
  import { log } from '@dxos/log';
11
12
  import { type TYPES } from '@dxos/protocols/proto';
@@ -13,7 +14,6 @@ import { type SignalServerRunner, runTestSignalServer } from '@dxos/signal';
13
14
  import { ComplexSet, range } from '@dxos/util';
14
15
 
15
16
  import { type Message, type PeerInfo } from '../signal-methods';
16
-
17
17
  import { SignalClient } from './signal-client';
18
18
 
19
19
  const PAYLOAD: TaggedType<TYPES, 'google.protobuf.Any'> = {
@@ -43,7 +43,7 @@ describe('SignalClient', () => {
43
43
 
44
44
  const message = createMessage(peer2, peer1);
45
45
  const receivedMessage = peer1.waitForNextMessage();
46
- await peer2.client.sendMessage(message);
46
+ await peer2.client.sendMessage(Context.default(), message);
47
47
  expect(await receivedMessage).toEqual(message);
48
48
  });
49
49
 
@@ -51,8 +51,8 @@ describe('SignalClient', () => {
51
51
  const topic = PublicKey.random();
52
52
  const [peer1, peer2] = setupPeers({ peerCount: 2 });
53
53
 
54
- await peer1.client.join({ topic, peer: peer1.peerInfo });
55
- await peer2.client.join({ topic, peer: peer2.peerInfo });
54
+ await peer1.client.join(Context.default(), { topic, peer: peer1.peerInfo });
55
+ await peer2.client.join(Context.default(), { topic, peer: peer2.peerInfo });
56
56
 
57
57
  await peer1.waitForPeer(peer2.peerKey);
58
58
  await peer2.waitForPeer(peer1.peerKey);
@@ -67,7 +67,7 @@ describe('SignalClient', () => {
67
67
  const message = createMessage(peer2, peer1);
68
68
  const receivedMessage = peer1.waitForNextMessage();
69
69
 
70
- await peer1.client.sendMessage(message);
70
+ await peer1.client.sendMessage(Context.default(), message);
71
71
  expect(await receivedMessage).toEqual(message);
72
72
  });
73
73
 
@@ -82,7 +82,7 @@ describe('SignalClient', () => {
82
82
 
83
83
  {
84
84
  const receivedMessage = peer1.waitForNextMessage({ timeout: 1_000 });
85
- await peer2.client.sendMessage(message);
85
+ await peer2.client.sendMessage(Context.default(), message);
86
86
  expect(await receivedMessage).toEqual(message);
87
87
  }
88
88
 
@@ -91,7 +91,7 @@ describe('SignalClient', () => {
91
91
 
92
92
  {
93
93
  const receivedMessage = peer1.waitForNextMessage({ timeout: 200 });
94
- await peer2.client.sendMessage(message);
94
+ await peer2.client.sendMessage(Context.default(), message);
95
95
  await expect(receivedMessage).rejects.toBeDefined();
96
96
  }
97
97
  });
@@ -106,7 +106,7 @@ describe('SignalClient', () => {
106
106
 
107
107
  {
108
108
  const waitMessage = peer1.waitForNextMessage();
109
- await peer2.client.sendMessage(message);
109
+ await peer2.client.sendMessage(Context.default(), message);
110
110
  expect(await waitMessage).toEqual(message);
111
111
  }
112
112
 
@@ -120,7 +120,7 @@ describe('SignalClient', () => {
120
120
 
121
121
  {
122
122
  const waitMessage = peer1.waitForNextMessage();
123
- await peer2.client.sendMessage(message);
123
+ await peer2.client.sendMessage(Context.default(), message);
124
124
  expect(await waitMessage).toEqual(message);
125
125
  }
126
126
  });
@@ -19,7 +19,6 @@ import {
19
19
  type SignalStatus,
20
20
  type SwarmEvent,
21
21
  } from '../signal-methods';
22
-
23
22
  import { SignalClientMonitor } from './signal-client-monitor';
24
23
  import { SignalLocalState } from './signal-local-state';
25
24
  import { SignalRPCClient } from './signal-rpc-client';
@@ -173,24 +172,24 @@ export class SignalClient extends Resource implements SignalClientMethods {
173
172
  };
174
173
  }
175
174
 
176
- async join(args: JoinRequest): Promise<void> {
175
+ async join(_ctx: Context, args: JoinRequest): Promise<void> {
177
176
  log('joining', { topic: args.topic, peerId: args.peer.peerKey });
178
177
  this._monitor.recordJoin();
179
178
  this.localState.join({ topic: args.topic, peerId: PublicKey.from(args.peer.peerKey) });
180
179
  this._reconcileTask?.schedule();
181
180
  }
182
181
 
183
- async leave(args: LeaveRequest): Promise<void> {
182
+ async leave(_ctx: Context, args: LeaveRequest): Promise<void> {
184
183
  log('leaving', { topic: args.topic, peerId: args.peer.peerKey });
185
184
  this._monitor.recordLeave();
186
185
  this.localState.leave({ topic: args.topic, peerId: PublicKey.from(args.peer.peerKey) });
187
186
  }
188
187
 
189
- async query(params: QueryRequest): Promise<SwarmResponse> {
188
+ async query(_ctx: Context, params: QueryRequest): Promise<SwarmResponse> {
190
189
  throw new Error('Not implemented');
191
190
  }
192
191
 
193
- async sendMessage(msg: Message): Promise<void> {
192
+ async sendMessage(_ctx: Context, msg: Message): Promise<void> {
194
193
  return this._monitor.recordMessageSending(msg, async () => {
195
194
  await this._clientReady.wait();
196
195
  invariant(this._state === SignalState.CONNECTED, 'Not connected to Signal Server');
@@ -14,7 +14,6 @@ import {
14
14
  import { ComplexMap, ComplexSet, safeAwaitAll } from '@dxos/util';
15
15
 
16
16
  import type { Message, SwarmEvent } from '../signal-methods';
17
-
18
17
  import { type SignalRPCClient } from './signal-rpc-client';
19
18
 
20
19
  export class SignalLocalState {
@@ -36,7 +36,7 @@ export type SignalCallbacks = {
36
36
  getMetadata?: () => any;
37
37
  };
38
38
 
39
- export type SignalRPCClientParams = {
39
+ export type SignalRPCClientProps = {
40
40
  url: string;
41
41
  callbacks?: SignalCallbacks;
42
42
  };
@@ -61,7 +61,7 @@ export class SignalRPCClient {
61
61
 
62
62
  private readonly _monitor = new SignalRpcClientMonitor();
63
63
 
64
- constructor({ url, callbacks = {} }: SignalRPCClientParams) {
64
+ constructor({ url, callbacks = {} }: SignalRPCClientProps) {
65
65
  const traceId = PublicKey.random().toHex();
66
66
  log.trace('dxos.mesh.signal-rpc-client.constructor', trace.begin({ id: traceId }));
67
67
  this._url = url;
@@ -3,8 +3,8 @@
3
3
  //
4
4
 
5
5
  import { Event, scheduleMicroTask } from '@dxos/async';
6
- import { Resource, cancelWithContext } from '@dxos/context';
7
- import { type EdgeConnection, protocol } from '@dxos/edge-client';
6
+ import { type Context, Resource, cancelWithContext } from '@dxos/context';
7
+ import { type EdgeConnection, EdgeIdentityChangedError, protocol } from '@dxos/edge-client';
8
8
  import { invariant } from '@dxos/invariant';
9
9
  import { PublicKey } from '@dxos/keys';
10
10
  import { log } from '@dxos/log';
@@ -21,7 +21,6 @@ import { type SwarmResponse } from '@dxos/protocols/proto/dxos/edge/messenger';
21
21
  import { ComplexMap, ComplexSet } from '@dxos/util';
22
22
 
23
23
  import { type Message, type PeerInfo, PeerInfoHash, type SwarmEvent } from '../signal-methods';
24
-
25
24
  import { type SignalManager } from './signal-manager';
26
25
 
27
26
  export class EdgeSignalManager extends Resource implements SignalManager {
@@ -60,7 +59,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
60
59
  /**
61
60
  * Warning: PeerInfo is inferred from edgeConnection.
62
61
  */
63
- async join({ topic, peer }: { topic: PublicKey; peer: PeerInfo }): Promise<void> {
62
+ async join(ctx: Context, { topic, peer }: { topic: PublicKey; peer: PeerInfo }): Promise<void> {
64
63
  if (!this._matchSelfPeerInfo(peer)) {
65
64
  // NOTE: Could only join swarm with the same peer info as the edge connection.
66
65
  log.warn('ignoring peer info on join request', {
@@ -77,6 +76,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
77
76
 
78
77
  this._swarmPeers.set(topic, { lastState: peer.state, joinedPeers: new ComplexSet<PeerInfo>(PeerInfoHash) });
79
78
  await this._edgeConnection.send(
79
+ ctx,
80
80
  protocol.createMessage(SwarmRequestSchema, {
81
81
  serviceId: EdgeService.SWARM,
82
82
  source: createMessageSource(topic, peer),
@@ -85,24 +85,35 @@ export class EdgeSignalManager extends Resource implements SignalManager {
85
85
  );
86
86
  }
87
87
 
88
- async leave({ topic, peer }: { topic: PublicKey; peer: PeerInfo }): Promise<void> {
88
+ async leave(ctx: Context, { topic, peer }: { topic: PublicKey; peer: PeerInfo }): Promise<void> {
89
89
  this._swarmPeers.delete(topic);
90
- await this._edgeConnection.send(
91
- protocol.createMessage(SwarmRequestSchema, {
92
- serviceId: EdgeService.SWARM,
93
- source: createMessageSource(topic, peer),
94
- payload: { action: SwarmRequestAction.LEAVE, swarmKeys: [topic.toHex()] },
95
- }),
96
- );
90
+ try {
91
+ await this._edgeConnection.send(
92
+ ctx,
93
+ protocol.createMessage(SwarmRequestSchema, {
94
+ serviceId: EdgeService.SWARM,
95
+ source: createMessageSource(topic, peer),
96
+ payload: { action: SwarmRequestAction.LEAVE, swarmKeys: [topic.toHex()] },
97
+ }),
98
+ );
99
+ } catch (err) {
100
+ if (err instanceof EdgeIdentityChangedError) {
101
+ // Note: On edge identity change, the connection is closed and EDGE will remove us from the swarm.
102
+ // So we should just delete the swarm from _swarmPeers.
103
+ return;
104
+ }
105
+ throw err;
106
+ }
97
107
  }
98
108
 
99
- async query({ topic }: { topic: PublicKey }): Promise<SwarmResponse> {
109
+ async query(ctx: Context, { topic }: { topic: PublicKey }): Promise<SwarmResponse> {
100
110
  const response = cancelWithContext(
101
111
  this._ctx,
102
112
  this.swarmState.waitFor((state) => state.swarmKey === topic.toHex()),
103
113
  );
104
114
 
105
115
  await this._edgeConnection.send(
116
+ ctx,
106
117
  protocol.createMessage(SwarmRequestSchema, {
107
118
  serviceId: EdgeService.SWARM,
108
119
  source: createMessageSource(topic, {
@@ -116,7 +127,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
116
127
  return response;
117
128
  }
118
129
 
119
- async sendMessage(message: Message): Promise<void> {
130
+ async sendMessage(ctx: Context, message: Message): Promise<void> {
120
131
  if (!this._matchSelfPeerInfo(message.author)) {
121
132
  // NOTE: Could only join swarm with the same peer info as the edge connection.
122
133
  log.warn('ignoring author on send request', {
@@ -126,6 +137,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
126
137
  }
127
138
 
128
139
  await this._edgeConnection.send(
140
+ ctx,
129
141
  protocol.createMessage(bufWkt.AnySchema, {
130
142
  serviceId: EdgeService.SIGNAL,
131
143
  source: message.author,
@@ -219,7 +231,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
219
231
  private async _rejoinAllSwarms(): Promise<void> {
220
232
  log('rejoin swarms', { swarms: Array.from(this._swarmPeers.keys()) });
221
233
  for (const [topic, { lastState }] of this._swarmPeers.entries()) {
222
- await this.join({
234
+ await this.join(this._ctx, {
223
235
  topic,
224
236
  peer: {
225
237
  peerKey: this._edgeConnection.peerKey,