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

package/dist/src/dht/store/StoreRpcLocal.d.ts

@@ -2,28 +2,30 @@ import { DeleteDataRequest, DeleteDataResponse, MigrateDataRequest, MigrateDataR
 import { Any } from '../../proto/google/protobuf/any';
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
-import { IRecursiveFinder } from '../find/RecursiveFinder';
+import { IFinder } from '../find/Finder';
 import { LocalDataStore } from './LocalDataStore';
 import { IStoreRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
 import EventEmitter from 'eventemitter3';
 import { Events } from '../DhtNode';
-import { RemoteDhtNode } from '../RemoteDhtNode';
+import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
+import { ServiceID } from '../../types/ServiceID';
 interface DataStoreConfig {
     rpcCommunicator: RoutingRpcCommunicator;
-    recursiveFinder: IRecursiveFinder;
-    ownPeerDescriptor: PeerDescriptor;
+    finder: IFinder;
+    localPeerDescriptor: PeerDescriptor;
     localDataStore: LocalDataStore;
-    serviceId: string;
+    serviceId: ServiceID;
     maxTtl: number;
     highestTtl: number;
     redundancyFactor: number;
     dhtNodeEmitter: EventEmitter<Events>;
-    getNodesClosestToIdFromBucket: (id: Uint8Array, n?: number) => RemoteDhtNode[];
+    getNodesClosestToIdFromBucket: (id: Uint8Array, n?: number) => DhtNodeRpcRemote[];
+    rpcRequestTimeout?: number;
 }
 export declare class StoreRpcLocal implements IStoreRpc {
     private readonly rpcCommunicator;
-    private readonly recursiveFinder;
-    private readonly ownPeerDescriptor;
+    private readonly finder;
+    private readonly localPeerDescriptor;
     private readonly localDataStore;
     private readonly serviceId;
     private readonly maxTtl;
@@ -31,6 +33,7 @@ export declare class StoreRpcLocal implements IStoreRpc {
     private readonly redundancyFactor;
     private readonly dhtNodeEmitter;
     private readonly getNodesClosestToIdFromBucket;
+    private readonly rpcRequestTimeout?;
     constructor(config: DataStoreConfig);
     private shouldMigrateDataToNewNode;
     private migrateDataToContact;

package/dist/src/dht/store/StoreRpcLocal.js

@@ -15,14 +15,15 @@ const logger = new utils_1.Logger(module);
 class StoreRpcLocal {
     constructor(config) {
         this.rpcCommunicator = config.rpcCommunicator;
-        this.recursiveFinder = config.recursiveFinder;
-        this.ownPeerDescriptor = config.ownPeerDescriptor;
+        this.finder = config.finder;
+        this.localPeerDescriptor = config.localPeerDescriptor;
         this.localDataStore = config.localDataStore;
         this.serviceId = config.serviceId;
         this.maxTtl = config.maxTtl;
         this.highestTtl = config.highestTtl;
         this.redundancyFactor = config.redundancyFactor;
         this.dhtNodeEmitter = config.dhtNodeEmitter;
+        this.rpcRequestTimeout = config.rpcRequestTimeout;
         this.getNodesClosestToIdFromBucket = config.getNodesClosestToIdFromBucket;
         this.rpcCommunicator.registerRpcMethod(DhtRpc_1.StoreDataRequest, DhtRpc_1.StoreDataResponse, 'storeData', (request, context) => this.storeData(request, context));
         this.rpcCommunicator.registerRpcMethod(DhtRpc_1.MigrateDataRequest, DhtRpc_1.MigrateDataResponse, 'migrateData', (request, context) => this.migrateData(request, context));
@@ -40,16 +41,16 @@ class StoreRpcLocal {
     shouldMigrateDataToNewNode(dataEntry, newNode) {
         const dataId = PeerID_1.PeerID.fromValue(dataEntry.kademliaId);
         const newNodeId = PeerID_1.PeerID.fromValue(newNode.kademliaId);
-        const ownPeerId = PeerID_1.PeerID.fromValue(this.ownPeerDescriptor.kademliaId);
+        const localPeerId = PeerID_1.PeerID.fromValue(this.localPeerDescriptor.kademliaId);
         const closestToData = this.getNodesClosestToIdFromBucket(dataEntry.kademliaId, 10);
         const sortedList = new SortedContactList_1.SortedContactList(dataId, 20, undefined, true);
-        sortedList.addContact(new Contact_1.Contact(this.ownPeerDescriptor));
+        sortedList.addContact(new Contact_1.Contact(this.localPeerDescriptor));
         closestToData.forEach((con) => {
             if (!newNodeId.equals(PeerID_1.PeerID.fromValue(con.getPeerDescriptor().kademliaId))) {
                 sortedList.addContact(new Contact_1.Contact(con.getPeerDescriptor()));
             }
         });
-        if (!sortedList.getAllContacts()[0].getPeerId().equals(ownPeerId)) {
+        if (!sortedList.getAllContacts()[0].getPeerId().equals(localPeerId)) {
             // If we are not the closes node to the data, do not migrate
             return false;
         }
@@ -74,7 +75,7 @@ class StoreRpcLocal {
         }
     }
     async migrateDataToContact(dataEntry, contact, doNotConnect = false) {
-        const rpcRemote = new StoreRpcRemote_1.StoreRpcRemote(this.ownPeerDescriptor, contact, this.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.StoreRpcClient(this.rpcCommunicator.getRpcClientTransport())));
+        const rpcRemote = new StoreRpcRemote_1.StoreRpcRemote(this.localPeerDescriptor, contact, this.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.StoreRpcClient(this.rpcCommunicator.getRpcClientTransport())), this.rpcRequestTimeout);
         try {
             const response = await rpcRemote.migrateData({ dataEntry }, doNotConnect);
             if (response.error) {
@@ -87,16 +88,16 @@ class StoreRpcLocal {
     }
     async storeDataToDht(key, data) {
         logger.debug(`Storing data to DHT ${this.serviceId}`);
-        const result = await this.recursiveFinder.startRecursiveFind(key);
+        const result = await this.finder.startFind(key);
         const closestNodes = result.closestNodes;
         const successfulNodes = [];
         const ttl = this.highestTtl; // ToDo: make TTL decrease according to some nice curve
         const storerTime = timestamp_1.Timestamp.now();
         for (let i = 0; i < closestNodes.length && successfulNodes.length < this.redundancyFactor; i++) {
-            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, closestNodes[i])) {
+            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, closestNodes[i])) {
                 this.localDataStore.storeEntry({
                     kademliaId: key,
-                    storer: this.ownPeerDescriptor,
+                    storer: this.localPeerDescriptor,
                     ttl,
                     storedAt: timestamp_1.Timestamp.now(),
                     data,
@@ -107,7 +108,7 @@ class StoreRpcLocal {
                 successfulNodes.push(closestNodes[i]);
                 continue;
             }
-            const rpcRemote = new StoreRpcRemote_1.StoreRpcRemote(this.ownPeerDescriptor, closestNodes[i], this.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.StoreRpcClient(this.rpcCommunicator.getRpcClientTransport())));
+            const rpcRemote = new StoreRpcRemote_1.StoreRpcRemote(this.localPeerDescriptor, closestNodes[i], this.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.StoreRpcClient(this.rpcCommunicator.getRpcClientTransport())), this.rpcRequestTimeout);
             try {
                 const response = await rpcRemote.storeData({ kademliaId: key, data, ttl, storerTime });
                 if (!response.error) {
@@ -125,32 +126,32 @@ class StoreRpcLocal {
         return successfulNodes;
     }
     selfIsOneOfClosestPeers(dataId) {
-        const ownPeerId = PeerID_1.PeerID.fromValue(this.ownPeerDescriptor.kademliaId);
+        const localPeerId = PeerID_1.PeerID.fromValue(this.localPeerDescriptor.kademliaId);
         const closestPeers = this.getNodesClosestToIdFromBucket(dataId, this.redundancyFactor);
-        const sortedList = new SortedContactList_1.SortedContactList(ownPeerId, this.redundancyFactor, undefined, true);
-        sortedList.addContact(new Contact_1.Contact(this.ownPeerDescriptor));
+        const sortedList = new SortedContactList_1.SortedContactList(localPeerId, this.redundancyFactor, undefined, true);
+        sortedList.addContact(new Contact_1.Contact(this.localPeerDescriptor));
         closestPeers.forEach((con) => sortedList.addContact(new Contact_1.Contact(con.getPeerDescriptor())));
-        return sortedList.getClosestContacts().some((node) => node.getPeerId().equals(ownPeerId));
+        return sortedList.getClosestContacts().some((node) => node.getPeerId().equals(localPeerId));
     }
     async deleteDataFromDht(key) {
         logger.debug(`Deleting data from DHT ${this.serviceId}`);
-        const result = await this.recursiveFinder.startRecursiveFind(key);
+        const result = await this.finder.startFind(key);
         const closestNodes = result.closestNodes;
         const successfulNodes = [];
         for (let i = 0; i < closestNodes.length && successfulNodes.length < this.redundancyFactor; i++) {
-            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, closestNodes[i])) {
-                this.localDataStore.markAsDeleted(key, (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.ownPeerDescriptor));
+            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, closestNodes[i])) {
+                this.localDataStore.markAsDeleted(key, (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.localPeerDescriptor));
                 successfulNodes.push(closestNodes[i]);
                 continue;
             }
-            const rpcRemote = new StoreRpcRemote_1.StoreRpcRemote(this.ownPeerDescriptor, closestNodes[i], this.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.StoreRpcClient(this.rpcCommunicator.getRpcClientTransport())));
+            const rpcRemote = new StoreRpcRemote_1.StoreRpcRemote(this.localPeerDescriptor, closestNodes[i], this.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.StoreRpcClient(this.rpcCommunicator.getRpcClientTransport())), this.rpcRequestTimeout);
             try {
                 const response = await rpcRemote.deleteData({ kademliaId: key });
                 if (response.deleted) {
                     logger.trace('remote.deleteData() returned success');
                 }
                 else {
-                    logger.trace('could not delete data from ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(closestNodes[i]));
+                    logger.trace('could not delete data from ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(closestNodes[i]));
                 }
                 successfulNodes.push(closestNodes[i]);
             }
@@ -203,21 +204,21 @@ class StoreRpcLocal {
     }
     migrateDataToNeighborsIfNeeded(incomingPeer, dataEntry) {
         // sort own contact list according to data id
-        const ownPeerId = PeerID_1.PeerID.fromValue(this.ownPeerDescriptor.kademliaId);
+        const localPeerId = PeerID_1.PeerID.fromValue(this.localPeerDescriptor.kademliaId);
         const dataId = PeerID_1.PeerID.fromValue(dataEntry.kademliaId);
         const incomingPeerId = PeerID_1.PeerID.fromValue(incomingPeer.kademliaId);
         const closestToData = this.getNodesClosestToIdFromBucket(dataEntry.kademliaId, 10);
         const sortedList = new SortedContactList_1.SortedContactList(dataId, this.redundancyFactor, undefined, true);
-        sortedList.addContact(new Contact_1.Contact(this.ownPeerDescriptor));
+        sortedList.addContact(new Contact_1.Contact(this.localPeerDescriptor));
         closestToData.forEach((con) => {
             sortedList.addContact(new Contact_1.Contact(con.getPeerDescriptor()));
         });
-        if (!sortedList.getAllContacts()[0].getPeerId().equals(ownPeerId)) {
+        if (!sortedList.getAllContacts()[0].getPeerId().equals(localPeerId)) {
             // If we are not the closest node to the data, migrate only to the 
             // closest one to the data
             const contact = sortedList.getAllContacts()[0];
             const contactPeerId = PeerID_1.PeerID.fromValue(contact.getPeerDescriptor().kademliaId);
-            if (!incomingPeerId.equals(contactPeerId) && !ownPeerId.equals(contactPeerId)) {
+            if (!incomingPeerId.equals(contactPeerId) && !localPeerId.equals(contactPeerId)) {
                 setImmediate(async () => {
                     try {
                         await this.migrateDataToContact(dataEntry, contact.getPeerDescriptor());
@@ -233,8 +234,8 @@ class StoreRpcLocal {
             // if we are the closest to the data, migrate to all storageRedundancyFactor nearest
             sortedList.getAllContacts().forEach((contact) => {
                 const contactPeerId = PeerID_1.PeerID.fromValue(contact.getPeerDescriptor().kademliaId);
-                if (!incomingPeerId.equals(contactPeerId) && !ownPeerId.equals(contactPeerId)) {
-                    if (!incomingPeerId.equals(contactPeerId) && !ownPeerId.equals(contactPeerId)) {
+                if (!incomingPeerId.equals(contactPeerId) && !localPeerId.equals(contactPeerId)) {
+                    if (!incomingPeerId.equals(contactPeerId) && !localPeerId.equals(contactPeerId)) {
                         setImmediate(async () => {
                             try {
                                 await this.migrateDataToContact(dataEntry, contact.getPeerDescriptor());

package/dist/src/dht/store/StoreRpcLocal.js.map

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

package/dist/src/dht/store/StoreRpcRemote.js

@@ -5,32 +5,28 @@ const Remote_1 = require("../contact/Remote");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 class StoreRpcRemote extends Remote_1.Remote {
     async storeData(request) {
-        const options = this.formDhtRpcOptions({
-            timeout: 10000
-        });
+        const options = this.formDhtRpcOptions();
         try {
             return await this.getClient().storeData(request, options);
         }
         catch (err) {
-            const to = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getPeerDescriptor());
-            const from = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getLocalPeerDescriptor());
+            const to = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor());
+            const from = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor());
             throw Error(`Could not store data to ${to} from ${from} ${err}`);
         }
     }
     async deleteData(request) {
-        const options = this.formDhtRpcOptions({
-            timeout: 10000
-        });
+        const options = this.formDhtRpcOptions();
         try {
             return await this.getClient().deleteData(request, options);
         }
         catch (err) {
-            throw Error(`Could not call delete data to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.getPeerDescriptor())} ${err}`);
+            throw Error(`Could not call delete data to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())} ${err}`);
         }
     }
     async migrateData(request, doNotConnect = false) {
         const options = this.formDhtRpcOptions({
-            timeout: 10000,
+            timeout: Remote_1.EXISTING_CONNECTION_TIMEOUT,
             doNotConnect
         });
         return this.getClient().migrateData(request, options);

package/dist/src/dht/store/StoreRpcRemote.js.map

@@ -1 +1 @@
-{"version":3,"file":"StoreRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/store/StoreRpcRemote.ts"],"names":[],"mappings":";;;AAAA,8CAA0C;AAU1C,qFAA8E;AAE9E,MAAa,cAAe,SAAQ,eAAuB;IAEvD,KAAK,CAAC,SAAS,CAAC,OAAyB;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;SAC5D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,EAAE,GAAG,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YAC1D,MAAM,IAAI,GAAG,IAAA,gDAAqB,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAA;YACjE,MAAM,KAAK,CACP,2BAA2B,EAAE,SAAS,IAAI,IAAI,GAAG,EAAE,CACtD,CAAA;SACJ;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAA0B;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;SAC7D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,KAAK,CACP,iCAAiC,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,GAAG,EAAE,CAC5F,CAAA;SACJ;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAA2B,EAAE,eAAwB,KAAK;QACxE,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;YACd,YAAY;SACf,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACzD,CAAC;CAEJ;AAtCD,wCAsCC"}
+{"version":3,"file":"StoreRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/store/StoreRpcRemote.ts"],"names":[],"mappings":";;;AAAA,8CAAuE;AAUvE,qFAAoF;AAEpF,MAAa,cAAe,SAAQ,eAAuB;IAEvD,KAAK,CAAC,SAAS,CAAC,OAAyB;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;SAC5D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,EAAE,GAAG,IAAA,sDAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YAChE,MAAM,IAAI,GAAG,IAAA,sDAA2B,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAA;YACvE,MAAM,KAAK,CACP,2BAA2B,EAAE,SAAS,IAAI,IAAI,GAAG,EAAE,CACtD,CAAA;SACJ;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAA0B;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;SAC7D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,KAAK,CACP,iCAAiC,IAAA,sDAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,GAAG,EAAE,CAClG,CAAA;SACJ;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAA2B,EAAE,eAAwB,KAAK;QACxE,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,oCAA2B;YACpC,YAAY;SACf,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACzD,CAAC;CAEJ;AAlCD,wCAkCC"}

package/dist/src/exports.d.ts

@@ -1,13 +1,19 @@
 export { DhtNode, DhtNodeEvents, DhtNodeOptions } from './dht/DhtNode';
 export { ListeningRpcCommunicator } from './transport/ListeningRpcCommunicator';
-export { Simulator, LatencyType } from './connection/Simulator/Simulator';
-export { SimulatorTransport } from './connection/Simulator/SimulatorTransport';
-export { getRandomRegion, getRegionDelayMatrix } from './connection/Simulator/pings';
+export { RoutingRpcCommunicator } from './transport/RoutingRpcCommunicator';
+export { Simulator, LatencyType } from './connection/simulator/Simulator';
+export { SimulatorTransport } from './connection/simulator/SimulatorTransport';
+export { getRandomRegion, getRegionDelayMatrix } from './connection/simulator/pings';
 export { PeerDescriptor, Message, NodeType, DataEntry } from './proto/packages/dht/protos/DhtRpc';
 export { ITransport } from './transport/ITransport';
 export { ConnectionManager, ConnectionLocker, PortRange, TlsCertificate } from './connection/ConnectionManager';
+export { DefaultConnectorFacade } from './connection/ConnectorFacade';
 export { DhtRpcOptions } from './rpc-protocol/DhtRpcOptions';
-export { Remote } from './dht/contact/Remote';
+export { Remote, EXISTING_CONNECTION_TIMEOUT } from './dht/contact/Remote';
 export { areEqualPeerDescriptors } from './helpers/peerIdFromPeerDescriptor';
-export { IceServer } from './connection/WebRTC/WebRtcConnectorRpcLocal';
+export { IceServer } from './connection/webrtc/WebrtcConnector';
 export { DhtCallContext } from './rpc-protocol/DhtCallContext';
+export { ClientWebsocket } from './connection/websocket/ClientWebsocket';
+export { ManagedConnection } from './connection/ManagedConnection';
+export { ConnectionType } from './connection/IConnection';
+export { PeerID } from './helpers/PeerID';

package/dist/src/exports.js

@@ -1,16 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DhtCallContext = exports.areEqualPeerDescriptors = exports.Remote = exports.ConnectionManager = exports.DataEntry = exports.NodeType = exports.Message = exports.PeerDescriptor = exports.getRegionDelayMatrix = exports.getRandomRegion = exports.SimulatorTransport = exports.LatencyType = exports.Simulator = exports.ListeningRpcCommunicator = exports.DhtNode = void 0;
+exports.PeerID = exports.ConnectionType = exports.ManagedConnection = exports.ClientWebsocket = exports.DhtCallContext = exports.areEqualPeerDescriptors = exports.EXISTING_CONNECTION_TIMEOUT = exports.Remote = exports.DefaultConnectorFacade = exports.ConnectionManager = exports.DataEntry = exports.NodeType = exports.Message = exports.PeerDescriptor = exports.getRegionDelayMatrix = exports.getRandomRegion = exports.SimulatorTransport = exports.LatencyType = exports.Simulator = exports.RoutingRpcCommunicator = exports.ListeningRpcCommunicator = exports.DhtNode = void 0;
 var DhtNode_1 = require("./dht/DhtNode");
 Object.defineProperty(exports, "DhtNode", { enumerable: true, get: function () { return DhtNode_1.DhtNode; } });
 var ListeningRpcCommunicator_1 = require("./transport/ListeningRpcCommunicator");
 Object.defineProperty(exports, "ListeningRpcCommunicator", { enumerable: true, get: function () { return ListeningRpcCommunicator_1.ListeningRpcCommunicator; } });
-var Simulator_1 = require("./connection/Simulator/Simulator");
+var RoutingRpcCommunicator_1 = require("./transport/RoutingRpcCommunicator");
+Object.defineProperty(exports, "RoutingRpcCommunicator", { enumerable: true, get: function () { return RoutingRpcCommunicator_1.RoutingRpcCommunicator; } });
+var Simulator_1 = require("./connection/simulator/Simulator");
 Object.defineProperty(exports, "Simulator", { enumerable: true, get: function () { return Simulator_1.Simulator; } });
 Object.defineProperty(exports, "LatencyType", { enumerable: true, get: function () { return Simulator_1.LatencyType; } });
-var SimulatorTransport_1 = require("./connection/Simulator/SimulatorTransport");
+var SimulatorTransport_1 = require("./connection/simulator/SimulatorTransport");
 Object.defineProperty(exports, "SimulatorTransport", { enumerable: true, get: function () { return SimulatorTransport_1.SimulatorTransport; } });
-var pings_1 = require("./connection/Simulator/pings");
+var pings_1 = require("./connection/simulator/pings");
 Object.defineProperty(exports, "getRandomRegion", { enumerable: true, get: function () { return pings_1.getRandomRegion; } });
 Object.defineProperty(exports, "getRegionDelayMatrix", { enumerable: true, get: function () { return pings_1.getRegionDelayMatrix; } });
 var DhtRpc_1 = require("./proto/packages/dht/protos/DhtRpc");
@@ -20,10 +22,21 @@ Object.defineProperty(exports, "NodeType", { enumerable: true, get: function ()
 Object.defineProperty(exports, "DataEntry", { enumerable: true, get: function () { return DhtRpc_1.DataEntry; } });
 var ConnectionManager_1 = require("./connection/ConnectionManager");
 Object.defineProperty(exports, "ConnectionManager", { enumerable: true, get: function () { return ConnectionManager_1.ConnectionManager; } });
+var ConnectorFacade_1 = require("./connection/ConnectorFacade");
+Object.defineProperty(exports, "DefaultConnectorFacade", { enumerable: true, get: function () { return ConnectorFacade_1.DefaultConnectorFacade; } });
 var Remote_1 = require("./dht/contact/Remote");
 Object.defineProperty(exports, "Remote", { enumerable: true, get: function () { return Remote_1.Remote; } });
+Object.defineProperty(exports, "EXISTING_CONNECTION_TIMEOUT", { enumerable: true, get: function () { return Remote_1.EXISTING_CONNECTION_TIMEOUT; } });
 var peerIdFromPeerDescriptor_1 = require("./helpers/peerIdFromPeerDescriptor");
 Object.defineProperty(exports, "areEqualPeerDescriptors", { enumerable: true, get: function () { return peerIdFromPeerDescriptor_1.areEqualPeerDescriptors; } });
 var DhtCallContext_1 = require("./rpc-protocol/DhtCallContext");
 Object.defineProperty(exports, "DhtCallContext", { enumerable: true, get: function () { return DhtCallContext_1.DhtCallContext; } });
+var ClientWebsocket_1 = require("./connection/websocket/ClientWebsocket");
+Object.defineProperty(exports, "ClientWebsocket", { enumerable: true, get: function () { return ClientWebsocket_1.ClientWebsocket; } });
+var ManagedConnection_1 = require("./connection/ManagedConnection");
+Object.defineProperty(exports, "ManagedConnection", { enumerable: true, get: function () { return ManagedConnection_1.ManagedConnection; } });
+var IConnection_1 = require("./connection/IConnection");
+Object.defineProperty(exports, "ConnectionType", { enumerable: true, get: function () { return IConnection_1.ConnectionType; } });
+var PeerID_1 = require("./helpers/PeerID");
+Object.defineProperty(exports, "PeerID", { enumerable: true, get: function () { return PeerID_1.PeerID; } });
 //# sourceMappingURL=exports.js.map

package/dist/src/exports.js.map

@@ -1 +1 @@
-{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../src/exports.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AAA7D,kGAAA,OAAO,OAAA;AAChB,iFAA+E;AAAtE,oIAAA,wBAAwB,OAAA;AACjC,8DAAyE;AAAhE,sGAAA,SAAS,OAAA;AAAE,wGAAA,WAAW,OAAA;AAC/B,gFAA8E;AAArE,wHAAA,kBAAkB,OAAA;AAC3B,sDAAoF;AAA3E,wGAAA,eAAe,OAAA;AAAE,6GAAA,oBAAoB,OAAA;AAC9C,6DAAiG;AAAxF,wGAAA,cAAc,OAAA;AAAE,iGAAA,OAAO,OAAA;AAAE,kGAAA,QAAQ,OAAA;AAAE,mGAAA,SAAS,OAAA;AAErD,oEAA+G;AAAtG,sHAAA,iBAAiB,OAAA;AAE1B,+CAA6C;AAApC,gGAAA,MAAM,OAAA;AACf,+EAA4E;AAAnE,mIAAA,uBAAuB,OAAA;AAEhC,gEAA8D;AAArD,gHAAA,cAAc,OAAA"}
+{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../src/exports.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AAA7D,kGAAA,OAAO,OAAA;AAChB,iFAA+E;AAAtE,oIAAA,wBAAwB,OAAA;AACjC,6EAA2E;AAAlE,gIAAA,sBAAsB,OAAA;AAC/B,8DAAyE;AAAhE,sGAAA,SAAS,OAAA;AAAE,wGAAA,WAAW,OAAA;AAC/B,gFAA8E;AAArE,wHAAA,kBAAkB,OAAA;AAC3B,sDAAoF;AAA3E,wGAAA,eAAe,OAAA;AAAE,6GAAA,oBAAoB,OAAA;AAC9C,6DAAiG;AAAxF,wGAAA,cAAc,OAAA;AAAE,iGAAA,OAAO,OAAA;AAAE,kGAAA,QAAQ,OAAA;AAAE,mGAAA,SAAS,OAAA;AAErD,oEAA+G;AAAtG,sHAAA,iBAAiB,OAAA;AAC1B,gEAAqE;AAA5D,yHAAA,sBAAsB,OAAA;AAE/B,+CAA0E;AAAjE,gGAAA,MAAM,OAAA;AAAE,qHAAA,2BAA2B,OAAA;AAC5C,+EAA4E;AAAnE,mIAAA,uBAAuB,OAAA;AAEhC,gEAA8D;AAArD,gHAAA,cAAc,OAAA;AACvB,0EAAwE;AAA/D,kHAAA,eAAe,OAAA;AACxB,oEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAC1B,wDAAyD;AAAhD,6GAAA,cAAc,OAAA;AACvB,2CAAyC;AAAhC,gGAAA,MAAM,OAAA"}

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

@@ -0,0 +1,4 @@
+import { ConnectionType } from '../connection/IConnection';
+import { ConnectivityMethod, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+export declare const canOpenConnectionFromBrowser: (websocketServer: ConnectivityMethod) => boolean;
+export declare const expectedConnectionType: (localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor) => ConnectionType;

package/dist/src/helpers/Connectivity.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.expectedConnectionType = exports.canOpenConnectionFromBrowser = void 0;
+const IConnection_1 = require("../connection/IConnection");
+const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
+const AddressTools_1 = require("./AddressTools");
+const canOpenConnectionFromBrowser = (websocketServer) => {
+    const hasPrivateAddress = ((websocketServer.host === 'localhost') || (0, AddressTools_1.isPrivateIPv4)(websocketServer.host));
+    return websocketServer.tls || hasPrivateAddress;
+};
+exports.canOpenConnectionFromBrowser = canOpenConnectionFromBrowser;
+const expectedConnectionType = (localPeerDescriptor, remotePeerDescriptor) => {
+    if (remotePeerDescriptor.websocket
+        && (localPeerDescriptor.type !== DhtRpc_1.NodeType.BROWSER || (0, exports.canOpenConnectionFromBrowser)(remotePeerDescriptor.websocket))) {
+        return IConnection_1.ConnectionType.WEBSOCKET_CLIENT;
+    }
+    else if (localPeerDescriptor.websocket
+        && (remotePeerDescriptor.type !== DhtRpc_1.NodeType.BROWSER || (0, exports.canOpenConnectionFromBrowser)(localPeerDescriptor.websocket))) {
+        return IConnection_1.ConnectionType.WEBSOCKET_SERVER;
+    }
+    return IConnection_1.ConnectionType.WEBRTC;
+};
+exports.expectedConnectionType = expectedConnectionType;
+//# sourceMappingURL=Connectivity.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Connectivity.js","sourceRoot":"","sources":["../../../src/helpers/Connectivity.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAC1D,gEAAkG;AAClG,iDAA8C;AAEvC,MAAM,4BAA4B,GAAG,CAAC,eAAmC,EAAW,EAAE;IACzF,MAAM,iBAAiB,GAAG,CAAC,CAAC,eAAe,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,IAAA,4BAAa,EAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAA;IACzG,OAAO,eAAe,CAAC,GAAG,IAAI,iBAAiB,CAAA;AACnD,CAAC,CAAA;AAHY,QAAA,4BAA4B,gCAGxC;AAEM,MAAM,sBAAsB,GAAG,CAAC,mBAAmC,EAAE,oBAAoC,EAAkB,EAAE;IAChI,IAAI,oBAAoB,CAAC,SAAS;WAC3B,CAAC,mBAAmB,CAAC,IAAI,KAAK,iBAAQ,CAAC,OAAO,IAAI,IAAA,oCAA4B,EAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,EAAE;QACpH,OAAO,4BAAc,CAAC,gBAAgB,CAAA;KACzC;SAAM,IAAI,mBAAmB,CAAC,SAAS;WACjC,CAAC,oBAAoB,CAAC,IAAI,KAAK,iBAAQ,CAAC,OAAO,IAAI,IAAA,oCAA4B,EAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,EAAE;QACpH,OAAO,4BAAc,CAAC,gBAAgB,CAAA;KACzC;IACD,OAAO,4BAAc,CAAC,MAAM,CAAA;AAChC,CAAC,CAAA;AATY,QAAA,sBAAsB,0BASlC"}

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

@@ -27,10 +27,10 @@ export declare class ConnectionFailed extends Err {
 export declare class CouldNotRoute extends Err {
     constructor(message?: string, originalError?: Error | string);
 }
-export declare class WebSocketServerStartError extends Err {
+export declare class WebsocketServerStartError extends Err {
     constructor(message?: string, originalError?: Error | string);
 }
-export declare class WebSocketConnectionRequestRejected extends Err {
+export declare class WebsocketConnectionRequestRejected extends Err {
     constructor(message?: string, originalError?: Error | string);
 }
 export declare class CouldNotStart extends Err {
@@ -45,7 +45,7 @@ export declare class CannotConnectToSelf extends Err {
 export declare class NotImplemented extends Err {
     constructor(message?: string, originalError?: Error | string);
 }
-export declare class IllegalRTCPeerConnectionState extends Err {
+export declare class IllegalRtcPeerConnectionState extends Err {
     constructor(message?: string, originalError?: Error | string);
 }
 export declare class IllegalArguments extends Err {

package/dist/src/helpers/errors.js

@@ -1,7 +1,7 @@
 "use strict";
 /* eslint-disable max-len */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionNotOpen = exports.GettingDataFailed = exports.SendFailed = exports.DhtJoinTimeout = exports.ConnectionLocker = exports.ConnectivityResponseTimeout = exports.IllegalArguments = exports.IllegalRTCPeerConnectionState = exports.NotImplemented = exports.CannotConnectToSelf = exports.CouldNotStop = exports.CouldNotStart = exports.WebSocketConnectionRequestRejected = exports.WebSocketServerStartError = exports.CouldNotRoute = exports.ConnectionFailed = exports.ErrorCode = void 0;
+exports.ConnectionNotOpen = exports.GettingDataFailed = exports.SendFailed = exports.DhtJoinTimeout = exports.ConnectionLocker = exports.ConnectivityResponseTimeout = exports.IllegalArguments = exports.IllegalRtcPeerConnectionState = exports.NotImplemented = exports.CannotConnectToSelf = exports.CouldNotStop = exports.CouldNotStart = exports.WebsocketConnectionRequestRejected = exports.WebsocketServerStartError = exports.CouldNotRoute = exports.ConnectionFailed = exports.ErrorCode = void 0;
 var ErrorCode;
 (function (ErrorCode) {
     ErrorCode["CONNECTION_FAILED"] = "CONNECTION_FAILED";
@@ -36,14 +36,14 @@ class CouldNotRoute extends Err {
     constructor(message, originalError) { super(ErrorCode.COULD_NOT_ROUTE, message, originalError); }
 }
 exports.CouldNotRoute = CouldNotRoute;
-class WebSocketServerStartError extends Err {
+class WebsocketServerStartError extends Err {
     constructor(message, originalError) { super(ErrorCode.STARTING_WEBSOCKET_SERVER_FAILED, message, originalError); }
 }
-exports.WebSocketServerStartError = WebSocketServerStartError;
-class WebSocketConnectionRequestRejected extends Err {
+exports.WebsocketServerStartError = WebsocketServerStartError;
+class WebsocketConnectionRequestRejected extends Err {
     constructor(message, originalError) { super(ErrorCode.WEBSOCKET_CONNECTION_REQUEST_REJECTED, message, originalError); }
 }
-exports.WebSocketConnectionRequestRejected = WebSocketConnectionRequestRejected;
+exports.WebsocketConnectionRequestRejected = WebsocketConnectionRequestRejected;
 class CouldNotStart extends Err {
     constructor(message, originalError) { super(ErrorCode.COULD_NOT_START, message, originalError); }
 }
@@ -60,10 +60,10 @@ class NotImplemented extends Err {
     constructor(message, originalError) { super(ErrorCode.NOT_IMPLEMENTED, message, originalError); }
 }
 exports.NotImplemented = NotImplemented;
-class IllegalRTCPeerConnectionState extends Err {
+class IllegalRtcPeerConnectionState extends Err {
     constructor(message, originalError) { super(ErrorCode.ILLEGAL_RTC_PEER_CONNECTION_STATE, message, originalError); }
 }
-exports.IllegalRTCPeerConnectionState = IllegalRTCPeerConnectionState;
+exports.IllegalRtcPeerConnectionState = IllegalRtcPeerConnectionState;
 class IllegalArguments extends Err {
     constructor(message, originalError) { super(ErrorCode.ILLEGAL_ARGUMENTS, message, originalError); }
 }

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

@@ -1,5 +1,6 @@
 import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
 import { PeerID, PeerIDKey } from './PeerID';
 export declare const peerIdFromPeerDescriptor: (peerDescriptor: PeerDescriptor) => PeerID;
+export declare const getNodeIdFromPeerDescriptor: (peerDescriptor: PeerDescriptor) => string;
 export declare const keyFromPeerDescriptor: (peerDescriptor: PeerDescriptor) => PeerIDKey;
 export declare const areEqualPeerDescriptors: (peerDescriptor1: PeerDescriptor, peerDescriptor2: PeerDescriptor) => boolean;

package/dist/src/helpers/peerIdFromPeerDescriptor.js

@@ -1,11 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.areEqualPeerDescriptors = exports.keyFromPeerDescriptor = exports.peerIdFromPeerDescriptor = void 0;
+exports.areEqualPeerDescriptors = exports.keyFromPeerDescriptor = exports.getNodeIdFromPeerDescriptor = exports.peerIdFromPeerDescriptor = void 0;
+const utils_1 = require("@streamr/utils");
 const PeerID_1 = require("./PeerID");
 const peerIdFromPeerDescriptor = (peerDescriptor) => {
     return PeerID_1.PeerID.fromValue(peerDescriptor.kademliaId);
 };
 exports.peerIdFromPeerDescriptor = peerIdFromPeerDescriptor;
+// TODO could move getNodeIdFromPeerDescriptor (and NodeID) from trackerless-network
+const getNodeIdFromPeerDescriptor = (peerDescriptor) => {
+    return (0, utils_1.binaryToHex)(peerDescriptor.kademliaId);
+};
+exports.getNodeIdFromPeerDescriptor = getNodeIdFromPeerDescriptor;
 const keyFromPeerDescriptor = (peerDescriptor) => {
     return PeerID_1.PeerID.fromValue(peerDescriptor.kademliaId).toKey();
 };

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

@@ -1 +1 @@
-{"version":3,"file":"peerIdFromPeerDescriptor.js","sourceRoot":"","sources":["../../../src/helpers/peerIdFromPeerDescriptor.ts"],"names":[],"mappings":";;;AACA,qCAA4C;AAErC,MAAM,wBAAwB,GAAG,CAAC,cAA8B,EAAU,EAAE;IAC/E,OAAO,eAAM,CAAC,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;AACtD,CAAC,CAAA;AAFY,QAAA,wBAAwB,4BAEpC;AAEM,MAAM,qBAAqB,GAAG,CAAC,cAA8B,EAAa,EAAE;IAC/E,OAAO,eAAM,CAAC,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,CAAA;AAC9D,CAAC,CAAA;AAFY,QAAA,qBAAqB,yBAEjC;AAEM,MAAM,uBAAuB,GAAG,CAAC,eAA+B,EAAE,eAA+B,EAAW,EAAE;IACjH,OAAO,IAAA,gCAAwB,EAAC,eAAe,CAAC,CAAC,MAAM,CAAC,IAAA,gCAAwB,EAAC,eAAe,CAAC,CAAC,CAAA;AACtG,CAAC,CAAA;AAFY,QAAA,uBAAuB,2BAEnC"}
+{"version":3,"file":"peerIdFromPeerDescriptor.js","sourceRoot":"","sources":["../../../src/helpers/peerIdFromPeerDescriptor.ts"],"names":[],"mappings":";;;AAAA,0CAA4C;AAE5C,qCAA4C;AAErC,MAAM,wBAAwB,GAAG,CAAC,cAA8B,EAAU,EAAE;IAC/E,OAAO,eAAM,CAAC,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;AACtD,CAAC,CAAA;AAFY,QAAA,wBAAwB,4BAEpC;AAED,oFAAoF;AAC7E,MAAM,2BAA2B,GAAG,CAAC,cAA8B,EAAU,EAAE;IAClF,OAAO,IAAA,mBAAW,EAAC,cAAc,CAAC,UAAU,CAAC,CAAA;AACjD,CAAC,CAAA;AAFY,QAAA,2BAA2B,+BAEvC;AAEM,MAAM,qBAAqB,GAAG,CAAC,cAA8B,EAAa,EAAE;IAC/E,OAAO,eAAM,CAAC,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,CAAA;AAC9D,CAAC,CAAA;AAFY,QAAA,qBAAqB,yBAEjC;AAEM,MAAM,uBAAuB,GAAG,CAAC,eAA+B,EAAE,eAA+B,EAAW,EAAE;IACjH,OAAO,IAAA,gCAAwB,EAAC,eAAe,CAAC,CAAC,MAAM,CAAC,IAAA,gCAAwB,EAAC,eAAe,CAAC,CAAC,CAAA;AACtG,CAAC,CAAA;AAFY,QAAA,uBAAuB,2BAEnC"}

package/dist/src/helpers/protoClasses.js

@@ -20,9 +20,9 @@ exports.protoClasses = [
     DhtRpc_1.HandshakeRequest,
     DhtRpc_1.HandshakeResponse,
     DhtRpc_1.Message,
-    DhtRpc_1.WebSocketConnectionRequest,
-    DhtRpc_1.WebSocketConnectionResponse,
-    DhtRpc_1.WebRtcConnectionRequest,
+    DhtRpc_1.WebsocketConnectionRequest,
+    DhtRpc_1.WebsocketConnectionResponse,
+    DhtRpc_1.WebrtcConnectionRequest,
     DhtRpc_1.RtcOffer,
     DhtRpc_1.RtcAnswer,
     DhtRpc_1.IceCandidate,