@streamr/dht 100.0.0-pretestnet.2 → 100.0.0-pretestnet.4

package/dist/src/types/ServiceID.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ServiceID.js.map

package/dist/src/types/ServiceID.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServiceID.js","sourceRoot":"","sources":["../../../src/types/ServiceID.ts"],"names":[],"mappings":""}

package/karma.config.js

@@ -5,16 +5,16 @@ const { createKarmaConfig, createWebpackConfig } = require('@streamr/browser-tes
 const TEST_PATHS = [
     'test/unit/**/*.ts',
     './test/integration/**/!(DhtWith*|MigrateData*).ts/',
-    'test/end-to-end/**/*.ts'
+    './test/end-to-end/**/!(RecoveryFromFailedAutoCertification*|memory-leak*).ts'
 ]
 
-const NodeWebRtcConnection = path.resolve(__dirname, 'src/connection/WebRTC/NodeWebRtcConnection.ts')
-const BrowserWebRtcConnection = path.resolve(__dirname, 'src/connection/WebRTC/BrowserWebRtcConnection.ts')
+const NodeWebrtcConnection = path.resolve(__dirname, 'src/connection/webrtc/NodeWebrtcConnection.ts')
+const BrowserWebrtcConnection = path.resolve(__dirname, 'src/connection/webrtc/BrowserWebrtcConnection.ts')
 
 module.exports = createKarmaConfig(TEST_PATHS, createWebpackConfig({
     entry: './src/exports.ts',
     libraryName: 'dht',
     alias: {
-        [NodeWebRtcConnection]: BrowserWebRtcConnection
+        [NodeWebrtcConnection]: BrowserWebrtcConnection
     }
 }))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamr/dht",
-  "version": "100.0.0-pretestnet.2",
+  "version": "100.0.0-pretestnet.4",
   "description": "Streamr Network DHT",
   "repository": {
     "type": "git",
@@ -31,8 +31,9 @@
   "dependencies": {
     "@protobuf-ts/runtime": "^2.8.2",
     "@protobuf-ts/runtime-rpc": "^2.8.2",
-    "@streamr/proto-rpc": "100.0.0-pretestnet.2",
-    "@streamr/utils": "100.0.0-pretestnet.2",
+    "@streamr/autocertifier-client": "100.0.0-pretestnet.4",
+    "@streamr/proto-rpc": "100.0.0-pretestnet.4",
+    "@streamr/utils": "100.0.0-pretestnet.4",
     "eventemitter3": "^5.0.0",
     "heap": "^0.2.6",
     "ipaddr.js": "^2.0.1",
@@ -45,15 +46,16 @@
   },
   "devDependencies": {
     "@streamr/browser-test-runner": "^0.0.1",
-    "@streamr/test-utils": "100.0.0-pretestnet.2",
-    "@types/express": "^4.17.20",
-    "@types/heap": "^0.2.33",
+    "@streamr/test-utils": "100.0.0-pretestnet.4",
+    "@types/express": "^4.17.21",
+    "@types/heap": "^0.2.34",
     "@types/k-bucket": "^5.0.1",
-    "@types/lodash": "^4.14.200",
+    "@types/lodash": "^4.14.201",
     "@types/sinon": "^10.0.15",
-    "@types/uuid": "^9.0.6",
+    "@types/uuid": "^9.0.7",
     "@types/websocket": "^1.0.3",
     "express": "^4.17.1",
+    "jest-leak-detector": "^27.3.1",
     "patch-package": "^8.0.0",
     "ts-essentials": "^9.4.1",
     "ts-node": "^10.9.1"

package/protos/DhtRpc.proto

@@ -8,7 +8,7 @@ import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 import "packages/proto-rpc/protos/ProtoRpc.proto";
 
-service DhtRpcService {
+service DhtNodeRpc {
   rpc getClosestPeers (ClosestPeersRequest) returns (ClosestPeersResponse);
   rpc ping (PingRequest) returns (PingResponse);
   rpc leaveNotice (LeaveNotice) returns (google.protobuf.Empty);
@@ -17,7 +17,10 @@ service DhtRpcService {
 service RouterRpc {
   rpc routeMessage (RouteMessageWrapper) returns (RouteMessageAck);
   rpc forwardMessage (RouteMessageWrapper) returns (RouteMessageAck);
-  rpc findRecursively (RouteMessageWrapper) returns (RouteMessageAck);
+}
+
+service FindRpc {
+  rpc routeFindRequest (RouteMessageWrapper) returns (RouteMessageAck);
 }
 
 service StoreRpc {
@@ -26,16 +29,16 @@ service StoreRpc {
   rpc deleteData (DeleteDataRequest) returns (DeleteDataResponse);
 }
 
-service RecursiveFindSessionService {
+service FindSessionRpc {
   rpc sendFindResponse(FindResponse) returns (google.protobuf.Empty);
 }
 
-service WebSocketConnectorRpc {
-  rpc requestConnection (WebSocketConnectionRequest) returns (WebSocketConnectionResponse);
+service WebsocketConnectorRpc {
+  rpc requestConnection (WebsocketConnectionRequest) returns (WebsocketConnectionResponse);
 }
 
-service WebRtcConnectorRpc {
-  rpc requestConnection (WebRtcConnectionRequest) returns (google.protobuf.Empty);
+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);
@@ -48,7 +51,7 @@ service ConnectionLockRpc {
 }
 
 service ExternalApiRpc {
-  rpc findData (FindDataRequest) returns (FindDataResponse);
+  rpc externalFindData (ExternalFindDataRequest) returns (ExternalFindDataResponse);
   rpc externalStoreData (ExternalStoreDataRequest) returns (ExternalStoreDataResponse);
 }
 
@@ -141,8 +144,7 @@ message PeerDescriptor {
   ConnectivityMethod udp = 3;
   ConnectivityMethod tcp = 4;
   ConnectivityMethod websocket = 5;
-  optional bool openInternet = 6;
-  optional uint32 region = 7;
+  optional uint32 region = 6;
 }
 
 message ConnectivityMethod {
@@ -168,10 +170,9 @@ message RouteMessageWrapper {
   PeerDescriptor sourcePeer = 1;
   string requestId = 2;
   PeerDescriptor destinationPeer = 3;
-  PeerDescriptor previousPeer = 4;
-  Message message = 5;
-  repeated PeerDescriptor reachableThrough = 6;
-  repeated PeerDescriptor routingPath = 7;
+  Message message = 4;
+  repeated PeerDescriptor reachableThrough = 5;
+  repeated PeerDescriptor routingPath = 6;
 }
 
 message RouteMessageAck {
@@ -185,35 +186,39 @@ message ConnectivityRequest {
   uint32 port = 1;
   bool tls = 2;
   optional string host = 3;
+  bool selfSigned = 4;
 }
 
 message ConnectivityResponse {
-  bool open_internet = 1;
-  string host = 2;
-  string natType = 3;
-  ConnectivityMethod websocket = 4;
+  string host = 1;
+  string natType = 2;
+  ConnectivityMethod websocket = 3;
 }
 
 message HandshakeRequest {
-  bytes sourceId = 1;
-  PeerDescriptor peerDescriptor = 2;
+  PeerDescriptor sourcePeerDescriptor = 1;
+  optional PeerDescriptor targetPeerDescriptor = 2;
 }
 
 message HandshakeResponse {
-  bytes sourceId = 1;
-  PeerDescriptor peerDescriptor = 2;
-  optional string responseError = 3;
+  PeerDescriptor sourcePeerDescriptor = 1;
+  optional HandshakeError error = 2;
+}
+
+enum HandshakeError {
+  DUPLICATE_CONNECTION = 0;
+  INVALID_TARGET_PEER_DESCRIPTOR = 1;
 }
 
 // Wraps all messages
 
 enum MessageType {
-  CONNECTIVITY_REQUEST = 0;
-  CONNECTIVITY_RESPONSE = 1;
-  HANDSHAKE_REQUEST = 2;
-  HANDSHAKE_RESPONSE = 3;
-  RPC = 4;
-  RECURSIVE_FIND_REQUEST = 5;
+  RPC = 0;
+  CONNECTIVITY_REQUEST = 1;
+  CONNECTIVITY_RESPONSE = 2;
+  HANDSHAKE_REQUEST = 3;
+  HANDSHAKE_RESPONSE = 4;
+  FIND_REQUEST = 5;
 }
 
 message Message {
@@ -235,19 +240,15 @@ message Message {
 // Connector Messages
 
 // WebSocket
-message WebSocketConnectionRequest {
-  string ip = 1;
-  uint32 port = 2;
+message WebsocketConnectionRequest {
 }
 
-message WebSocketConnectionResponse {
+message WebsocketConnectionResponse {
   bool accepted = 1;
-  optional string reason = 2;
 }
 
 // WebRTC
-message WebRtcConnectionRequest {
-  string connectionId = 1;
+message WebrtcConnectionRequest {
 }
 
 message RtcOffer {
@@ -267,11 +268,11 @@ message IceCandidate {
 }
 
 message LockRequest {
-  string serviceId = 1;
+  string lockId = 1;
 }
 
 message UnlockRequest {
-  string serviceId = 1;
+  string lockId = 1;
 }
 
 message LockResponse {
@@ -291,11 +292,11 @@ message DisconnectNotice {
 message DisconnectNoticeResponse {
 }
 
-message FindDataRequest {
+message ExternalFindDataRequest {
   bytes kademliaId = 1;
 }
 
-message FindDataResponse {
+message ExternalFindDataResponse {
   repeated DataEntry dataEntries = 1;
   optional string error = 2;
 }

package/src/connection/ConnectionLockHandler.ts

@@ -3,12 +3,14 @@
 
 import { PeerIDKey } from '../helpers/PeerID'
 
-type ServiceName = string
+export type LockID = string
 
 export class ConnectionLockHandler {
 
-    private localLocks: Map<PeerIDKey, Set<ServiceName>> = new Map()
-    private remoteLocks: Map<PeerIDKey, Set<ServiceName>> = new Map()
+    private localLocks: Map<PeerIDKey, Set<LockID>> = new Map()
+    private remoteLocks: Map<PeerIDKey, Set<LockID>> = new Map()
+    // TODO: remove weakLocks use localLocks instead. When opening weakLocks from the ConnectioManager,
+    // simply do not send lock requests.
     private weakLocks: Set<PeerIDKey> = new Set()
 
     public getNumberOfLocalLockedConnections(): number {
@@ -23,19 +25,19 @@ export class ConnectionLockHandler {
         return this.weakLocks.size
     }
 
-    public isLocalLocked(id: PeerIDKey, serviceName?: ServiceName): boolean {
-        if (!serviceName) {
+    public isLocalLocked(id: PeerIDKey, lockId?: LockID): boolean {
+        if (!lockId) {
             return this.localLocks.has(id)
         } else {
-            return this.localLocks.has(id) && this.localLocks.get(id)!.has(serviceName)
+            return this.localLocks.has(id) && this.localLocks.get(id)!.has(lockId)
         }
     }
 
-    public isRemoteLocked(id: PeerIDKey, serviceName?: ServiceName): boolean {
-        if (!serviceName) {
+    public isRemoteLocked(id: PeerIDKey, lockId?: LockID): boolean {
+        if (!lockId) {
             return this.remoteLocks.has(id)
         } else {
-            if (this.remoteLocks.has(id) && this.remoteLocks.get(id)!.has(serviceName)) {
+            if (this.remoteLocks.has(id) && this.remoteLocks.get(id)!.has(lockId)) {
                 return true
             } else {
                 return false
@@ -51,36 +53,36 @@ export class ConnectionLockHandler {
         return (this.isLocalLocked(id) || this.isRemoteLocked(id) || this.isWeakLocked(id))
     }
 
-    public addLocalLocked(id: PeerIDKey, serviceName: ServiceName): void {
+    public addLocalLocked(id: PeerIDKey, lockId: LockID): void {
         if (!this.localLocks.has(id)) {
             this.localLocks.set(id, new Set())
         }
-        this.localLocks.get(id)!.add(serviceName)
+        this.localLocks.get(id)!.add(lockId)
     }
 
-    public addRemoteLocked(id: PeerIDKey, serviceName: ServiceName): void {
+    public addRemoteLocked(id: PeerIDKey, lockId: LockID): void {
         if (!this.remoteLocks.has(id)) {
             this.remoteLocks.set(id, new Set())
         }
-        this.remoteLocks.get(id)!.add(serviceName)
+        this.remoteLocks.get(id)!.add(lockId)
     }
 
     public addWeakLocked(id: PeerIDKey): void {
         this.weakLocks.add(id)
     }
 
-    public removeLocalLocked(id: PeerIDKey, serviceName: ServiceName): void {
+    public removeLocalLocked(id: PeerIDKey, lockId: LockID): void {
         if (this.localLocks.has(id)) {
-            this.localLocks.get(id)?.delete(serviceName)
+            this.localLocks.get(id)?.delete(lockId)
             if (this.localLocks.get(id)?.size === 0) {
                 this.localLocks.delete(id)
             }
         }
     }
 
-    public removeRemoteLocked(id: PeerIDKey, serviceName: ServiceName): void {
+    public removeRemoteLocked(id: PeerIDKey, lockId: LockID): void {
         if (this.remoteLocks.has(id)) {
-            this.remoteLocks.get(id)?.delete(serviceName)
+            this.remoteLocks.get(id)?.delete(lockId)
             if (this.remoteLocks.get(id)?.size === 0) {
                 this.remoteLocks.delete(id)
             }

package/src/connection/ConnectionLockRpcLocal.ts

@@ -0,0 +1,74 @@
+import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
+import { Logger } from '@streamr/utils'
+import {
+    areEqualPeerDescriptors,
+    keyFromPeerDescriptor,
+    peerIdFromPeerDescriptor
+} from '../helpers/peerIdFromPeerDescriptor'
+import { Empty } from '../proto/google/protobuf/empty'
+import {
+    DisconnectMode,
+    DisconnectNotice,
+    LockRequest,
+    LockResponse,
+    PeerDescriptor,
+    UnlockRequest
+} from '../proto/packages/dht/protos/DhtRpc'
+import { IConnectionLockRpc } from '../proto/packages/dht/protos/DhtRpc.server'
+import { DhtCallContext } from '../rpc-protocol/DhtCallContext'
+import { PeerIDKey } from '../helpers/PeerID'
+import { getNodeIdOrUnknownFromPeerDescriptor } from './ConnectionManager'
+import { LockID } from './ConnectionLockHandler'
+
+interface ConnectionLockRpcLocalConfig {
+    addRemoteLocked: (id: PeerIDKey, lockId: LockID) => void
+    removeRemoteLocked: (id: PeerIDKey, lockId: LockID) => void
+    closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) => void
+    getLocalPeerDescriptor: () => PeerDescriptor
+}
+
+const logger = new Logger(module)
+
+export class ConnectionLockRpcLocal implements IConnectionLockRpc {
+
+    private readonly config: ConnectionLockRpcLocalConfig
+
+    constructor(config: ConnectionLockRpcLocalConfig) {
+        this.config = config
+    }
+
+    async lockRequest(lockRequest: LockRequest, context: ServerCallContext): Promise<LockResponse> {
+        const senderPeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
+        const remotePeerId = peerIdFromPeerDescriptor(senderPeerDescriptor)
+        if (areEqualPeerDescriptors(senderPeerDescriptor, this.config.getLocalPeerDescriptor())) {
+            const response: LockResponse = {
+                accepted: false
+            }
+            return response
+        }
+        this.config.addRemoteLocked(remotePeerId.toKey(), lockRequest.lockId)
+        const response: LockResponse = {
+            accepted: true
+        }
+        return response
+    }
+
+    async unlockRequest(unlockRequest: UnlockRequest, context: ServerCallContext): Promise<Empty> {
+        const senderPeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
+        const peerIdKey = keyFromPeerDescriptor(senderPeerDescriptor)
+        this.config.removeRemoteLocked(peerIdKey, unlockRequest.lockId)
+        return {}
+    }
+
+    async gracefulDisconnect(disconnectNotice: DisconnectNotice, context: ServerCallContext): Promise<Empty> {
+        const senderPeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
+        logger.trace(getNodeIdOrUnknownFromPeerDescriptor(senderPeerDescriptor) + ' received gracefulDisconnect notice')
+
+        if (disconnectNotice.disconnectMode === DisconnectMode.LEAVING) {
+            this.config.closeConnection(senderPeerDescriptor, true, 'graceful leave notified')
+        } else {
+            this.config.closeConnection(senderPeerDescriptor, false, 'graceful disconnect notified')
+        }
+        return {}
+    }
+}

package/src/connection/ConnectionLockRpcRemote.ts

@@ -2,27 +2,27 @@ 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 { getNodeIdFromPeerDescriptor } from '../helpers/peerIdFromPeerDescriptor'
 import { Remote } from '../dht/contact/Remote'
+import { LockID } from './ConnectionLockHandler'
 
 const logger = new Logger(module)
 
 export class ConnectionLockRpcRemote extends Remote<IConnectionLockRpcClient> {
 
     constructor(
-        ownPeerDescriptor: PeerDescriptor,
+        localPeerDescriptor: PeerDescriptor,
         targetPeerDescriptor: PeerDescriptor,
         client: ProtoRpcClient<IConnectionLockRpcClient>
     ) {
-        super(ownPeerDescriptor, targetPeerDescriptor, 'DUMMY', client)
+        super(localPeerDescriptor, targetPeerDescriptor, 'DUMMY', client)
     }
 
-    public async lockRequest(serviceId: string): Promise<boolean> {
-        logger.trace(`Requesting locked connection to ${keyFromPeerDescriptor(this.getPeerDescriptor())}`)
+    public async lockRequest(lockId: LockID): Promise<boolean> {
+        logger.trace(`Requesting locked connection to ${getNodeIdFromPeerDescriptor(this.getPeerDescriptor())}`)
         const request: LockRequest = {
-            serviceId
+            lockId
         }
         const options = this.formDhtRpcOptions()
         try {
@@ -34,10 +34,10 @@ export class ConnectionLockRpcRemote extends Remote<IConnectionLockRpcClient> {
         }
     }
 
-    public unlockRequest(serviceId: string): void {
-        logger.trace(`Requesting connection to be unlocked from ${keyFromPeerDescriptor(this.getPeerDescriptor())}`)
+    public unlockRequest(lockId: LockID): void {
+        logger.trace(`Requesting connection to be unlocked from ${getNodeIdFromPeerDescriptor(this.getPeerDescriptor())}`)
         const request: UnlockRequest = {
-            serviceId
+            lockId
         }
         const options = this.formDhtRpcOptions({
             notification: true
@@ -48,7 +48,7 @@ export class ConnectionLockRpcRemote extends Remote<IConnectionLockRpcClient> {
     }
 
     public async gracefulDisconnect(disconnectMode: DisconnectMode): Promise<void> {
-        logger.trace(`Notifying a graceful disconnect to ${keyFromPeerDescriptor(this.getPeerDescriptor())}`)
+        logger.trace(`Notifying a graceful disconnect to ${getNodeIdFromPeerDescriptor(this.getPeerDescriptor())}`)
         const request: DisconnectNotice = {
             disconnectMode
         }