@streamr/dht 100.0.0-pretestnet.0 → 100.0.0-pretestnet.3

package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts

@@ -240,11 +240,7 @@ export interface PeerDescriptor {
      */
     websocket?: ConnectivityMethod;
     /**
-     * @generated from protobuf field: optional bool openInternet = 6;
-     */
-    openInternet?: boolean;
-    /**
-     * @generated from protobuf field: optional uint32 region = 7;
+     * @generated from protobuf field: optional uint32 region = 6;
      */
     region?: number;
 }
@@ -282,19 +278,15 @@ export interface RouteMessageWrapper {
      */
     destinationPeer?: PeerDescriptor;
     /**
-     * @generated from protobuf field: dht.PeerDescriptor previousPeer = 4;
-     */
-    previousPeer?: PeerDescriptor;
-    /**
-     * @generated from protobuf field: dht.Message message = 5;
+     * @generated from protobuf field: dht.Message message = 4;
      */
     message?: Message;
     /**
-     * @generated from protobuf field: repeated dht.PeerDescriptor reachableThrough = 6;
+     * @generated from protobuf field: repeated dht.PeerDescriptor reachableThrough = 5;
      */
     reachableThrough: PeerDescriptor[];
     /**
-     * @generated from protobuf field: repeated dht.PeerDescriptor routingPath = 7;
+     * @generated from protobuf field: repeated dht.PeerDescriptor routingPath = 6;
      */
     routingPath: PeerDescriptor[];
 }
@@ -327,25 +319,25 @@ export interface ConnectivityRequest {
      * @generated from protobuf field: optional string host = 3;
      */
     host?: string;
+    /**
+     * @generated from protobuf field: bool selfSigned = 4;
+     */
+    selfSigned: boolean;
 }
 /**
  * @generated from protobuf message dht.ConnectivityResponse
  */
 export interface ConnectivityResponse {
     /**
-     * @generated from protobuf field: bool open_internet = 1;
-     */
-    openInternet: boolean;
-    /**
-     * @generated from protobuf field: string host = 2;
+     * @generated from protobuf field: string host = 1;
      */
     host: string;
     /**
-     * @generated from protobuf field: string natType = 3;
+     * @generated from protobuf field: string natType = 2;
      */
     natType: string;
     /**
-     * @generated from protobuf field: dht.ConnectivityMethod websocket = 4;
+     * @generated from protobuf field: dht.ConnectivityMethod websocket = 3;
      */
     websocket?: ConnectivityMethod;
 }
