@streamr/dht 100.0.0-pretestnet.6 → 100.0.0-rc.1

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

@@ -1,254 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StoreRpcLocal = void 0;
-const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
-const PeerID_1 = require("../../helpers/PeerID");
-const proto_rpc_1 = require("@streamr/proto-rpc");
-const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
-const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 const utils_1 = require("@streamr/utils");
-const StoreRpcRemote_1 = require("./StoreRpcRemote");
 const timestamp_1 = require("../../proto/google/protobuf/timestamp");
-const SortedContactList_1 = require("../contact/SortedContactList");
-const Contact_1 = require("../contact/Contact");
+const identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
 class StoreRpcLocal {
+    config;
     constructor(config) {
-        this.rpcCommunicator = config.rpcCommunicator;
-        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));
-        this.rpcCommunicator.registerRpcMethod(DhtRpc_1.DeleteDataRequest, DhtRpc_1.DeleteDataResponse, 'deleteData', (request, context) => this.deleteData(request, context));
-        this.dhtNodeEmitter.on('newContact', (peerDescriptor) => {
-            this.localDataStore.getStore().forEach((dataMap, _dataKey) => {
-                dataMap.forEach((dataEntry) => {
-                    if (this.shouldMigrateDataToNewNode(dataEntry.dataEntry, peerDescriptor)) {
-                        this.migrateDataToContact(dataEntry.dataEntry, peerDescriptor);
-                    }
-                });
-            });
-        });
-    }
-    shouldMigrateDataToNewNode(dataEntry, newNode) {
-        const dataId = PeerID_1.PeerID.fromValue(dataEntry.kademliaId);
-        const newNodeId = PeerID_1.PeerID.fromValue(newNode.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.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(localPeerId)) {
-            // If we are not the closes node to the data, do not migrate
-            return false;
-        }
-        const newPeerId = PeerID_1.PeerID.fromValue(newNode.kademliaId);
-        sortedList.addContact(new Contact_1.Contact(newNode));
-        const sorted = sortedList.getAllContacts();
-        let index = 0;
-        for (index = 0; index < sorted.length; index++) {
-            if (sorted[index].getPeerId().equals(newPeerId)) {
-                break;
-            }
-        }
-        // if new node is within the storageRedundancyFactor closest nodes to the data
-        // do migrate data to it
-        if (index < this.redundancyFactor) {
-            this.localDataStore.setStale(dataId, dataEntry.storer, false);
-            return true;
-        }
-        else {
-            this.localDataStore.setStale(dataId, dataEntry.storer, true);
-            return false;
-        }
-    }
-    async migrateDataToContact(dataEntry, contact, doNotConnect = false) {
-        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) {
-                logger.trace('migrateData() returned error: ' + response.error);
-            }
-        }
-        catch (e) {
-            logger.trace('migrateData() threw an exception ' + e);
-        }
-    }
-    async storeDataToDht(key, data) {
-        logger.debug(`Storing data to DHT ${this.serviceId}`);
-        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.localPeerDescriptor, closestNodes[i])) {
-                this.localDataStore.storeEntry({
-                    kademliaId: key,
-                    storer: this.localPeerDescriptor,
-                    ttl,
-                    storedAt: timestamp_1.Timestamp.now(),
-                    data,
-                    stale: false,
-                    deleted: false,
-                    storerTime
-                });
-                successfulNodes.push(closestNodes[i]);
-                continue;
-            }
-            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) {
-                    successfulNodes.push(closestNodes[i]);
-                    logger.trace('remote.storeData() returned success');
-                }
-                else {
-                    logger.trace('remote.storeData() returned error: ' + response.error);
-                }
-            }
-            catch (e) {
-                logger.trace('remote.storeData() threw an exception ' + e);
-            }
-        }
-        return successfulNodes;
-    }
-    selfIsOneOfClosestPeers(dataId) {
-        const localPeerId = PeerID_1.PeerID.fromValue(this.localPeerDescriptor.kademliaId);
-        const closestPeers = this.getNodesClosestToIdFromBucket(dataId, this.redundancyFactor);
-        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(localPeerId));
-    }
-    async deleteDataFromDht(key) {
-        logger.debug(`Deleting data from DHT ${this.serviceId}`);
-        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.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.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.getNodeIdFromPeerDescriptor)(closestNodes[i]));
-                }
-                successfulNodes.push(closestNodes[i]);
-            }
-            catch (e) {
-                logger.trace('remote.deleteData() threw an exception ' + e);
-            }
-        }
+        this.config = config;
     }
