@streamr/dht 100.0.0-pretestnet.2 → 100.0.0-pretestnet.4

package/dist/src/connection/ConnectivityChecker.js

@@ -23,50 +23,47 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectivityChecker = exports.ConnectionMode = void 0;
+exports.ConnectivityChecker = void 0;
 const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
 const utils_1 = require("@streamr/utils");
 const Err = __importStar(require("../helpers/errors"));
-const ClientWebSocket_1 = require("./WebSocket/ClientWebSocket");
+const ClientWebsocket_1 = require("./websocket/ClientWebsocket");
 const uuid_1 = require("uuid");
 const ConnectionManager_1 = require("./ConnectionManager");
-const WebSocketConnectorRpcLocal_1 = require("./WebSocket/WebSocketConnectorRpcLocal");
+const WebsocketConnector_1 = require("./websocket/WebsocketConnector");
 const logger = new utils_1.Logger(module);
 // Class for handling both client and server side of the connectivity
-// checks. This is attached to all ServerWebSockets to listen to
+// checks. This is attached to all ServerWebsockets to listen to
 // ConnectivityRequest messages. 
-var ConnectionMode;
-(function (ConnectionMode) {
-    ConnectionMode["REQUEST"] = "connectivityRequest";
-    ConnectionMode["PROBE"] = "connectivityProbe";
-})(ConnectionMode || (exports.ConnectionMode = ConnectionMode = {}));
 class ConnectivityChecker {
-    constructor(webSocketPort, tls, host) {
+    constructor(websocketPort, tls, host) {
         this.destroyed = false;
-        this.webSocketPort = webSocketPort;
+        this.websocketPort = websocketPort;
         this.tls = tls;
         this.host = host;
     }
-    async sendConnectivityRequest(entryPoint) {
+    async sendConnectivityRequest(entryPoint, selfSigned) {
         if (this.destroyed) {
             throw new Err.ConnectionFailed('ConnectivityChecker is destroyed');
         }
         let outgoingConnection;
+        const wsServerInfo = {
+            host: entryPoint.websocket.host,
+            port: entryPoint.websocket.port,
+            tls: entryPoint.websocket.tls,
+        };
+        const url = (0, WebsocketConnector_1.connectivityMethodToWebsocketUrl)(wsServerInfo, 'connectivityRequest');
         try {
             outgoingConnection = await this.connectAsync({
-                wsServerInfo: {
-                    host: entryPoint.websocket.host,
-                    port: entryPoint.websocket.port,
-                    tls: entryPoint.websocket.tls,
-                },
-                mode: ConnectionMode.REQUEST
+                url,
+                selfSigned
             });
         }
         catch (e) {
-            throw new Err.ConnectionFailed(`Failed to connect to the entrypoint ${(0, WebSocketConnectorRpcLocal_1.connectivityMethodToWebSocketUrl)(entryPoint.websocket)}`, e);
+            throw new Err.ConnectionFailed(`Failed to connect to the entrypoint ${url}`, e);
         }
         // send connectivity request
-        const connectivityRequestMessage = { port: this.webSocketPort, host: this.host, tls: this.tls };
+        const connectivityRequestMessage = { port: this.websocketPort, host: this.host, tls: this.tls, selfSigned };
         const msg = {
             serviceId: ConnectivityChecker.CONNECTIVITY_CHECKER_SERVICE_ID,
             messageType: DhtRpc_1.MessageType.CONNECTIVITY_REQUEST, messageId: (0, uuid_1.v4)(),
@@ -78,11 +75,11 @@ class ConnectivityChecker {
         const responseAwaiter = () => {
             return new Promise((resolve, reject) => {
                 const timeoutId = setTimeout(() => {
-                    outgoingConnection.close('OTHER');
+                    outgoingConnection.close(false);
                     reject(new Err.ConnectivityResponseTimeout('timeout'));
                 }, ConnectivityChecker.CONNECTIVITY_CHECKER_TIMEOUT);
                 const listener = (bytes) => {
-                    outgoingConnection.close('OTHER');
+                    outgoingConnection.close(false);
                     try {
                         const message = DhtRpc_1.Message.fromBinary(bytes);
                         if (message.body.oneofKind === 'connectivityResponse') {
@@ -114,6 +111,9 @@ class ConnectivityChecker {
             throw e;
         }
     }
+    setHost(hostName) {
+        this.host = hostName;
+    }
     listenToIncomingConnectivityRequests(connectionToListenTo) {
         connectionToListenTo.on('data', (data) => {
             logger.trace('server received data');
@@ -147,25 +147,24 @@ class ConnectivityChecker {
                 port: connectivityRequest.port,
                 tls: connectivityRequest.tls
             };
-            logger.trace(`Attempting Connectivity Check to ${(0, WebSocketConnectorRpcLocal_1.connectivityMethodToWebSocketUrl)(wsServerInfo)}`);
+            const url = (0, WebsocketConnector_1.connectivityMethodToWebsocketUrl)(wsServerInfo, 'connectivityProbe');
+            logger.trace(`Attempting Connectivity Check to ${url}`);
             outgoingConnection = await this.connectAsync({
-                wsServerInfo,
-                mode: ConnectionMode.PROBE
+                url,
+                selfSigned: connectivityRequest.selfSigned
             });
         }
         catch (err) {
             logger.debug('error', { err });
             connectivityResponseMessage = {
-                openInternet: false,
                 host,
                 natType: ConnectionManager_1.NatType.UNKNOWN
             };
         }
         if (outgoingConnection) {
-            outgoingConnection.close('OTHER');
+            outgoingConnection.close(false);
             logger.trace('Connectivity test produced positive result, communicating reply to the requester ' + host + ':' + connectivityRequest.port);
             connectivityResponseMessage = {
-                openInternet: true,
                 host,
                 natType: ConnectionManager_1.NatType.OPEN_INTERNET,
                 websocket: { host, port: connectivityRequest.port, tls: connectivityRequest.tls }
@@ -183,13 +182,12 @@ class ConnectivityChecker {
         logger.trace('ConnectivityResponse sent: ' + JSON.stringify(DhtRpc_1.Message.toJson(msg)));
     }
     // eslint-disable-next-line class-methods-use-this
-    async connectAsync({ wsServerInfo, mode, timeoutMs = 1000, }) {
-        const socket = new ClientWebSocket_1.ClientWebSocket();
-        const url = `${(0, WebSocketConnectorRpcLocal_1.connectivityMethodToWebSocketUrl)(wsServerInfo)}?${mode}=true`;
+    async connectAsync({ url, selfSigned, timeoutMs = 1000, }) {
+        const socket = new ClientWebsocket_1.ClientWebsocket();
         let result;
         try {
             result = await (0, utils_1.runAndRaceEvents3)([
-                () => { socket.connect(url); }
+                () => { socket.connect(url, selfSigned); }
             ], socket, ['connected', 'error'], timeoutMs);
         }
         catch (e) {

package/dist/src/connection/ConnectivityChecker.js.map

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

package/dist/src/connection/ConnectorFacade.d.ts

@@ -2,12 +2,13 @@ import { ConnectivityResponse, PeerDescriptor } from '../proto/packages/dht/prot
 import { ITransport } from '../transport/ITransport';
 import { PortRange, TlsCertificate } from './ConnectionManager';
 import { ManagedConnection } from './ManagedConnection';
-import { Simulator } from './Simulator/Simulator';
-import { IceServer } from './WebRTC/WebRtcConnectorRpcLocal';
+import { Simulator } from './simulator/Simulator';
+import { IceServer } from './webrtc/WebrtcConnector';
+import { WebsocketConnectorConfig } from './websocket/WebsocketConnector';
 export interface ConnectorFacade {
     createConnection: (peerDescriptor: PeerDescriptor) => ManagedConnection;
-    getOwnPeerDescriptor: () => PeerDescriptor | undefined;
-    start: (onIncomingConnection: (connection: ManagedConnection) => boolean, canConnect: (peerDescriptor: PeerDescriptor) => boolean) => Promise<void>;
+    getLocalPeerDescriptor: () => PeerDescriptor | undefined;
+    start: (onNewConnection: (connection: ManagedConnection) => boolean, canConnect: (peerDescriptor: PeerDescriptor) => boolean, autoCertifierTransport: ITransport) => Promise<void>;
     stop: () => Promise<void>;
 }
 export interface DefaultConnectorFacadeConfig {
@@ -24,26 +25,31 @@ export interface DefaultConnectorFacadeConfig {
     webrtcPortRange?: PortRange;
     maxMessageSize?: number;
     tlsCertificate?: TlsCertificate;
-    createOwnPeerDescriptor: (connectivityResponse: ConnectivityResponse) => PeerDescriptor;
+    websocketServerEnableTls?: boolean;
+    autoCertifierUrl?: string;
+    autoCertifierConfigFile?: string;
+    createLocalPeerDescriptor: (connectivityResponse: ConnectivityResponse) => PeerDescriptor;
 }
 export declare class DefaultConnectorFacade implements ConnectorFacade {
     private readonly config;
-    private ownPeerDescriptor?;
-    private webSocketConnector?;
+    private localPeerDescriptor?;
+    private websocketConnector?;
     private webrtcConnector?;
     constructor(config: DefaultConnectorFacadeConfig);
-    start(onIncomingConnection: (connection: ManagedConnection) => boolean, canConnect: (peerDescriptor: PeerDescriptor) => boolean): Promise<void>;
+    start(onNewConnection: (connection: ManagedConnection) => boolean, canConnect: (peerDescriptor: PeerDescriptor) => boolean, autoCertifierTransport: ITransport): Promise<void>;
+    private setLocalPeerDescriptor;
+    restartWebsocketConnector(webSocketConnectorConfig: WebsocketConnectorConfig): Promise<void>;
     createConnection(peerDescriptor: PeerDescriptor): ManagedConnection;
-    getOwnPeerDescriptor(): PeerDescriptor | undefined;
+    getLocalPeerDescriptor(): PeerDescriptor | undefined;
     stop(): Promise<void>;
 }
 export declare class SimulatorConnectorFacade implements ConnectorFacade {
-    private readonly ownPeerDescriptor;
+    private readonly localPeerDescriptor;
     private simulatorConnector?;
     private simulator;
-    constructor(ownPeerDescriptor: PeerDescriptor, simulator: Simulator);
-    start(onIncomingConnection: (connection: ManagedConnection) => boolean): Promise<void>;
+    constructor(localPeerDescriptor: PeerDescriptor, simulator: Simulator);
+    start(onNewConnection: (connection: ManagedConnection) => boolean): Promise<void>;
     createConnection(peerDescriptor: PeerDescriptor): ManagedConnection;
-    getOwnPeerDescriptor(): PeerDescriptor;
+    getLocalPeerDescriptor(): PeerDescriptor;
     stop(): Promise<void>;
 }

package/dist/src/connection/ConnectorFacade.js

@@ -2,29 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SimulatorConnectorFacade = exports.DefaultConnectorFacade = void 0;
 const utils_1 = require("@streamr/utils");
-const SimulatorConnector_1 = require("./Simulator/SimulatorConnector");
-const WebRtcConnectorRpcLocal_1 = require("./WebRTC/WebRtcConnectorRpcLocal");
-const WebSocketConnectorRpcLocal_1 = require("./WebSocket/WebSocketConnectorRpcLocal");
+const SimulatorConnector_1 = require("./simulator/SimulatorConnector");
+const WebrtcConnector_1 = require("./webrtc/WebrtcConnector");
+const WebsocketConnector_1 = require("./websocket/WebsocketConnector");
 const logger = new utils_1.Logger(module);
 class DefaultConnectorFacade {
     constructor(config) {
         this.config = config;
     }
-    async start(onIncomingConnection, canConnect) {
-        logger.trace(`Creating WebSocketConnector`);
-        this.webSocketConnector = new WebSocketConnectorRpcLocal_1.WebSocketConnectorRpcLocal({
+    async start(onNewConnection, canConnect, autoCertifierTransport) {
+        logger.trace(`Creating WebsocketConnectorRpcLocal`);
+        const webSocketConnectorConfig = {
             transport: this.config.transport,
-            // TODO should we use canConnect also for WebRtcConnector? (NET-1142)
+            // TODO should we use canConnect also for WebrtcConnector? (NET-1142)
             canConnect: (peerDescriptor) => canConnect(peerDescriptor),
-            onIncomingConnection,
+            onNewConnection,
             portRange: this.config.websocketPortRange,
             host: this.config.websocketHost,
             entrypoints: this.config.entryPoints,
             tlsCertificate: this.config.tlsCertificate,
+            serverEnableTls: this.config.websocketServerEnableTls,
+            autoCertifierUrl: this.config.autoCertifierUrl,
+            autoCertifierConfigFile: this.config.autoCertifierConfigFile,
+            autoCertifierTransport,
             maxMessageSize: this.config.maxMessageSize
-        });
-        logger.trace(`Creating WebRTCConnector`);
-        this.webrtcConnector = new WebRtcConnectorRpcLocal_1.WebRtcConnectorRpcLocal({
+        };
+        this.websocketConnector = new WebsocketConnector_1.WebsocketConnector(webSocketConnectorConfig);
+        logger.trace(`Creating WebRtcConnectorRpcLocal`);
+        this.webrtcConnector = new WebrtcConnector_1.WebrtcConnector({
             transport: this.config.transport,
             iceServers: this.config.iceServers,
             allowPrivateAddresses: this.config.webrtcAllowPrivateAddresses,
@@ -34,46 +39,86 @@ class DefaultConnectorFacade {
             externalIp: this.config.externalIp,
             portRange: this.config.webrtcPortRange,
             maxMessageSize: this.config.maxMessageSize
-        }, onIncomingConnection);
-        await this.webSocketConnector.start();
-        const connectivityResponse = await this.webSocketConnector.checkConnectivity();
-        const ownPeerDescriptor = this.config.createOwnPeerDescriptor(connectivityResponse);
-        this.ownPeerDescriptor = ownPeerDescriptor;
-        this.webSocketConnector.setOwnPeerDescriptor(ownPeerDescriptor);
-        this.webrtcConnector.setOwnPeerDescriptor(ownPeerDescriptor);
+        }, onNewConnection);
+        await this.websocketConnector.start();
+        // TODO: generate a PeerDescriptor in a single function. Requires changes to the createOwnPeerDescriptor
+        // function in the config. Currently it's given by the DhtNode and it sets the PeerDescriptor for the
+        // DhtNode in each call. 
+        // LocalPeerDescriptor could be stored in one place and passed from there to the connectors
+        const temporarilySelfSigned = (!this.config.tlsCertificate && this.config.websocketServerEnableTls === true);
+        const connectivityResponse = await this.websocketConnector.checkConnectivity(temporarilySelfSigned);
+        const localPeerDescriptor = this.config.createLocalPeerDescriptor(connectivityResponse);
+        this.setLocalPeerDescriptor(localPeerDescriptor);
+        if (localPeerDescriptor.websocket && !this.config.tlsCertificate && this.config.websocketServerEnableTls) {
+            try {
+                await this.websocketConnector.autoCertify();
+                const connectivityResponse = await this.websocketConnector.checkConnectivity(false);
+                const autocertifiedLocalPeerDescriptor = this.config.createLocalPeerDescriptor(connectivityResponse);
+                if (autocertifiedLocalPeerDescriptor.websocket !== undefined) {
+                    this.setLocalPeerDescriptor(autocertifiedLocalPeerDescriptor);
+                }
+                else {
+                    logger.warn('Connectivity check failed after auto-certification, disabling WebSocket server TLS');
+                    await this.restartWebsocketConnector({
+                        ...webSocketConnectorConfig,
+                        serverEnableTls: false
+                    });
+                }
+            }
+            catch (err) {
+                logger.warn('Failed to auto-certify, disabling WebSocket server TLS');
+                await this.restartWebsocketConnector({
+                    ...webSocketConnectorConfig,
+                    serverEnableTls: false
+                });
+            }
+        }
+    }
+    setLocalPeerDescriptor(peerDescriptor) {
+        this.localPeerDescriptor = peerDescriptor;
+        this.websocketConnector.setLocalPeerDescriptor(peerDescriptor);
+        this.webrtcConnector.setLocalPeerDescriptor(peerDescriptor);
+    }
+    async restartWebsocketConnector(webSocketConnectorConfig) {
+        await this.websocketConnector.destroy();
+        this.websocketConnector = new WebsocketConnector_1.WebsocketConnector(webSocketConnectorConfig);
+        await this.websocketConnector.start();
+        const connectivityResponse = await this.websocketConnector.checkConnectivity(false);
+        const localPeerDescriptor = this.config.createLocalPeerDescriptor(connectivityResponse);
+        this.setLocalPeerDescriptor(localPeerDescriptor);
     }
     createConnection(peerDescriptor) {
-        if (this.webSocketConnector.isPossibleToFormConnection(peerDescriptor)) {
-            return this.webSocketConnector.connect(peerDescriptor);
+        if (this.websocketConnector.isPossibleToFormConnection(peerDescriptor)) {
+            return this.websocketConnector.connect(peerDescriptor);
         }
         else {
             return this.webrtcConnector.connect(peerDescriptor);
         }
     }
-    getOwnPeerDescriptor() {
-        return this.ownPeerDescriptor;
+    getLocalPeerDescriptor() {
+        return this.localPeerDescriptor;
     }
     async stop() {
-        await this.webSocketConnector.destroy();
+        await this.websocketConnector.destroy();
         await this.webrtcConnector.stop();
     }
 }
 exports.DefaultConnectorFacade = DefaultConnectorFacade;
 class SimulatorConnectorFacade {
-    constructor(ownPeerDescriptor, simulator) {
-        this.ownPeerDescriptor = ownPeerDescriptor;
+    constructor(localPeerDescriptor, simulator) {
+        this.localPeerDescriptor = localPeerDescriptor;
         this.simulator = simulator;
     }
-    async start(onIncomingConnection) {
+    async start(onNewConnection) {
         logger.trace(`Creating SimulatorConnector`);
-        this.simulatorConnector = new SimulatorConnector_1.SimulatorConnector(this.ownPeerDescriptor, this.simulator, onIncomingConnection);
+        this.simulatorConnector = new SimulatorConnector_1.SimulatorConnector(this.localPeerDescriptor, this.simulator, onNewConnection);
         this.simulator.addConnector(this.simulatorConnector);
     }
     createConnection(peerDescriptor) {
         return this.simulatorConnector.connect(peerDescriptor);
     }
-    getOwnPeerDescriptor() {
-        return this.ownPeerDescriptor;
+    getLocalPeerDescriptor() {
+        return this.localPeerDescriptor;
     }
     async stop() {
         await this.simulatorConnector.stop();

package/dist/src/connection/ConnectorFacade.js.map

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

package/dist/src/connection/Handshaker.d.ts

@@ -1,18 +1,18 @@
 import { EventEmitter } from 'eventemitter3';
-import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+import { PeerDescriptor, HandshakeError } from '../proto/packages/dht/protos/DhtRpc';
 import { IConnection } from './IConnection';
 interface HandshakerEvents {
-    handshakeRequest: (peerDescriptor: PeerDescriptor) => void;
-    handshakeCompleted: (peerDescriptor: PeerDescriptor) => void;
-    handshakeFailed: (reason?: string) => void;
+    handshakeRequest: (source: PeerDescriptor, target?: PeerDescriptor) => void;
+    handshakeCompleted: (remote: PeerDescriptor) => void;
+    handshakeFailed: (error?: HandshakeError) => void;
 }
 export declare class Handshaker extends EventEmitter<HandshakerEvents> {
     private static readonly HANDSHAKER_SERVICE_ID;
-    private ownPeerDescriptor;
+    private localPeerDescriptor;
     private connection;
-    constructor(ownPeerDescriptor: PeerDescriptor, connection: IConnection);
+    constructor(localPeerDescriptor: PeerDescriptor, connection: IConnection);
     private onData;
-    sendHandshakeRequest(): void;
-    sendHandshakeResponse(error?: string): void;
+    sendHandshakeRequest(remotePeerDescriptor?: PeerDescriptor): void;
+    sendHandshakeResponse(error?: HandshakeError): void;
 }
 export {};

package/dist/src/connection/Handshaker.js

@@ -7,39 +7,39 @@ const uuid_1 = require("uuid");
 const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
 const logger = new utils_1.Logger(module);
 class Handshaker extends eventemitter3_1.EventEmitter {
-    constructor(ownPeerDescriptor, connection) {
+    constructor(localPeerDescriptor, connection) {
         super();
-        this.onData = (data) => {
-            try {
-                const message = DhtRpc_1.Message.fromBinary(data);
-                if (message.body.oneofKind === 'handshakeRequest') {
-                    logger.trace('handshake request received');
-                    const handshake = message.body.handshakeRequest;
-                    this.emit('handshakeRequest', handshake.peerDescriptor);
+        this.localPeerDescriptor = localPeerDescriptor;
+        this.connection = connection;
+        this.connection.on('data', (data) => this.onData(data));
+    }
+    onData(data) {
+        try {
+            const message = DhtRpc_1.Message.fromBinary(data);
+            if (message.body.oneofKind === 'handshakeRequest') {
+                logger.trace('handshake request received');
+                const handshake = message.body.handshakeRequest;
+                this.emit('handshakeRequest', handshake.sourcePeerDescriptor, handshake.targetPeerDescriptor);
+            }
+            if (message.body.oneofKind === 'handshakeResponse') {
+                logger.trace('handshake response received');
+                const handshake = message.body.handshakeResponse;
+                if (handshake.error !== undefined) {
+                    this.emit('handshakeFailed', handshake.error);
                 }
-                if (message.body.oneofKind === 'handshakeResponse') {
-                    logger.trace('handshake response received');
-                    const handshake = message.body.handshakeResponse;
-                    if (handshake.responseError) {
-                        this.emit('handshakeFailed', handshake.responseError);
-                    }
-                    else {
-                        this.emit('handshakeCompleted', handshake.peerDescriptor);
-                    }
+                else {
+                    this.emit('handshakeCompleted', handshake.sourcePeerDescriptor);
                 }
             }
-            catch (err) {
-                logger.error('error while parsing handshake message', err);
-            }
-        };
-        this.ownPeerDescriptor = ownPeerDescriptor;
-        this.connection = connection;
-        this.connection.on('data', this.onData);
+        }
+        catch (err) {
+            logger.error('error while parsing handshake message', err);
+        }
     }
-    sendHandshakeRequest() {
+    sendHandshakeRequest(remotePeerDescriptor) {
         const outgoingHandshake = {
-            sourceId: this.ownPeerDescriptor.kademliaId,
-            peerDescriptor: this.ownPeerDescriptor
+            sourcePeerDescriptor: this.localPeerDescriptor,
+            targetPeerDescriptor: remotePeerDescriptor
         };
         const msg = {
             serviceId: Handshaker.HANDSHAKER_SERVICE_ID,
@@ -55,12 +55,9 @@ class Handshaker extends eventemitter3_1.EventEmitter {
     }
     sendHandshakeResponse(error) {
         const outgoingHandshakeResponse = {
-            sourceId: this.ownPeerDescriptor.kademliaId,
-            peerDescriptor: this.ownPeerDescriptor
+            sourcePeerDescriptor: this.localPeerDescriptor,
+            error
         };
-        if (error) {
-            outgoingHandshakeResponse.responseError = error;
-        }
         const msg = {
             serviceId: Handshaker.HANDSHAKER_SERVICE_ID,
             messageType: DhtRpc_1.MessageType.HANDSHAKE_RESPONSE,
@@ -71,7 +68,7 @@ class Handshaker extends eventemitter3_1.EventEmitter {
             }
         };
         this.connection.send(DhtRpc_1.Message.toBinary(msg));
-        logger.trace('handshake request sent');
+        logger.trace('handshake response sent');
     }
 }
 exports.Handshaker = Handshaker;

package/dist/src/connection/Handshaker.js.map

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

package/dist/src/connection/IConnection.d.ts

@@ -1,9 +1,8 @@
 import { UUID } from '../helpers/UUID';
-import { DisconnectionType } from '../transport/ITransport';
 export interface ConnectionEvents {
     data: (bytes: Uint8Array) => void;
     connected: () => void;
-    disconnected: (disconnectionType: DisconnectionType, code?: number, reason?: string) => void;
+    disconnected: (gracefulLeave: boolean, code?: number, reason?: string) => void;
     error: (name: string) => void;
 }
 export declare enum ConnectionType {
@@ -23,16 +22,16 @@ export interface IConnection {
     on(event: 'data', listener: (bytes: Uint8Array) => void): this;
     on(event: 'error', listener: (name: string) => void): this;
     on(event: 'connected', listener: () => void): this;
-    on(event: 'disconnected', listener: (disconnectionType: DisconnectionType, code?: number, reason?: string) => void): this;
+    on(event: 'disconnected', listener: (gracefulLeave: boolean, code?: number, reason?: string) => void): this;
     once(event: 'data', listener: (bytes: Uint8Array) => void): this;
     once(event: 'error', listener: (name: string) => void): this;
     once(event: 'connected', listener: () => void): this;
-    once(event: 'disconnected', listener: (disconnectionType: DisconnectionType, code?: number, reason?: string) => void): this;
+    once(event: 'disconnected', listener: (gracefulLeave: boolean, code?: number, reason?: string) => void): this;
     off(event: 'data', listener: (bytes: Uint8Array) => void): void;
     off(event: 'error', listener: (name: string) => void): void;
     off(event: 'connected', listener: () => void): void;
-    off(event: 'disconnected', listener: (disconnectionType: DisconnectionType, code?: number, reason?: string) => void): void;
+    off(event: 'disconnected', listener: (gracefulLeave: boolean, code?: number, reason?: string) => void): void;
     send(data: Uint8Array): void;
-    close(disconnectionType: DisconnectionType): Promise<void>;
+    close(gracefulLeave: boolean): Promise<void>;
     destroy(): void;
 }

package/dist/src/connection/IConnection.js.map

@@ -1 +1 @@
-{"version":3,"file":"IConnection.js","sourceRoot":"","sources":["../../../src/connection/IConnection.ts"],"names":[],"mappings":";;;AAAA,0CAAsC;AAUtC,IAAY,cAMX;AAND,WAAY,cAAc;IACtB,uDAAqC,CAAA;IACrC,uDAAqC,CAAA;IACrC,mCAAiB,CAAA;IACjB,uDAAqC,CAAA;IACrC,uDAAqC,CAAA;AACzC,CAAC,EANW,cAAc,8BAAd,cAAc,QAMzB;AAID,MAAa,YAAa,SAAQ,WAAI;IAClC,QAAQ;QACJ,OAAO,IAAI,CAAC,QAAQ,EAAqB,CAAA;IAC7C,CAAC;CACJ;AAJD,oCAIC"}
+{"version":3,"file":"IConnection.js","sourceRoot":"","sources":["../../../src/connection/IConnection.ts"],"names":[],"mappings":";;;AAAA,0CAAsC;AAStC,IAAY,cAMX;AAND,WAAY,cAAc;IACtB,uDAAqC,CAAA;IACrC,uDAAqC,CAAA;IACrC,mCAAiB,CAAA;IACjB,uDAAqC,CAAA;IACrC,uDAAqC,CAAA;AACzC,CAAC,EANW,cAAc,8BAAd,cAAc,QAMzB;AAID,MAAa,YAAa,SAAQ,WAAI;IAClC,QAAQ;QACJ,OAAO,IAAI,CAAC,QAAQ,EAAqB,CAAA;IAC7C,CAAC;CACJ;AAJD,oCAIC"}