@@ -449,41 +441,25 @@ export interface Message {
 /**
  * WebSocket
  *
- * @generated from protobuf message dht.WebSocketConnectionRequest
+ * @generated from protobuf message dht.WebsocketConnectionRequest
  */
-export interface WebSocketConnectionRequest {
-    /**
-     * @generated from protobuf field: string ip = 1;
-     */
-    ip: string;
-    /**
-     * @generated from protobuf field: uint32 port = 2;
-     */
-    port: number;
+export interface WebsocketConnectionRequest {
 }
 /**
- * @generated from protobuf message dht.WebSocketConnectionResponse
+ * @generated from protobuf message dht.WebsocketConnectionResponse
  */
-export interface WebSocketConnectionResponse {
+export interface WebsocketConnectionResponse {
     /**
      * @generated from protobuf field: bool accepted = 1;
      */
     accepted: boolean;
-    /**
-     * @generated from protobuf field: optional string reason = 2;
-     */
-    reason?: string;
 }
 /**
  * WebRTC
  *
- * @generated from protobuf message dht.WebRtcConnectionRequest
+ * @generated from protobuf message dht.WebrtcConnectionRequest
  */
-export interface WebRtcConnectionRequest {
-    /**
-     * @generated from protobuf field: string connectionId = 1;
-     */
-    connectionId: string;
+export interface WebrtcConnectionRequest {
 }
 /**
  * @generated from protobuf message dht.RtcOffer
@@ -533,18 +509,18 @@ export interface IceCandidate {
  */
 export interface LockRequest {
     /**
-     * @generated from protobuf field: string serviceId = 1;
+     * @generated from protobuf field: string lockId = 1;
      */
-    serviceId: string;
+    lockId: string;
 }
 /**
  * @generated from protobuf message dht.UnlockRequest
  */
 export interface UnlockRequest {
     /**
-     * @generated from protobuf field: string serviceId = 1;
+     * @generated from protobuf field: string lockId = 1;
      */
-    serviceId: string;
+    lockId: string;
 }
 /**
  * @generated from protobuf message dht.LockResponse
@@ -574,18 +550,18 @@ export interface DisconnectNotice {
 export interface DisconnectNoticeResponse {
 }
 /**
- * @generated from protobuf message dht.FindDataRequest
+ * @generated from protobuf message dht.ExternalFindDataRequest
  */
-export interface FindDataRequest {
+export interface ExternalFindDataRequest {
     /**
      * @generated from protobuf field: bytes kademliaId = 1;
      */
     kademliaId: Uint8Array;
 }
 /**
- * @generated from protobuf message dht.FindDataResponse
+ * @generated from protobuf message dht.ExternalFindDataResponse
  */
-export interface FindDataResponse {
+export interface ExternalFindDataResponse {
     /**
      * @generated from protobuf field: repeated dht.DataEntry dataEntries = 1;
      */
@@ -638,29 +614,29 @@ export declare enum RpcResponseError {
  */
 export declare enum MessageType {
     /**
-     * @generated from protobuf enum value: CONNECTIVITY_REQUEST = 0;
+     * @generated from protobuf enum value: RPC = 0;
      */
-    CONNECTIVITY_REQUEST = 0,
+    RPC = 0,
     /**
-     * @generated from protobuf enum value: CONNECTIVITY_RESPONSE = 1;
+     * @generated from protobuf enum value: CONNECTIVITY_REQUEST = 1;
      */
-    CONNECTIVITY_RESPONSE = 1,
+    CONNECTIVITY_REQUEST = 1,
     /**
-     * @generated from protobuf enum value: HANDSHAKE_REQUEST = 2;
+     * @generated from protobuf enum value: CONNECTIVITY_RESPONSE = 2;
      */
-    HANDSHAKE_REQUEST = 2,
+    CONNECTIVITY_RESPONSE = 2,
     /**
-     * @generated from protobuf enum value: HANDSHAKE_RESPONSE = 3;
+     * @generated from protobuf enum value: HANDSHAKE_REQUEST = 3;
      */
-    HANDSHAKE_RESPONSE = 3,
+    HANDSHAKE_REQUEST = 3,
     /**
-     * @generated from protobuf enum value: RPC = 4;
+     * @generated from protobuf enum value: HANDSHAKE_RESPONSE = 4;
      */
-    RPC = 4,
+    HANDSHAKE_RESPONSE = 4,
     /**
-     * @generated from protobuf enum value: RECURSIVE_FIND_REQUEST = 5;
+     * @generated from protobuf enum value: FIND_REQUEST = 5;
      */
-    RECURSIVE_FIND_REQUEST = 5
+    FIND_REQUEST = 5
 }
 /**
  * @generated from protobuf enum dht.DisconnectMode
@@ -850,27 +826,27 @@ declare class Message$Type extends MessageType$<Message> {
  * @generated MessageType for protobuf message dht.Message
  */
 export declare const Message: Message$Type;
-declare class WebSocketConnectionRequest$Type extends MessageType$<WebSocketConnectionRequest> {
+declare class WebsocketConnectionRequest$Type extends MessageType$<WebsocketConnectionRequest> {
     constructor();
 }
 /**
- * @generated MessageType for protobuf message dht.WebSocketConnectionRequest
+ * @generated MessageType for protobuf message dht.WebsocketConnectionRequest
  */
-export declare const WebSocketConnectionRequest: WebSocketConnectionRequest$Type;
-declare class WebSocketConnectionResponse$Type extends MessageType$<WebSocketConnectionResponse> {
+export declare const WebsocketConnectionRequest: WebsocketConnectionRequest$Type;
+declare class WebsocketConnectionResponse$Type extends MessageType$<WebsocketConnectionResponse> {
     constructor();
 }
 /**
- * @generated MessageType for protobuf message dht.WebSocketConnectionResponse
+ * @generated MessageType for protobuf message dht.WebsocketConnectionResponse
  */
-export declare const WebSocketConnectionResponse: WebSocketConnectionResponse$Type;
-declare class WebRtcConnectionRequest$Type extends MessageType$<WebRtcConnectionRequest> {
+export declare const WebsocketConnectionResponse: WebsocketConnectionResponse$Type;
+declare class WebrtcConnectionRequest$Type extends MessageType$<WebrtcConnectionRequest> {
     constructor();
 }
 /**
- * @generated MessageType for protobuf message dht.WebRtcConnectionRequest
+ * @generated MessageType for protobuf message dht.WebrtcConnectionRequest
  */
-export declare const WebRtcConnectionRequest: WebRtcConnectionRequest$Type;
+export declare const WebrtcConnectionRequest: WebrtcConnectionRequest$Type;
 declare class RtcOffer$Type extends MessageType$<RtcOffer> {
     constructor();
 }
@@ -927,44 +903,48 @@ declare class DisconnectNoticeResponse$Type extends MessageType$<DisconnectNotic
  * @generated MessageType for protobuf message dht.DisconnectNoticeResponse
  */
 export declare const DisconnectNoticeResponse: DisconnectNoticeResponse$Type;
-declare class FindDataRequest$Type extends MessageType$<FindDataRequest> {
+declare class ExternalFindDataRequest$Type extends MessageType$<ExternalFindDataRequest> {
     constructor();
 }
 /**
- * @generated MessageType for protobuf message dht.FindDataRequest
+ * @generated MessageType for protobuf message dht.ExternalFindDataRequest
  */
-export declare const FindDataRequest: FindDataRequest$Type;
-declare class FindDataResponse$Type extends MessageType$<FindDataResponse> {
+export declare const ExternalFindDataRequest: ExternalFindDataRequest$Type;
+declare class ExternalFindDataResponse$Type extends MessageType$<ExternalFindDataResponse> {
     constructor();
 }
 /**
- * @generated MessageType for protobuf message dht.FindDataResponse
+ * @generated MessageType for protobuf message dht.ExternalFindDataResponse
  */
-export declare const FindDataResponse: FindDataResponse$Type;
+export declare const ExternalFindDataResponse: ExternalFindDataResponse$Type;
 /**
- * @generated ServiceType for protobuf service dht.DhtRpcService
+ * @generated ServiceType for protobuf service dht.DhtNodeRpc
  */
-export declare const DhtRpcService: ServiceType;
+export declare const DhtNodeRpc: ServiceType;
 /**
  * @generated ServiceType for protobuf service dht.RouterRpc
  */
 export declare const RouterRpc: ServiceType;
+/**
+ * @generated ServiceType for protobuf service dht.FindRpc
+ */
+export declare const FindRpc: ServiceType;
 /**
  * @generated ServiceType for protobuf service dht.StoreRpc
  */
 export declare const StoreRpc: ServiceType;
 /**
- * @generated ServiceType for protobuf service dht.RecursiveFindSessionService
+ * @generated ServiceType for protobuf service dht.FindSessionRpc
  */
-export declare const RecursiveFindSessionService: ServiceType;
+export declare const FindSessionRpc: ServiceType;
 /**
- * @generated ServiceType for protobuf service dht.WebSocketConnectorRpc
+ * @generated ServiceType for protobuf service dht.WebsocketConnectorRpc
  */
-export declare const WebSocketConnectorRpc: ServiceType;
+export declare const WebsocketConnectorRpc: ServiceType;
 /**
- * @generated ServiceType for protobuf service dht.WebRtcConnectorRpc
+ * @generated ServiceType for protobuf service dht.WebrtcConnectorRpc
  */
-export declare const WebRtcConnectorRpc: ServiceType;
+export declare const WebrtcConnectorRpc: ServiceType;
 /**
  * @generated ServiceType for protobuf service dht.ConnectionLockRpc
  */

package/dist/src/proto/packages/dht/protos/DhtRpc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExternalApiRpc = exports.ConnectionLockRpc = exports.WebRtcConnectorRpc = exports.WebSocketConnectorRpc = exports.RecursiveFindSessionService = exports.StoreRpc = exports.RouterRpc = exports.DhtRpcService = exports.FindDataResponse = exports.FindDataRequest = exports.DisconnectNoticeResponse = exports.DisconnectNotice = exports.LockResponse = exports.UnlockRequest = exports.LockRequest = exports.IceCandidate = exports.RtcAnswer = exports.RtcOffer = exports.WebRtcConnectionRequest = exports.WebSocketConnectionResponse = exports.WebSocketConnectionRequest = exports.Message = exports.HandshakeResponse = exports.HandshakeRequest = exports.ConnectivityResponse = exports.ConnectivityRequest = exports.RouteMessageAck = exports.RouteMessageWrapper = exports.ConnectivityMethod = exports.PeerDescriptor = exports.LeaveNotice = exports.PingResponse = exports.PingRequest = exports.FindResponse = exports.FindRequest = exports.ClosestPeersResponse = exports.ClosestPeersRequest = exports.DataEntry = exports.DeleteDataResponse = exports.DeleteDataRequest = exports.MigrateDataResponse = exports.MigrateDataRequest = exports.ExternalStoreDataResponse = exports.ExternalStoreDataRequest = exports.StoreDataResponse = exports.StoreDataRequest = exports.DisconnectMode = exports.MessageType = exports.RpcResponseError = exports.NodeType = void 0;
+exports.ConnectionLockRpc = exports.WebrtcConnectorRpc = exports.WebsocketConnectorRpc = exports.FindSessionRpc = exports.StoreRpc = exports.FindRpc = exports.RouterRpc = exports.DhtNodeRpc = exports.ExternalFindDataResponse = exports.ExternalFindDataRequest = exports.DisconnectNoticeResponse = exports.DisconnectNotice = exports.LockResponse = exports.UnlockRequest = exports.LockRequest = exports.IceCandidate = exports.RtcAnswer = exports.RtcOffer = exports.WebrtcConnectionRequest = exports.WebsocketConnectionResponse = exports.WebsocketConnectionRequest = exports.Message = exports.HandshakeResponse = exports.HandshakeRequest = exports.ConnectivityResponse = exports.ConnectivityRequest = exports.RouteMessageAck = exports.RouteMessageWrapper = exports.ConnectivityMethod = exports.PeerDescriptor = exports.LeaveNotice = exports.PingResponse = exports.PingRequest = exports.FindResponse = exports.FindRequest = exports.ClosestPeersResponse = exports.ClosestPeersRequest = exports.DataEntry = exports.DeleteDataResponse = exports.DeleteDataRequest = exports.MigrateDataResponse = exports.MigrateDataRequest = exports.ExternalStoreDataResponse = exports.ExternalStoreDataRequest = exports.StoreDataResponse = exports.StoreDataRequest = exports.DisconnectMode = exports.MessageType = exports.RpcResponseError = exports.NodeType = void 0;
+exports.ExternalApiRpc = void 0;
 // @generated by protobuf-ts 2.9.1 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/dht/protos/DhtRpc.proto" (package "dht", syntax proto3)
 // tslint:disable
@@ -57,29 +58,29 @@ var RpcResponseError;
 var MessageType;
 (function (MessageType) {
     /**
-     * @generated from protobuf enum value: CONNECTIVITY_REQUEST = 0;
+     * @generated from protobuf enum value: RPC = 0;
      */
-    MessageType[MessageType["CONNECTIVITY_REQUEST"] = 0] = "CONNECTIVITY_REQUEST";
+    MessageType[MessageType["RPC"] = 0] = "RPC";
     /**
-     * @generated from protobuf enum value: CONNECTIVITY_RESPONSE = 1;
+     * @generated from protobuf enum value: CONNECTIVITY_REQUEST = 1;
      */
-    MessageType[MessageType["CONNECTIVITY_RESPONSE"] = 1] = "CONNECTIVITY_RESPONSE";
+    MessageType[MessageType["CONNECTIVITY_REQUEST"] = 1] = "CONNECTIVITY_REQUEST";
     /**
-     * @generated from protobuf enum value: HANDSHAKE_REQUEST = 2;
+     * @generated from protobuf enum value: CONNECTIVITY_RESPONSE = 2;
      */
-    MessageType[MessageType["HANDSHAKE_REQUEST"] = 2] = "HANDSHAKE_REQUEST";
+    MessageType[MessageType["CONNECTIVITY_RESPONSE"] = 2] = "CONNECTIVITY_RESPONSE";
     /**
-     * @generated from protobuf enum value: HANDSHAKE_RESPONSE = 3;
+     * @generated from protobuf enum value: HANDSHAKE_REQUEST = 3;
      */
-    MessageType[MessageType["HANDSHAKE_RESPONSE"] = 3] = "HANDSHAKE_RESPONSE";
+    MessageType[MessageType["HANDSHAKE_REQUEST"] = 3] = "HANDSHAKE_REQUEST";
     /**
-     * @generated from protobuf enum value: RPC = 4;
+     * @generated from protobuf enum value: HANDSHAKE_RESPONSE = 4;
      */
-    MessageType[MessageType["RPC"] = 4] = "RPC";
+    MessageType[MessageType["HANDSHAKE_RESPONSE"] = 4] = "HANDSHAKE_RESPONSE";
     /**
-     * @generated from protobuf enum value: RECURSIVE_FIND_REQUEST = 5;
+     * @generated from protobuf enum value: FIND_REQUEST = 5;
      */
-    MessageType[MessageType["RECURSIVE_FIND_REQUEST"] = 5] = "RECURSIVE_FIND_REQUEST";
+    MessageType[MessageType["FIND_REQUEST"] = 5] = "FIND_REQUEST";
 })(MessageType || (exports.MessageType = MessageType = {}));
 /**
  * @generated from protobuf enum dht.DisconnectMode
@@ -313,8 +314,7 @@ class PeerDescriptor$Type extends runtime_1.MessageType {
             { no: 3, name: "udp", kind: "message", T: () => exports.ConnectivityMethod },
             { no: 4, name: "tcp", kind: "message", T: () => exports.ConnectivityMethod },
             { no: 5, name: "websocket", kind: "message", T: () => exports.ConnectivityMethod },
-            { no: 6, name: "openInternet", kind: "scalar", opt: true, T: 8 /*ScalarType.BOOL*/ },
-            { no: 7, name: "region", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ }
+            { no: 6, name: "region", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ }
         ]);
     }
 }
@@ -343,10 +343,9 @@ class RouteMessageWrapper$Type extends runtime_1.MessageType {
             { no: 1, name: "sourcePeer", kind: "message", T: () => exports.PeerDescriptor },
             { no: 2, name: "requestId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { no: 3, name: "destinationPeer", kind: "message", T: () => exports.PeerDescriptor },
-            { no: 4, name: "previousPeer", kind: "message", T: () => exports.PeerDescriptor },
-            { no: 5, name: "message", kind: "message", T: () => exports.Message },
-            { no: 6, name: "reachableThrough", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => exports.PeerDescriptor },
-            { no: 7, name: "routingPath", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => exports.PeerDescriptor }
+            { no: 4, name: "message", kind: "message", T: () => exports.Message },
+            { no: 5, name: "reachableThrough", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => exports.PeerDescriptor },
+            { no: 6, name: "routingPath", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => exports.PeerDescriptor }
         ]);
     }
 }
@@ -373,7 +372,8 @@ class ConnectivityRequest$Type extends runtime_1.MessageType {
         super("dht.ConnectivityRequest", [
             { no: 1, name: "port", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
             { no: 2, name: "tls", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
-            { no: 3, name: "host", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ }
+            { no: 3, name: "host", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
+            { no: 4, name: "selfSigned", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
         ]);
     }
 }
@@ -385,10 +385,9 @@ exports.ConnectivityRequest = new ConnectivityRequest$Type();
 class ConnectivityResponse$Type extends runtime_1.MessageType {
     constructor() {
         super("dht.ConnectivityResponse", [
-            { no: 1, name: "open_internet", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
-            { no: 2, name: "host", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 3, name: "natType", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 4, name: "websocket", kind: "message", T: () => exports.ConnectivityMethod }
+            { no: 1, name: "host", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 2, name: "natType", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 3, name: "websocket", kind: "message", T: () => exports.ConnectivityMethod }
         ]);
     }
 }
@@ -446,43 +445,37 @@ class Message$Type extends runtime_1.MessageType {
  */
 exports.Message = new Message$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class WebSocketConnectionRequest$Type extends runtime_1.MessageType {
+class WebsocketConnectionRequest$Type extends runtime_1.MessageType {
     constructor() {
-        super("dht.WebSocketConnectionRequest", [
-            { no: 1, name: "ip", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "port", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
-        ]);
+        super("dht.WebsocketConnectionRequest", []);
     }
 }
 /**
- * @generated MessageType for protobuf message dht.WebSocketConnectionRequest
+ * @generated MessageType for protobuf message dht.WebsocketConnectionRequest
  */
-exports.WebSocketConnectionRequest = new WebSocketConnectionRequest$Type();
+exports.WebsocketConnectionRequest = new WebsocketConnectionRequest$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class WebSocketConnectionResponse$Type extends runtime_1.MessageType {
+class WebsocketConnectionResponse$Type extends runtime_1.MessageType {
     constructor() {
-        super("dht.WebSocketConnectionResponse", [
-            { no: 1, name: "accepted", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
-            { no: 2, name: "reason", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ }
+        super("dht.WebsocketConnectionResponse", [
+            { no: 1, name: "accepted", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
         ]);
     }
 }
 /**
- * @generated MessageType for protobuf message dht.WebSocketConnectionResponse
+ * @generated MessageType for protobuf message dht.WebsocketConnectionResponse
  */
-exports.WebSocketConnectionResponse = new WebSocketConnectionResponse$Type();
+exports.WebsocketConnectionResponse = new WebsocketConnectionResponse$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class WebRtcConnectionRequest$Type extends runtime_1.MessageType {
+class WebrtcConnectionRequest$Type extends runtime_1.MessageType {
     constructor() {
-        super("dht.WebRtcConnectionRequest", [
-            { no: 1, name: "connectionId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
-        ]);
+        super("dht.WebrtcConnectionRequest", []);
     }
 }
 /**
- * @generated MessageType for protobuf message dht.WebRtcConnectionRequest
+ * @generated MessageType for protobuf message dht.WebrtcConnectionRequest
  */
-exports.WebRtcConnectionRequest = new WebRtcConnectionRequest$Type();
+exports.WebrtcConnectionRequest = new WebrtcConnectionRequest$Type();
 // @generated message type with reflection information, may provide speed optimized methods
 class RtcOffer$Type extends runtime_1.MessageType {
     constructor() {
@@ -527,7 +520,7 @@ exports.IceCandidate = new IceCandidate$Type();
 class LockRequest$Type extends runtime_1.MessageType {
     constructor() {
         super("dht.LockRequest", [
-            { no: 1, name: "serviceId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 1, name: "lockId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
         ]);
     }
 }
@@ -539,7 +532,7 @@ exports.LockRequest = new LockRequest$Type();
 class UnlockRequest$Type extends runtime_1.MessageType {
     constructor() {
         super("dht.UnlockRequest", [
-            { no: 1, name: "serviceId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 1, name: "lockId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
         ]);
     }
 }
@@ -583,34 +576,34 @@ class DisconnectNoticeResponse$Type extends runtime_1.MessageType {
  */
 exports.DisconnectNoticeResponse = new DisconnectNoticeResponse$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class FindDataRequest$Type extends runtime_1.MessageType {
+class ExternalFindDataRequest$Type extends runtime_1.MessageType {
     constructor() {
-        super("dht.FindDataRequest", [
+        super("dht.ExternalFindDataRequest", [
             { no: 1, name: "kademliaId", kind: "scalar", T: 12 /*ScalarType.BYTES*/ }
         ]);
     }
 }
 /**
- * @generated MessageType for protobuf message dht.FindDataRequest
+ * @generated MessageType for protobuf message dht.ExternalFindDataRequest
  */
-exports.FindDataRequest = new FindDataRequest$Type();
+exports.ExternalFindDataRequest = new ExternalFindDataRequest$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class FindDataResponse$Type extends runtime_1.MessageType {
+class ExternalFindDataResponse$Type extends runtime_1.MessageType {
     constructor() {
-        super("dht.FindDataResponse", [
+        super("dht.ExternalFindDataResponse", [
             { no: 1, name: "dataEntries", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => exports.DataEntry },
             { no: 2, name: "error", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ }
         ]);
     }
 }
 /**
- * @generated MessageType for protobuf message dht.FindDataResponse
+ * @generated MessageType for protobuf message dht.ExternalFindDataResponse
  */
-exports.FindDataResponse = new FindDataResponse$Type();
+exports.ExternalFindDataResponse = new ExternalFindDataResponse$Type();
 /**
- * @generated ServiceType for protobuf service dht.DhtRpcService
+ * @generated ServiceType for protobuf service dht.DhtNodeRpc
  */
-exports.DhtRpcService = new runtime_rpc_1.ServiceType("dht.DhtRpcService", [
+exports.DhtNodeRpc = new runtime_rpc_1.ServiceType("dht.DhtNodeRpc", [
     { name: "getClosestPeers", options: {}, I: exports.ClosestPeersRequest, O: exports.ClosestPeersResponse },
     { name: "ping", options: {}, I: exports.PingRequest, O: exports.PingResponse },
     { name: "leaveNotice", options: {}, I: exports.LeaveNotice, O: empty_1.Empty }
@@ -620,8 +613,13 @@ exports.DhtRpcService = new runtime_rpc_1.ServiceType("dht.DhtRpcService", [
  */
 exports.RouterRpc = new runtime_rpc_1.ServiceType("dht.RouterRpc", [
     { name: "routeMessage", options: {}, I: exports.RouteMessageWrapper, O: exports.RouteMessageAck },
-    { name: "forwardMessage", options: {}, I: exports.RouteMessageWrapper, O: exports.RouteMessageAck },
-    { name: "findRecursively", options: {}, I: exports.RouteMessageWrapper, O: exports.RouteMessageAck }
+    { name: "forwardMessage", options: {}, I: exports.RouteMessageWrapper, O: exports.RouteMessageAck }
+]);
+/**
+ * @generated ServiceType for protobuf service dht.FindRpc
+ */
+exports.FindRpc = new runtime_rpc_1.ServiceType("dht.FindRpc", [
+    { name: "routeFindRequest", options: {}, I: exports.RouteMessageWrapper, O: exports.RouteMessageAck }
 ]);
 /**
  * @generated ServiceType for protobuf service dht.StoreRpc
@@ -632,22 +630,22 @@ exports.StoreRpc = new runtime_rpc_1.ServiceType("dht.StoreRpc", [
     { name: "deleteData", options: {}, I: exports.DeleteDataRequest, O: exports.DeleteDataResponse }
 ]);
 /**
- * @generated ServiceType for protobuf service dht.RecursiveFindSessionService
+ * @generated ServiceType for protobuf service dht.FindSessionRpc
  */
-exports.RecursiveFindSessionService = new runtime_rpc_1.ServiceType("dht.RecursiveFindSessionService", [
+exports.FindSessionRpc = new runtime_rpc_1.ServiceType("dht.FindSessionRpc", [
     { name: "sendFindResponse", options: {}, I: exports.FindResponse, O: empty_1.Empty }
 ]);
 /**
- * @generated ServiceType for protobuf service dht.WebSocketConnectorRpc
+ * @generated ServiceType for protobuf service dht.WebsocketConnectorRpc
  */
-exports.WebSocketConnectorRpc = new runtime_rpc_1.ServiceType("dht.WebSocketConnectorRpc", [
-    { name: "requestConnection", options: {}, I: exports.WebSocketConnectionRequest, O: exports.WebSocketConnectionResponse }
+exports.WebsocketConnectorRpc = new runtime_rpc_1.ServiceType("dht.WebsocketConnectorRpc", [
+    { name: "requestConnection", options: {}, I: exports.WebsocketConnectionRequest, O: exports.WebsocketConnectionResponse }
 ]);
 /**
- * @generated ServiceType for protobuf service dht.WebRtcConnectorRpc
+ * @generated ServiceType for protobuf service dht.WebrtcConnectorRpc
  */
-exports.WebRtcConnectorRpc = new runtime_rpc_1.ServiceType("dht.WebRtcConnectorRpc", [
-    { name: "requestConnection", options: {}, I: exports.WebRtcConnectionRequest, O: empty_1.Empty },
+exports.WebrtcConnectorRpc = new runtime_rpc_1.ServiceType("dht.WebrtcConnectorRpc", [
+    { name: "requestConnection", options: {}, I: exports.WebrtcConnectionRequest, O: empty_1.Empty },
     { name: "rtcOffer", options: {}, I: exports.RtcOffer, O: empty_1.Empty },
     { name: "rtcAnswer", options: {}, I: exports.RtcAnswer, O: empty_1.Empty },
     { name: "iceCandidate", options: {}, I: exports.IceCandidate, O: empty_1.Empty }
@@ -664,7 +662,7 @@ exports.ConnectionLockRpc = new runtime_rpc_1.ServiceType("dht.ConnectionLockRpc
  * @generated ServiceType for protobuf service dht.ExternalApiRpc
  */
 exports.ExternalApiRpc = new runtime_rpc_1.ServiceType("dht.ExternalApiRpc", [
-    { name: "findData", options: {}, I: exports.FindDataRequest, O: exports.FindDataResponse },
+    { name: "externalFindData", options: {}, I: exports.ExternalFindDataRequest, O: exports.ExternalFindDataResponse },
     { name: "externalStoreData", options: {}, I: exports.ExternalStoreDataRequest, O: exports.ExternalStoreDataResponse }
 ]);
 //# sourceMappingURL=DhtRpc.js.map