@streamr/dht 0.0.1-tatum.6 → 0.0.1-tatum.8

package/protos/DhtRpc.proto

@@ -14,40 +14,40 @@ service DhtRpcService {
   rpc leaveNotice (LeaveNotice) returns (google.protobuf.Empty);
 }
 
-service RoutingService {
+service RouterRpc {
   rpc routeMessage (RouteMessageWrapper) returns (RouteMessageAck);
   rpc forwardMessage (RouteMessageWrapper) returns (RouteMessageAck);
   rpc findRecursively (RouteMessageWrapper) returns (RouteMessageAck);
 }
 
-service StoreService {
+service StoreRpc {
   rpc storeData (StoreDataRequest) returns (StoreDataResponse);
   rpc migrateData (MigrateDataRequest) returns (MigrateDataResponse);
   rpc deleteData (DeleteDataRequest) returns (DeleteDataResponse);
 }
 
 service RecursiveFindSessionService {
-  rpc reportRecursiveFindResult(RecursiveFindReport) returns (google.protobuf.Empty);
+  rpc sendFindResponse(FindResponse) returns (google.protobuf.Empty);
 }
 
-service WebSocketConnectorService {
+service WebSocketConnectorRpc {
   rpc requestConnection (WebSocketConnectionRequest) returns (WebSocketConnectionResponse);
 }
 
-service WebRtcConnectorService {
+service WebRtcConnectorRpc {
   rpc requestConnection (WebRtcConnectionRequest) returns (google.protobuf.Empty);
   rpc rtcOffer (RtcOffer) returns (google.protobuf.Empty);
   rpc rtcAnswer (RtcAnswer) returns (google.protobuf.Empty);
   rpc iceCandidate (IceCandidate) returns (google.protobuf.Empty);
 }
 
-service ConnectionLocker {
+service ConnectionLockRpc {
   rpc lockRequest (LockRequest) returns (LockResponse);
   rpc unlockRequest (UnlockRequest) returns (google.protobuf.Empty);
   rpc gracefulDisconnect (DisconnectNotice) returns (DisconnectNoticeResponse);
 }
 
-service ExternalApiService {
+service ExternalApiRpc {
   rpc findData (FindDataRequest) returns (FindDataResponse);
   rpc externalStoreData (ExternalStoreDataRequest) returns (ExternalStoreDataResponse);
 }
@@ -111,18 +111,13 @@ message ClosestPeersResponse {
   string requestId = 2;
 }
 
-enum FindMode {
-  NODE = 0;
-  DATA = 1;
+message FindRequest {
+  string sessionId = 1;
+  bool fetchData = 2;
 }
 
-message RecursiveFindRequest {
-  string recursiveFindSessionId = 1;
-  FindMode findMode = 2;
-}
-
-message RecursiveFindReport {
-  repeated PeerDescriptor nodes = 1;
+message FindResponse {
+  repeated PeerDescriptor closestConnectedPeers = 1;
   repeated DataEntry dataEntries = 2;
   optional bool noCloserNodesFound = 3;
   repeated PeerDescriptor routingPath = 4;
@@ -148,7 +143,6 @@ message PeerDescriptor {
   ConnectivityMethod websocket = 5;
   optional bool openInternet = 6;
   optional uint32 region = 7;
-  optional string nodeName = 8;
 }
 
 message ConnectivityMethod {
@@ -181,10 +175,8 @@ message RouteMessageWrapper {
 }
 
 message RouteMessageAck {
-  PeerDescriptor sourcePeer = 1;
-  string requestId = 2;
-  PeerDescriptor destinationPeer = 3;
-  string error = 4;
+  string requestId = 1;
+  string error = 2;
 }
 
 // Correspond to the MessageType Enum
@@ -204,15 +196,13 @@ message ConnectivityResponse {
 
 message HandshakeRequest {
   bytes sourceId = 1;
-  string protocolVersion = 2;
-  PeerDescriptor peerDescriptor = 3;
+  PeerDescriptor peerDescriptor = 2;
 }
 
 message HandshakeResponse {
   bytes sourceId = 1;
-  string protocolVersion = 2;
-  PeerDescriptor peerDescriptor = 3;
-  optional string responseError = 4;
+  PeerDescriptor peerDescriptor = 2;
+  optional string responseError = 3;
 }
 
 // Wraps all messages
@@ -238,7 +228,7 @@ message Message {
     HandshakeRequest handshakeRequest = 8;
     HandshakeResponse handshakeResponse = 9;
     protorpc.RpcMessage rpcMessage = 10;
-    RecursiveFindRequest RecursiveFindRequest = 11;
+    FindRequest findRequest = 11;
   };
 }
 
@@ -246,58 +236,42 @@ message Message {
 
 // WebSocket
 message WebSocketConnectionRequest {
-  PeerDescriptor requester = 1;
-  PeerDescriptor target = 2;
-  string ip = 3;
-  uint32 port = 4;
+  string ip = 1;
+  uint32 port = 2;
 }
 
 message WebSocketConnectionResponse {
-  PeerDescriptor requester = 1;
-  PeerDescriptor target = 2;
-  bool accepted = 3;
-  optional string reason = 4;
+  bool accepted = 1;
+  optional string reason = 2;
 }
 
 // WebRTC
 message WebRtcConnectionRequest {
-  PeerDescriptor requester = 1;
-  PeerDescriptor target = 2;
-  string connectionId = 3;
+  string connectionId = 1;
 }
 
 message RtcOffer {
-  PeerDescriptor requester = 1;
-  PeerDescriptor target = 2;
-  string description = 3;
-  string connectionId = 4;
+  string description = 1;
+  string connectionId = 2;
 }
 
 message RtcAnswer {
-  PeerDescriptor requester = 1;
-  PeerDescriptor target = 2;
-  string description = 3;
-  string connectionId = 4;
+  string description = 1;
+  string connectionId = 2;
 }
 
 message IceCandidate {
   string candidate = 1;
   string mid = 2;
   string connectionId = 3;
-  PeerDescriptor requester = 4;
-  PeerDescriptor target = 5;
 }
 
 message LockRequest {
-  string protocolVersion = 1;
-  PeerDescriptor peerDescriptor = 2;
-  string serviceId = 3;
+  string serviceId = 1;
 }
 
 message UnlockRequest {
-  string protocolVersion = 1;
-  PeerDescriptor peerDescriptor = 2;
-  string serviceId = 3;
+  string serviceId = 1;
 }
 
 message LockResponse {
@@ -311,18 +285,14 @@ enum DisconnectMode {
 }
 
 message DisconnectNotice {
-  string protocolVersion = 1;
-  PeerDescriptor peerDescriptor = 2;
-  DisconnectMode disconnecMode = 3;
+  DisconnectMode disconnectMode = 1;
 }
 
 message DisconnectNoticeResponse {
-  string protocolVersion = 1;
 }
 
 message FindDataRequest {
   bytes kademliaId = 1;
-  PeerDescriptor requestor = 2;
 }
 
 message FindDataResponse {

package/src/connection/ConnectionLockHandler.ts

@@ -43,7 +43,7 @@ export class ConnectionLockHandler {
         }
     }
 
-    public isWeakLocked(id: PeerIDKey): boolean {
+    private isWeakLocked(id: PeerIDKey): boolean {
         return this.weakLocks.has(id)
     }
 

package/src/connection/ConnectionLockRpcRemote.ts

@@ -0,0 +1,62 @@
+import { Logger } from '@streamr/utils'
+import { ProtoRpcClient } from '@streamr/proto-rpc'
+import { IConnectionLockRpcClient } from '../proto/packages/dht/protos/DhtRpc.client'
+import { LockRequest, UnlockRequest, PeerDescriptor, DisconnectNotice, DisconnectMode } from '../proto/packages/dht/protos/DhtRpc'
+
+import * as Err from '../helpers/errors'
+import { keyFromPeerDescriptor } from '../helpers/peerIdFromPeerDescriptor'
+import { Remote } from '../dht/contact/Remote'
+
+const logger = new Logger(module)
+
+export class ConnectionLockRpcRemote extends Remote<IConnectionLockRpcClient> {
+
+    constructor(
+        ownPeerDescriptor: PeerDescriptor,
+        targetPeerDescriptor: PeerDescriptor,
+        client: ProtoRpcClient<IConnectionLockRpcClient>
+    ) {
+        super(ownPeerDescriptor, targetPeerDescriptor, 'DUMMY', client)
+    }
+
+    public async lockRequest(serviceId: string): Promise<boolean> {
+        logger.trace(`Requesting locked connection to ${keyFromPeerDescriptor(this.getPeerDescriptor())}`)
+        const request: LockRequest = {
+            serviceId
+        }
+        const options = this.formDhtRpcOptions()
+        try {
+            const res = await this.getClient().lockRequest(request, options)
+            return res.accepted
+        } catch (err) {
+            logger.debug(new Err.ConnectionLocker('Connection lock rejected', err).stack!)
+            return false
+        }
+    }
+
+    public unlockRequest(serviceId: string): void {
+        logger.trace(`Requesting connection to be unlocked from ${keyFromPeerDescriptor(this.getPeerDescriptor())}`)
+        const request: UnlockRequest = {
+            serviceId
+        }
+        const options = this.formDhtRpcOptions({
+            notification: true
+        })
+        this.getClient().unlockRequest(request, options).catch((_e) => {
+            logger.trace('failed to send unlockRequest')
+        })
+    }
+
+    public async gracefulDisconnect(disconnectMode: DisconnectMode): Promise<void> {
+        logger.trace(`Notifying a graceful disconnect to ${keyFromPeerDescriptor(this.getPeerDescriptor())}`)
+        const request: DisconnectNotice = {
+            disconnectMode
+        }
+        const options = this.formDhtRpcOptions({
+            doNotConnect: true,
+            doNotMindStopped: true,
+            timeout: 2000
+        })
+        await this.getClient().gracefulDisconnect(request, options)
+    }
+}