@streamr/dht 100.0.0-pretestnet.6 → 100.0.0-testnet-one.0

package/test/unit/Router.test.ts

@@ -2,7 +2,15 @@ import { v4 } from 'uuid'
 import { DhtNodeRpcRemote } from '../../src/dht/DhtNodeRpcRemote'
 import { Router } from '../../src/dht/routing/Router'
 import { PeerID, PeerIDKey } from '../../src/helpers/PeerID'
-import { Message, MessageType, NodeType, PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '../../src/proto/packages/dht/protos/DhtRpc'
+import { 
+    Message,
+    MessageType,
+    NodeType,
+    PeerDescriptor,
+    RouteMessageAck,
+    RouteMessageError,
+    RouteMessageWrapper
+} from '../../src/proto/packages/dht/protos/DhtRpc'
 import { createWrappedClosestPeersRequest } from '../utils/utils'
 import { FakeRpcCommunicator } from '../utils/FakeRpcCommunicator'
 
@@ -11,11 +19,11 @@ describe('Router', () => {
 
     const peerId = PeerID.fromString('router')
     const peerDescriptor1: PeerDescriptor = {
-        kademliaId: peerId.value,
+        nodeId: peerId.value,
         type: NodeType.NODEJS
     }
     const peerDescriptor2: PeerDescriptor = {
-        kademliaId: PeerID.fromString('destination').value,
+        nodeId: PeerID.fromString('destination').value,
         type: NodeType.NODEJS
     }
     const rpcWrapper = createWrappedClosestPeersRequest(peerDescriptor1)
@@ -69,7 +77,7 @@ describe('Router', () => {
             reachableThrough: [],
             routingPath: []
         }) as RouteMessageAck
-        expect(ack.error).toEqual('No routing candidates found')
+        expect(ack.error).toEqual(RouteMessageError.NO_TARGETS)
     })
 
     it('doRouteMessage with connections', async () => {
@@ -82,40 +90,40 @@ describe('Router', () => {
             reachableThrough: [],
             routingPath: []
         }) as RouteMessageAck
-        expect(ack.error).toEqual('')
+        expect(ack.error).toBeUndefined()
     })
 
     it('route server is destination without connections', async () => {
         const ack = await rpcCommunicator.callRpcMethod('routeMessage', routedMessage) as RouteMessageAck
-        expect(ack.error).toEqual('')
+        expect(ack.error).toBeUndefined()
     })
 
     it('route server with connections', async () => {
         connections.set(PeerID.fromString('test').toKey(), createMockDhtNodeRpcRemote(peerDescriptor2))
         const ack = await rpcCommunicator.callRpcMethod('routeMessage', routedMessage) as RouteMessageAck
-        expect(ack.error).toEqual('')
+        expect(ack.error).toBeUndefined()
     })
 
     it('route server on duplicate message', async () => {
         router.addToDuplicateDetector(routedMessage.requestId)
         const ack = await rpcCommunicator.callRpcMethod('routeMessage', routedMessage) as RouteMessageAck
-        expect(ack.error).toEqual('message given to routeMessage() service is likely a duplicate')
+        expect(ack.error).toEqual(RouteMessageError.DUPLICATE)
     })
 
     it('forward server no connections', async () => {
         const ack = await rpcCommunicator.callRpcMethod('forwardMessage', routedMessage) as RouteMessageAck
-        expect(ack.error).toEqual('No routing candidates found')
+        expect(ack.error).toEqual(RouteMessageError.NO_TARGETS)
     })
 
     it('forward server with connections', async () => {
         connections.set(PeerID.fromString('test').toKey(), createMockDhtNodeRpcRemote(peerDescriptor2))
         const ack = await rpcCommunicator.callRpcMethod('forwardMessage', routedMessage) as RouteMessageAck
-        expect(ack.error).toEqual('')
+        expect(ack.error).toBeUndefined()
     })
 
     it('forward server on duplicate message', async () => {
         router.addToDuplicateDetector(routedMessage.requestId)
         const ack = await rpcCommunicator.callRpcMethod('forwardMessage', routedMessage) as RouteMessageAck
-        expect(ack.error).toEqual('message given to forwardMessage() service is likely a duplicate')
+        expect(ack.error).toEqual(RouteMessageError.DUPLICATE)
     })
 })

