@dxos/network-manager 0.1.9 → 0.1.11

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

@@ -39,6 +39,7 @@ export class WebRTCTransportProxy implements Transport {
       proxyId: this._proxyId,
       initiator: this._params.initiator
     });
+
     this._serviceStream.waitUntilReady().then(
       () => {
         this._serviceStream.subscribe(async (event: BridgeEvent) => {
@@ -78,7 +79,7 @@ export class WebRTCTransportProxy implements Transport {
         break;
       }
       case ConnectionState.CLOSED: {
-        await this.close();
+        await this.destroy();
         break;
       }
     }
@@ -93,23 +94,29 @@ export class WebRTCTransportProxy implements Transport {
     await this._params.sendSignal(signalEvent.payload);
   }
 
-  async signal(signal: Signal): Promise<void> {
-    await this._params.bridgeService.sendSignal({
-      proxyId: this._proxyId,
-      signal
-    });
+  signal(signal: Signal): void {
+    this._params.bridgeService
+      .sendSignal({
+        proxyId: this._proxyId,
+        signal
+      })
+      .catch((err) => this.errors.raise(err));
   }
 
-  async close(): Promise<void> {
+  // TODO(burdon): Move open from constructor.
+  async destroy(): Promise<void> {
     if (this._closed) {
       return;
     }
+
     this._serviceStream.close();
+
     try {
       await this._params.bridgeService.close({ proxyId: this._proxyId });
     } catch (err: any) {
       log.catch(err);
     }
+
     this.closed.emit();
     this._closed = true;
   }
@@ -117,6 +124,7 @@ export class WebRTCTransportProxy implements Transport {
   /**
    * Called when underlying proxy service becomes unavailable.
    */
+  // TODO(burdon): Option on close method.
   forceClose() {
     this._serviceStream.close();
     this.closed.emit();
@@ -124,6 +132,7 @@ export class WebRTCTransportProxy implements Transport {
   }
 }
 
+// TODO(burdon): Why is this named Proxy?
 export class WebRTCTransportProxyFactory implements TransportFactory {
   private _bridgeService: BridgeService | undefined;
   private _connections = new Set<WebRTCTransportProxy>();
@@ -141,7 +150,7 @@ export class WebRTCTransportProxyFactory implements TransportFactory {
     return this;
   }
 
-  create(options: TransportOptions): Transport {
+  createTransport(options: TransportOptions): Transport {
     assert(this._bridgeService, 'WebRTCTransportProxyFactory is not ready to open connections');
 
     const transport = new WebRTCTransportProxy({

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

@@ -102,7 +102,7 @@ export class WebRTCTransportService implements BridgeService {
   }
 
   async close({ proxyId }: CloseRequest) {
-    await this.transports.get(proxyId)?.transport.close();
+    await this.transports.get(proxyId)?.transport.destroy();
     await this.transports.get(proxyId)?.stream.end();
     this.transports.delete(proxyId);
     log('Closed.');

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

@@ -28,13 +28,12 @@ describe('WebRTCTransport', function () {
     const closedCb = () => {
       callsCounter++;
     };
-    connection.closed.once(closedCb);
 
+    connection.closed.once(closedCb);
     await sleep(10); // Let simple-peer process events.
-    await connection.close();
+    await connection.destroy();
 
     await sleep(10); // Process events.
-
     expect(callsCounter).toEqual(1);
   })
     .timeout(1_000)
@@ -58,7 +57,7 @@ describe('WebRTCTransport', function () {
         await connection2.signal(signal);
       }
     });
-    afterTest(() => connection1.close());
+    afterTest(() => connection1.destroy());
     afterTest(() => connection1.errors.assertNoUnhandledErrors());
 
     const plugin2 = new TestProtocolPlugin(peer2Id.asBuffer());
@@ -74,7 +73,7 @@ describe('WebRTCTransport', function () {
         await connection1.signal(signal);
       }
     });
-    afterTest(() => connection2.close());
+    afterTest(() => connection2.destroy());
     afterTest(() => connection2.errors.assertNoUnhandledErrors());
 
     const received: any[] = [];
@@ -83,7 +82,6 @@ describe('WebRTCTransport', function () {
       return undefined;
     };
     plugin1.on('receive', mockReceive);
-
     plugin2.on('connect', async (protocol) => {
       await plugin2.send(peer1Id.asBuffer(), '{"message": "Hello"}');
     });

package/src/transport/webrtc-transport.ts

@@ -57,11 +57,11 @@ export class WebRTCTransport implements Transport {
 
     this._peer.on('error', async (err) => {
       this.errors.raise(err);
-      await this.close();
+      await this.destroy();
     });
   }
 
-  async close() {
+  async destroy() {
     log('closing...');
     await this._disconnectStreams();
     this._peer!.destroy();
@@ -69,7 +69,7 @@ export class WebRTCTransport implements Transport {
     log('closed');
   }
 
-  async signal(signal: Signal) {
+  signal(signal: Signal) {
     assert(this._peer, 'Connection not ready to accept signals.');
     assert(signal.json, 'Signal message must contain signal data.');
     this._peer.signal(JSON.parse(signal.json));
@@ -83,7 +83,7 @@ export class WebRTCTransport implements Transport {
 
 // TODO(dmaretskyi): Convert to class.
 export const createWebRTCTransportFactory = (webrtcConfig?: any): TransportFactory => ({
-  create: (params) =>
+  createTransport: (params) =>
     new WebRTCTransport({
       ...params,
       webrtcConfig

package/testing.d.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+/**
+ * Enable testing imports:
+ * ```tsc
+ * import { ... } from '@dxos/network-manager/testing';
+ * ```
+ */
+export * from './dist/src/testing';

package/testing.js

@@ -0,0 +1,5 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+module.exports = require('./dist/src/testing/index.js');

package/dist/src/network-manager.test.d.ts

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

package/dist/src/network-manager.test.d.ts.map

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