@dxos/messaging 0.6.13-main.548ca8d → 0.6.13-staging.1e988a3

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 (60) hide show
  1. package/dist/lib/browser/index.mjs +2286 -9
  2. package/dist/lib/browser/index.mjs.map +4 -4
  3. package/dist/lib/browser/meta.json +1 -1
  4. package/dist/lib/node/index.cjs +2242 -9
  5. package/dist/lib/node/index.cjs.map +4 -4
  6. package/dist/lib/node/meta.json +1 -1
  7. package/dist/types/src/messenger.blueprint-test.d.ts +3 -2
  8. package/dist/types/src/messenger.blueprint-test.d.ts.map +1 -1
  9. package/dist/types/src/messenger.d.ts.map +1 -1
  10. package/dist/types/src/messenger.test.d.ts +2 -0
  11. package/dist/types/src/messenger.test.d.ts.map +1 -0
  12. package/dist/types/src/signal-client/signal-client.test.d.ts +2 -0
  13. package/dist/types/src/signal-client/signal-client.test.d.ts.map +1 -0
  14. package/dist/types/src/signal-client/signal-rpc-client.test.d.ts +2 -0
  15. package/dist/types/src/signal-client/signal-rpc-client.test.d.ts.map +1 -0
  16. package/dist/types/src/signal-manager/edge-signal-manager.d.ts.map +1 -1
  17. package/dist/types/src/signal-manager/edge-signal-manager.test.d.ts +2 -0
  18. package/dist/types/src/signal-manager/edge-signal-manager.test.d.ts.map +1 -0
  19. package/dist/types/src/signal-manager/websocket-signal-manager.test.d.ts +2 -0
  20. package/dist/types/src/signal-manager/websocket-signal-manager.test.d.ts.map +1 -0
  21. package/dist/types/src/testing/test-builder.d.ts +4 -3
  22. package/dist/types/src/testing/test-builder.d.ts.map +1 -1
  23. package/dist/types/src/testing/test-peer.d.ts +1 -0
  24. package/dist/types/src/testing/test-peer.d.ts.map +1 -1
  25. package/package.json +21 -32
  26. package/src/messenger.blueprint-test.ts +33 -25
  27. package/src/{messenger.node.test.ts → messenger.test.ts} +8 -9
  28. package/src/messenger.ts +1 -1
  29. package/src/signal-client/{signal-client.node.test.ts → signal-client.test.ts} +8 -9
  30. package/src/signal-client/{signal-rpc-client.node.test.ts → signal-rpc-client.test.ts} +13 -8
  31. package/src/signal-manager/{edge-signal-manager.node.test.ts → edge-signal-manager.test.ts} +7 -14
  32. package/src/signal-manager/edge-signal-manager.ts +6 -5
  33. package/src/signal-manager/{websocket-signal-manager.node.test.ts → websocket-signal-manager.test.ts} +30 -12
  34. package/src/testing/test-builder.ts +6 -3
  35. package/src/testing/test-peer.ts +7 -5
  36. package/dist/lib/browser/chunk-BN7UMWB4.mjs +0 -2299
  37. package/dist/lib/browser/chunk-BN7UMWB4.mjs.map +0 -7
  38. package/dist/lib/browser/testing/index.mjs +0 -147
  39. package/dist/lib/browser/testing/index.mjs.map +0 -7
  40. package/dist/lib/node/chunk-DBUGAS7J.cjs +0 -2276
  41. package/dist/lib/node/chunk-DBUGAS7J.cjs.map +0 -7
  42. package/dist/lib/node/testing/index.cjs +0 -162
  43. package/dist/lib/node/testing/index.cjs.map +0 -7
  44. package/dist/lib/node-esm/chunk-5LCDIQ7T.mjs +0 -2291
  45. package/dist/lib/node-esm/chunk-5LCDIQ7T.mjs.map +0 -7
  46. package/dist/lib/node-esm/index.mjs +0 -22
  47. package/dist/lib/node-esm/index.mjs.map +0 -7
  48. package/dist/lib/node-esm/meta.json +0 -1
  49. package/dist/lib/node-esm/testing/index.mjs +0 -146
  50. package/dist/lib/node-esm/testing/index.mjs.map +0 -7
  51. package/dist/types/src/messenger.node.test.d.ts +0 -2
  52. package/dist/types/src/messenger.node.test.d.ts.map +0 -1
  53. package/dist/types/src/signal-client/signal-client.node.test.d.ts +0 -2
  54. package/dist/types/src/signal-client/signal-client.node.test.d.ts.map +0 -1
  55. package/dist/types/src/signal-client/signal-rpc-client.node.test.d.ts +0 -2
  56. package/dist/types/src/signal-client/signal-rpc-client.node.test.d.ts.map +0 -1
  57. package/dist/types/src/signal-manager/edge-signal-manager.node.test.d.ts +0 -2
  58. package/dist/types/src/signal-manager/edge-signal-manager.node.test.d.ts.map +0 -1
  59. package/dist/types/src/signal-manager/websocket-signal-manager.node.test.d.ts +0 -2
  60. package/dist/types/src/signal-manager/websocket-signal-manager.node.test.d.ts.map +0 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/messaging",