-    // RPC service implementation
-    async storeData(request, context) {
-        const ttl = Math.min(request.ttl, this.maxTtl);
-        const { incomingSourceDescriptor } = context;
-        const { kademliaId, data, storerTime } = request;
-        this.localDataStore.storeEntry({
-            kademliaId,
-            storer: incomingSourceDescriptor,
-            ttl,
+    async storeData(request) {
+        logger.trace('storeData()');
+        const key = (0, identifiers_1.getDhtAddressFromRaw)(request.key);
+        const selfIsOneOfClosestPeers = this.config.selfIsWithinRedundancyFactor(key);
+        this.config.localDataStore.storeEntry({
+            key: request.key,
+            data: request.data,
+            creator: request.creator,
+            createdAt: request.createdAt,
             storedAt: timestamp_1.Timestamp.now(),
-            storerTime,
-            data,
-            stale: !this.selfIsOneOfClosestPeers(kademliaId),
+            ttl: request.ttl,
+            stale: !selfIsOneOfClosestPeers,
             deleted: false
         });
-        if (!this.selfIsOneOfClosestPeers(kademliaId)) {
-            this.localDataStore.setAllEntriesAsStale(PeerID_1.PeerID.fromValue(kademliaId));
+        if (!selfIsOneOfClosestPeers) {
+            this.config.localDataStore.setAllEntriesAsStale(key);
         }
-        logger.trace('storeData()');
-        return DhtRpc_1.StoreDataResponse.create();
+        return {};
     }
-    // RPC service implementation
-    async deleteData(request, context) {
-        const { incomingSourceDescriptor } = context;
-        const { kademliaId } = request;
-        const deleted = this.localDataStore.markAsDeleted(kademliaId, (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(incomingSourceDescriptor));
-        return DhtRpc_1.DeleteDataResponse.create({ deleted });
-    }
-    // RPC service implementation
-    async migrateData(request, context) {
-        logger.trace('server-side migrateData()');
-        const dataEntry = request.dataEntry;
-        const wasStored = this.localDataStore.storeEntry(dataEntry);
+    async replicateData(request, context) {
+        logger.trace('server-side replicateData()');
+        const dataEntry = request.entry;
+        const wasStored = this.config.localDataStore.storeEntry(dataEntry);
         if (wasStored) {
-            this.migrateDataToNeighborsIfNeeded(context.incomingSourceDescriptor, request.dataEntry);
-        }
-        if (!this.selfIsOneOfClosestPeers(dataEntry.kademliaId)) {
-            this.localDataStore.setAllEntriesAsStale(PeerID_1.PeerID.fromValue(dataEntry.kademliaId));
-        }
-        logger.trace('server-side migrateData() at end');
-        return DhtRpc_1.MigrateDataResponse.create();
-    }
-    migrateDataToNeighborsIfNeeded(incomingPeer, dataEntry) {
-        // sort own contact list according to data id
-        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.localPeerDescriptor));
-        closestToData.forEach((con) => {
-            sortedList.addContact(new Contact_1.Contact(con.getPeerDescriptor()));
-        });
-        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) && !localPeerId.equals(contactPeerId)) {
-                setImmediate(async () => {
-                    try {
-                        await this.migrateDataToContact(dataEntry, contact.getPeerDescriptor());
-                        logger.trace('migrateDataToContact() returned when migrating to only the closest contact');
-                    }
-                    catch (e) {
-                        logger.error('migrating data to only the closest contact failed ' + e);
-                    }
-                });
-            }
+            this.config.replicateDataToNeighbors(context.incomingSourceDescriptor, request.entry);
         }
-        else {
-            // 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) && !localPeerId.equals(contactPeerId)) {
-                    if (!incomingPeerId.equals(contactPeerId) && !localPeerId.equals(contactPeerId)) {
-                        setImmediate(async () => {
-                            try {
-                                await this.migrateDataToContact(dataEntry, contact.getPeerDescriptor());
-                                logger.trace('migrateDataToContact() returned');
-                            }
-                            catch (e) {
-                                logger.error('migrating data to one of the closest contacts failed ' + e);
-                            }
-                        });
-                    }
-                }
-            });
+        const key = (0, identifiers_1.getDhtAddressFromRaw)(dataEntry.key);
+        if (!this.config.selfIsWithinRedundancyFactor(key)) {
+            this.config.localDataStore.setAllEntriesAsStale(key);
         }
