@dxos/network-manager 2.12.16 → 2.12.20

package/src/presence.test.ts

@@ -20,6 +20,7 @@ const createPeer = (topic: PublicKey) => {
   afterTest(() => networkManager.destroy());
 
   const presencePlugin = new PresencePlugin(peerId.asBuffer());
+  afterTest(() => presencePlugin.stop());
 
   networkManager.joinProtocolSwarm({
     peerId,

package/src/signal/in-memory-signal-manager.ts

@@ -58,6 +58,8 @@ export class InMemorySignalManager implements SignalManager {
     assert(state.connections.get(msg.remoteId), 'Peer not connected');
     state.connections.get(msg.remoteId)!.onSignal.emit(msg);
   }
+
+  async destroy () {}
 }
 
 // This is global state for the in-memory signal manager.

package/src/signal/interface.ts

@@ -27,4 +27,6 @@ export interface SignalManager {
   offer (msg: SignalApi.SignalMessage): Promise<SignalApi.Answer>;
 
   signal (msg: SignalApi.SignalMessage): void;
+
+  destroy(): Promise<void>;
 }

package/src/signal/signal-api.ts

@@ -141,6 +141,9 @@ export class SignalApi {
       console.error('Signal api already reconnecting.');
       return;
     }
+    if (this._state === SignalApi.State.CLOSED) {
+      return;
+    }
 
     this._reconnectIntervalId = setTimeout(() => {
       this._reconnectIntervalId = undefined;

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

@@ -151,6 +151,10 @@ export class WebsocketSignalManager implements SignalManager {
     }
   }
 
+  async destroy () {
+    await Promise.all(Array.from(this._servers.values()).map(server => server.close()));
+  }
+
   peerCandidatesChanged = new Event<[topic: PublicKey, candidates: PublicKey[]]>()
 
   onSignal = new Event<SignalApi.SignalMessage>();

package/src/swarm/connection.ts

@@ -75,6 +75,10 @@ export class Connection {
     return this._transport;
   }
 
+  get protocol () {
+    return this._protocol;
+  }
+
   connect () {
     assert(this._state === ConnectionState.INITIAL, 'Invalid state.');
 

package/src/swarm/swarm.ts

@@ -10,6 +10,7 @@ import { discoveryKey, PublicKey } from '@dxos/crypto';
 import { ErrorStream } from '@dxos/debug';
 import { ComplexMap, ComplexSet } from '@dxos/util';
 
+import { Topic } from '..';
 import { ProtocolProvider } from '../network-manager';
 import { SignalApi } from '../signal';
 import { SwarmController, Topology } from '../topology';
@@ -24,6 +25,11 @@ const log = debug('dxos:network-manager:swarm');
  * Routes signal events and maintains swarm topology.
  */
 export class Swarm {
+  /**
+   * Unique id of the swarm, local to the current peer, generated when swarm is joined.
+   */
+  readonly id = PublicKey.random();
+
   private readonly _connections = new ComplexMap<PublicKey, Connection>(x => x.toHex());
 
   private readonly _discoveredPeers = new ComplexSet<PublicKey>(x => x.toHex());
@@ -77,6 +83,10 @@ export class Swarm {
     return this._label;
   }
 
+  get topic (): Topic {
+    return this._topic;
+  }
+
   onPeerCandidatesChanged (candidates: PublicKey[]) {
     log(`New peers for ${this._topic} ${candidates}`);
     this._discoveredPeers.clear();
@@ -118,7 +128,7 @@ export class Swarm {
         const connection = this._createConnection(false, message.id, message.sessionId);
         try {
           connection.connect();
-        } catch (err) {
+        } catch (err: any) {
           this.errors.raise(err);
         }
         accept = true;

package/src/transport/webrtc-transport.test.ts

@@ -4,6 +4,7 @@
 
 import expect from 'expect';
 import { it as test } from 'mocha';
+import { Duplex } from 'stream';
 import waitForExpect from 'wait-for-expect';
 
 import { sleep } from '@dxos/async';
@@ -14,12 +15,12 @@ import { afterTest } from '@dxos/testutils';
 import { TestProtocolPlugin, testProtocolProvider } from '../testing/test-protocol';
 import { WebrtcTransport } from './webrtc-transport';
 
-describe('WebrtcConnection', () => {
-  // This doesn't clean up correctly and crashes with SIGSEGV at the end. Probably an issue with wrtc package.
+describe('WebrtcTransport', () => {
+  // This doesn't clean up correctly and crashes with SIGSEGV / SIGABRT at the end. Probably an issue with wrtc package.
   test('open and close', async () => {
     const connection = new WebrtcTransport(
       true,
-      new Protocol().stream,
+      new Duplex(),
       PublicKey.random(),
       PublicKey.random(),
       PublicKey.random(),

package/src/transport/webrtc-transport.ts

@@ -72,7 +72,7 @@ export class WebrtcTransport implements Transport {
     });
     this._peer.on('close', async () => {
       log(`Connection closed ${this._ownId} -> ${this._remoteId}`);
-      await this._closeStream();
+      await this._disconnectStreams();
       this.closed.emit();
     });
   }
@@ -95,12 +95,12 @@ export class WebrtcTransport implements Transport {
   }
 
   async close () {
-    await this._closeStream();
+    await this._disconnectStreams();
     this._peer!.destroy();
     log('Closed.');
   }
 
-  private async _closeStream () {
+  private async _disconnectStreams () {
     this._stream.unpipe?.(this._peer)?.unpipe?.(this._stream); // TODO(rzadp): Find a way of unpiping this?
   }
 }

package/src/transport/wrtc-simple-peer.test.ts

@@ -0,0 +1,23 @@
+//
+// Copyright 2020 DXOS.org
+//
+
+import { it as test } from 'mocha';
+import SimplePeerConstructor from 'simple-peer';
+import wrtc from 'wrtc';
+
+import { sleep } from '@dxos/async';
+
+describe('node wrtc and simple-peer', () => {
+  // Simplest test that reproduces SIGABRT (mac) and SIGSEGV (linux) in wrtc.
+  test.skip('open and close', async () => {
+    const peer = new SimplePeerConstructor({
+      initiator: true,
+      wrtc
+    });
+
+    await sleep(1);
+
+    await peer.destroy();
+  }).timeout(3_000);
+});

package/src/types.ts

@@ -0,0 +1,10 @@
+//
+// Copyright 2021 DXOS.org
+//
+
+import { PublicKey } from '@dxos/crypto';
+
+/**
+ * Swarm topic.
+ */
+export type Topic = PublicKey