3
- "version": "0.6.13-main.548ca8d",
3
+ "version": "0.6.13-staging.1e988a3",
4
4
  "description": "Messaging",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,27 +10,14 @@
10
10
  ".": {
11
11
  "browser": "./dist/lib/browser/index.mjs",
12
12
  "node": {
13
- "require": "./dist/lib/node/index.cjs",
14
- "default": "./dist/lib/node-esm/index.mjs"
13
+ "default": "./dist/lib/node/index.cjs"
15
14
  },
16
15
  "types": "./dist/types/src/index.d.ts"
17
- },
18
- "./testing": {
19
- "browser": "./dist/lib/browser/testing/index.mjs",
20
- "node": {
21
- "require": "./dist/lib/node/testing/index.cjs",
22
- "default": "./dist/lib/node-esm/testing/index.mjs"
23
- },
24
- "types": "./dist/types/src/testing/index.d.ts"
25
16
  }
26
17
  },
27
18
  "types": "dist/types/src/index.d.ts",
28
19
  "typesVersions": {
29
- "*": {
30
- "testing": [
31
- "dist/types/src/testing/index.d.ts"
32
- ]
33
- }
20
+ "*": {}
34
21
  },
35
22
  "files": [
36
23
  "dist",
@@ -38,26 +25,28 @@
38
25
  "README.md"
39
26
  ],
40
27
  "dependencies": {
28
+ "@bufbuild/protobuf": "^2.0.0",
41
29
  "isomorphic-ws": "^5.0.0",
42
30
  "ws": "^8.14.2",
43
- "@dxos/async": "0.6.13-main.548ca8d",
44
- "@dxos/codec-protobuf": "0.6.13-main.548ca8d",
45
- "@dxos/context": "0.6.13-main.548ca8d",
46
- "@dxos/edge-client": "0.6.13-main.548ca8d",
47
- "@dxos/invariant": "0.6.13-main.548ca8d",
48
- "@dxos/keys": "0.6.13-main.548ca8d",
49
- "@dxos/log": "0.6.13-main.548ca8d",
50
- "@dxos/node-std": "0.6.13-main.548ca8d",
51
- "@dxos/protocols": "0.6.13-main.548ca8d",
52
- "@dxos/rpc": "0.6.13-main.548ca8d",
53
- "@dxos/util": "0.6.13-main.548ca8d",
54
- "@dxos/tracing": "0.6.13-main.548ca8d"
31
+ "@dxos/codec-protobuf": "0.6.13-staging.1e988a3",
32
+ "@dxos/async": "0.6.13-staging.1e988a3",
33
+ "@dxos/context": "0.6.13-staging.1e988a3",
34
+ "@dxos/invariant": "0.6.13-staging.1e988a3",
35
+ "@dxos/edge-client": "0.6.13-staging.1e988a3",
36
+ "@dxos/keys": "0.6.13-staging.1e988a3",
37
+ "@dxos/log": "0.6.13-staging.1e988a3",
38
+ "@dxos/node-std": "0.6.13-staging.1e988a3",
39
+ "@dxos/protocols": "0.6.13-staging.1e988a3",
40
+ "@dxos/tracing": "0.6.13-staging.1e988a3",
41
+ "@dxos/util": "0.6.13-staging.1e988a3",
42
+ "@dxos/rpc": "0.6.13-staging.1e988a3"
55
43
  },
56
44
  "devDependencies": {
57
- "@types/node": "^22.7.4",
58
- "@dxos/keyring": "0.6.13-main.548ca8d",
59
- "@dxos/signal": "0.6.13-main.548ca8d",
60
- "@dxos/test-utils": "0.6.13-main.548ca8d"
45
+ "@types/node": "^18.11.9",
46
+ "earljs": "~0.1.10",
47
+ "typescript": "^5.5.4",
48
+ "wait-for-expect": "^3.0.2",
49
+ "@dxos/signal": "0.6.13-staging.1e988a3"
61
50
  },
