@streamr/dht 100.0.0-testnet-one.4 → 100.0.0-testnet-two.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamr/dht",
-  "version": "100.0.0-testnet-one.4",
+  "version": "100.0.0-testnet-two.1",
   "description": "Streamr Network DHT",
   "repository": {
     "type": "git",
@@ -31,26 +31,25 @@
   "dependencies": {
     "@protobuf-ts/runtime": "^2.8.2",
     "@protobuf-ts/runtime-rpc": "^2.8.2",
-    "@streamr/autocertifier-client": "100.0.0-testnet-one.4",
-    "@streamr/proto-rpc": "100.0.0-testnet-one.4",
-    "@streamr/utils": "100.0.0-testnet-one.4",
+    "@streamr/autocertifier-client": "100.0.0-testnet-two.1",
+    "@streamr/proto-rpc": "100.0.0-testnet-two.1",
+    "@streamr/utils": "100.0.0-testnet-two.1",
     "eventemitter3": "^5.0.0",
     "heap": "^0.2.6",
     "ipaddr.js": "^2.0.1",
     "k-bucket": "^5.1.0",
     "lodash": "^4.17.21",
     "node-datachannel": "^0.4.3",
-    "sinon": "15.1.2",
     "uuid": "^9.0.1",
     "websocket": "^1.0.34"
   },
   "devDependencies": {
     "@streamr/browser-test-runner": "^0.0.1",
-    "@streamr/test-utils": "100.0.0-testnet-one.4",
+    "@streamr/test-utils": "100.0.0-testnet-two.1",
     "@types/express": "^4.17.21",
     "@types/heap": "^0.2.34",
     "@types/k-bucket": "^5.0.1",
-    "@types/lodash": "^4.14.201",
+    "@types/lodash": "^4.14.202",
     "@types/sinon": "^10.0.15",
     "@types/uuid": "^9.0.7",
     "@types/websocket": "^1.0.3",

package/protos/DhtRpc.proto

@@ -19,8 +19,8 @@ service RouterRpc {
   rpc forwardMessage (RouteMessageWrapper) returns (RouteMessageAck);
 }
 
-service FindRpc {
-  rpc routeFindRequest (RouteMessageWrapper) returns (RouteMessageAck);
+service RecursiveOperationRpc {
+  rpc routeRequest (RouteMessageWrapper) returns (RouteMessageAck);
 }
 
 service StoreRpc {
@@ -28,12 +28,12 @@ service StoreRpc {
   rpc replicateData (ReplicateDataRequest) returns (google.protobuf.Empty);
 }
 
-service FindSessionRpc {
-  rpc sendFindResponse(FindResponse) returns (google.protobuf.Empty);
+service RecursiveOperationSessionRpc {
+  rpc sendResponse(RecursiveOperationResponse) returns (google.protobuf.Empty);
 }
 
 service WebsocketConnectorRpc {
-  rpc requestConnection (WebsocketConnectionRequest) returns (WebsocketConnectionResponse);
+  rpc requestConnection (WebsocketConnectionRequest) returns (google.protobuf.Empty);
 }
 
 service WebrtcConnectorRpc {
@@ -59,13 +59,12 @@ service ExternalApiRpc {
 message StoreDataRequest {
   bytes key = 1;
   google.protobuf.Any data = 2;
-  PeerDescriptor creator = 3;
+  bytes creator = 3;
   google.protobuf.Timestamp createdAt = 4;
   uint32 ttl = 5;
 }
 
 message StoreDataResponse {
-  string error = 1;
 }
 
 message ExternalStoreDataRequest {
@@ -84,7 +83,7 @@ message ReplicateDataRequest {
 message DataEntry {
   bytes key = 1;
   google.protobuf.Any data = 2;
-  PeerDescriptor creator = 3;
+  bytes creator = 3;
   google.protobuf.Timestamp createdAt = 4;
   google.protobuf.Timestamp storedAt = 5; 
   uint32 ttl = 6;   // milliseconds
@@ -102,18 +101,18 @@ message ClosestPeersResponse {
   string requestId = 2;
 }
 
-message FindRequest {
+message RecursiveOperationRequest {
   string sessionId = 1;
-  FindAction action = 2;
+  RecursiveOperation operation = 2;
 }
 
-enum FindAction {
-  NODE = 0;
+enum RecursiveOperation {
+  FIND_NODE = 0;
   FETCH_DATA = 1;
   DELETE_DATA = 2;
 }
 
-message FindResponse {
+message RecursiveOperationResponse {
   repeated PeerDescriptor closestConnectedPeers = 1;
   repeated DataEntry dataEntries = 2;
   bool noCloserNodesFound = 3;
@@ -129,7 +128,6 @@ message PingResponse {
 }
 
 message LeaveNotice {
-  string serviceId = 1;
 }
 
 message PeerDescriptor {
@@ -150,7 +148,6 @@ message ConnectivityMethod {
 enum NodeType {
   NODEJS = 0;
   BROWSER = 1;
-  VIRTUAL = 3;
 }
 
 enum RpcResponseError {
@@ -161,9 +158,9 @@ enum RpcResponseError {
 }
 
 message RouteMessageWrapper {
-  PeerDescriptor sourcePeer = 1;
-  string requestId = 2;
-  PeerDescriptor destinationPeer = 3;
+  string requestId = 1;
+  PeerDescriptor sourcePeer = 2;
+  bytes target = 3;
   Message message = 4;
   repeated PeerDescriptor reachableThrough = 5;
   repeated PeerDescriptor routingPath = 6;
@@ -200,16 +197,19 @@ message ConnectivityResponse {
 message HandshakeRequest {
   PeerDescriptor sourcePeerDescriptor = 1;
   optional PeerDescriptor targetPeerDescriptor = 2;
+  string version = 3;
 }
 
 message HandshakeResponse {
   PeerDescriptor sourcePeerDescriptor = 1;
   optional HandshakeError error = 2;
+  string version = 3;
 }
 
 enum HandshakeError {
   DUPLICATE_CONNECTION = 0;
   INVALID_TARGET_PEER_DESCRIPTOR = 1;
+  UNSUPPORTED_VERSION = 2;
 }
 
 // Wraps all messages
@@ -220,7 +220,7 @@ enum MessageType {
   CONNECTIVITY_RESPONSE = 2;
   HANDSHAKE_REQUEST = 3;
   HANDSHAKE_RESPONSE = 4;
-  FIND_REQUEST = 5;
+  RECURSIVE_OPERATION_REQUEST = 5;
 }
 
 message Message {
@@ -235,7 +235,7 @@ message Message {
     HandshakeRequest handshakeRequest = 8;
     HandshakeResponse handshakeResponse = 9;
     protorpc.RpcMessage rpcMessage = 10;
-    FindRequest findRequest = 11;
+    RecursiveOperationRequest recursiveOperationRequest = 11;
   };
 }
 
@@ -245,10 +245,6 @@ message Message {
 message WebsocketConnectionRequest {
 }
 
-message WebsocketConnectionResponse {
-  bool accepted = 1;
-}
-
 // WebRTC
 message WebrtcConnectionRequest {
 }

package/src/connection/ConnectionLockHandler.ts

@@ -1,17 +1,17 @@
 // Connection locks are independent of the existence of connections
 // that is why this class is needed
 
-import { PeerIDKey } from '../helpers/PeerID'
+import { NodeID } from '../helpers/nodeId'
 
 export type LockID = string
 
 export class ConnectionLockHandler {
 
-    private localLocks: Map<PeerIDKey, Set<LockID>> = new Map()
-    private remoteLocks: Map<PeerIDKey, Set<LockID>> = new Map()
+    private localLocks: Map<NodeID, Set<LockID>> = new Map()
+    private remoteLocks: Map<NodeID, 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()
+    private weakLocks: Set<NodeID> = new Set()
 
     public getNumberOfLocalLockedConnections(): number {
         return this.localLocks.size
@@ -25,7 +25,7 @@ export class ConnectionLockHandler {
         return this.weakLocks.size
     }
 
-    public isLocalLocked(id: PeerIDKey, lockId?: LockID): boolean {
+    public isLocalLocked(id: NodeID, lockId?: LockID): boolean {
         if (lockId === undefined) {
             return this.localLocks.has(id)
         } else {
@@ -33,7 +33,7 @@ export class ConnectionLockHandler {
         }
     }
 
-    public isRemoteLocked(id: PeerIDKey, lockId?: LockID): boolean {
+    public isRemoteLocked(id: NodeID, lockId?: LockID): boolean {
         if (lockId === undefined) {
             return this.remoteLocks.has(id)
         } else {
@@ -45,33 +45,33 @@ export class ConnectionLockHandler {
         }
     }
 
-    private isWeakLocked(id: PeerIDKey): boolean {
+    private isWeakLocked(id: NodeID): boolean {
         return this.weakLocks.has(id)
     }
 
-    public isLocked(id: PeerIDKey): boolean {
+    public isLocked(id: NodeID): boolean {
         return (this.isLocalLocked(id) || this.isRemoteLocked(id) || this.isWeakLocked(id))
     }
 
-    public addLocalLocked(id: PeerIDKey, lockId: LockID): void {
+    public addLocalLocked(id: NodeID, lockId: LockID): void {
         if (!this.localLocks.has(id)) {
             this.localLocks.set(id, new Set())
         }
         this.localLocks.get(id)!.add(lockId)
     }
 
-    public addRemoteLocked(id: PeerIDKey, lockId: LockID): void {
+    public addRemoteLocked(id: NodeID, lockId: LockID): void {
         if (!this.remoteLocks.has(id)) {
             this.remoteLocks.set(id, new Set())
         }
         this.remoteLocks.get(id)!.add(lockId)
     }
 
-    public addWeakLocked(id: PeerIDKey): void {
+    public addWeakLocked(id: NodeID): void {
         this.weakLocks.add(id)
     }
 
-    public removeLocalLocked(id: PeerIDKey, lockId: LockID): void {
+    public removeLocalLocked(id: NodeID, lockId: LockID): void {
         if (this.localLocks.has(id)) {
             this.localLocks.get(id)?.delete(lockId)
             if (this.localLocks.get(id)?.size === 0) {
@@ -80,7 +80,7 @@ export class ConnectionLockHandler {
         }
     }
 
-    public removeRemoteLocked(id: PeerIDKey, lockId: LockID): void {
+    public removeRemoteLocked(id: NodeID, lockId: LockID): void {
         if (this.remoteLocks.has(id)) {
             this.remoteLocks.get(id)?.delete(lockId)
             if (this.remoteLocks.get(id)?.size === 0) {
@@ -89,11 +89,11 @@ export class ConnectionLockHandler {
         }
     }
 
-    public removeWeakLocked(id: PeerIDKey): void {
+    public removeWeakLocked(id: NodeID): void {
         this.weakLocks.delete(id)
     }
 
-    public clearAllLocks(id: PeerIDKey): void {
+    public clearAllLocks(id: NodeID): void {
         this.localLocks.delete(id)
         this.remoteLocks.delete(id)
         this.weakLocks.delete(id)

package/src/connection/ConnectionLockRpcLocal.ts

@@ -2,8 +2,7 @@ import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { Logger } from '@streamr/utils'
 import {
     areEqualPeerDescriptors,
-    keyFromPeerDescriptor,
-    peerIdFromPeerDescriptor
+    getNodeIdFromPeerDescriptor
 } from '../helpers/peerIdFromPeerDescriptor'
 import { Empty } from '../proto/google/protobuf/empty'
 import {
@@ -16,13 +15,13 @@ import {
 } 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'
+import { NodeID } from '../helpers/nodeId'
 
 interface ConnectionLockRpcLocalConfig {
-    addRemoteLocked: (id: PeerIDKey, lockId: LockID) => void
-    removeRemoteLocked: (id: PeerIDKey, lockId: LockID) => void
+    addRemoteLocked: (id: NodeID, lockId: LockID) => void
+    removeRemoteLocked: (id: NodeID, lockId: LockID) => void
     closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) => void
     getLocalPeerDescriptor: () => PeerDescriptor
 }
@@ -39,14 +38,14 @@ export class ConnectionLockRpcLocal implements IConnectionLockRpc {
 
     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 remoteNodeId = getNodeIdFromPeerDescriptor(senderPeerDescriptor)
+        this.config.addRemoteLocked(remoteNodeId, lockRequest.lockId)
         const response: LockResponse = {
             accepted: true
         }
@@ -55,8 +54,8 @@ export class ConnectionLockRpcLocal implements IConnectionLockRpc {
 
     async unlockRequest(unlockRequest: UnlockRequest, context: ServerCallContext): Promise<Empty> {
         const senderPeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
-        const peerIdKey = keyFromPeerDescriptor(senderPeerDescriptor)
-        this.config.removeRemoteLocked(peerIdKey, unlockRequest.lockId)
+        const nodeId = getNodeIdFromPeerDescriptor(senderPeerDescriptor)
+        this.config.removeRemoteLocked(nodeId, unlockRequest.lockId)
         return {}
     }
 

package/src/connection/ConnectionLockRpcRemote.ts

@@ -1,22 +1,13 @@
 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 { getNodeIdFromPeerDescriptor } from '../helpers/peerIdFromPeerDescriptor'
 import { RpcRemote } from '../dht/contact/RpcRemote'
+import { getNodeIdFromPeerDescriptor } from '../helpers/peerIdFromPeerDescriptor'
+import { DisconnectMode, DisconnectNotice, LockRequest, UnlockRequest } from '../proto/packages/dht/protos/DhtRpc'
+import { ConnectionLockRpcClient } from '../proto/packages/dht/protos/DhtRpc.client'
 import { LockID } from './ConnectionLockHandler'
 
 const logger = new Logger(module)
 
-export class ConnectionLockRpcRemote extends RpcRemote<IConnectionLockRpcClient> {
-
-    constructor(
-        localPeerDescriptor: PeerDescriptor,
-        targetPeerDescriptor: PeerDescriptor,
-        client: ProtoRpcClient<IConnectionLockRpcClient>
-    ) {
-        super(localPeerDescriptor, targetPeerDescriptor, 'DUMMY', client)
-    }
+export class ConnectionLockRpcRemote extends RpcRemote<ConnectionLockRpcClient> {
 
     public async lockRequest(lockId: LockID): Promise<boolean> {
         logger.trace(`Requesting locked connection to ${getNodeIdFromPeerDescriptor(this.getPeerDescriptor())}`)
@@ -52,9 +43,9 @@ export class ConnectionLockRpcRemote extends RpcRemote<IConnectionLockRpcClient>
             disconnectMode
         }
         const options = this.formDhtRpcOptions({
-            doNotConnect: true,
-            doNotMindStopped: true,
-            timeout: 2000
+            connect: false,
+            sendIfStopped: true,
+            timeout: 2000  // TODO use config option or named constant?
         })
         await this.getClient().gracefulDisconnect(request, options)
     }