@dxos/network-manager 2.33.5-dev.fa6b779b → 2.33.5-dev.fee8f5fe

package/src/transport/transport.ts

@@ -12,37 +12,33 @@ import { SignalApi } from '../signal';
  * Abstraction over a P2P connection transport. Currently either WebRTC or in-memory.
  */
 export interface Transport {
-  closed: Event;
-
-  connected: Event;
-
-  errors: ErrorStream;
-
-  signal (msg: SignalApi.SignalMessage): void;
-
-  close (): Promise<void>;
+  closed: Event
+  connected: Event
+  errors: ErrorStream
+  signal (msg: SignalApi.SignalMessage): Promise<void> // TODO(burdon): Remove async?
+  close (): Promise<void>
 }
 
 export interface TransportOptions {
   /**
    * Did local node initiate this connection.
    */
-  initiator: boolean,
+  initiator: boolean
 
-  ownId: PublicKey,
-  remoteId: PublicKey,
-  sessionId: PublicKey,
-  topic: PublicKey,
+  ownId: PublicKey
+  remoteId: PublicKey
+  sessionId: PublicKey
+  topic: PublicKey
 
   /**
    * Wire protocol.
    */
-  stream: NodeJS.ReadWriteStream,
+  stream: NodeJS.ReadWriteStream
 
   /**
    * Send a signal message to remote peer.
    */
-  sendSignal: (msg: SignalApi.SignalMessage) => Promise<void>,
+  sendSignal: (msg: SignalApi.SignalMessage) => Promise<void> // TODO(burdon): Remove async?
 }
 
-export type TransportFactory = (options: TransportOptions) => Transport;
+export type TransportFactory = (options: TransportOptions) => Transport

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

@@ -13,12 +13,12 @@ import { Protocol } from '@dxos/mesh-protocol';
 import { afterTest } from '@dxos/testutils';
 
 import { TestProtocolPlugin, testProtocolProvider } from '../testing/test-protocol';
-import { WebrtcTransport } from './webrtc-transport';
+import { WebRTCTransport } from './webrtc-transport';
 
-describe('WebrtcTransport', () => {
+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(
+    const connection = new WebRTCTransport(
       true,
       new Duplex(),
       PublicKey.random(),
@@ -50,7 +50,7 @@ describe('WebrtcTransport', () => {
 
     const plugin1 = new TestProtocolPlugin(peer1Id.asBuffer());
     const protocolProvider1 = testProtocolProvider(topic.asBuffer(), peer1Id.asBuffer(), plugin1);
-    const connection1 = new WebrtcTransport(
+    const connection1 = new WebRTCTransport(
       true,
       protocolProvider1({ channel: discoveryKey(topic), initiator: true }).stream,
       peer1Id,
@@ -67,7 +67,7 @@ describe('WebrtcTransport', () => {
 
     const plugin2 = new TestProtocolPlugin(peer2Id.asBuffer());
     const protocolProvider2 = testProtocolProvider(topic.asBuffer(), peer2Id.asBuffer(), plugin2);
-    const connection2 = new WebrtcTransport(
+    const connection2 = new WebRTCTransport(
       false,
       protocolProvider2({ channel: discoveryKey(topic), initiator: false }).stream,
       peer2Id,

package/src/transport/webrtc-transport.ts

@@ -19,7 +19,7 @@ const log = debug('dxos:network-manager:swarm:transport:webrtc');
 /**
  * Implements Transport for WebRTC. Uses simple-peer under the hood.
  */
-export class WebrtcTransport implements Transport {
+export class WebRTCTransport implements Transport {
   private _peer: SimplePeer;
 
   readonly closed = new Event();
@@ -35,7 +35,7 @@ export class WebrtcTransport implements Transport {
     private readonly _remoteId: PublicKey,
     private readonly _sessionId: PublicKey,
     private readonly _topic: PublicKey,
-    private readonly _sendSignal: (msg: SignalApi.SignalMessage) => Promise<void>,
+    private readonly _sendSignal: (msg: SignalApi.SignalMessage) => void,
     private readonly _webrtcConfig?: any
   ) {
     log(`Created WebRTC connection ${this._ownId} -> ${this._remoteId} initiator=${this._initiator}`);
@@ -89,7 +89,7 @@ export class WebrtcTransport implements Transport {
     return this._peer;
   }
 
-  signal (msg: SignalApi.SignalMessage) {
+  async signal (msg: SignalApi.SignalMessage) {
     assert(this._peer, 'Connection not ready to accept signals.');
     this._peer.signal(msg.data);
   }
@@ -101,11 +101,12 @@ export class WebrtcTransport implements Transport {
   }
 
   private async _disconnectStreams () {
-    this._stream.unpipe?.(this._peer)?.unpipe?.(this._stream); // TODO(rzadp): Find a way of unpiping this?
+    // TODO(rzadp): Find a way of unpiping this?
+    this._stream.unpipe?.(this._peer)?.unpipe?.(this._stream);
   }
 }
 
-export const createWebRtcTransportFactory = (webrtcConfig?: any): TransportFactory => opts => new WebrtcTransport(
+export const createWebRTCTransportFactory = (webrtcConfig?: any): TransportFactory => opts => new WebRTCTransport(
   opts.initiator,
   opts.stream,
   opts.ownId,

package/dist/src/signal/interface.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/signal/interface.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,WAAW,aAAa;IAC5B,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;IAEzC,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAE5C,qBAAqB,EAAE,KAAK,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAE1E,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAEzC,SAAS,IAAK,SAAS,CAAC,MAAM,EAAE,CAAC;IAEjC,IAAI,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAAC;IAEjD,KAAK,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAAC;IAElD,MAAM,CAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IAEhC,KAAK,CAAE,GAAG,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAEhE,MAAM,CAAE,GAAG,EAAE,SAAS,CAAC,aAAa,GAAG,IAAI,CAAC;IAE5C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B"}

package/dist/src/signal/interface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/signal/interface.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE"}

package/dist/src/signal/signal-api.test.d.ts

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

package/dist/src/signal/signal-api.test.d.ts.map

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

package/dist/src/signal/signal-api.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"signal-api.test.js","sourceRoot":"","sources":["../../../src/signal/signal-api.test.ts"],"names":[],"mappings":"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"}

package/src/signal/interface.ts

@@ -1,32 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import { Event } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
-
-import { SignalApi } from './signal-api';
-
-export interface SignalManager {
-  statusChanged: Event<SignalApi.Status[]>;
-
-  commandTrace: Event<SignalApi.CommandTrace>;
-
-  peerCandidatesChanged: Event<[topic: PublicKey, candidates: PublicKey[]]>;
-
-  onSignal: Event<SignalApi.SignalMessage>;
-
-  getStatus (): SignalApi.Status[];
-
-  join (topic: PublicKey, peerId: PublicKey): void;
-
-  leave (topic: PublicKey, peerId: PublicKey): void;
-
-  lookup (topic: PublicKey): void;
-
-  offer (msg: SignalApi.SignalMessage): Promise<SignalApi.Answer>;
-
-  signal (msg: SignalApi.SignalMessage): void;
-
-  destroy(): Promise<void>;
-}