62
51
  "publishConfig": {
63
52
  "access": "public"
@@ -2,21 +2,25 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import { describe, expect, test, onTestFinished } from 'vitest';
5
+ import { expect } from 'earljs';
6
6
 
7
7
  import { asyncTimeout, latch, sleep } from '@dxos/async';
8
+ import { type PublicKey } from '@dxos/keys';
9
+ import { describe, test, afterTest } from '@dxos/test';
8
10
  import { range } from '@dxos/util';
9
11
 
10
- import { WebsocketSignalManager } from './signal-manager';
12
+ import { type SignalManager, WebsocketSignalManager } from './signal-manager';
11
13
  import { type Message } from './signal-methods';
12
14
  import { messageEqual, PAYLOAD_1, PAYLOAD_2, PAYLOAD_3, TestBuilder } from './testing';
13
15
 
14
- export const messengerTests = (signalManagerFactory: TestBuilder['createSignalManager']) => {
16
+ export const messengerTests = (
17
+ signalManagerFactory: (identityKey: PublicKey, deviceKey: PublicKey) => Promise<SignalManager>,
18
+ ) => {
15
19
  test('Message between peers', async () => {
16
20
  const builder = new TestBuilder({
17
21
  signalManagerFactory,
18
22
  });
19
- onTestFinished(() => builder.close());
23
+ afterTest(() => builder.close());
20
24
  const peer1 = await builder.createPeer();
21
25
  const peer2 = await builder.createPeer();
22
26
 
@@ -35,11 +39,11 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
35
39
  await promise;
36
40
  });
37
41
 
38
- test('Message 3 peers', { timeout: 1_000 }, async () => {
42
+ test('Message 3 peers', async () => {
39
43
  const builder = new TestBuilder({
40
44
  signalManagerFactory,
41
45
  });
42
- onTestFinished(() => builder.close());
46
+ afterTest(() => builder.close());
43
47
  const peer1 = await builder.createPeer();
44
48
  const peer2 = await builder.createPeer();
45
49
  const peer3 = await builder.createPeer();
@@ -79,13 +83,13 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
79
83
  await peer2.messenger.sendMessage(message);
80
84
  await asyncTimeout(promise, 1_000);
81
85
  }
82
- });
86
+ }).timeout(1_000);
83
87
 
84
- test('Message routing', { timeout: 4_000 }, async () => {
88
+ test('Message routing', async () => {
85
89
  const builder = new TestBuilder({
86
90
  signalManagerFactory,
87
91
  });
88
- onTestFinished(() => builder.close());
92
+ afterTest(() => builder.close());
89
93
  const peer1 = await builder.createPeer();
90
94
  const peer2 = await builder.createPeer();
91
95
 
@@ -136,13 +140,13 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
136
140
  expect(messageEqual(message, onMessage2[0])).toEqual(true);
137
141
  expect(onMessage3.length === 0);
138
142
  }
139
- });
143
+ }).timeout(4_000);
140
144
 
141
- test.skip('Unsubscribe listener', { timeout: 1_000 }, async () => {
145
+ test('Unsubscribe listener', async () => {
142
146
  const builder = new TestBuilder({
143
147
  signalManagerFactory,
144
148
  });
145
- onTestFinished(() => builder.close());
149
+ afterTest(() => builder.close());
146
150
  const peer1 = await builder.createPeer();
147
151
  const peer2 = await builder.createPeer();
148
152
 
@@ -203,13 +207,15 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
203
207
  expect(messages1.length).toEqual(2);
204
208
  expect(messages2.length).toEqual(1);
205
209
  }
206
- });
210
+ })
211
+ .tag('flaky')
212
+ .timeout(1_000);
207
213
 
208
- test('re-entrant message', { timeout: 1_000 }, async () => {
214
+ test('re-entrant message', async () => {
209
215
  const builder = new TestBuilder({
210
216
  signalManagerFactory,
211
217
  });
212
- onTestFinished(() => builder.close());
218
+ afterTest(() => builder.close());
213
219
  const peer1 = await builder.createPeer();
214
220
  const peer2 = await builder.createPeer();
215
221
 
@@ -239,9 +245,9 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
239
245
  await peer1.messenger.sendMessage(message);
240
246
  await asyncTimeout(receivePromise, 1_000);
241
247
  }
242
- });
248
+ }).timeout(1_000);
243
249
 