+        logger.trace('server-side replicateData() at end');
+        return {};
     }
 }
 exports.StoreRpcLocal = StoreRpcLocal;

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":";;;AACA,0CAAuC;AAEvC,qEAAiE;AAUjE,mDAAoE;AAQpE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,aAAa;IAEL,MAAM,CAAqB;IAE5C,YAAY,MAA2B;QACnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAyB;QACrC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAC3B,MAAM,GAAG,GAAG,IAAA,kCAAoB,EAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAC7C,MAAM,uBAAuB,GAAG,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAA;QAC7E,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC;YAClC,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,QAAQ,EAAE,qBAAS,CAAC,GAAG,EAAE;YACzB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,KAAK,EAAE,CAAC,uBAAuB;YAC/B,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAA;QACxD,CAAC;QACD,OAAO,EAAE,CAAA;IACb,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAA6B,EAAE,OAA0B;QAChF,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAC3C,MAAM,SAAS,GAAG,OAAO,CAAC,KAAM,CAAA;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;QAClE,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAE,OAA0B,CAAC,wBAAyB,EAAE,OAAO,CAAC,KAAM,CAAC,CAAA;QAC/G,CAAC;QACD,MAAM,GAAG,GAAG,IAAA,kCAAoB,EAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QAC/C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAAC,GAAG,CAAC,EAAE,CAAC;YACjD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAA;QACxD,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAA;QAClD,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AA1CD,sCA0CC"}

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