package/test/unit/RoutingSession.test.ts

@@ -0,0 +1,76 @@
+import { v4 } from 'uuid'
+import { RoutingSession } from '../../src/dht/routing/RoutingSession'
+import { Message, MessageType, NodeType, PeerDescriptor, RouteMessageWrapper } from '../../src/proto/packages/dht/protos/DhtRpc'
+import { createWrappedClosestPeersRequest } from '../utils/utils'
+import { hexToBinary } from '@streamr/utils'
+import { PeerIDKey } from '../../src/helpers/PeerID'
+import { DhtNodeRpcRemote } from '../../src/dht/DhtNodeRpcRemote'
+import { RoutingRpcCommunicator } from '../../src/transport/RoutingRpcCommunicator'
+import { keyFromPeerDescriptor } from '../../src/helpers/peerIdFromPeerDescriptor'
+
+describe('RoutingSession', () => {
+
+    let session: RoutingSession
+    let connections: Map<PeerIDKey, DhtNodeRpcRemote>
+    let rpcCommunicator: RoutingRpcCommunicator
+
+    const mockPeerDescriptor1: PeerDescriptor = {
+        nodeId: hexToBinary('eee1'),
+        type: NodeType.NODEJS
+    }
+
+    const mockPeerDescriptor2 = {
+        nodeId: hexToBinary('eee2'),
+        type: NodeType.NODEJS
+    }
+
+    const rpcWrapper = createWrappedClosestPeersRequest(mockPeerDescriptor1)
+    const message: Message = {
+        serviceId: 'unknown',
+        messageId: v4(),
+        messageType: MessageType.RPC,
+        body: {
+            oneofKind: 'rpcMessage',
+            rpcMessage: rpcWrapper
+        },
+        sourceDescriptor: mockPeerDescriptor1,
+        targetDescriptor: mockPeerDescriptor2
+    }
+    const routedMessage: RouteMessageWrapper = {
+        message,
+        requestId: 'REQ',
+        routingPath: [],
+        reachableThrough: [],
+        destinationPeer: mockPeerDescriptor1,
+        sourcePeer: mockPeerDescriptor2
+    }
+
+    const createMockDhtNodeRpcRemote = (destination: PeerDescriptor): DhtNodeRpcRemote => {
+        return new DhtNodeRpcRemote(mockPeerDescriptor1, destination, {} as any, 'router')
+    }
+
+    beforeEach(() => {
+        rpcCommunicator = new RoutingRpcCommunicator('mock', async () => {})
+        connections = new Map()
+        session = new RoutingSession(rpcCommunicator, mockPeerDescriptor1, routedMessage, connections, 2)
+    })
+
+    afterEach(() => {
+        rpcCommunicator.stop()
+        session.stop()
+    })
+
+    it('findMoreContacts', () => {
+        connections.set(keyFromPeerDescriptor(mockPeerDescriptor2), createMockDhtNodeRpcRemote(mockPeerDescriptor2))
+        const contacts = session.updateAndGetRoutablePeers()
+        expect(contacts.length).toBe(1)
+    })
+
+    it('findMoreContacts peer disconnects', () => {
+        connections.set(keyFromPeerDescriptor(mockPeerDescriptor2), createMockDhtNodeRpcRemote(mockPeerDescriptor2))
+        expect(session.updateAndGetRoutablePeers().length).toBe(1)
+        connections.delete(keyFromPeerDescriptor(mockPeerDescriptor2))
+        expect(session.updateAndGetRoutablePeers().length).toBe(0)
+    })
+
+})

