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

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

@@ -246,11 +246,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;
 }
@@ -288,19 +284,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[];
 }
@@ -335,25 +327,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;
 }
@@ -459,41 +451,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
@@ -543,18 +519,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
@@ -584,18 +560,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;
      */
@@ -650,29 +626,29 @@ export enum RpcResponseError {
  */
 export 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
@@ -905,8 +881,7 @@ class PeerDescriptor$Type extends MessageType$<PeerDescriptor> {
             { no: 3, name: "udp", kind: "message", T: () => ConnectivityMethod },
             { no: 4, name: "tcp", kind: "message", T: () => ConnectivityMethod },
             { no: 5, name: "websocket", kind: "message", T: () => 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*/ }
         ]);
     }
 }
@@ -935,10 +910,9 @@ class RouteMessageWrapper$Type extends MessageType$<RouteMessageWrapper> {
             { no: 1, name: "sourcePeer", kind: "message", T: () => PeerDescriptor },
             { no: 2, name: "requestId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { no: 3, name: "destinationPeer", kind: "message", T: () => PeerDescriptor },
-            { no: 4, name: "previousPeer", kind: "message", T: () => PeerDescriptor },
-            { no: 5, name: "message", kind: "message", T: () => Message },
-            { no: 6, name: "reachableThrough", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor },
-            { no: 7, name: "routingPath", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor }
+            { no: 4, name: "message", kind: "message", T: () => Message },
+            { no: 5, name: "reachableThrough", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor },
+            { no: 6, name: "routingPath", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor }
         ]);
     }
 }
@@ -965,7 +939,8 @@ class ConnectivityRequest$Type extends MessageType$<ConnectivityRequest> {
         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*/ }
         ]);
     }
 }
@@ -977,10 +952,9 @@ export const ConnectivityRequest = new ConnectivityRequest$Type();
 class ConnectivityResponse$Type extends MessageType$<ConnectivityResponse> {
     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: () => 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: () => ConnectivityMethod }
         ]);
     }
 }