@@ -1,8 +1,7 @@
-import { Remote } from '../contact/Remote';
-import { IStoreRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
-import { DeleteDataRequest, DeleteDataResponse, MigrateDataRequest, MigrateDataResponse, StoreDataRequest, StoreDataResponse } from '../../proto/packages/dht/protos/DhtRpc';
-export declare class StoreRpcRemote extends Remote<IStoreRpcClient> {
-    storeData(request: StoreDataRequest): Promise<StoreDataResponse>;
-    deleteData(request: DeleteDataRequest): Promise<DeleteDataResponse>;
-    migrateData(request: MigrateDataRequest, doNotConnect?: boolean): Promise<MigrateDataResponse>;
+import { ReplicateDataRequest, StoreDataRequest } from '../../proto/packages/dht/protos/DhtRpc';
+import { StoreRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
+import { RpcRemote } from '../contact/RpcRemote';
+export declare class StoreRpcRemote extends RpcRemote<StoreRpcClient> {
+    storeData(request: StoreDataRequest): Promise<void>;
+    replicateData(request: ReplicateDataRequest): Promise<void>;
 }

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

@@ -1,35 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StoreRpcRemote = void 0;
-const Remote_1 = require("../contact/Remote");
-const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
-class StoreRpcRemote extends Remote_1.Remote {
+const identifiers_1 = require("../../identifiers");
+const RpcRemote_1 = require("../contact/RpcRemote");
+class StoreRpcRemote extends RpcRemote_1.RpcRemote {
     async storeData(request) {
         const options = this.formDhtRpcOptions();
         try {
-            return await this.getClient().storeData(request, options);
+            await this.getClient().storeData(request, options);
         }
         catch (err) {
-            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}`);
+            const to = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor());
+            const from = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getLocalPeerDescriptor());
+            throw new Error(`Could not store data to ${to} from ${from} ${err}`);
         }
     }
-    async deleteData(request) {
-        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.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())} ${err}`);
-        }
-    }
-    async migrateData(request, doNotConnect = false) {
+    async replicateData(request) {
         const options = this.formDhtRpcOptions({
-            timeout: Remote_1.EXISTING_CONNECTION_TIMEOUT,
-            doNotConnect
+            timeout: RpcRemote_1.EXISTING_CONNECTION_TIMEOUT
         });
-        return this.getClient().migrateData(request, options);
+        return this.getClient().replicateData(request, options);
     }
 }
 exports.StoreRpcRemote = StoreRpcRemote;

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,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"}
+{"version":3,"file":"StoreRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/store/StoreRpcRemote.ts"],"names":[],"mappings":";;;AAAA,mDAA+D;AAM/D,oDAA6E;AAE7E,MAAa,cAAe,SAAQ,qBAAyB;IAEzD,KAAK,CAAC,SAAS,CAAC,OAAyB;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACtD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,EAAE,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YAChE,MAAM,IAAI,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAA;YACvE,MAAM,IAAI,KAAK,CAAC,2BAA2B,EAAE,SAAS,IAAI,IAAI,GAAG,EAAE,CAAC,CAAA;QACxE,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAA6B;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,uCAA2B;SACvC,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC3D,CAAC;CAEJ;AApBD,wCAoBC"}

package/dist/src/exports.d.ts

@@ -7,13 +7,15 @@ export { getRandomRegion, getRegionDelayMatrix } from './connection/simulator/pi
 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 { LockID } from './connection/ConnectionLockHandler';
 export { DefaultConnectorFacade } from './connection/ConnectorFacade';
 export { DhtRpcOptions } from './rpc-protocol/DhtRpcOptions';
-export { Remote, EXISTING_CONNECTION_TIMEOUT } from './dht/contact/Remote';
-export { areEqualPeerDescriptors } from './helpers/peerIdFromPeerDescriptor';
+export { RpcRemote, EXISTING_CONNECTION_TIMEOUT } from './dht/contact/RpcRemote';
 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';
+export { ServiceID } from './types/ServiceID';
+export { RingContacts } from './dht/contact/RingContactList';
+export { DhtAddress, DhtAddressRaw, getDhtAddressFromRaw, getRawFromDhtAddress, createRandomDhtAddress, areEqualPeerDescriptors, getNodeIdFromPeerDescriptor } from './identifiers';

package/dist/src/exports.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.getNodeIdFromPeerDescriptor = exports.areEqualPeerDescriptors = exports.createRandomDhtAddress = exports.getRawFromDhtAddress = exports.getDhtAddressFromRaw = exports.ConnectionType = exports.ManagedConnection = exports.ClientWebsocket = exports.DhtCallContext = exports.EXISTING_CONNECTION_TIMEOUT = exports.RpcRemote = 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");
@@ -24,11 +24,9 @@ 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 RpcRemote_1 = require("./dht/contact/RpcRemote");
+Object.defineProperty(exports, "RpcRemote", { enumerable: true, get: function () { return RpcRemote_1.RpcRemote; } });
+Object.defineProperty(exports, "EXISTING_CONNECTION_TIMEOUT", { enumerable: true, get: function () { return RpcRemote_1.EXISTING_CONNECTION_TIMEOUT; } });
 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");
@@ -37,6 +35,10 @@ 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; } });
+var identifiers_1 = require("./identifiers");
+Object.defineProperty(exports, "getDhtAddressFromRaw", { enumerable: true, get: function () { return identifiers_1.getDhtAddressFromRaw; } });
+Object.defineProperty(exports, "getRawFromDhtAddress", { enumerable: true, get: function () { return identifiers_1.getRawFromDhtAddress; } });
+Object.defineProperty(exports, "createRandomDhtAddress", { enumerable: true, get: function () { return identifiers_1.createRandomDhtAddress; } });
+Object.defineProperty(exports, "areEqualPeerDescriptors", { enumerable: true, get: function () { return identifiers_1.areEqualPeerDescriptors; } });
+Object.defineProperty(exports, "getNodeIdFromPeerDescriptor", { enumerable: true, get: function () { return identifiers_1.getNodeIdFromPeerDescriptor; } });
 //# 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,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"}
