@dxos/messaging 0.6.12 → 0.6.13-main.041e8aa

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":""}

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

@@ -1,67 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-import { EdgeClient } from '@dxos/edge-client';
-import { PublicKey } from '@dxos/keys';
-import { afterTest, describe, openAndClose, test } from '@dxos/test';
-
-import { EdgeSignalManager } from './edge-signal-manager';
-import { createMessage, expectReceivedMessage, TestBuilder, type TestBuilderOptions } from '../testing';
-
-// TODO(mykola): Expects wrangler dev in edge repo to run. Skip to pass CI.
-describe.skip('EdgeSignalManager', () => {
-  const edgeSignalFactory: TestBuilderOptions['signalManagerFactory'] = async (identityKey, deviceKey) => {
-    const client = new EdgeClient(identityKey.toHex(), deviceKey.toHex(), { socketEndpoint: 'ws://localhost:8787' });
-    await openAndClose(client);
-
-    return new EdgeSignalManager({ edgeConnection: client });
-  };
-
-  test('two peers discover each other', async () => {
-    const builder = new TestBuilder({ signalManagerFactory: edgeSignalFactory });
-    afterTest(() => builder.close());
-    const [peer1, peer2] = await builder.createPeers(2);
-
-    const topic = PublicKey.random();
-
-    const discover12 = peer1.waitForPeerAvailable(topic, peer2.peerInfo);
-    const discover21 = peer2.waitForPeerAvailable(topic, peer1.peerInfo);
-
-    await peer1.signalManager.join({ topic, peer: peer1.peerInfo });
-    await peer2.signalManager.join({ topic, peer: peer2.peerInfo });
-
-    await discover12;
-    await discover21;
-  });
-
-  test('join and leave swarm', async () => {
-    const builder = new TestBuilder({ signalManagerFactory: edgeSignalFactory });
-    afterTest(() => builder.close());
-    const [peer1, peer2] = await builder.createPeers(2);
-
-    const topic = PublicKey.random();
-
-    const discover12 = peer1.waitForPeerAvailable(topic, peer2.peerInfo);
-    const left12 = peer1.waitForPeerLeft(topic, peer2.peerInfo);
-
-    await peer2.signalManager.join({ topic, peer: peer2.peerInfo });
-    await peer1.signalManager.join({ topic, peer: peer1.peerInfo });
-    await discover12;
-
-    await peer2.signalManager.leave({ topic, peer: peer2.peerInfo });
-    await left12;
-  });
-
-  test('message between peers', async () => {
-    const builder = new TestBuilder({ signalManagerFactory: edgeSignalFactory });
-    afterTest(() => builder.close());
-    const [peer1, peer2] = await builder.createPeers(2);
-    const message = createMessage(peer1.peerInfo, peer2.peerInfo);
-
-    const receivedMessage = expectReceivedMessage(peer2.signalManager.onMessage, message);
-    await peer2.signalManager.subscribeMessages(peer2.peerInfo);
-    await peer1.signalManager.sendMessage(message);
-
-    await receivedMessage;
-  });
-});