package/test/unit/SortedContactList.test.ts

@@ -1,8 +1,8 @@
 import { SortedContactList } from '../../src/dht/contact/SortedContactList'
 import { PeerID } from '../../src/helpers/PeerID'
 
-const createItem = (kademliaId: Uint8Array): { getPeerId: () => PeerID } => {
-    return { getPeerId: () => PeerID.fromValue(kademliaId) }
+const createItem = (nodeId: Uint8Array): { getPeerId: () => PeerID } => {
+    return { getPeerId: () => PeerID.fromValue(nodeId) }
 }
 
 describe('SortedContactList', () => {

package/test/unit/WebsocketConnector.test.ts

@@ -6,7 +6,7 @@ import { MockTransport } from '../utils/mock/Transport'
 
 const createMockPeerDescriptor = (nodeType: NodeType, websocket?: ConnectivityMethod): PeerDescriptor => {
     return {
-        kademliaId: crypto.randomBytes(10),
+        nodeId: crypto.randomBytes(10),
         type: nodeType,
         websocket
     }

package/test/unit/connectivityRequestHandler.test.ts

@@ -0,0 +1,71 @@
+import { waitForCondition } from '@streamr/utils'
+import { EventEmitter } from 'eventemitter3'
+import { once } from 'events'
+import { Server as HttpServer, createServer as createHttpServer } from 'http'
+import { server as WsServer } from 'websocket'
+import { CONNECTIVITY_CHECKER_SERVICE_ID } from '../../src/connection/connectivityChecker'
+import { attachConnectivityRequestHandler } from '../../src/connection/connectivityRequestHandler'
+import { Message, MessageType } from '../../src/proto/packages/dht/protos/DhtRpc'
+
+const HOST = '127.0.0.1'
+const PORT = 15001
+
+describe('connectivityRequestHandler', () => {
+
+    let httpServer: HttpServer
+    let wsServer: WsServer
+
+    beforeAll(async () => {
+        httpServer = createHttpServer()
+        wsServer = new WsServer({
+            httpServer,
+            autoAcceptConnections: true
+        })
+        httpServer.listen(PORT)
+        await once(httpServer, 'listening')
+    })
+
+    afterAll(async () => {
+        wsServer.shutDown()
+        httpServer.close()
+        await once(httpServer, 'close')
+    })
+
+    it('happy path', async () => {
+        const connection: any = new EventEmitter()
+        connection.send = jest.fn()
+
+        attachConnectivityRequestHandler(connection as any)
+        const request: Message = {
+            serviceId: CONNECTIVITY_CHECKER_SERVICE_ID,
+            messageType: MessageType.CONNECTIVITY_REQUEST,
+            messageId: 'mock-message-id',
+            body: {
+                oneofKind: 'connectivityRequest',
+                connectivityRequest: { port: PORT, host: HOST, tls: false, selfSigned: false }
+            }
+        }
+        connection.emit('data', Message.toBinary(request))
+
+        await waitForCondition(() => connection.send.mock.calls.length > 0)
+
+        const receivedMessage = Message.fromBinary(connection.send.mock.calls[0][0])
+        expect(receivedMessage).toEqual({
+            body: {
+                connectivityResponse: {
+                    host: HOST,
+                    natType: 'open_internet',
+                    websocket: {
+                        host: HOST,
+                        port: PORT,
+                        tls: false
+                    },
+                },
+                oneofKind: 'connectivityResponse'
+            },
+            messageId: expect.any(String),
+            messageType: MessageType.CONNECTIVITY_RESPONSE,
+            serviceId: 'system/connectivity-checker'
+        })
+    })
+})

package/test/utils/mock/Router.ts

@@ -30,7 +30,7 @@ export class MockRouter implements IRouter {
 
     // eslint-disable-next-line class-methods-use-this
     send(): Promise<void> {
-        throw Error('Not implemented')
+        throw new Error('Not implemented')
     }
 
     // eslint-disable-next-line class-methods-use-this

package/test/utils/utils.ts

@@ -2,7 +2,6 @@ import { DhtNode } from '../../src/dht/DhtNode'
 import {
     ClosestPeersRequest,
     ClosestPeersResponse,
-    MigrateDataResponse,
     NodeType,
     PeerDescriptor,
     PingRequest,
@@ -13,7 +12,7 @@ import {
     StoreDataResponse,
     WebsocketConnectionResponse,
     FindRequest, 
-    DeleteDataResponse
+    FindAction
 } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { RpcMessage } from '../../src/proto/packages/proto-rpc/protos/ProtoRpc'
 import { PeerID } from '../../src/helpers/PeerID'
@@ -31,11 +30,19 @@ import { Empty } from '../../src/proto/google/protobuf/empty'
 import { Any } from '../../src/proto/google/protobuf/any'
 import { wait, waitForCondition } from '@streamr/utils'
 import { SimulatorTransport } from '../../src/connection/simulator/SimulatorTransport'
+import { createRandomNodeId } from '../../src/helpers/nodeId'
 
 export const generateId = (stringId: string): Uint8Array => {
     return PeerID.fromString(stringId).value
 }
 
+export const createMockPeerDescriptor = (): PeerDescriptor => {
+    return {
+        nodeId: createRandomNodeId(),
+        type: NodeType.NODEJS,
+    }  
+}
+
 export const createMockConnectionDhtNode = async (
     stringId: string,
     simulator: Simulator,
@@ -51,7 +58,7 @@ export const createMockConnectionDhtNode = async (
         id = PeerID.fromString(stringId)
     }
     const peerDescriptor: PeerDescriptor = {
-        kademliaId: id.value,
+        nodeId: id.value,
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }
@@ -83,7 +90,7 @@ export const createMockConnectionLayer1Node = async (
 ): Promise<DhtNode> => {
     const id = PeerID.fromString(stringId)
     const descriptor: PeerDescriptor = {
-        kademliaId: id.value,
+        nodeId: id.value,
         type: NodeType.NODEJS,
     }
     const node = new DhtNode({
@@ -100,7 +107,7 @@ export const createWrappedClosestPeersRequest = (
 ): RpcMessage => {
 
     const routedMessage: ClosestPeersRequest = {
-        kademliaId: sourceDescriptor.kademliaId,
+        nodeId: sourceDescriptor.nodeId,
         requestId: v4()
     }
     const rpcWrapper: RpcMessage = {
@@ -115,10 +122,10 @@ export const createWrappedClosestPeersRequest = (
 }
 
 export const createFindRequest = (
-    fetchData: boolean
+    action: FindAction
 ): FindRequest => {
     const request: FindRequest = {
-        fetchData,
+        action,
         sessionId: v4()
     }
     return request
@@ -170,15 +177,13 @@ interface IRouterRpcWithError extends IRouterRpc {
 export const mockRouterRpc: IRouterRpcWithError = {
     async routeMessage(routed: RouteMessageWrapper): Promise<RouteMessageAck> {
         const response: RouteMessageAck = {
-            requestId: routed.requestId,
-            error: ''
+            requestId: routed.requestId
         }
         return response
     },
     async forwardMessage(routed: RouteMessageWrapper): Promise<RouteMessageAck> {
         const response: RouteMessageAck = {
-            requestId: routed.requestId,
-            error: ''
+            requestId: routed.requestId
         }
         return response
     },
@@ -206,11 +211,8 @@ export const mockStoreRpc: IStoreRpcWithError = {
             error: 'Mock'
         }
     },
-    async migrateData(): Promise<MigrateDataResponse> {
-        return MigrateDataResponse.create()
-    },
-    async deleteData(): Promise<DeleteDataResponse> {
-        return DeleteDataResponse.create()
+    async replicateData(): Promise<Empty> {
+        return {}
     }
 }
 
@@ -225,19 +227,19 @@ export const mockWebsocketConnectorRpc: IWebsocketConnectorRpc = {
 
 export const getMockPeers = (): PeerDescriptor[] => {
     const n1: PeerDescriptor = {
-        kademliaId: generateId('Neighbor1'),
+        nodeId: generateId('Neighbor1'),
         type: NodeType.NODEJS,
     }
     const n2: PeerDescriptor = {
-        kademliaId: generateId('Neighbor2'),
+        nodeId: generateId('Neighbor2'),
         type: NodeType.NODEJS,
     }
     const n3: PeerDescriptor = {
-        kademliaId: generateId('Neighbor3'),
+        nodeId: generateId('Neighbor3'),
         type: NodeType.NODEJS,
     }
     const n4: PeerDescriptor = {
-        kademliaId: generateId('Neighbor4'),
+        nodeId: generateId('Neighbor4'),
         type: NodeType.NODEJS,
     }
     return [
@@ -278,9 +280,9 @@ async function waitReadyForTesting(connectionManager: ConnectionManager, limit:
     } catch (err) {
         if (connectionManager.getNumberOfLocalLockedConnections() > 0
             && connectionManager.getNumberOfRemoteLockedConnections() > 0) {
-            throw Error('Connections are still locked')
+            throw new Error('Connections are still locked')
         } else if (connectionManager.getAllConnectionPeerDescriptors().length > limit) {
-            throw Error(`ConnectionManager has more than ${limit}`)
+            throw new Error(`ConnectionManager has more than ${limit}`)
         }
     }
 }

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

@@ -1,17 +0,0 @@
-import { ConnectivityResponse, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
-import { ServerWebsocket } from './websocket/ServerWebsocket';
-export declare class ConnectivityChecker {
-    private static readonly CONNECTIVITY_CHECKER_SERVICE_ID;
-    private static readonly CONNECTIVITY_CHECKER_TIMEOUT;
-    private destroyed;
-    private readonly websocketPort;
-    private readonly tls;
-    private host?;
-    constructor(websocketPort: number, tls: boolean, host?: string);
-    sendConnectivityRequest(entryPoint: PeerDescriptor, selfSigned: boolean): Promise<ConnectivityResponse>;
-    setHost(hostName: string): void;
-    listenToIncomingConnectivityRequests(connectionToListenTo: ServerWebsocket): void;
-    private handleIncomingConnectivityRequest;
-    private connectAsync;
-    destroy(): void;
-}

package/dist/src/connection/ConnectivityChecker.js

@@ -1,208 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-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 uuid_1 = require("uuid");
-const ConnectionManager_1 = require("./ConnectionManager");
-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
-// ConnectivityRequest messages. 
-class ConnectivityChecker {
-    constructor(websocketPort, tls, host) {
-        this.destroyed = false;
-        this.websocketPort = websocketPort;
-        this.tls = tls;
-        this.host = host;
-    }
-    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({
-                url,
-                selfSigned
-            });
-        }
-        catch (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, selfSigned };
-        const msg = {
-            serviceId: ConnectivityChecker.CONNECTIVITY_CHECKER_SERVICE_ID,
-            messageType: DhtRpc_1.MessageType.CONNECTIVITY_REQUEST, messageId: (0, uuid_1.v4)(),
-            body: {
-                oneofKind: 'connectivityRequest',
-                connectivityRequest: connectivityRequestMessage
-            }
-        };
-        const responseAwaiter = () => {
-            return new Promise((resolve, reject) => {
-                const timeoutId = setTimeout(() => {
-                    outgoingConnection.close(false);
-                    reject(new Err.ConnectivityResponseTimeout('timeout'));
-                }, ConnectivityChecker.CONNECTIVITY_CHECKER_TIMEOUT);
-                const listener = (bytes) => {
-                    outgoingConnection.close(false);
-                    try {
-                        const message = DhtRpc_1.Message.fromBinary(bytes);
-                        if (message.body.oneofKind === 'connectivityResponse') {
-                            logger.trace('ConnectivityResponse received: ' + JSON.stringify(DhtRpc_1.Message.toJson(message)));
-                            const connectivityResponseMessage = message.body.connectivityResponse;
-                            outgoingConnection.off('data', listener);
-                            clearTimeout(timeoutId);
-                            resolve(connectivityResponseMessage);
-                        }
-                        else {
-                            return;
-                        }
-                    }
-                    catch (err) {
-                        logger.trace(`Could not parse message: ${err}`);
-                    }
-                };
-                outgoingConnection.on('data', listener);
-            });
-        };
-        try {
-            const retPromise = responseAwaiter();
-            outgoingConnection.send(DhtRpc_1.Message.toBinary(msg));
-            logger.trace('ConnectivityRequest sent: ' + JSON.stringify(DhtRpc_1.Message.toJson(msg)));
-            return await retPromise;
-        }
-        catch (e) {
-            logger.error('error getting connectivityresponse');
-            throw e;
-        }
-    }
-    setHost(hostName) {
-        this.host = hostName;
-    }
-    listenToIncomingConnectivityRequests(connectionToListenTo) {
-        connectionToListenTo.on('data', (data) => {
-            logger.trace('server received data');
-            try {
-                const message = DhtRpc_1.Message.fromBinary(data);
-                if (message.body.oneofKind === 'connectivityRequest') {
-                    logger.trace('ConnectivityRequest received: ' + JSON.stringify(DhtRpc_1.Message.toJson(message)));
-                    this.handleIncomingConnectivityRequest(connectionToListenTo, message.body.connectivityRequest).then(() => {
-                        logger.trace('handleIncomingConnectivityRequest ok');
-                        return;
-                    }).catch((e) => {
-                        logger.error('handleIncomingConnectivityRequest' + e);
-                    });
-                }
-            }
-            catch (err) {
-                logger.trace(`Could not parse message: ${err}`);
-            }
-        });
-    }
-    async handleIncomingConnectivityRequest(connection, connectivityRequest) {
-        if (this.destroyed) {
-            return;
-        }
-        let outgoingConnection;
-        let connectivityResponseMessage;
-        const host = connectivityRequest.host ?? connection.getRemoteAddress();
-        try {
-            const wsServerInfo = {
-                host,
-                port: connectivityRequest.port,
-                tls: connectivityRequest.tls
-            };
-            const url = (0, WebsocketConnector_1.connectivityMethodToWebsocketUrl)(wsServerInfo, 'connectivityProbe');
-            logger.trace(`Attempting Connectivity Check to ${url}`);
-            outgoingConnection = await this.connectAsync({
-                url,
-                selfSigned: connectivityRequest.selfSigned
-            });
-        }
-        catch (err) {
-            logger.debug('error', { err });
-            connectivityResponseMessage = {
-                host,
-                natType: ConnectionManager_1.NatType.UNKNOWN
-            };
-        }
-        if (outgoingConnection) {
-            outgoingConnection.close(false);
-            logger.trace('Connectivity test produced positive result, communicating reply to the requester ' + host + ':' + connectivityRequest.port);
-            connectivityResponseMessage = {
-                host,
-                natType: ConnectionManager_1.NatType.OPEN_INTERNET,
-                websocket: { host, port: connectivityRequest.port, tls: connectivityRequest.tls }
-            };
-        }
-        const msg = {
-            serviceId: ConnectivityChecker.CONNECTIVITY_CHECKER_SERVICE_ID,
-            messageType: DhtRpc_1.MessageType.CONNECTIVITY_RESPONSE, messageId: (0, uuid_1.v4)(),
-            body: {
-                oneofKind: 'connectivityResponse',
-                connectivityResponse: connectivityResponseMessage
-            }
-        };
-        connection.send(DhtRpc_1.Message.toBinary(msg));
-        logger.trace('ConnectivityResponse sent: ' + JSON.stringify(DhtRpc_1.Message.toJson(msg)));
-    }
-    // eslint-disable-next-line class-methods-use-this
-    async connectAsync({ url, selfSigned, timeoutMs = 1000, }) {
-        const socket = new ClientWebsocket_1.ClientWebsocket();
-        let result;
-        try {
-            result = await (0, utils_1.runAndRaceEvents3)([
-                () => { socket.connect(url, selfSigned); }
-            ], socket, ['connected', 'error'], timeoutMs);
-        }
-        catch (e) {
-            throw (new Err.ConnectionFailed('WebSocket connection timed out'));
-        }
-        if (result.winnerName === 'error') {
-            throw (new Err.ConnectionFailed('Could not open WebSocket connection'));
-        }
-        return socket;
-    }
-    destroy() {
-        this.destroyed = true;
-    }
-}
-exports.ConnectivityChecker = ConnectivityChecker;
-ConnectivityChecker.CONNECTIVITY_CHECKER_SERVICE_ID = 'system/connectivity-checker';
-ConnectivityChecker.CONNECTIVITY_CHECKER_TIMEOUT = 5000;
-//# sourceMappingURL=ConnectivityChecker.js.map

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

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

package/dist/src/dht/contact/Remote.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Remote.js","sourceRoot":"","sources":["../../../../src/dht/contact/Remote.ts"],"names":[],"mappings":";;;AAIA,8DAA6D;AAC7D,6DAAmE;AAEnE,4DAA4D;AAC5D,MAAM,wBAAwB,GAAG,IAAI,CAAA;AACrC,uGAAuG;AACvG,kDAAkD;AAClD,MAAM,wBAAwB,GAAG,IAAI,CAAA;AACrC,sFAAsF;AACtF,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B,2CAA2C;AAC9B,QAAA,2BAA2B,GAAG,IAAI,CAAA;AAE/C,MAAM,aAAa,GAAG,CAAC,mBAAmC,EAAE,oBAAoC,EAAU,EAAE;IACxG,MAAM,cAAc,GAAG,IAAA,qCAAsB,EAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAA;IACxF,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE;QACpD,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE;QAC3D,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,MAAM,EAAE;QACjD,OAAO,cAAc,CAAA;KACxB;IACD,OAAO,cAAc,CAAA;AACzB,CAAC,CAAA;AAED,MAAsB,MAAM;IAOxB,YACI,mBAAmC,EACnC,oBAAoC,EACpC,SAAoB,EACpB,MAAyB,EACzB,UAAmB;QAEnB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAChC,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;IAED,sBAAsB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACnC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IAED,iBAAiB,CAAC,IAAmE;QACjF,OAAO;YACH,gBAAgB,EAAE,IAAI,CAAC,mBAAmB;YAC1C,gBAAgB,EAAE,IAAI,CAAC,oBAAoB;YAC3C,OAAO,EAAE,IAAI,CAAC,UAAU,IAAI,aAAa,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,oBAAoB,CAAC;YAC9F,GAAG,IAAI;SACV,CAAA;IACL,CAAC;CACJ;AA7CD,wBA6CC"}

package/dist/src/helpers/kademliaId.d.ts

@@ -1 +0,0 @@
-export declare const createRandomKademliaId: () => Uint8Array;

package/dist/src/helpers/kademliaId.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"kademliaId.js","sourceRoot":"","sources":["../../../src/helpers/kademliaId.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA2B;AAE3B,wDAAwD;AACxD,MAAM,2BAA2B,GAAG,EAAE,CAAA;AAE/B,MAAM,sBAAsB,GAAG,GAAe,EAAE;IACnD,OAAO,gBAAM,CAAC,WAAW,CAAC,2BAA2B,CAAC,CAAA;AAC1D,CAAC,CAAA;AAFY,QAAA,sBAAsB,0BAElC"}