244
- describe('Reliability', { timeout: 5_000 }, () => {
250
+ describe('Reliability', () => {
245
251
  test('message with non reliable connection', async () => {
246
252
  // Simulate unreliable connection.
247
253
  // Only each 3rd message is sent.
@@ -258,7 +264,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
258
264
  signalManagerFactory,
259
265
  messageDisruption: unreliableConnection,
260
266
  });
261
- onTestFinished(() => builder.close());
267
+ afterTest(() => builder.close());
262
268
  const peer1 = await builder.createPeer();
263
269
  await peer1.open();
264
270
  const peer2 = await builder.createPeer();
@@ -280,9 +286,9 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
280
286
 
281
287
  // expect to receive 3 messages.
282
288
  await receivePromise;
283
- });
289
+ }).timeout(5_000);
284
290
 
285
- test('ignoring doubled messages', { timeout: 5_000 }, async () => {
291
+ test('ignoring doubled messages', async () => {
286
292
  // Message got doubled going through signal network.
287
293
  const doublingMessage = (data: Message) => [data, data];
288
294
 
@@ -290,7 +296,7 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
290
296
  signalManagerFactory,
291
297
  messageDisruption: doublingMessage,
292
298
  });
293
- onTestFinished(() => builder.close());
299
+ afterTest(() => builder.close());
294
300
  const peer1 = await builder.createPeer();
295
301
  await peer1.open();
296
302
  const peer2 = await builder.createPeer();
@@ -311,10 +317,10 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
311
317
  await asyncTimeout(promise(), 1000);
312
318
  expect(count).toEqual(1);
313
319
  });
314
- });
320
+ }).timeout(5_000);
315
321
 
