@dxos/messaging 0.6.12-main.ed7cda7 → 0.6.12-staging.0b4bb48

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

@@ -2,6 +2,8 @@
 // Copyright 2024 DXOS.org
 //
 
+import { AnySchema } from '@bufbuild/protobuf/wkt';
+
 import { Event } from '@dxos/async';
 import { Resource } from '@dxos/context';
 import { type EdgeConnection, protocol } from '@dxos/edge-client';
@@ -9,7 +11,6 @@ import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { EdgeService } from '@dxos/protocols';
-import { bufWkt } from '@dxos/protocols/buf';
 import {
   SwarmRequestSchema,
   SwarmRequest_Action as SwarmRequestAction,
@@ -87,7 +88,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
     }
 
     await this._edgeConnection.send(
-      protocol.createMessage(bufWkt.AnySchema, {
+      protocol.createMessage(AnySchema, {
         serviceId: EdgeService.SIGNAL_SERVICE_ID,
         source: message.author,
         target: [message.recipient],
@@ -125,7 +126,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
       return;
     }
     const oldPeers = this._swarmPeers.get(topic)!;
-    const timestamp = message.timestamp ? new Date(Date.parse(message.timestamp)) : new Date();
+    const timestamp = new Date(Date.parse(message.timestamp));
     const newPeers = new ComplexSet<PeerInfo>(PeerInfoHash, payload.peers);
 
     // Emit new available peers in the swarm.
@@ -154,8 +155,8 @@ export class EdgeSignalManager extends Resource implements SignalManager {
   }
 
   private _processMessage(message: EdgeMessage) {
-    invariant(protocol.getPayloadType(message) === bufWkt.AnySchema.typeName, 'Wrong payload type');
-    const payload = protocol.getPayload(message, bufWkt.AnySchema);
+    invariant(protocol.getPayloadType(message) === AnySchema.typeName, 'Wrong payload type');
+    const payload = protocol.getPayload(message, AnySchema);
     invariant(message.source, 'source is missing');
     invariant(message.target, 'target is missing');
     invariant(message.target.length === 1, 'target should have exactly one item');

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

@@ -2,31 +2,37 @@
 // 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 { openAndClose } from '@dxos/test-utils';
+import { afterAll, beforeAll, describe, test, openAndClose } from '@dxos/test';
 
 import { WebsocketSignalManager } from './websocket-signal-manager';
 import { createMessage, expectPeerAvailable, expectReceivedMessage } from '../testing';
 
-describe.skip('WebSocketSignalManager', () => {
+describe('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', { timeout: 1_000 }, async () => {
+  test('join swarm with two brokers', 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() }]);
@@ -44,9 +50,12 @@ describe.skip('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', { timeout: 1_000 }, async () => {
+  test('join single swarm with doubled brokers', 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);
@@ -69,9 +78,12 @@ describe.skip('WebSocketSignalManager', () => {
     await client1.sendMessage(message);
 
     await asyncTimeout(received, 1_000);
-  });
+  })
+    .timeout(1_000)
+    .retries(2)
+    .tag('e2e');
 
-  test('works with one broken server', { timeout: 1_000 }, async () => {
+  test('works with one broken server', 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);
@@ -85,9 +97,12 @@ describe.skip('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', { timeout: 1_000 }, async () => {
+  test('join two swarms with a broken signal server', 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);
@@ -107,5 +122,8 @@ describe.skip('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-peer.ts

@@ -45,7 +45,7 @@ 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, retryDelay: 300 });
+    this.messenger = new Messenger({ signalManager: this.signalManager });
 
     await this.signalManager.open();
     this.messenger.open();