@streamr/dht 100.0.0-testnet-one.3 → 100.0.0-testnet-two.0

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

@@ -18,15 +18,14 @@ import type { RtcAnswer } from "./DhtRpc";
 import type { RtcOffer } from "./DhtRpc";
 import type { WebrtcConnectionRequest } from "./DhtRpc";
 import { WebsocketConnectorRpc } from "./DhtRpc";
-import type { WebsocketConnectionResponse } from "./DhtRpc";
 import type { WebsocketConnectionRequest } from "./DhtRpc";
-import { FindSessionRpc } from "./DhtRpc";
-import type { FindResponse } from "./DhtRpc";
+import { RecursiveOperationSessionRpc } from "./DhtRpc";
+import type { RecursiveOperationResponse } from "./DhtRpc";
 import { StoreRpc } from "./DhtRpc";
 import type { ReplicateDataRequest } from "./DhtRpc";
 import type { StoreDataResponse } from "./DhtRpc";
 import type { StoreDataRequest } from "./DhtRpc";
-import { FindRpc } from "./DhtRpc";
+import { RecursiveOperationRpc } from "./DhtRpc";
 import { RouterRpc } from "./DhtRpc";
 import type { RouteMessageAck } from "./DhtRpc";
 import type { RouteMessageWrapper } from "./DhtRpc";
@@ -128,27 +127,27 @@ export class RouterRpcClient implements IRouterRpcClient, ServiceInfo {
     }
 }
 /**
- * @generated from protobuf service dht.FindRpc
+ * @generated from protobuf service dht.RecursiveOperationRpc
  */