@@ -1038,43 +1012,37 @@ class Message$Type extends MessageType$<Message> {
  */
 export const Message = new Message$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class WebSocketConnectionRequest$Type extends MessageType$<WebSocketConnectionRequest> {
+class WebsocketConnectionRequest$Type extends MessageType$<WebsocketConnectionRequest> {
     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
  */
-export const WebSocketConnectionRequest = new WebSocketConnectionRequest$Type();
+export const WebsocketConnectionRequest = new WebsocketConnectionRequest$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class WebSocketConnectionResponse$Type extends MessageType$<WebSocketConnectionResponse> {
+class WebsocketConnectionResponse$Type extends MessageType$<WebsocketConnectionResponse> {
     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
  */
-export const WebSocketConnectionResponse = new WebSocketConnectionResponse$Type();
+export const WebsocketConnectionResponse = new WebsocketConnectionResponse$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class WebRtcConnectionRequest$Type extends MessageType$<WebRtcConnectionRequest> {
+class WebrtcConnectionRequest$Type extends MessageType$<WebrtcConnectionRequest> {
     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
  */
-export const WebRtcConnectionRequest = new WebRtcConnectionRequest$Type();
+export const WebrtcConnectionRequest = new WebrtcConnectionRequest$Type();
 // @generated message type with reflection information, may provide speed optimized methods
 class RtcOffer$Type extends MessageType$<RtcOffer> {
     constructor() {
@@ -1119,7 +1087,7 @@ export const IceCandidate = new IceCandidate$Type();
 class LockRequest$Type extends MessageType$<LockRequest> {
     constructor() {
         super("dht.LockRequest", [
-            { no: 1, name: "serviceId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 1, name: "lockId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
         ]);
     }
 }
@@ -1131,7 +1099,7 @@ export const LockRequest = new LockRequest$Type();
 class UnlockRequest$Type extends MessageType$<UnlockRequest> {
     constructor() {
         super("dht.UnlockRequest", [
-            { no: 1, name: "serviceId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 1, name: "lockId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
         ]);
     }
 }
@@ -1175,34 +1143,34 @@ class DisconnectNoticeResponse$Type extends MessageType$<DisconnectNoticeRespons
  */
 export const DisconnectNoticeResponse = new DisconnectNoticeResponse$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class FindDataRequest$Type extends MessageType$<FindDataRequest> {
+class ExternalFindDataRequest$Type extends MessageType$<ExternalFindDataRequest> {
     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
  */
-export const FindDataRequest = new FindDataRequest$Type();
+export const ExternalFindDataRequest = new ExternalFindDataRequest$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class FindDataResponse$Type extends MessageType$<FindDataResponse> {
+class ExternalFindDataResponse$Type extends MessageType$<ExternalFindDataResponse> {
     constructor() {
-        super("dht.FindDataResponse", [
+        super("dht.ExternalFindDataResponse", [
             { no: 1, name: "dataEntries", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => 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
  */
-export const FindDataResponse = new FindDataResponse$Type();
+export const ExternalFindDataResponse = new ExternalFindDataResponse$Type();
 /**
- * @generated ServiceType for protobuf service dht.DhtRpcService
+ * @generated ServiceType for protobuf service dht.DhtNodeRpc
  */
-export const DhtRpcService = new ServiceType("dht.DhtRpcService", [
+export const DhtNodeRpc = new ServiceType("dht.DhtNodeRpc", [
     { name: "getClosestPeers", options: {}, I: ClosestPeersRequest, O: ClosestPeersResponse },
     { name: "ping", options: {}, I: PingRequest, O: PingResponse },
     { name: "leaveNotice", options: {}, I: LeaveNotice, O: Empty }
@@ -1212,8 +1180,13 @@ export const DhtRpcService = new ServiceType("dht.DhtRpcService", [
  */
 export const RouterRpc = new ServiceType("dht.RouterRpc", [
     { name: "routeMessage", options: {}, I: RouteMessageWrapper, O: RouteMessageAck },
-    { name: "forwardMessage", options: {}, I: RouteMessageWrapper, O: RouteMessageAck },
-    { name: "findRecursively", options: {}, I: RouteMessageWrapper, O: RouteMessageAck }
+    { name: "forwardMessage", options: {}, I: RouteMessageWrapper, O: RouteMessageAck }
+]);
+/**
+ * @generated ServiceType for protobuf service dht.FindRpc
+ */
+export const FindRpc = new ServiceType("dht.FindRpc", [
+    { name: "routeFindRequest", options: {}, I: RouteMessageWrapper, O: RouteMessageAck }
 ]);
 /**
  * @generated ServiceType for protobuf service dht.StoreRpc
@@ -1224,22 +1197,22 @@ export const StoreRpc = new ServiceType("dht.StoreRpc", [
     { name: "deleteData", options: {}, I: DeleteDataRequest, O: DeleteDataResponse }
 ]);
 /**
- * @generated ServiceType for protobuf service dht.RecursiveFindSessionService
+ * @generated ServiceType for protobuf service dht.FindSessionRpc
  */
-export const RecursiveFindSessionService = new ServiceType("dht.RecursiveFindSessionService", [
+export const FindSessionRpc = new ServiceType("dht.FindSessionRpc", [
     { name: "sendFindResponse", options: {}, I: FindResponse, O: Empty }
 ]);
 /**
- * @generated ServiceType for protobuf service dht.WebSocketConnectorRpc
+ * @generated ServiceType for protobuf service dht.WebsocketConnectorRpc
  */
-export const WebSocketConnectorRpc = new ServiceType("dht.WebSocketConnectorRpc", [
-    { name: "requestConnection", options: {}, I: WebSocketConnectionRequest, O: WebSocketConnectionResponse }
+export const WebsocketConnectorRpc = new ServiceType("dht.WebsocketConnectorRpc", [
+    { name: "requestConnection", options: {}, I: WebsocketConnectionRequest, O: WebsocketConnectionResponse }
 ]);
 /**
- * @generated ServiceType for protobuf service dht.WebRtcConnectorRpc
+ * @generated ServiceType for protobuf service dht.WebrtcConnectorRpc
  */
-export const WebRtcConnectorRpc = new ServiceType("dht.WebRtcConnectorRpc", [
-    { name: "requestConnection", options: {}, I: WebRtcConnectionRequest, O: Empty },
+export const WebrtcConnectorRpc = new ServiceType("dht.WebrtcConnectorRpc", [
+    { name: "requestConnection", options: {}, I: WebrtcConnectionRequest, O: Empty },
     { name: "rtcOffer", options: {}, I: RtcOffer, O: Empty },
     { name: "rtcAnswer", options: {}, I: RtcAnswer, O: Empty },
     { name: "iceCandidate", options: {}, I: IceCandidate, O: Empty }
@@ -1256,6 +1229,6 @@ export const ConnectionLockRpc = new ServiceType("dht.ConnectionLockRpc", [
  * @generated ServiceType for protobuf service dht.ExternalApiRpc
  */
 export const ExternalApiRpc = new ServiceType("dht.ExternalApiRpc", [
-    { name: "findData", options: {}, I: FindDataRequest, O: FindDataResponse },
+    { name: "externalFindData", options: {}, I: ExternalFindDataRequest, O: ExternalFindDataResponse },
     { name: "externalStoreData", options: {}, I: ExternalStoreDataRequest, O: ExternalStoreDataResponse }
 ]);

package/src/rpc-protocol/DhtCallContext.ts

@@ -10,6 +10,5 @@ export class DhtCallContext extends ProtoCallContext implements DhtRpcOptions {
     clientId?: number
     doNotConnect?: boolean 
     //used in incoming calls
-    incomingTargetDescriptor?: PeerDescriptor
     incomingSourceDescriptor?: PeerDescriptor
 }

package/src/transport/ITransport.ts

@@ -1,10 +1,7 @@
 import { Message, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc'
 
-export type DisconnectionType = 'OUTGOING_GRACEFUL_DISCONNECT' | 'OUTGOING_GRACEFUL_LEAVE' |
-    'INCOMING_GRACEFUL_DISCONNECT' | 'INCOMING_GRACEFUL_LEAVE' | 'OTHER'
-
 export interface TransportEvents {
-    disconnected: (peerDescriptor: PeerDescriptor, disconnectionType: DisconnectionType) => void
+    disconnected: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean) => void
     message: (message: Message) => void
     connected: (peerDescriptor: PeerDescriptor) => void
 
@@ -13,19 +10,19 @@ export interface TransportEvents {
 export interface ITransport {
     on<T extends keyof TransportEvents>(eventName: T, listener: (message: Message) => void): void
     on<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
-    on<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, disconnectionType: DisconnectionType) => void): void
+    on<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean) => void): void
 
     once<T extends keyof TransportEvents>(eventName: T, listener: (message: Message) => void): void
     once<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
     once<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, 
-        disconnectionType: DisconnectionType) => void): void
+        gracefulLeave: boolean) => void): void
 
     off<T extends keyof TransportEvents>(eventName: T, listener: (message: Message) => void): void
     off<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
-    off<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, disconnectionType: DisconnectionType) => void): void
+    off<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean) => void): void
 
     send(msg: Message, doNotConnect?: boolean): Promise<void>
-    getPeerDescriptor(): PeerDescriptor
+    getLocalPeerDescriptor(): PeerDescriptor
     getAllConnectionPeerDescriptors(): PeerDescriptor[]
     stop(): void | Promise<void>
 }

package/src/transport/ListeningRpcCommunicator.ts

@@ -2,13 +2,23 @@ import { ITransport } from './ITransport'
 import { RoutingRpcCommunicator } from './RoutingRpcCommunicator'
 import { RpcCommunicatorConfig } from '@streamr/proto-rpc'
 import { Message } from '../proto/packages/dht/protos/DhtRpc'
+import { ServiceID } from '../types/ServiceID'
 
 export class ListeningRpcCommunicator extends RoutingRpcCommunicator {
-    constructor(ownServiceId: string, transport: ITransport, config?: RpcCommunicatorConfig) {
+    private readonly transport: ITransport
+    private readonly listener: (msg: Message) => void
+
+    constructor(ownServiceId: ServiceID, transport: ITransport, config?: RpcCommunicatorConfig) {
         super(ownServiceId, transport.send, config)
-        
-        transport.on('message', (msg: Message) => {
+        this.listener = (msg: Message) => {
             this.handleMessageFromPeer(msg)
-        })
+        }
+        this.transport = transport
+        transport.on('message', this.listener) 
+    }
+
+    destroy(): void {
+        this.transport.off('message', this.listener)
+        this.stop()
     }
 }

package/src/transport/RoutingRpcCommunicator.ts

@@ -3,13 +3,14 @@ import { v4 } from 'uuid'
 import { RpcCommunicator, RpcCommunicatorConfig } from '@streamr/proto-rpc'
 import { DhtCallContext } from '../rpc-protocol/DhtCallContext'
 import { RpcMessage } from '../proto/packages/proto-rpc/protos/ProtoRpc'
+import { ServiceID } from '../types/ServiceID'
 
 export class RoutingRpcCommunicator extends RpcCommunicator {
-    private ownServiceId: string
+    private ownServiceId: ServiceID
     private sendFn: (msg: Message, doNotConnect?: boolean, doNotMindStopped?: boolean) => Promise<void>
 
     constructor(
-        ownServiceId: string,
+        ownServiceId: ServiceID,
         sendFn: (msg: Message, doNotConnect?: boolean) => Promise<void>,
         config?: RpcCommunicatorConfig
     ) {
@@ -20,7 +21,6 @@ export class RoutingRpcCommunicator extends RpcCommunicator {
         this.setOutgoingMessageListener((msg: RpcMessage, _requestId: string, callContext?: DhtCallContext) => {
             let targetDescriptor: PeerDescriptor
             // rpc call message
-
             if (callContext!.targetDescriptor) {
                 targetDescriptor = callContext!.targetDescriptor!
             } else { // rpc reply message
@@ -53,7 +53,6 @@ export class RoutingRpcCommunicator extends RpcCommunicator {
         if (message.serviceId == this.ownServiceId && message.body.oneofKind === 'rpcMessage') {
             const context = new DhtCallContext()
             context.incomingSourceDescriptor = message.sourceDescriptor
-            context.incomingTargetDescriptor = message.targetDescriptor
             this.handleIncomingMessage(message.body.rpcMessage, context)
         }
     }

package/src/types/ServiceID.ts

@@ -0,0 +1 @@
+export type ServiceID = string

package/test/benchmark/{RecursiveFind.test.ts → Find.test.ts}

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import { LatencyType, Simulator } from '../../src/connection/Simulator/Simulator'
+import { LatencyType, Simulator } from '../../src/connection/simulator/Simulator'
 import { DhtNode } from '../../src/dht/DhtNode'
 import { NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { createMockConnectionDhtNode } from '../utils/utils'
@@ -12,7 +12,7 @@ import { debugVars } from '../../src/helpers/debugHelpers'
 
 const logger = new Logger(module)
 
-describe('Recursive find correctness', () => {
+describe('Find correctness', () => {
     let entryPoint: DhtNode
     let nodes: DhtNode[]
     let entrypointDescriptor: PeerDescriptor
@@ -70,16 +70,16 @@ describe('Recursive find correctness', () => {
         debugVars['waiting'] = false
         logger.info('waiting over')
 
-        nodes.forEach((node) => logger.info(keyFromPeerDescriptor(node.getPeerDescriptor()) + ': connections:' +
+        nodes.forEach((node) => logger.info(keyFromPeerDescriptor(node.getLocalPeerDescriptor()) + ': connections:' +
             node.getNumberOfConnections() + ', kbucket: ' + node.getBucketSize()
             + ', localLocked: ' + node.getNumberOfLocalLockedConnections()
             + ', remoteLocked: ' + node.getNumberOfRemoteLockedConnections()
             + ', weakLocked: ' + node.getNumberOfWeakLockedConnections()))
 
-        logger.info('starting recursive find')
+        logger.info('starting find')
         const kademliaIdToFind = Uint8Array.from(dhtIds[9].data)
-        const results = await nodes[159].startRecursiveFind(kademliaIdToFind)
-        logger.info('recursive find over')
+        const results = await nodes[159].startFind(kademliaIdToFind)
+        logger.info('find over')
         expect(results.closestNodes).toBeGreaterThanOrEqual(5)
         expect(PeerID.fromValue(kademliaIdToFind).equals(peerIdFromPeerDescriptor(results.closestNodes[0])))
 

package/test/benchmark/KademliaCorrectness.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import { Simulator } from '../../src/connection/Simulator/Simulator'
+import { Simulator } from '../../src/connection/simulator/Simulator'
 import { DhtNode } from '../../src/dht/DhtNode'
 import { PeerID } from '../../src/helpers/PeerID'
 import { keyFromPeerDescriptor } from '../../src/helpers/peerIdFromPeerDescriptor'
@@ -88,7 +88,7 @@ describe('Kademlia correctness', () => {
                     correctNeighbors++
                 }
             } catch (e) {
-                console.error('Node ' + keyFromPeerDescriptor(nodes[i].getPeerDescriptor()) + ' had only ' 
+                console.error('Node ' + keyFromPeerDescriptor(nodes[i].getLocalPeerDescriptor()) + ' had only ' 
                     + kademliaNeighbors.length + ' kademlia neighbors')
             }
             if (correctNeighbors === 0) {

package/test/benchmark/kademlia-simulation/SimulationNode.ts

@@ -94,7 +94,7 @@ export class SimulationNode {
         while (true) {
             let oldClosestContactId = this.neighborList.getClosestContactId()
             let uncontacted = this.neighborList.getUncontactedContacts(this.ALPHA)
-            if (uncontacted.length < 1) {
+            if (uncontacted.length === 0) {
                 return
             }
 
@@ -102,7 +102,7 @@ export class SimulationNode {
 
             if (oldClosestContactId.equals(this.neighborList.getClosestContactId())) {
                 uncontacted = this.neighborList.getUncontactedContacts(this.K)
-                if (uncontacted.length < 1) {
+                if (uncontacted.length === 0) {
                     return
                 }
 
@@ -115,7 +115,7 @@ export class SimulationNode {
                         return
                     }
                     uncontacted = this.neighborList.getUncontactedContacts(this.ALPHA)
-                    if (uncontacted.length < 1) {
+                    if (uncontacted.length === 0) {
                         return
                     }
                 }

package/test/end-to-end/Layer0-Layer1.test.ts

@@ -25,12 +25,20 @@ describe('Layer0-Layer1', () => {
 
     beforeEach(async () => {
 
-        epDhtNode = new DhtNode({ peerDescriptor: epPeerDescriptor })
+        epDhtNode = new DhtNode({ peerDescriptor: epPeerDescriptor, websocketServerEnableTls: false })
         await epDhtNode.start()
         await epDhtNode.joinDht([epPeerDescriptor])
 
-        node1 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
-        node2 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
+        node1 = new DhtNode({ 
+            websocketPortRange, 
+            entryPoints: [epPeerDescriptor], 
+            websocketServerEnableTls: false
+        })
+        node2 = new DhtNode({ 
+            websocketPortRange,
+            entryPoints: [epPeerDescriptor],
+            websocketServerEnableTls: false
+        })
 
         await node1.start()
         await node2.start()
@@ -81,9 +89,9 @@ describe('Layer0-Layer1', () => {
         expect(stream2Node1.getClosestContacts()).toHaveLength(1)
         expect(stream2Node2.getClosestContacts()).toHaveLength(1)
 
-        expect(areEqualPeerDescriptors(stream1Node1.getClosestContacts()[0], node1.getPeerDescriptor())).toBe(true)
+        expect(areEqualPeerDescriptors(stream1Node1.getClosestContacts()[0], node1.getLocalPeerDescriptor())).toBe(true)
         expect(areEqualPeerDescriptors(stream1Node2.getClosestContacts()[0], epPeerDescriptor)).toBe(true)
-        expect(areEqualPeerDescriptors(stream2Node1.getClosestContacts()[0], node2.getPeerDescriptor())).toBe(true)
+        expect(areEqualPeerDescriptors(stream2Node1.getClosestContacts()[0], node2.getLocalPeerDescriptor())).toBe(true)
         expect(areEqualPeerDescriptors(stream2Node2.getClosestContacts()[0], epPeerDescriptor)).toBe(true)
     })
 })