@dxos/network-manager 0.1.3 → 0.1.4

package/src/transport/webrtc-transport.ts

@@ -7,14 +7,19 @@ import SimplePeerConstructor, { Instance as SimplePeer } from 'simple-peer';
 
 import { Event } from '@dxos/async';
 import { ErrorStream, raise } from '@dxos/debug';
-import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
-import { SignalMessage } from '../signal';
 import { Transport, TransportFactory } from './transport';
 import { wrtc } from './webrtc';
 
+export type WebRTCTransportParams = {
+  initiator: boolean;
+  stream: NodeJS.ReadWriteStream;
+  webrtcConfig?: any;
+  sendSignal: (signal: Signal) => Promise<void>;
+};
+
 /**
  * Implements Transport for WebRTC. Uses simple-peer under the hood.
  */
@@ -25,51 +30,27 @@ export class WebRTCTransport implements Transport {
   readonly connected = new Event();
   readonly errors = new ErrorStream();
 
-  constructor(
-    private readonly _initiator: boolean,
-    private readonly _stream: NodeJS.ReadWriteStream,
-    private readonly _ownId: PublicKey,
-    private readonly _remoteId: PublicKey,
-    private readonly _sessionId: PublicKey,
-    private readonly _topic: PublicKey,
-    private readonly _sendSignal: (msg: SignalMessage) => void,
-    private readonly _webrtcConfig?: any
-  ) {
-    log('created connection', {
-      id: this._ownId,
-      topic: this._topic,
-      remoteId: this._remoteId,
-      initiator: this._initiator,
-      config: this._webrtcConfig
-    });
+  constructor(private readonly params: WebRTCTransportParams) {
+    log('created connection', params);
     this._peer = new SimplePeerConstructor({
-      initiator: this._initiator,
+      initiator: this.params.initiator,
       wrtc: SimplePeerConstructor.WEBRTC_SUPPORT ? undefined : wrtc ?? raise(new Error('wrtc not available')),
-      config: this._webrtcConfig
+      config: this.params.webrtcConfig
     });
 
     this._peer.on('signal', async (data) => {
-      try {
-        await this._sendSignal({
-          author: this._ownId,
-          recipient: this._remoteId,
-          sessionId: this._sessionId,
-          topic: this._topic,
-          data: { signal: { json: JSON.stringify(data) } }
-        });
-      } catch (err: any) {
-        this.errors.raise(err);
-      }
+      log('signal', data);
+      await this.params.sendSignal({ json: JSON.stringify(data) });
     });
 
     this._peer.on('connect', () => {
-      log('connected', { id: this._ownId, remoteId: this._remoteId });
-      this._stream.pipe(this._peer!).pipe(this._stream);
+      log('connected');
+      this.params.stream.pipe(this._peer!).pipe(this.params.stream);
       this.connected.emit();
     });
 
     this._peer.on('close', async () => {
-      log('closed', { id: this._ownId, remoteId: this._remoteId });
+      log('closed');
       await this._disconnectStreams();
       this.closed.emit();
     });
@@ -80,14 +61,6 @@ export class WebRTCTransport implements Transport {
     });
   }
 
-  get remoteId() {
-    return this._remoteId;
-  }
-
-  get sessionId() {
-    return this._sessionId;
-  }
-
   get peer() {
     return this._peer;
   }
@@ -96,6 +69,7 @@ export class WebRTCTransport implements Transport {
     log('closing...');
     await this._disconnectStreams();
     this._peer!.destroy();
+    this.closed.emit();
     log('closed');
   }
 
@@ -107,21 +81,15 @@ export class WebRTCTransport implements Transport {
 
   private async _disconnectStreams() {
     // TODO(rzadp): Find a way of unpiping this?
-    this._stream.unpipe?.(this._peer)?.unpipe?.(this._stream);
+    this.params.stream.unpipe?.(this._peer)?.unpipe?.(this.params.stream);
   }
 }
 
 // TODO(dmaretskyi): Convert to class.
 export const createWebRTCTransportFactory = (webrtcConfig?: any): TransportFactory => ({
-  create: (opts) =>
-    new WebRTCTransport( // TODO(burdon): Refactor with to take opts in constructor.
-      opts.initiator,
-      opts.stream,
-      opts.ownId,
-      opts.remoteId,
-      opts.sessionId,
-      opts.topic,
-      opts.sendSignal,
+  create: (params) =>
+    new WebRTCTransport({
+      ...params,
       webrtcConfig
-    )
+    })
 });