-export interface IFindRpcClient {
+export interface IRecursiveOperationRpcClient {
     /**
-     * @generated from protobuf rpc: routeFindRequest(dht.RouteMessageWrapper) returns (dht.RouteMessageAck);
+     * @generated from protobuf rpc: routeRequest(dht.RouteMessageWrapper) returns (dht.RouteMessageAck);
      */
-    routeFindRequest(input: RouteMessageWrapper, options?: RpcOptions): UnaryCall<RouteMessageWrapper, RouteMessageAck>;
+    routeRequest(input: RouteMessageWrapper, options?: RpcOptions): UnaryCall<RouteMessageWrapper, RouteMessageAck>;
 }
 /**
- * @generated from protobuf service dht.FindRpc
+ * @generated from protobuf service dht.RecursiveOperationRpc
  */
-export class FindRpcClient implements IFindRpcClient, ServiceInfo {
-    typeName = FindRpc.typeName;
-    methods = FindRpc.methods;
-    options = FindRpc.options;
+export class RecursiveOperationRpcClient implements IRecursiveOperationRpcClient, ServiceInfo {
+    typeName = RecursiveOperationRpc.typeName;
+    methods = RecursiveOperationRpc.methods;
+    options = RecursiveOperationRpc.options;
     constructor(private readonly _transport: RpcTransport) {
     }
     /**
-     * @generated from protobuf rpc: routeFindRequest(dht.RouteMessageWrapper) returns (dht.RouteMessageAck);
+     * @generated from protobuf rpc: routeRequest(dht.RouteMessageWrapper) returns (dht.RouteMessageAck);
      */
-    routeFindRequest(input: RouteMessageWrapper, options?: RpcOptions): UnaryCall<RouteMessageWrapper, RouteMessageAck> {
+    routeRequest(input: RouteMessageWrapper, options?: RpcOptions): UnaryCall<RouteMessageWrapper, RouteMessageAck> {
         const method = this.methods[0], opt = this._transport.mergeOptions(options);
         return stackIntercept<RouteMessageWrapper, RouteMessageAck>("unary", this._transport, method, opt, input);
     }
@@ -191,29 +190,29 @@ export class StoreRpcClient implements IStoreRpcClient, ServiceInfo {
     }
 }
 /**
- * @generated from protobuf service dht.FindSessionRpc
+ * @generated from protobuf service dht.RecursiveOperationSessionRpc
  */
-export interface IFindSessionRpcClient {
+export interface IRecursiveOperationSessionRpcClient {
     /**
-     * @generated from protobuf rpc: sendFindResponse(dht.FindResponse) returns (google.protobuf.Empty);
+     * @generated from protobuf rpc: sendResponse(dht.RecursiveOperationResponse) returns (google.protobuf.Empty);
      */
-    sendFindResponse(input: FindResponse, options?: RpcOptions): UnaryCall<FindResponse, Empty>;
+    sendResponse(input: RecursiveOperationResponse, options?: RpcOptions): UnaryCall<RecursiveOperationResponse, Empty>;
 }
 /**
- * @generated from protobuf service dht.FindSessionRpc
+ * @generated from protobuf service dht.RecursiveOperationSessionRpc
  */
-export class FindSessionRpcClient implements IFindSessionRpcClient, ServiceInfo {
-    typeName = FindSessionRpc.typeName;
-    methods = FindSessionRpc.methods;
-    options = FindSessionRpc.options;
+export class RecursiveOperationSessionRpcClient implements IRecursiveOperationSessionRpcClient, ServiceInfo {
+    typeName = RecursiveOperationSessionRpc.typeName;
+    methods = RecursiveOperationSessionRpc.methods;
+    options = RecursiveOperationSessionRpc.options;
     constructor(private readonly _transport: RpcTransport) {
     }
     /**
-     * @generated from protobuf rpc: sendFindResponse(dht.FindResponse) returns (google.protobuf.Empty);
+     * @generated from protobuf rpc: sendResponse(dht.RecursiveOperationResponse) returns (google.protobuf.Empty);
      */
-    sendFindResponse(input: FindResponse, options?: RpcOptions): UnaryCall<FindResponse, Empty> {
+    sendResponse(input: RecursiveOperationResponse, options?: RpcOptions): UnaryCall<RecursiveOperationResponse, Empty> {
         const method = this.methods[0], opt = this._transport.mergeOptions(options);
-        return stackIntercept<FindResponse, Empty>("unary", this._transport, method, opt, input);
+        return stackIntercept<RecursiveOperationResponse, Empty>("unary", this._transport, method, opt, input);
     }
 }
 /**
@@ -221,9 +220,9 @@ export class FindSessionRpcClient implements IFindSessionRpcClient, ServiceInfo
  */
 export interface IWebsocketConnectorRpcClient {
     /**
-     * @generated from protobuf rpc: requestConnection(dht.WebsocketConnectionRequest) returns (dht.WebsocketConnectionResponse);
+     * @generated from protobuf rpc: requestConnection(dht.WebsocketConnectionRequest) returns (google.protobuf.Empty);
      */
-    requestConnection(input: WebsocketConnectionRequest, options?: RpcOptions): UnaryCall<WebsocketConnectionRequest, WebsocketConnectionResponse>;
+    requestConnection(input: WebsocketConnectionRequest, options?: RpcOptions): UnaryCall<WebsocketConnectionRequest, Empty>;
 }
 /**
  * @generated from protobuf service dht.WebsocketConnectorRpc
@@ -235,11 +234,11 @@ export class WebsocketConnectorRpcClient implements IWebsocketConnectorRpcClient
     constructor(private readonly _transport: RpcTransport) {
     }
     /**
-     * @generated from protobuf rpc: requestConnection(dht.WebsocketConnectionRequest) returns (dht.WebsocketConnectionResponse);
+     * @generated from protobuf rpc: requestConnection(dht.WebsocketConnectionRequest) returns (google.protobuf.Empty);
      */
-    requestConnection(input: WebsocketConnectionRequest, options?: RpcOptions): UnaryCall<WebsocketConnectionRequest, WebsocketConnectionResponse> {
+    requestConnection(input: WebsocketConnectionRequest, options?: RpcOptions): UnaryCall<WebsocketConnectionRequest, Empty> {
         const method = this.methods[0], opt = this._transport.mergeOptions(options);
-        return stackIntercept<WebsocketConnectionRequest, WebsocketConnectionResponse>("unary", this._transport, method, opt, input);
+        return stackIntercept<WebsocketConnectionRequest, Empty>("unary", this._transport, method, opt, input);
     }
 }
 /**

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

@@ -14,9 +14,8 @@ import { IceCandidate } from "./DhtRpc";
 import { RtcAnswer } from "./DhtRpc";
 import { RtcOffer } from "./DhtRpc";
 import { WebrtcConnectionRequest } from "./DhtRpc";
-import { WebsocketConnectionResponse } from "./DhtRpc";
 import { WebsocketConnectionRequest } from "./DhtRpc";
-import { FindResponse } from "./DhtRpc";
+import { RecursiveOperationResponse } from "./DhtRpc";
 import { ReplicateDataRequest } from "./DhtRpc";
 import { StoreDataResponse } from "./DhtRpc";
 import { StoreDataRequest } from "./DhtRpc";
@@ -60,13 +59,13 @@ export interface IRouterRpc<T = ServerCallContext> {
     forwardMessage(request: RouteMessageWrapper, context: T): Promise<RouteMessageAck>;
 }
 /**
- * @generated from protobuf service dht.FindRpc
+ * @generated from protobuf service dht.RecursiveOperationRpc
  */
-export interface IFindRpc<T = ServerCallContext> {
+export interface IRecursiveOperationRpc<T = ServerCallContext> {
     /**
-     * @generated from protobuf rpc: routeFindRequest(dht.RouteMessageWrapper) returns (dht.RouteMessageAck);
+     * @generated from protobuf rpc: routeRequest(dht.RouteMessageWrapper) returns (dht.RouteMessageAck);
      */
-    routeFindRequest(request: RouteMessageWrapper, context: T): Promise<RouteMessageAck>;
+    routeRequest(request: RouteMessageWrapper, context: T): Promise<RouteMessageAck>;
 }
 /**
  * @generated from protobuf service dht.StoreRpc
@@ -82,22 +81,22 @@ export interface IStoreRpc<T = ServerCallContext> {
     replicateData(request: ReplicateDataRequest, context: T): Promise<Empty>;
 }
 /**
- * @generated from protobuf service dht.FindSessionRpc
+ * @generated from protobuf service dht.RecursiveOperationSessionRpc
  */
-export interface IFindSessionRpc<T = ServerCallContext> {
+export interface IRecursiveOperationSessionRpc<T = ServerCallContext> {
     /**
-     * @generated from protobuf rpc: sendFindResponse(dht.FindResponse) returns (google.protobuf.Empty);
+     * @generated from protobuf rpc: sendResponse(dht.RecursiveOperationResponse) returns (google.protobuf.Empty);
      */
-    sendFindResponse(request: FindResponse, context: T): Promise<Empty>;
+    sendResponse(request: RecursiveOperationResponse, context: T): Promise<Empty>;
 }
 /**
  * @generated from protobuf service dht.WebsocketConnectorRpc
  */
 export interface IWebsocketConnectorRpc<T = ServerCallContext> {
     /**
-     * @generated from protobuf rpc: requestConnection(dht.WebsocketConnectionRequest) returns (dht.WebsocketConnectionResponse);
+     * @generated from protobuf rpc: requestConnection(dht.WebsocketConnectionRequest) returns (google.protobuf.Empty);
      */
-    requestConnection(request: WebsocketConnectionRequest, context: T): Promise<WebsocketConnectionResponse>;
+    requestConnection(request: WebsocketConnectionRequest, context: T): Promise<Empty>;
 }
 /**
  * @generated from protobuf service dht.WebrtcConnectorRpc

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

@@ -22,9 +22,9 @@ export interface StoreDataRequest {
      */
     data?: Any;
     /**
-     * @generated from protobuf field: dht.PeerDescriptor creator = 3;
+     * @generated from protobuf field: bytes creator = 3;
      */
-    creator?: PeerDescriptor;
+    creator: Uint8Array;
     /**
      * @generated from protobuf field: google.protobuf.Timestamp createdAt = 4;
      */
@@ -38,10 +38,6 @@ export interface StoreDataRequest {
  * @generated from protobuf message dht.StoreDataResponse
  */
 export interface StoreDataResponse {
-    /**
-     * @generated from protobuf field: string error = 1;
-     */
-    error: string;
 }
 /**
  * @generated from protobuf message dht.ExternalStoreDataRequest
@@ -87,9 +83,9 @@ export interface DataEntry {
      */
     data?: Any;
     /**
-     * @generated from protobuf field: dht.PeerDescriptor creator = 3;
+     * @generated from protobuf field: bytes creator = 3;
      */
-    creator?: PeerDescriptor;
+    creator: Uint8Array;
     /**
      * @generated from protobuf field: google.protobuf.Timestamp createdAt = 4;
      */
@@ -138,22 +134,22 @@ export interface ClosestPeersResponse {
     requestId: string;
 }
 /**
- * @generated from protobuf message dht.FindRequest
+ * @generated from protobuf message dht.RecursiveOperationRequest
  */
-export interface FindRequest {
+export interface RecursiveOperationRequest {
     /**
      * @generated from protobuf field: string sessionId = 1;
      */
     sessionId: string;
     /**
-     * @generated from protobuf field: dht.FindAction action = 2;
+     * @generated from protobuf field: dht.RecursiveOperation operation = 2;
      */
-    action: FindAction;
+    operation: RecursiveOperation;
 }
 /**
- * @generated from protobuf message dht.FindResponse
+ * @generated from protobuf message dht.RecursiveOperationResponse
  */
-export interface FindResponse {
+export interface RecursiveOperationResponse {
     /**
      * @generated from protobuf field: repeated dht.PeerDescriptor closestConnectedPeers = 1;
      */
@@ -249,17 +245,17 @@ export interface ConnectivityMethod {
  */
 export interface RouteMessageWrapper {
     /**
-     * @generated from protobuf field: dht.PeerDescriptor sourcePeer = 1;
+     * @generated from protobuf field: string requestId = 1;
      */
-    sourcePeer?: PeerDescriptor;
+    requestId: string;
     /**
-     * @generated from protobuf field: string requestId = 2;
+     * @generated from protobuf field: dht.PeerDescriptor sourcePeer = 2;
      */
-    requestId: string;
+    sourcePeer?: PeerDescriptor;
     /**
-     * @generated from protobuf field: dht.PeerDescriptor destinationPeer = 3;
+     * @generated from protobuf field: bytes target = 3;
      */
-    destinationPeer?: PeerDescriptor;
+    target: Uint8Array;
     /**
      * @generated from protobuf field: dht.Message message = 4;
      */
@@ -410,11 +406,11 @@ export interface Message {
          */
         rpcMessage: RpcMessage;
     } | {
-        oneofKind: "findRequest";
+        oneofKind: "recursiveOperationRequest";
         /**
-         * @generated from protobuf field: dht.FindRequest findRequest = 11;
+         * @generated from protobuf field: dht.RecursiveOperationRequest recursiveOperationRequest = 11;
          */
-        findRequest: FindRequest;
+        recursiveOperationRequest: RecursiveOperationRequest;
     } | {
         oneofKind: undefined;
     };
@@ -428,15 +424,6 @@ export interface Message {
  */
 export interface WebsocketConnectionRequest {
 }
-/**
- * @generated from protobuf message dht.WebsocketConnectionResponse
- */
-export interface WebsocketConnectionResponse {
-    /**
-     * @generated from protobuf field: bool accepted = 1;
-     */
-    accepted: boolean;
-}
 /**
  * WebRTC
  *
@@ -547,13 +534,13 @@ export interface ExternalFindDataResponse {
     entries: DataEntry[];
 }
 /**
- * @generated from protobuf enum dht.FindAction
+ * @generated from protobuf enum dht.RecursiveOperation
  */
-export enum FindAction {
+export enum RecursiveOperation {
     /**
-     * @generated from protobuf enum value: NODE = 0;
+     * @generated from protobuf enum value: FIND_NODE = 0;
      */
-    NODE = 0,
+    FIND_NODE = 0,
     /**
      * @generated from protobuf enum value: FETCH_DATA = 1;
      */
@@ -574,11 +561,7 @@ export enum NodeType {
     /**
      * @generated from protobuf enum value: BROWSER = 1;
      */
-    BROWSER = 1,
-    /**
-     * @generated from protobuf enum value: VIRTUAL = 3;
-     */
-    VIRTUAL = 3
+    BROWSER = 1
 }
 /**
  * @generated from protobuf enum dht.RpcResponseError
@@ -661,9 +644,9 @@ export enum MessageType {
      */
     HANDSHAKE_RESPONSE = 4,
     /**
-     * @generated from protobuf enum value: FIND_REQUEST = 5;
+     * @generated from protobuf enum value: RECURSIVE_OPERATION_REQUEST = 5;
      */
-    FIND_REQUEST = 5
+    RECURSIVE_OPERATION_REQUEST = 5
 }
 /**
  * @generated from protobuf enum dht.DisconnectMode
@@ -684,7 +667,7 @@ class StoreDataRequest$Type extends MessageType$<StoreDataRequest> {
         super("dht.StoreDataRequest", [
             { no: 1, name: "key", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
             { no: 2, name: "data", kind: "message", T: () => Any },
-            { no: 3, name: "creator", kind: "message", T: () => PeerDescriptor },
+            { no: 3, name: "creator", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
             { no: 4, name: "createdAt", kind: "message", T: () => Timestamp },
             { no: 5, name: "ttl", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
         ]);
@@ -697,9 +680,7 @@ export const StoreDataRequest = new StoreDataRequest$Type();
 // @generated message type with reflection information, may provide speed optimized methods
 class StoreDataResponse$Type extends MessageType$<StoreDataResponse> {
     constructor() {
-        super("dht.StoreDataResponse", [
-            { no: 1, name: "error", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
-        ]);
+        super("dht.StoreDataResponse", []);
     }
 }
 /**
@@ -749,7 +730,7 @@ class DataEntry$Type extends MessageType$<DataEntry> {
         super("dht.DataEntry", [
             { no: 1, name: "key", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
             { no: 2, name: "data", kind: "message", T: () => Any },
-            { no: 3, name: "creator", kind: "message", T: () => PeerDescriptor },
+            { no: 3, name: "creator", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
             { no: 4, name: "createdAt", kind: "message", T: () => Timestamp },
             { no: 5, name: "storedAt", kind: "message", T: () => Timestamp },
             { no: 6, name: "ttl", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
@@ -789,22 +770,22 @@ class ClosestPeersResponse$Type extends MessageType$<ClosestPeersResponse> {
  */
 export const ClosestPeersResponse = new ClosestPeersResponse$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class FindRequest$Type extends MessageType$<FindRequest> {
+class RecursiveOperationRequest$Type extends MessageType$<RecursiveOperationRequest> {
     constructor() {
-        super("dht.FindRequest", [
+        super("dht.RecursiveOperationRequest", [
             { no: 1, name: "sessionId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "action", kind: "enum", T: () => ["dht.FindAction", FindAction] }
+            { no: 2, name: "operation", kind: "enum", T: () => ["dht.RecursiveOperation", RecursiveOperation] }
         ]);
     }
 }
 /**
- * @generated MessageType for protobuf message dht.FindRequest
+ * @generated MessageType for protobuf message dht.RecursiveOperationRequest
  */
-export const FindRequest = new FindRequest$Type();
+export const RecursiveOperationRequest = new RecursiveOperationRequest$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class FindResponse$Type extends MessageType$<FindResponse> {
+class RecursiveOperationResponse$Type extends MessageType$<RecursiveOperationResponse> {
     constructor() {
-        super("dht.FindResponse", [
+        super("dht.RecursiveOperationResponse", [
             { no: 1, name: "closestConnectedPeers", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor },
             { no: 2, name: "dataEntries", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => DataEntry },
             { no: 3, name: "noCloserNodesFound", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
@@ -813,9 +794,9 @@ class FindResponse$Type extends MessageType$<FindResponse> {
     }
 }
 /**
- * @generated MessageType for protobuf message dht.FindResponse
+ * @generated MessageType for protobuf message dht.RecursiveOperationResponse
  */
-export const FindResponse = new FindResponse$Type();
+export const RecursiveOperationResponse = new RecursiveOperationResponse$Type();
 // @generated message type with reflection information, may provide speed optimized methods
 class PingRequest$Type extends MessageType$<PingRequest> {
     constructor() {
@@ -887,9 +868,9 @@ export const ConnectivityMethod = new ConnectivityMethod$Type();
 class RouteMessageWrapper$Type extends MessageType$<RouteMessageWrapper> {
     constructor() {
         super("dht.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: 1, name: "requestId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 2, name: "sourcePeer", kind: "message", T: () => PeerDescriptor },
+            { no: 3, name: "target", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
             { 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 }
@@ -982,7 +963,7 @@ class Message$Type extends MessageType$<Message> {
             { no: 8, name: "handshakeRequest", kind: "message", oneof: "body", T: () => HandshakeRequest },
             { no: 9, name: "handshakeResponse", kind: "message", oneof: "body", T: () => HandshakeResponse },
             { no: 10, name: "rpcMessage", kind: "message", oneof: "body", T: () => RpcMessage },
-            { no: 11, name: "findRequest", kind: "message", oneof: "body", T: () => FindRequest }
+            { no: 11, name: "recursiveOperationRequest", kind: "message", oneof: "body", T: () => RecursiveOperationRequest }
         ]);
     }
 }
@@ -1001,18 +982,6 @@ class WebsocketConnectionRequest$Type extends MessageType$<WebsocketConnectionRe
  */
 export const WebsocketConnectionRequest = new WebsocketConnectionRequest$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class WebsocketConnectionResponse$Type extends MessageType$<WebsocketConnectionResponse> {
-    constructor() {
-        super("dht.WebsocketConnectionResponse", [
-            { no: 1, name: "accepted", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
-        ]);
-    }
-}
-/**
- * @generated MessageType for protobuf message dht.WebsocketConnectionResponse
- */
-export const WebsocketConnectionResponse = new WebsocketConnectionResponse$Type();
-// @generated message type with reflection information, may provide speed optimized methods
 class WebrtcConnectionRequest$Type extends MessageType$<WebrtcConnectionRequest> {
     constructor() {
         super("dht.WebrtcConnectionRequest", []);
@@ -1160,10 +1129,10 @@ export const RouterRpc = new ServiceType("dht.RouterRpc", [
     { name: "forwardMessage", options: {}, I: RouteMessageWrapper, O: RouteMessageAck }
 ]);
 /**
- * @generated ServiceType for protobuf service dht.FindRpc
+ * @generated ServiceType for protobuf service dht.RecursiveOperationRpc
  */
-export const FindRpc = new ServiceType("dht.FindRpc", [
-    { name: "routeFindRequest", options: {}, I: RouteMessageWrapper, O: RouteMessageAck }
+export const RecursiveOperationRpc = new ServiceType("dht.RecursiveOperationRpc", [
+    { name: "routeRequest", options: {}, I: RouteMessageWrapper, O: RouteMessageAck }
 ]);
 /**
  * @generated ServiceType for protobuf service dht.StoreRpc
@@ -1173,16 +1142,16 @@ export const StoreRpc = new ServiceType("dht.StoreRpc", [
     { name: "replicateData", options: {}, I: ReplicateDataRequest, O: Empty }
 ]);
 /**
- * @generated ServiceType for protobuf service dht.FindSessionRpc
+ * @generated ServiceType for protobuf service dht.RecursiveOperationSessionRpc
  */
-export const FindSessionRpc = new ServiceType("dht.FindSessionRpc", [
-    { name: "sendFindResponse", options: {}, I: FindResponse, O: Empty }
+export const RecursiveOperationSessionRpc = new ServiceType("dht.RecursiveOperationSessionRpc", [
+    { name: "sendResponse", options: {}, I: RecursiveOperationResponse, O: Empty }
 ]);
 /**
  * @generated ServiceType for protobuf service dht.WebsocketConnectorRpc
  */
 export const WebsocketConnectorRpc = new ServiceType("dht.WebsocketConnectorRpc", [
-    { name: "requestConnection", options: {}, I: WebsocketConnectionRequest, O: WebsocketConnectionResponse }
+    { name: "requestConnection", options: {}, I: WebsocketConnectionRequest, O: Empty }
 ]);
 /**
  * @generated ServiceType for protobuf service dht.WebrtcConnectorRpc

package/src/rpc-protocol/DhtCallContext.ts

@@ -8,7 +8,8 @@ export class DhtCallContext extends ProtoCallContext implements DhtRpcOptions {
     sourceDescriptor?: PeerDescriptor
     notification?: boolean
     clientId?: number
-    doNotConnect?: boolean 
+    connect?: boolean
+    sendIfStopped?: boolean
     //used in incoming calls
     incomingSourceDescriptor?: PeerDescriptor
 }

package/src/rpc-protocol/DhtRpcOptions.ts

@@ -5,5 +5,6 @@ export interface DhtRpcOptions extends ProtoRpcOptions {
     targetDescriptor?: PeerDescriptor
     sourceDescriptor?: PeerDescriptor
     clientId?: number
-    doNotConnect?: boolean
+    connect?: boolean
+    sendIfStopped?: boolean
 }

package/src/transport/ITransport.ts

@@ -4,7 +4,16 @@ export interface TransportEvents {
     disconnected: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean) => void
     message: (message: Message) => void
     connected: (peerDescriptor: PeerDescriptor) => void
+}
+
+export interface SendOptions {
+    connect: boolean
+    sendIfStopped: boolean
+}
 
+export const DEFAULT_SEND_OPTIONS = {
+    connect: true,
+    sendIfStopped: false
 }
 
 export interface ITransport {
@@ -21,7 +30,7 @@ export interface ITransport {
     off<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
     off<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean) => void): void
 
-    send(msg: Message, doNotConnect?: boolean): Promise<void>
+    send(msg: Message, opts?: SendOptions): Promise<void>
     getLocalPeerDescriptor(): PeerDescriptor
     getAllConnectionPeerDescriptors(): PeerDescriptor[]
     stop(): void | Promise<void>

package/src/transport/ListeningRpcCommunicator.ts

@@ -9,7 +9,7 @@ export class ListeningRpcCommunicator extends RoutingRpcCommunicator {
     private readonly listener: (msg: Message) => void
 
     constructor(ownServiceId: ServiceID, transport: ITransport, config?: RpcCommunicatorConfig) {
-        super(ownServiceId, transport.send, config)
+        super(ownServiceId, (msg, opts) => transport.send(msg, opts), config)
         this.listener = (msg: Message) => {
             this.handleMessageFromPeer(msg)
         }

package/src/transport/RoutingRpcCommunicator.ts

@@ -4,14 +4,15 @@ 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'
+import { DEFAULT_SEND_OPTIONS, SendOptions } from './ITransport'
 
 export class RoutingRpcCommunicator extends RpcCommunicator {
     private ownServiceId: ServiceID
-    private sendFn: (msg: Message, doNotConnect?: boolean, doNotMindStopped?: boolean) => Promise<void>
+    private sendFn: (msg: Message, opts: SendOptions) => Promise<void>
 
     constructor(
         ownServiceId: ServiceID,
-        sendFn: (msg: Message, doNotConnect?: boolean) => Promise<void>,
+        sendFn: (msg: Message, opts: SendOptions) => Promise<void>,
         config?: RpcCommunicatorConfig
     ) {
         super(config)
@@ -38,20 +39,25 @@ export class RoutingRpcCommunicator extends RpcCommunicator {
                 targetDescriptor
             }
 
-            // TODO is it possible to have explicit default values for "doNotConnect" and "doNotMindStopped"?
-            if (msg.header.response || callContext && callContext.doNotConnect && callContext.doNotMindStopped ) {
-                return this.sendFn(message, true, true)
-            } else if (msg.header.response || callContext && callContext.doNotConnect) {
-                return this.sendFn(message, true)
-            } else {
-                return this.sendFn(message)
-            }
-
+            // TODO maybe sendOptions could be a separate block inside callContext
+            const sendOpts = (msg.header.response !== undefined)
+                ? {
+                    // typically we already have a connection, but if it has disconnected for some reason
+                    // the receiver could have gone offline (or it is no longer a neighbor) and therefore there
+                    // is no point in trying form a new connection
+                    connect: false,
+                    // TODO maybe this options could be removed?
+                    sendIfStopped: true
+                } : {
+                    connect: callContext?.connect ?? DEFAULT_SEND_OPTIONS.connect,
+                    sendIfStopped: callContext?.sendIfStopped ?? DEFAULT_SEND_OPTIONS.sendIfStopped
+                }
+            return this.sendFn(message, sendOpts)
         })
     }
 
     public handleMessageFromPeer(message: Message): void {
-        if (message.serviceId == this.ownServiceId && message.body.oneofKind === 'rpcMessage') {
+        if (message.serviceId === this.ownServiceId && message.body.oneofKind === 'rpcMessage') {
             const context = new DhtCallContext()
             context.incomingSourceDescriptor = message.sourceDescriptor
             // TODO should we have some handling for this floating promise?