316
- describe.skip('load', () => {
317
- test('many connections to KUBE', { timeout: 5_000 }, async () => {
322
+ describe('load', () => {
323
+ test('many connections to KUBE', async () => {
318
324
  const builder = new TestBuilder({
319
325
  signalManagerFactory: async () =>
320
326
  new WebsocketSignalManager([{ server: 'wss://dev.kube.dxos.org/.well-known/dx/signal' }]),
@@ -333,6 +339,8 @@ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalMa
333
339
  });
334
340
 
335
341
  await sleep(1000000);
336
- });
342
+ })
343
+ .tag('stress')
344
+ .timeout(5_000);
337
345
  });
338
346
  };
@@ -2,12 +2,11 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
- import { afterAll, onTestFinished, beforeAll, test, describe } from 'vitest';
6
-
7
5
  import { asyncTimeout } from '@dxos/async';
8
- import { createEphemeralEdgeIdentity, EdgeClient } from '@dxos/edge-client';
6
+ import { EdgeClient } from '@dxos/edge-client';
7
+ import { type PublicKey } from '@dxos/keys';
9
8
  import { runTestSignalServer, type SignalServerRunner } from '@dxos/signal';
10
- import { openAndClose } from '@dxos/test-utils';
9
+ import { afterAll, afterTest, beforeAll, openAndClose, test, describe } from '@dxos/test';
11
10
 
12
11
  import { messengerTests } from './messenger.blueprint-test';
13
12
  import { EdgeSignalManager, WebsocketSignalManager } from './signal-manager';
@@ -27,12 +26,12 @@ describe('Messenger with WebsocketSignalManager', () => {
27
26
 
28
27
  messengerTests(async () => new WebsocketSignalManager([{ server: broker.url() }]));
29
28
 
30
- test('Message with broken signal server', { timeout: 1000 }, async () => {
29
+ test('Message with broken signal server', async () => {
31
30
  const builder = new TestBuilder({
32
31
  signalManagerFactory: async () =>
33
32
  new WebsocketSignalManager([{ server: 'ws://broken.kube.' }, { server: broker.url() }]),
34
33
  });
35
- onTestFinished(() => builder.close());
34
+ afterTest(() => builder.close());
36
35
  const peer1 = await builder.createPeer();
37
36
  const peer2 = await builder.createPeer();
38
37
 
@@ -47,13 +46,13 @@ describe('Messenger with WebsocketSignalManager', () => {
47
46
  await peer1.messenger.sendMessage(message);
48
47
  await asyncTimeout(receivePromise, 1_000);
49
48
  }
50
- });
49
+ }).timeout(1_000);
51
50
  });
52
51
 
53
52
  // TODO(mykola): Expects wrangler dev in edge repo to run. Skip to pass CI.
54
53
  describe.skip('Messenger with EdgeSignalManager', () => {
55
- const edgeSignalFactory = async () => {
56
- const client = new EdgeClient(await createEphemeralEdgeIdentity(), { socketEndpoint: 'ws://localhost:8787' });
54
+ const edgeSignalFactory = async (identityKey: PublicKey, deviceKey: PublicKey) => {
55
+ const client = new EdgeClient(identityKey.toHex(), deviceKey.toHex(), { socketEndpoint: 'ws://localhost:8787' });
57
56
  await openAndClose(client);
58
57
 
59
58
  return new EdgeSignalManager({ edgeConnection: client });
package/src/messenger.ts CHANGED
@@ -57,7 +57,7 @@ export class Messenger {
57
57
  private _closed = true;
58
58
  private readonly _retryDelay: number;
59
59
 
60
- constructor({ signalManager, retryDelay = 1000 }: MessengerOptions) {
60
+ constructor({ signalManager, retryDelay = 300 }: MessengerOptions) {
61
61
  this._signalManager = signalManager;
62
62
  this._retryDelay = retryDelay;
63
63
 
@@ -2,14 +2,15 @@
2
2
  // Copyright 2020 DXOS.org
3
3
  //
4
4
 
5
- import { afterAll, beforeAll, describe, expect, test, onTestFinished } from 'vitest';
5
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
6
+ import { expect } from 'earljs';
6
7
 
7
8
  import { asyncTimeout, waitForCondition } from '@dxos/async';
8
9
  import { type Any, type TaggedType } from '@dxos/codec-protobuf';
9
10
  import { PublicKey } from '@dxos/keys';
10
- import { log } from '@dxos/log';
11
11
  import { type TYPES } from '@dxos/protocols/proto';
12
12
  import { runTestSignalServer, type SignalServerRunner } from '@dxos/signal';
13
+ import { afterAll, beforeAll, describe, test, afterTest } from '@dxos/test';
13
14
  import { ComplexSet, range } from '@dxos/util';
14
15
 
15
16
  import { SignalClient } from './signal-client';
@@ -29,9 +30,7 @@ describe('SignalClient', () => {
29
30
  });
30
31
 
31
32
  afterAll(async () => {
32
- log.info('begin stop');
33
33
  await broker1.stop();
34
- log.info('end stop');
35
34
  });
36
35
 
37
36
  test('message between 2 clients', async () => {
@@ -80,7 +79,7 @@ describe('SignalClient', () => {
80
79
  const message = createMessage(peer2, peer1);
81
80
 
82
81
  {
83
- const receivedMessage = peer1.waitForNextMessage({ timeout: 1_000 });
82
+ const receivedMessage = peer1.waitForNextMessage();
84
83
  await peer2.client.sendMessage(message);
85
84
  expect(await receivedMessage).toEqual(message);
86
85
  }
@@ -91,7 +90,7 @@ describe('SignalClient', () => {
91
90
  {
92
91
  const receivedMessage = peer1.waitForNextMessage({ timeout: 200 });
93
92
  await peer2.client.sendMessage(message);
94
- await expect(receivedMessage).rejects.toBeDefined();
93
+ await expect(receivedMessage).toBeRejected();
95
94
  }
96
95
  });
97
96
 
@@ -139,7 +138,7 @@ describe('SignalClient', () => {
139
138
  });
140
139
 
141
140
  void client.open();
142
- onTestFinished(async () => {
141
+ afterTest(async () => {
143
142
  await client.close();
144
143
  });
145
144
  return {
@@ -147,10 +146,10 @@ describe('SignalClient', () => {
147
146
  identityKey,
148
147
  client,
149
148
  peerInfo: { peerKey: peerKey.toHex(), identityKey: identityKey.toHex() },
150
- waitForNextMessage: async ({ timeout = 5_000 } = {}) => {
149
+ waitForNextMessage: async () => {
151
150
  return asyncTimeout(
152
151
  client.onMessage.waitFor(() => true),
153
- timeout,
152
+ 5000,
154
153
  );
155
154
  },
156
155
  waitForPeer: (peerId: PublicKey) => waitForCondition({ condition: () => peers.has(peerId) }),
@@ -2,7 +2,7 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
- import { afterAll, beforeAll, describe, expect, onTestFinished, test } from 'vitest';
5
+ import { expect } from 'earljs';
6
6
 
7
7
  import { type Any } from '@dxos/codec-protobuf';
8
8
  import { PublicKey } from '@dxos/keys';
@@ -10,6 +10,7 @@ import { log } from '@dxos/log';
10
10
  import { schema } from '@dxos/protocols/proto';
11
11
  import { type Message as SignalMessage, type SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
12
12
  import { runTestSignalServer, type SignalServerRunner } from '@dxos/signal';
13
+ import { afterAll, afterTest, beforeAll, describe, test } from '@dxos/test';
13
14
 
14
15
  import { SignalRPCClient } from './signal-rpc-client';
15
16
 
@@ -27,11 +28,11 @@ describe('SignalRPCClient', () => {
27
28
  // TODO(burdon): Convert to TestBuilder pattern.
28
29
  const setupClient = async () => {
29
30
  const client = new SignalRPCClient({ url: broker.url() });
30
- onTestFinished(async () => await client.close());
31
+ afterTest(async () => await client.close());
31
32
  return client;
32
33
  };
33
34
 
34
- test('signal between 2 peers', { timeout: 2_000 }, async () => {
35
+ test('signal between 2 peers', async () => {
35
36
  const client1 = await setupClient();
36
37
  const client2 = await setupClient();
37
38
 
@@ -64,12 +65,14 @@ describe('SignalRPCClient', () => {
64
65
  payload,
65
66
  });
66
67
 
67
- expect((await received).author).toEqual(peerId2.asBuffer());
68
- expect((await received).payload).toEqual(expect.objectContaining(payload));
68
+ expect((await received).author).toEqual(peerId2.asUint8Array());
69
+ expect((await received).payload).toBeAnObjectWith(payload);
69
70
  void stream1.close();
70
- });
71
+ })
72
+ .timeout(2_000)
73
+ .retries(2);
71
74
 
72
- test('join', { timeout: 2_000 }, async () => {
75
+ test('join', async () => {
73
76
  const client1 = await setupClient();
74
77
  const client2 = await setupClient();
75
78
 
@@ -98,5 +101,7 @@ describe('SignalRPCClient', () => {
98
101
  expect((await promise).peerAvailable?.peer).toEqual(peerId2.asBuffer());
99
102
  void stream1.close();
100
103
  void stream2.close();
101
- });
104
+ })
105
+ .timeout(2_000)
106
+ .retries(2);
102
107
  });
@@ -1,24 +1,17 @@
1
1
  //
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
-
5
- import { onTestFinished, describe, test } from 'vitest';
6
-
7
- import { createDeviceEdgeIdentity, EdgeClient } from '@dxos/edge-client';
8
- import { Keyring } from '@dxos/keyring';
4
+ import { EdgeClient } from '@dxos/edge-client';
9
5
  import { PublicKey } from '@dxos/keys';
10
- import { openAndClose } from '@dxos/test-utils';
6
+ import { afterTest, describe, openAndClose, test } from '@dxos/test';
11
7
 
12
8
  import { EdgeSignalManager } from './edge-signal-manager';
13
9
  import { createMessage, expectReceivedMessage, TestBuilder, type TestBuilderOptions } from '../testing';
14
10
 
15
11
  // TODO(mykola): Expects wrangler dev in edge repo to run. Skip to pass CI.
16
12
  describe.skip('EdgeSignalManager', () => {
17
- const edgeSignalFactory: TestBuilderOptions['signalManagerFactory'] = async (peer) => {
18
- const keyring = new Keyring();
19
- const client = new EdgeClient(await createDeviceEdgeIdentity(keyring, peer.peerId), {
20
- socketEndpoint: 'ws://localhost:8787',
21
- });
13
+ const edgeSignalFactory: TestBuilderOptions['signalManagerFactory'] = async (identityKey, deviceKey) => {
14
+ const client = new EdgeClient(identityKey.toHex(), deviceKey.toHex(), { socketEndpoint: 'ws://localhost:8787' });
22
15
  await openAndClose(client);
23
16
 
24
17
  return new EdgeSignalManager({ edgeConnection: client });
@@ -26,7 +19,7 @@ describe.skip('EdgeSignalManager', () => {
26
19
 
27
20
  test('two peers discover each other', async () => {
28
21
  const builder = new TestBuilder({ signalManagerFactory: edgeSignalFactory });
29
- onTestFinished(() => builder.close());
22
+ afterTest(() => builder.close());
30
23
  const [peer1, peer2] = await builder.createPeers(2);
31
24
 
32
25
  const topic = PublicKey.random();
@@ -43,7 +36,7 @@ describe.skip('EdgeSignalManager', () => {
43
36
 
44
37
  test('join and leave swarm', async () => {
45
38
  const builder = new TestBuilder({ signalManagerFactory: edgeSignalFactory });
46
- onTestFinished(() => builder.close());
39
+ afterTest(() => builder.close());
47
40
  const [peer1, peer2] = await builder.createPeers(2);
48
41
 
49
42
  const topic = PublicKey.random();
@@ -61,7 +54,7 @@ describe.skip('EdgeSignalManager', () => {
61
54
 
62
55
  test('message between peers', async () => {
63
56
  const builder = new TestBuilder({ signalManagerFactory: edgeSignalFactory });
64
- onTestFinished(() => builder.close());
57
+ afterTest(() => builder.close());
65
58
  const [peer1, peer2] = await builder.createPeers(2);
66
59
  const message = createMessage(peer1.peerInfo, peer2.peerInfo);
67
60
 
@@ -2,6 +2,8 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
+ import { AnySchema } from '@bufbuild/protobuf/wkt';
6
+
5
7
  import { Event } from '@dxos/async';
6
8
  import { Resource } from '@dxos/context';
7
9
  import { type EdgeConnection, protocol } from '@dxos/edge-client';
@@ -9,7 +11,6 @@ import { invariant } from '@dxos/invariant';
9
11
  import { PublicKey } from '@dxos/keys';
10
12
  import { log } from '@dxos/log';
11
13
  import { EdgeService } from '@dxos/protocols';
12
- import { bufWkt } from '@dxos/protocols/buf';
13
14
  import {
14
15
  SwarmRequestSchema,
15
16
  SwarmRequest_Action as SwarmRequestAction,
@@ -87,7 +88,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
87
88
  }
88
89
 
89
90
  await this._edgeConnection.send(
90
- protocol.createMessage(bufWkt.AnySchema, {
91
+ protocol.createMessage(AnySchema, {
91
92
  serviceId: EdgeService.SIGNAL_SERVICE_ID,
92
93
  source: message.author,
93
94
  target: [message.recipient],
@@ -125,7 +126,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
125
126
  return;
126
127
  }
127
128
  const oldPeers = this._swarmPeers.get(topic)!;
128
- const timestamp = message.timestamp ? new Date(Date.parse(message.timestamp)) : new Date();
129
+ const timestamp = new Date(Date.parse(message.timestamp));
129
130
  const newPeers = new ComplexSet<PeerInfo>(PeerInfoHash, payload.peers);
130
131
 
131
132
  // Emit new available peers in the swarm.
@@ -154,8 +155,8 @@ export class EdgeSignalManager extends Resource implements SignalManager {
154
155
  }
155
156
 
156
157
  private _processMessage(message: EdgeMessage) {
157
- invariant(protocol.getPayloadType(message) === bufWkt.AnySchema.typeName, 'Wrong payload type');
158
- const payload = protocol.getPayload(message, bufWkt.AnySchema);
158
+ invariant(protocol.getPayloadType(message) === AnySchema.typeName, 'Wrong payload type');
159
+ const payload = protocol.getPayload(message, AnySchema);
159
160
  invariant(message.source, 'source is missing');
160
161
  invariant(message.target, 'target is missing');
161
162
  invariant(message.target.length === 1, 'target should have exactly one item');
@@ -2,31 +2,37 @@
2
2
  // Copyright 2023 DXOS.org
3
3
  //
4
4
 
5
- import { afterAll, beforeAll, describe, test } from 'vitest';
6
-
7
5
  import { asyncTimeout, sleep } from '@dxos/async';
8
6
  import { PublicKey } from '@dxos/keys';
9
7
  import { runTestSignalServer, type SignalServerRunner } from '@dxos/signal';
10
- import { openAndClose } from '@dxos/test-utils';
8
+ import { afterAll, beforeAll, describe, test, openAndClose } from '@dxos/test';
11
9
 
12
10
  import { WebsocketSignalManager } from './websocket-signal-manager';
13
11
  import { createMessage, expectPeerAvailable, expectReceivedMessage } from '../testing';
14
12
 
15
- describe.skip('WebSocketSignalManager', () => {
13
+ describe('WebSocketSignalManager', () => {
16
14
  let broker1: SignalServerRunner;
17
15
  let broker2: SignalServerRunner;
18
16
 
19
17
  beforeAll(async () => {
18
+ if (!mochaExecutor.tags.includes('e2e')) {
19
+ return;
20
+ }
21
+
20
22
  broker1 = await runTestSignalServer({ port: 5001 });
21
23
  broker2 = await runTestSignalServer({ port: 5002 });
22
24
  });
23
25
 
24
26
  afterAll(() => {
27
+ if (!mochaExecutor.tags.includes('e2e')) {
28
+ return;
29
+ }
30
+
25
31
  void broker1.stop();
26
32
  void broker2.stop();
27
33
  });
28
34
 
29
- test('join swarm with two brokers', { timeout: 1_000 }, async () => {
35
+ test('join swarm with two brokers', async () => {
30
36
  const client1 = new WebsocketSignalManager([{ server: broker1.url() }, { server: broker2.url() }]);
31
37
  const client2 = new WebsocketSignalManager([{ server: broker1.url() }]);
32
38
  const client3 = new WebsocketSignalManager([{ server: broker2.url() }]);
@@ -44,9 +50,12 @@ describe.skip('WebSocketSignalManager', () => {
44
50
  await client3.join({ topic, peer: { peerKey: peer3.toHex() } });
45
51
 
46
52
  await Promise.all([joined12, joined13, joined21, joined31]);
47
- });
53
+ })
54
+ .timeout(1_000)
55
+ .retries(2)
56
+ .tag('e2e');
48
57
 
49
- test('join single swarm with doubled brokers', { timeout: 1_000 }, async () => {
58
+ test('join single swarm with doubled brokers', async () => {
50
59
  const client1 = new WebsocketSignalManager([{ server: broker1.url() }, { server: broker2.url() }]);
51
60
  const client2 = new WebsocketSignalManager([{ server: broker1.url() }, { server: broker2.url() }]);
52
61
  await openAndClose(client1, client2);
@@ -69,9 +78,12 @@ describe.skip('WebSocketSignalManager', () => {
69
78
  await client1.sendMessage(message);
70
79
 
71
80
  await asyncTimeout(received, 1_000);
72
- });
81
+ })
82
+ .timeout(1_000)
83
+ .retries(2)
84
+ .tag('e2e');
73
85
 
74
- test('works with one broken server', { timeout: 1_000 }, async () => {
86
+ test('works with one broken server', async () => {
75
87
  const client1 = new WebsocketSignalManager([{ server: 'ws://broken.server/signal' }, { server: broker1.url() }]);
76
88
  const client2 = new WebsocketSignalManager([{ server: 'ws://broken.server/signal' }, { server: broker1.url() }]);
77
89
  await openAndClose(client1, client2);
@@ -85,9 +97,12 @@ describe.skip('WebSocketSignalManager', () => {
85
97
  await client2.join({ topic, peer: { peerKey: peer2.toHex() } });
86
98
 
87
99
  await Promise.all([joined12, joined21]);
88
- });
100
+ })
101
+ .timeout(1_000)
102
+ .retries(2)
103
+ .tag('e2e');
89
104
 
90
- test('join two swarms with a broken signal server', { timeout: 1_000 }, async () => {
105
+ test('join two swarms with a broken signal server', async () => {
91
106
  const client1 = new WebsocketSignalManager([{ server: 'ws://broken.server/signal' }, { server: broker1.url() }]);
92
107
  const client2 = new WebsocketSignalManager([{ server: 'ws://broken.server/signal' }, { server: broker1.url() }]);
93
108
  await openAndClose(client1, client2);
@@ -107,5 +122,8 @@ describe.skip('WebSocketSignalManager', () => {
107
122
  await client1.join({ topic: topic2, peer: { peerKey: peer1.toHex() } });
108
123
  await client2.join({ topic: topic2, peer: { peerKey: peer2.toHex() } });
109
124
  await Promise.all([joined212, joined221]);
110
- });
125
+ })
126
+ .timeout(1_000)
127
+ .retries(2)
128
+ .tag('e2e');
111
129
  });
@@ -2,12 +2,14 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
+ import { type PublicKey } from '@dxos/keys';
6
+
5
7
  import { TestPeer } from './test-peer';
6
8
  import { type SignalManager, MemorySignalManager, MemorySignalManagerContext } from '../signal-manager';
7
9
  import { type Message } from '../signal-methods';
8
10
 
9
11
  export type TestBuilderOptions = {
10
- signalManagerFactory?: (peer: TestPeer) => Promise<SignalManager>;
12
+ signalManagerFactory?: (identityKey: PublicKey, deviceKey: PublicKey) => Promise<SignalManager>;
11
13
  messageDisruption?: (msg: Message) => Message[];
12
14
  };
13
15
 
@@ -17,9 +19,10 @@ export class TestBuilder {
17
19
 
18
20
  constructor(public options: TestBuilderOptions) {}
19
21
 
20
- async createSignalManager(peer: TestPeer): Promise<SignalManager> {
22
+ async createSignalManager(identityKey: PublicKey, deviceKey: PublicKey) {
21
23
  const signalManager =
22
- (await this.options.signalManagerFactory?.(peer)) ?? new MemorySignalManager(this._signalContext);
24
+ (await this.options.signalManagerFactory?.(identityKey, deviceKey)) ??
25
+ new MemorySignalManager(this._signalContext);
23
26
 
24
27
  if (this.options.messageDisruption) {
25
28
  // Imitates signal network disruptions (e. g. message doubling, ).