@dxos/messaging 0.6.12 → 0.6.13-main.548ca8d

package/src/signal-manager/{websocket-signal-manager.test.ts → websocket-signal-manager.node.test.ts}

@@ -2,37 +2,31 @@
 // Copyright 2023 DXOS.org
 //
 
+import { afterAll, beforeAll, describe, test } from 'vitest';
+
 import { asyncTimeout, sleep } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 import { runTestSignalServer, type SignalServerRunner } from '@dxos/signal';
-import { afterAll, beforeAll, describe, test, openAndClose } from '@dxos/test';
+import { openAndClose } from '@dxos/test-utils';
 
 import { WebsocketSignalManager } from './websocket-signal-manager';
 import { createMessage, expectPeerAvailable, expectReceivedMessage } from '../testing';
 
-describe('WebSocketSignalManager', () => {
+describe.skip('WebSocketSignalManager', () => {
   let broker1: SignalServerRunner;
   let broker2: SignalServerRunner;
 
   beforeAll(async () => {
-    if (!mochaExecutor.tags.includes('e2e')) {
-      return;
-    }
-
     broker1 = await runTestSignalServer({ port: 5001 });
     broker2 = await runTestSignalServer({ port: 5002 });
   });
 
   afterAll(() => {
-    if (!mochaExecutor.tags.includes('e2e')) {
-      return;
-    }
-
     void broker1.stop();
     void broker2.stop();
   });
 
-  test('join swarm with two brokers', async () => {
+  test('join swarm with two brokers', { timeout: 1_000 }, async () => {
     const client1 = new WebsocketSignalManager([{ server: broker1.url() }, { server: broker2.url() }]);
     const client2 = new WebsocketSignalManager([{ server: broker1.url() }]);
     const client3 = new WebsocketSignalManager([{ server: broker2.url() }]);
@@ -50,12 +44,9 @@ describe('WebSocketSignalManager', () => {
     await client3.join({ topic, peer: { peerKey: peer3.toHex() } });
 
     await Promise.all([joined12, joined13, joined21, joined31]);
-  })
-    .timeout(1_000)
-    .retries(2)
-    .tag('e2e');
+  });
 
-  test('join single swarm with doubled brokers', async () => {
+  test('join single swarm with doubled brokers', { timeout: 1_000 }, async () => {
     const client1 = new WebsocketSignalManager([{ server: broker1.url() }, { server: broker2.url() }]);
     const client2 = new WebsocketSignalManager([{ server: broker1.url() }, { server: broker2.url() }]);
     await openAndClose(client1, client2);
@@ -78,12 +69,9 @@ describe('WebSocketSignalManager', () => {
     await client1.sendMessage(message);
 
     await asyncTimeout(received, 1_000);
-  })
-    .timeout(1_000)
-    .retries(2)
-    .tag('e2e');
+  });
 
-  test('works with one broken server', async () => {
+  test('works with one broken server', { timeout: 1_000 }, async () => {
     const client1 = new WebsocketSignalManager([{ server: 'ws://broken.server/signal' }, { server: broker1.url() }]);
     const client2 = new WebsocketSignalManager([{ server: 'ws://broken.server/signal' }, { server: broker1.url() }]);
     await openAndClose(client1, client2);
@@ -97,12 +85,9 @@ describe('WebSocketSignalManager', () => {
     await client2.join({ topic, peer: { peerKey: peer2.toHex() } });
 
     await Promise.all([joined12, joined21]);
-  })
-    .timeout(1_000)
-    .retries(2)
-    .tag('e2e');
+  });
 
-  test('join two swarms with a broken signal server', async () => {
+  test('join two swarms with a broken signal server', { timeout: 1_000 }, async () => {
     const client1 = new WebsocketSignalManager([{ server: 'ws://broken.server/signal' }, { server: broker1.url() }]);
     const client2 = new WebsocketSignalManager([{ server: 'ws://broken.server/signal' }, { server: broker1.url() }]);
     await openAndClose(client1, client2);
@@ -122,8 +107,5 @@ describe('WebSocketSignalManager', () => {
     await client1.join({ topic: topic2, peer: { peerKey: peer1.toHex() } });
     await client2.join({ topic: topic2, peer: { peerKey: peer2.toHex() } });
     await Promise.all([joined212, joined221]);
-  })
-    .timeout(1_000)
-    .retries(2)
-    .tag('e2e');
+  });
 });

package/src/testing/test-builder.ts

@@ -2,14 +2,12 @@
 // Copyright 2022 DXOS.org
 //
 
-import { type PublicKey } from '@dxos/keys';
-
 import { TestPeer } from './test-peer';
 import { type SignalManager, MemorySignalManager, MemorySignalManagerContext } from '../signal-manager';
 import { type Message } from '../signal-methods';
 
 export type TestBuilderOptions = {
-  signalManagerFactory?: (identityKey: PublicKey, deviceKey: PublicKey) => Promise<SignalManager>;
+  signalManagerFactory?: (peer: TestPeer) => Promise<SignalManager>;
   messageDisruption?: (msg: Message) => Message[];
 };
 
@@ -19,10 +17,9 @@ export class TestBuilder {
 
   constructor(public options: TestBuilderOptions) {}
 
-  async createSignalManager(identityKey: PublicKey, deviceKey: PublicKey) {
+  async createSignalManager(peer: TestPeer): Promise<SignalManager> {
     const signalManager =
-      (await this.options.signalManagerFactory?.(identityKey, deviceKey)) ??
-      new MemorySignalManager(this._signalContext);
+      (await this.options.signalManagerFactory?.(peer)) ?? new MemorySignalManager(this._signalContext);
 
     if (this.options.messageDisruption) {
       // Imitates signal network disruptions (e. g. message doubling, ).

package/src/testing/test-peer.ts

@@ -4,8 +4,10 @@
 
 import { Event } from '@dxos/async';
 import { Resource } from '@dxos/context';
+import { PeerSchema } from '@dxos/edge-client';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import { buf } from '@dxos/protocols/buf';
 
 import { type TestBuilder } from './test-builder';
 import { expectPeerAvailable, expectPeerLeft, expectReceivedMessage } from './utils';
@@ -15,7 +17,6 @@ import { type Message, type PeerInfo } from '../signal-methods';
 
 export class TestPeer extends Resource {
   public peerId = PublicKey.random();
-  public identityKey = PublicKey.random();
   public signalManager!: SignalManager;
   public messenger!: Messenger;
   public defaultReceived = new Event<Message>();
@@ -25,10 +26,7 @@ export class TestPeer extends Resource {
   }
 
   get peerInfo(): PeerInfo {
-    return {
-      peerKey: this.peerId.toHex(),
-      identityKey: this.identityKey.toHex(),
-    };
+    return buf.create(PeerSchema, { peerKey: this.peerId.toHex(), identityKey: this.peerId.toHex() });
   }
 
   async waitTillReceive(message: Message) {
@@ -44,8 +42,8 @@ export class TestPeer extends Resource {
   }
 
   protected override async _open() {
-    this.signalManager = await this.testBuilder.createSignalManager(this.identityKey, this.peerId);
-    this.messenger = new Messenger({ signalManager: this.signalManager });
+    this.signalManager = await this.testBuilder.createSignalManager(this);
+    this.messenger = new Messenger({ signalManager: this.signalManager, retryDelay: 300 });
 
     await this.signalManager.open();
     this.messenger.open();

package/dist/types/src/messenger.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=messenger.test.d.ts.map

package/dist/types/src/messenger.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"messenger.test.d.ts","sourceRoot":"","sources":["../../../src/messenger.test.ts"],"names":[],"mappings":""}

package/dist/types/src/signal-client/signal-client.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=signal-client.test.d.ts.map

package/dist/types/src/signal-client/signal-client.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"signal-client.test.d.ts","sourceRoot":"","sources":["../../../../src/signal-client/signal-client.test.ts"],"names":[],"mappings":""}

package/dist/types/src/signal-client/signal-rpc-client.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=signal-rpc-client.test.d.ts.map

package/dist/types/src/signal-client/signal-rpc-client.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"signal-rpc-client.test.d.ts","sourceRoot":"","sources":["../../../../src/signal-client/signal-rpc-client.test.ts"],"names":[],"mappings":""}

package/dist/types/src/signal-manager/edge-signal-manager.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=edge-signal-manager.test.d.ts.map

package/dist/types/src/signal-manager/edge-signal-manager.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"edge-signal-manager.test.d.ts","sourceRoot":"","sources":["../../../../src/signal-manager/edge-signal-manager.test.ts"],"names":[],"mappings":""}

package/dist/types/src/signal-manager/websocket-signal-manager.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=websocket-signal-manager.test.d.ts.map

package/dist/types/src/signal-manager/websocket-signal-manager.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-signal-manager.test.d.ts","sourceRoot":"","sources":["../../../../src/signal-manager/websocket-signal-manager.test.ts"],"names":[],"mappings":""}