+{"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;AAE1B,gEAAqE;AAA5D,yHAAA,sBAAsB,OAAA;AAE/B,qDAAgF;AAAvE,sGAAA,SAAS,OAAA;AAAE,wHAAA,2BAA2B,OAAA;AAE/C,gEAA8D;AAArD,gHAAA,cAAc,OAAA;AACvB,0EAAwE;AAA/D,kHAAA,eAAe,OAAA;AACxB,oEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAC1B,wDAAyD;AAAhD,6GAAA,cAAc,OAAA;AAGvB,6CAQsB;AALlB,mHAAA,oBAAoB,OAAA;AACpB,mHAAA,oBAAoB,OAAA;AACpB,qHAAA,sBAAsB,OAAA;AACtB,sHAAA,uBAAuB,OAAA;AACvB,0HAAA,2BAA2B,OAAA"}

package/dist/src/helpers/AddressTools.js

@@ -6,10 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAddressFromIceCandidate = exports.isPrivateIPv4 = void 0;
 const ipaddr_js_1 = __importDefault(require("ipaddr.js"));
 // IPv4 private address ranges as specified by RFC 1918
+// and private loopback addresses
 const IPv4PrivateRanges = [
     '10.0.0.0/8',
     '172.16.0.0/12',
     '192.168.0.0/16',
+    '127.0.0.0/8'
 ].map((a) => ipaddr_js_1.default.parseCIDR(a));
 function isPrivateIPv4(address) {
     if (ipaddr_js_1.default.IPv4.isValid(address)) {

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

@@ -1 +1 @@
-{"version":3,"file":"AddressTools.js","sourceRoot":"","sources":["../../../src/helpers/AddressTools.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA8B;AAE9B,uDAAuD;AACvD,MAAM,iBAAiB,GAAG;IACtB,YAAY;IACZ,eAAe;IACf,gBAAgB;CACnB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;AAEjC,SAAgB,aAAa,CAAC,OAAe;IACzC,IAAI,mBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAC9B,MAAM,EAAE,GAAG,mBAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACrC,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE;YACnC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBACjB,OAAO,IAAI,CAAA;aACd;SACJ;KACJ;IAED,OAAO,KAAK,CAAA;AAChB,CAAC;AAXD,sCAWC;AAED,SAAgB,0BAA0B,CAAC,SAAiB;IACxD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACvE,OAAO,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,mBAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAClF,CAAC;AAHD,gEAGC"}
+{"version":3,"file":"AddressTools.js","sourceRoot":"","sources":["../../../src/helpers/AddressTools.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA8B;AAE9B,uDAAuD;AACvD,iCAAiC;AACjC,MAAM,iBAAiB,GAAG;IACtB,YAAY;IACZ,eAAe;IACf,gBAAgB;IAChB,aAAa;CAChB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;AAEjC,SAAgB,aAAa,CAAC,OAAe;IACzC,IAAI,mBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,MAAM,EAAE,GAAG,mBAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACrC,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;YACpC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClB,OAAO,IAAI,CAAA;YACf,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAA;AAChB,CAAC;AAXD,sCAWC;AAED,SAAgB,0BAA0B,CAAC,SAAiB;IACxD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACvE,OAAO,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,mBAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAClF,CAAC;AAHD,gEAGC"}

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

@@ -1 +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"}
+{"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,CAAC;QACrH,OAAO,4BAAc,CAAC,gBAAgB,CAAA;IAC1C,CAAC;SAAM,IAAI,mBAAmB,CAAC,SAAS;WACjC,CAAC,oBAAoB,CAAC,IAAI,KAAK,iBAAQ,CAAC,OAAO,IAAI,IAAA,oCAA4B,EAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QACrH,OAAO,4BAAc,CAAC,gBAAgB,CAAA;IAC1C,CAAC;IACD,OAAO,4BAAc,CAAC,MAAM,CAAA;AAChC,CAAC,CAAA;AATY,QAAA,sBAAsB,0BASlC"}

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

@@ -0,0 +1,14 @@
+export declare class MapWithTtl<K, V> {
+    private readonly delegate;
+    private readonly getTtl;
+    constructor(getTtl: (value: V) => number);
+    set(key: K, value: V): void;
+    get(key: K): V | undefined;
+    has(key: K): boolean;
+    delete(key: K): void;
+    clear(): void;
+    size(): number;
+    values(): IterableIterator<V>;
+    forEach(cb: (value: V, key: K) => void): void;
+    private createTimeout;
+}

package/dist/src/helpers/MapWithTtl.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MapWithTtl = void 0;
+class MapWithTtl {
+    delegate = new Map();
+    getTtl;
+    constructor(getTtl) {
+        this.getTtl = getTtl;
+    }
+    set(key, value) {
+        const existing = this.delegate.get(key);
+        if (existing !== undefined) {
+            clearTimeout(existing.timeout);
+        }
+        this.delegate.set(key, {
+            value,
+            timeout: this.createTimeout(key, value)
+        });
+    }
+    get(key) {
+        const wrapper = this.delegate.get(key);
+        return wrapper?.value;
+    }
+    has(key) {
+        return this.delegate.has(key);
+    }
+    delete(key) {
+        const existing = this.delegate.get(key);
+        if (existing !== undefined) {
+            clearTimeout(existing.timeout);
+            this.delegate.delete(key);
+        }
+    }
+    clear() {
+        this.delegate.forEach((value) => {
+            clearTimeout(value.timeout);
+        });
+        this.delegate.clear();
+    }
+    size() {
+        return this.delegate.size;
+    }
+    *values() {
+        for (const v of this.delegate.values()) {
+            yield v.value;
+        }
+    }
+    forEach(cb) {
+        this.delegate.forEach((valueWrapper, key) => {
+            cb(valueWrapper.value, key);
+        });
+    }
+    createTimeout(key, value) {
+        return setTimeout(() => {
+            this.delete(key);
+        }, this.getTtl(value));
+    }
+}
+exports.MapWithTtl = MapWithTtl;
+//# sourceMappingURL=MapWithTtl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"MapWithTtl.js","sourceRoot":"","sources":["../../../src/helpers/MapWithTtl.ts"],"names":[],"mappings":";;;AAKA,MAAa,UAAU;IAEF,QAAQ,GAA4B,IAAI,GAAG,EAAE,CAAA;IAC7C,MAAM,CAAsB;IAE7C,YAAY,MAA4B;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,GAAG,CAAC,GAAM,EAAE,KAAQ;QAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACvC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAClC,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE;YACnB,KAAK;YACL,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC;SAC1C,CAAC,CAAA;IACN,CAAC;IAED,GAAG,CAAC,GAAM;QACN,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACtC,OAAO,OAAO,EAAE,KAAK,CAAA;IACzB,CAAC;IAED,GAAG,CAAC,GAAM;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,MAAM,CAAC,GAAM;QACT,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACvC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;YAC9B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC7B,CAAC;IACL,CAAC;IAED,KAAK;QACD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC5B,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAC/B,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;IACzB,CAAC;IAED,IAAI;QACA,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAA;IAC7B,CAAC;IAED,CAAC,MAAM;QACH,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YACrC,MAAM,CAAC,CAAC,KAAK,CAAA;QACjB,CAAC;IACL,CAAC;IAED,OAAO,CAAC,EAA8B;QAClC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,YAA6B,EAAE,GAAM,EAAE,EAAE;YAC5D,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAC/B,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,aAAa,CAAC,GAAM,EAAE,KAAQ;QAClC,OAAO,UAAU,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACpB,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IAC1B,CAAC;CACJ;AAjED,gCAiEC"}

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

@@ -0,0 +1,3 @@
+import { DhtAddress } from '../identifiers';
+import { ConnectivityResponse, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
+export declare const createPeerDescriptor: (connectivityResponse: ConnectivityResponse, region: number, nodeId?: DhtAddress) => PeerDescriptor;

package/dist/src/helpers/createPeerDescriptor.js

@@ -0,0 +1,57 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPeerDescriptor = void 0;
+const utils_1 = require("@streamr/utils");
+const crypto_1 = __importDefault(require("crypto"));
+const isBrowserEnvironment_1 = require("../helpers/browser/isBrowserEnvironment");
+const createPeerDescriptorSignaturePayload_1 = require("../helpers/createPeerDescriptorSignaturePayload");
+const identifiers_1 = require("../identifiers");
+const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
+const calculateNodeIdRaw = (ipAddress, privateKey) => {
+    // nodeId is calculated as 
+    // concatenate(
+    //   get104leastSignificatBits(hash(ipAddress)), 
+    //   get56leastSignificatBits(sign(ipAddress))
+    // )
+    const ipAsBuffer = Buffer.alloc(4);
+    ipAsBuffer.writeUInt32BE(ipAddress);
+    const ipHash = (0, utils_1.hash)(ipAsBuffer);
+    const signature = (0, utils_1.createSignature)(ipAsBuffer, privateKey);
+    const nodeIdRaw = Buffer.concat([
+        ipHash.subarray(ipHash.length - 13, ipHash.length),
+        signature.subarray(signature.length - 7, signature.length)
+    ]);
+    return nodeIdRaw;
+};
+const createPeerDescriptor = (connectivityResponse, region, nodeId) => {
+    const privateKey = crypto_1.default.randomBytes(32);
+    const publicKey = crypto_1.default.randomBytes(20); // TODO calculate publicKey from privateKey
+    let nodeIdRaw;
+    if (nodeId !== undefined) {
+        nodeIdRaw = (0, identifiers_1.getRawFromDhtAddress)(nodeId);
+    }
+    else {
+        nodeIdRaw = calculateNodeIdRaw(connectivityResponse.ipAddress, privateKey);
+    }
+    const ret = {
+        nodeId: nodeIdRaw,
+        type: (0, isBrowserEnvironment_1.isBrowserEnvironment)() ? DhtRpc_1.NodeType.BROWSER : DhtRpc_1.NodeType.NODEJS,
+        ipAddress: connectivityResponse.ipAddress,
+        region,
+        publicKey
+    };
+    if (connectivityResponse.websocket) {
+        ret.websocket = {
+            host: connectivityResponse.websocket.host,
+            port: connectivityResponse.websocket.port,
+            tls: connectivityResponse.websocket.tls
+        };
+    }
+    ret.signature = (0, utils_1.createSignature)((0, createPeerDescriptorSignaturePayload_1.createPeerDescriptorSignaturePayload)(ret), privateKey);
+    return ret;
+};
+exports.createPeerDescriptor = createPeerDescriptor;
+//# sourceMappingURL=createPeerDescriptor.js.map