@streamr/trackerless-network 100.0.0-testnet-three.3 → 100.0.0-testnet-three.5

package/protos/NetworkRpc.proto

@@ -175,4 +175,5 @@ message NodeInfoResponse {
   dht.PeerDescriptor peerDescriptor = 1;
   repeated StreamPartitionInfo streamPartitions = 2;
   optional ControlLayerInfo controlLayer = 3;
+  string version = 4;
 }

package/src/NetworkNode.ts

@@ -73,7 +73,7 @@ export class NetworkNode {
     }
 
     setStreamPartEntryPoints(streamPartId: StreamPartID, contactPeerDescriptors: PeerDescriptor[]): void {
-        this.stack.getStreamrNode()!.setStreamPartEntryPoints(streamPartId, contactPeerDescriptors)
+        this.stack.getStreamrNode().setStreamPartEntryPoints(streamPartId, contactPeerDescriptors)
     }
 
     removeMessageListener(cb: (msg: StreamMessage) => void): void {

package/src/NetworkStack.ts

@@ -1,6 +1,6 @@
 import { ConnectionManager, DhtNode, DhtNodeOptions, ListeningRpcCommunicator, PeerDescriptor, areEqualPeerDescriptors } from '@streamr/dht'
 import { StreamrNode, StreamrNodeConfig } from './logic/StreamrNode'
-import { MetricsContext, waitForCondition } from '@streamr/utils'
+import { Logger, MetricsContext, waitForCondition } from '@streamr/utils'
 import { StreamID, StreamPartID, toStreamPartID } from '@streamr/protocol'
 import { NodeInfoResponse, ProxyDirection, StreamMessage, StreamMessageType } from './proto/packages/trackerless-network/protos/NetworkRpc'
 import { Layer0Node } from './logic/Layer0Node'
@@ -14,6 +14,8 @@ export interface NetworkOptions {
     metricsContext?: MetricsContext
 }
 
+const logger = new Logger(module)
+
 const instances: NetworkStack[] = []
 const stopInstances = async () => {
     // make a clone so that it is ok for each instance.stop() to remove itself from the list (at line 139)
@@ -23,9 +25,13 @@ const stopInstances = async () => {
 }
 const EXIT_EVENTS = [`exit`, `SIGINT`, `SIGUSR1`, `SIGUSR2`, `uncaughtException`, `unhandledRejection`, `SIGTERM`]
 EXIT_EVENTS.forEach((event) => {
-    process.on(event, async () => {
+    process.on(event, async (eventArg) => {
+        const isError = (event === 'uncaughtException') || (event === 'unhandledRejection')
+        if (isError) {
+            logger.error(`exit event: ${event}`, eventArg)
+        }
         await stopInstances()
-        process.exit()
+        process.exit(isError ? 1 : 0)
     })
 })
 declare let window: any

package/src/exports.ts

@@ -1,7 +1,8 @@
 export { NetworkStack, NetworkOptions } from './NetworkStack'
 export { NetworkNode, createNetworkNode } from './NetworkNode'
 export { StreamrNodeConfig } from './logic/StreamrNode'
-export { ProxyDirection } from './proto/packages/trackerless-network/protos/NetworkRpc'
+export { ProxyDirection, NodeInfoResponse } from './proto/packages/trackerless-network/protos/NetworkRpc'
+export { streamPartIdToDataKey } from './logic/EntryPointDiscovery'
 export {
     convertStreamMessageToBytes,
     convertBytesToStreamMessage

package/src/logic/createRandomGraphNode.ts

@@ -37,6 +37,7 @@ const createConfigWithDefaults = (config: RandomGraphNodeConfig): StrictRandomGr
     const nearbyNodeView = config.nearbyNodeView ?? new NodeList(ownNodeId, maxContactCount)
     const randomNodeView = config.randomNodeView ?? new NodeList(ownNodeId, maxContactCount)
     const neighbors = config.neighbors ?? new NodeList(ownNodeId, maxContactCount)
+    const ongoingHandshakes = new Set<DhtAddress>()
 
     const temporaryConnectionRpcLocal = new TemporaryConnectionRpcLocal({
         rpcCommunicator,
@@ -70,7 +71,8 @@ const createConfigWithDefaults = (config: RandomGraphNodeConfig): StrictRandomGr
         randomNodeView,
         neighbors,
         maxNeighborCount: neighborTargetCount,
-        rpcRequestTimeout: config.rpcRequestTimeout
+        rpcRequestTimeout: config.rpcRequestTimeout,
+        ongoingHandshakes
     })
     const neighborFinder = config.neighborFinder ?? new NeighborFinder({
         neighbors,
@@ -87,7 +89,8 @@ const createConfigWithDefaults = (config: RandomGraphNodeConfig): StrictRandomGr
         rpcCommunicator,
         neighborUpdateInterval,
         neighborTargetCount,
-        connectionLocker: config.connectionLocker
+        connectionLocker: config.connectionLocker,
+        ongoingHandshakes
     })
     const inspector = config.inspector ?? new Inspector({
         localPeerDescriptor: config.localPeerDescriptor,

package/src/logic/neighbor-discovery/Handshaker.ts

@@ -25,6 +25,7 @@ interface HandshakerConfig {
     randomNodeView: NodeList
     rpcCommunicator: ListeningRpcCommunicator
     maxNeighborCount: number
+    ongoingHandshakes: Set<DhtAddress>
     rpcRequestTimeout?: number
 }
 
@@ -34,7 +35,6 @@ const PARALLEL_HANDSHAKE_COUNT = 2
 
 export class Handshaker {
 
-    private readonly ongoingHandshakes: Set<DhtAddress> = new Set()
     private config: HandshakerConfig
     private readonly rpcLocal: IHandshakeRpc
 
@@ -44,7 +44,7 @@ export class Handshaker {
             streamPartId: this.config.streamPartId,
             neighbors: this.config.neighbors,
             connectionLocker: this.config.connectionLocker,
-            ongoingHandshakes: this.ongoingHandshakes,
+            ongoingHandshakes: this.config.ongoingHandshakes,
             ongoingInterleaves: new Set(),
             maxNeighborCount: this.config.maxNeighborCount,
             handshakeWithInterleaving: (target: PeerDescriptor, senderId: DhtAddress) => this.handshakeWithInterleaving(target, senderId),
@@ -59,10 +59,10 @@ export class Handshaker {
 
     async attemptHandshakesOnContacts(excludedIds: DhtAddress[]): Promise<DhtAddress[]> {
         // TODO use config option or named constant? or why the value 2?
-        if (this.config.neighbors.size() + this.ongoingHandshakes.size < this.config.maxNeighborCount - 2) {
+        if (this.config.neighbors.size() + this.config.ongoingHandshakes.size < this.config.maxNeighborCount - 2) {
             logger.trace(`Attempting parallel handshakes with ${PARALLEL_HANDSHAKE_COUNT} targets`)
             return this.selectParallelTargetsAndHandshake(excludedIds)
-        } else if (this.config.neighbors.size() + this.ongoingHandshakes.size < this.config.maxNeighborCount) {
+        } else if (this.config.neighbors.size() + this.config.ongoingHandshakes.size < this.config.maxNeighborCount) {
             logger.trace(`Attempting handshake with new target`)
             return this.selectNewTargetAndHandshake(excludedIds)
         }
@@ -72,17 +72,22 @@ export class Handshaker {
     private async selectParallelTargetsAndHandshake(excludedIds: DhtAddress[]): Promise<DhtAddress[]> {
         const exclude = excludedIds.concat(this.config.neighbors.getIds())
         const neighbors = this.selectParallelTargets(exclude)
-        neighbors.forEach((contact) => this.ongoingHandshakes.add(getNodeIdFromPeerDescriptor(contact.getPeerDescriptor())))
+        neighbors.forEach((contact) => this.config.ongoingHandshakes.add(getNodeIdFromPeerDescriptor(contact.getPeerDescriptor())))
         return this.doParallelHandshakes(neighbors, exclude)
     }
 
     private selectParallelTargets(excludedIds: DhtAddress[]): HandshakeRpcRemote[] {
         const neighbors = this.config.nearbyNodeView.getFirstAndLast(excludedIds)
-        while (neighbors.length < PARALLEL_HANDSHAKE_COUNT && this.config.randomNodeView.size(excludedIds) > 0) {
-            const random = this.config.randomNodeView.getRandom(excludedIds)
-            if (random) {
-                neighbors.push(random)
-            }
+        const getExcludedFromRandomView = () => [
+            ...excludedIds,
+            ...neighbors.map((neighbor) => getNodeIdFromPeerDescriptor(neighbor.getPeerDescriptor()))
+        ]
+        while (
+            neighbors.length < PARALLEL_HANDSHAKE_COUNT 
+            && this.config.randomNodeView.size(getExcludedFromRandomView()) > 0
+        ) {
+            const random = this.config.randomNodeView.getRandom(getExcludedFromRandomView())!
+            neighbors.push(random)
         }
         return neighbors.map((neighbor) => this.createRpcRemote(neighbor.getPeerDescriptor()))
     }
@@ -118,7 +123,7 @@ export class Handshaker {
 
     private async handshakeWithTarget(neighbor: HandshakeRpcRemote, concurrentNodeId?: DhtAddress): Promise<boolean> {
         const targetNodeId = getNodeIdFromPeerDescriptor(neighbor.getPeerDescriptor())
-        this.ongoingHandshakes.add(targetNodeId)
+        this.config.ongoingHandshakes.add(targetNodeId)
         const result = await neighbor.handshake(
             this.config.streamPartId,
             this.config.neighbors.getIds(),
@@ -131,14 +136,14 @@ export class Handshaker {
         if (result.interleaveTargetDescriptor) {
             await this.handshakeWithInterleaving(result.interleaveTargetDescriptor, targetNodeId)
         }
-        this.ongoingHandshakes.delete(targetNodeId)
+        this.config.ongoingHandshakes.delete(targetNodeId)
         return result.accepted
     }
 
     private async handshakeWithInterleaving(target: PeerDescriptor, interleaveSourceId: DhtAddress): Promise<boolean> {
         const neighbor = this.createRpcRemote(target)
         const targetNodeId = getNodeIdFromPeerDescriptor(neighbor.getPeerDescriptor())
-        this.ongoingHandshakes.add(targetNodeId)
+        this.config.ongoingHandshakes.add(targetNodeId)
         const result = await neighbor.handshake(
             this.config.streamPartId,
             this.config.neighbors.getIds(),
@@ -149,7 +154,7 @@ export class Handshaker {
             this.config.neighbors.add(this.createDeliveryRpcRemote(neighbor.getPeerDescriptor()))
             this.config.connectionLocker.lockConnection(neighbor.getPeerDescriptor(), this.config.streamPartId)
         }
-        this.ongoingHandshakes.delete(targetNodeId)
+        this.config.ongoingHandshakes.delete(targetNodeId)
         return result.accepted
     }
 
@@ -174,7 +179,7 @@ export class Handshaker {
     }
 
     getOngoingHandshakes(): Set<DhtAddress> {
-        return this.ongoingHandshakes
+        return this.config.ongoingHandshakes
     }
 
 }

package/src/logic/neighbor-discovery/NeighborUpdateManager.ts

@@ -1,5 +1,5 @@
 import { NeighborUpdate } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { ConnectionLocker, ListeningRpcCommunicator, PeerDescriptor, getNodeIdFromPeerDescriptor } from '@streamr/dht'
+import { ConnectionLocker, DhtAddress, ListeningRpcCommunicator, PeerDescriptor, getNodeIdFromPeerDescriptor } from '@streamr/dht'
 import { NeighborUpdateRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
 import { Logger, scheduleAtInterval } from '@streamr/utils'
 import { NeighborFinder } from './NeighborFinder'
@@ -18,6 +18,7 @@ interface NeighborUpdateManagerConfig {
     rpcCommunicator: ListeningRpcCommunicator
     neighborUpdateInterval: number
     neighborTargetCount: number
+    ongoingHandshakes: Set<DhtAddress>
 }
 
 const logger = new Logger(module)

package/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.ts

@@ -1,5 +1,5 @@
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
-import { ConnectionLocker, DhtCallContext, ListeningRpcCommunicator, PeerDescriptor, getNodeIdFromPeerDescriptor } from '@streamr/dht'
+import { ConnectionLocker, DhtAddress, DhtCallContext, ListeningRpcCommunicator, PeerDescriptor, getNodeIdFromPeerDescriptor } from '@streamr/dht'
 import { NeighborUpdate } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
 import { DeliveryRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
 import { INeighborUpdateRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server'
@@ -17,6 +17,7 @@ interface NeighborUpdateRpcLocalConfig {
     connectionLocker: ConnectionLocker
     rpcCommunicator: ListeningRpcCommunicator
     neighborTargetCount: number
+    ongoingHandshakes: Set<DhtAddress>
 }
 
 export class NeighborUpdateRpcLocal implements INeighborUpdateRpc {
@@ -56,7 +57,7 @@ export class NeighborUpdateRpcLocal implements INeighborUpdateRpc {
         const senderPeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
         const senderId = getNodeIdFromPeerDescriptor(senderPeerDescriptor)
         this.updateContacts(message.neighborDescriptors)
-        if (!this.config.neighbors.has(senderId)) {
+        if (!this.config.neighbors.has(senderId) && !this.config.ongoingHandshakes.has(senderId)) {
             return this.createResponse(true)
         } else {
             const isOverNeighborCount = this.config.neighbors.size() > this.config.neighborTargetCount

package/src/logic/node-info/NodeInfoRpcLocal.ts

@@ -2,6 +2,7 @@ import { NodeInfoRequest, NodeInfoResponse } from '../../proto/packages/trackerl
 import { INodeInfoRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server'
 import { NetworkStack } from '../../NetworkStack'
 import { ListeningRpcCommunicator } from '@streamr/dht'
+import { version as localVersion } from '../../../package.json'
 
 export const NODE_INFO_RPC_SERVICE_ID = 'system/node-info-rpc'
 
@@ -28,7 +29,8 @@ export class NodeInfoRpcLocal implements INodeInfoRpc {
                 connections: this.stack.getLayer0Node().getConnections(),
                 neighbors: this.stack.getLayer0Node().getNeighbors()
             },
-            streamPartitions: this.stack.getStreamrNode().getNodeInfo()
+            streamPartitions: this.stack.getStreamrNode().getNodeInfo(),
+            version: localVersion
         }
     }
 

package/src/proto/packages/trackerless-network/protos/NetworkRpc.ts

@@ -329,6 +329,10 @@ export interface NodeInfoResponse {
      * @generated from protobuf field: optional ControlLayerInfo controlLayer = 3;
      */
     controlLayer?: ControlLayerInfo;
+    /**
+     * @generated from protobuf field: string version = 4;
+     */
+    version: string;
 }
 /**
  * @generated from protobuf enum StreamMessageType
@@ -673,7 +677,8 @@ class NodeInfoResponse$Type extends MessageType<NodeInfoResponse> {
         super("NodeInfoResponse", [
             { no: 1, name: "peerDescriptor", kind: "message", T: () => PeerDescriptor },
             { no: 2, name: "streamPartitions", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => StreamPartitionInfo },
-            { no: 3, name: "controlLayer", kind: "message", T: () => ControlLayerInfo }
+            { no: 3, name: "controlLayer", kind: "message", T: () => ControlLayerInfo },
+            { no: 4, name: "version", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
         ]);
     }
 }

package/test/end-to-end/inspect.test.ts

@@ -96,9 +96,9 @@ describe('inspect', () => {
         await inspectedNode.start()
         await inspectorNode.start()
 
-        publisherNode.stack.getStreamrNode()!.joinStreamPart(STREAM_PART_ID)
-        inspectedNode.stack.getStreamrNode()!.joinStreamPart(STREAM_PART_ID)
-        inspectorNode.stack.getStreamrNode()!.joinStreamPart(STREAM_PART_ID)
+        publisherNode.stack.getStreamrNode().joinStreamPart(STREAM_PART_ID)
+        inspectedNode.stack.getStreamrNode().joinStreamPart(STREAM_PART_ID)
+        inspectorNode.stack.getStreamrNode().joinStreamPart(STREAM_PART_ID)
 
         await waitForCondition(() => 
             publisherNode.stack.getStreamrNode().getNeighbors(STREAM_PART_ID).length === 2 

package/test/end-to-end/proxy-and-full-node.test.ts

@@ -65,11 +65,11 @@ describe('proxy and full node', () => {
             }
         })
         await proxyNode.start()
-        proxyNode.stack.getStreamrNode()!.joinStreamPart(proxiedStreamPart)
-        proxyNode.stack.getStreamrNode()!.joinStreamPart(regularStreamPart1)
-        proxyNode.stack.getStreamrNode()!.joinStreamPart(regularStreamPart2)
-        proxyNode.stack.getStreamrNode()!.joinStreamPart(regularStreamPart3)
-        proxyNode.stack.getStreamrNode()!.joinStreamPart(regularStreamPart4)
+        proxyNode.stack.getStreamrNode().joinStreamPart(proxiedStreamPart)
+        proxyNode.stack.getStreamrNode().joinStreamPart(regularStreamPart1)
+        proxyNode.stack.getStreamrNode().joinStreamPart(regularStreamPart2)
+        proxyNode.stack.getStreamrNode().joinStreamPart(regularStreamPart3)
+        proxyNode.stack.getStreamrNode().joinStreamPart(regularStreamPart4)
 
         proxiedNode = createNetworkNode({
             layer0: {
@@ -90,14 +90,14 @@ describe('proxy and full node', () => {
         expect(proxiedNode.stack.getLayer0Node().hasJoined()).toBe(false)
 
         await Promise.all([
-            waitForEvent3(proxyNode.stack.getStreamrNode()! as any, 'newMessage'),
+            waitForEvent3(proxyNode.stack.getStreamrNode() as any, 'newMessage'),
             proxiedNode.broadcast(createMessage(regularStreamPart1))
         ])
 
         expect(proxiedNode.stack.getLayer0Node().hasJoined()).toBe(true)
 
         await Promise.all([
-            waitForEvent3(proxyNode.stack.getStreamrNode()! as any, 'newMessage'),
+            waitForEvent3(proxyNode.stack.getStreamrNode() as any, 'newMessage'),
             proxiedNode.broadcast(createMessage(proxiedStreamPart))
         ])
 
@@ -110,13 +110,13 @@ describe('proxy and full node', () => {
         expect(proxiedNode.stack.getLayer0Node().hasJoined()).toBe(false)
 
         await Promise.all([
-            waitForEvent3(proxyNode.stack.getStreamrNode()! as any, 'newMessage', 5000, 
+            waitForEvent3(proxyNode.stack.getStreamrNode() as any, 'newMessage', 5000, 
                 (streamMessage: InternalStreamMessage) => streamMessage.messageId!.streamId === StreamPartIDUtils.getStreamID(regularStreamPart1)),
-            waitForEvent3(proxyNode.stack.getStreamrNode()! as any, 'newMessage', 5000, 
+            waitForEvent3(proxyNode.stack.getStreamrNode() as any, 'newMessage', 5000, 
                 (streamMessage: InternalStreamMessage) => streamMessage.messageId!.streamId === StreamPartIDUtils.getStreamID(regularStreamPart2)),
-            waitForEvent3(proxyNode.stack.getStreamrNode()! as any, 'newMessage', 5000, 
+            waitForEvent3(proxyNode.stack.getStreamrNode() as any, 'newMessage', 5000, 
                 (streamMessage: InternalStreamMessage) => streamMessage.messageId!.streamId === StreamPartIDUtils.getStreamID(regularStreamPart3)),
-            waitForEvent3(proxyNode.stack.getStreamrNode()! as any, 'newMessage', 5000, 
+            waitForEvent3(proxyNode.stack.getStreamrNode() as any, 'newMessage', 5000, 
                 (streamMessage: InternalStreamMessage) => streamMessage.messageId!.streamId === StreamPartIDUtils.getStreamID(regularStreamPart4)),
             proxiedNode.broadcast(createMessage(regularStreamPart1)),
             proxiedNode.broadcast(createMessage(regularStreamPart2)),
@@ -127,7 +127,7 @@ describe('proxy and full node', () => {
         expect(proxiedNode.stack.getLayer0Node().hasJoined()).toBe(true)
 
         await Promise.all([
-            waitForEvent3(proxyNode.stack.getStreamrNode()! as any, 'newMessage'),
+            waitForEvent3(proxyNode.stack.getStreamrNode() as any, 'newMessage'),
             proxiedNode.broadcast(createMessage(proxiedStreamPart))
         ])
 

package/test/end-to-end/proxy-connections.test.ts

@@ -46,14 +46,14 @@ describe('Proxy connections', () => {
     let proxiedNode: NetworkNode
 
     const hasConnectionFromProxy = (proxyNode: NetworkNode): boolean => {
-        const delivery = proxyNode.stack.getStreamrNode()!.getStreamPartDelivery(STREAM_PART_ID)
+        const delivery = proxyNode.stack.getStreamrNode().getStreamPartDelivery(STREAM_PART_ID)
         return (delivery !== undefined)
             ? ((delivery as { node: RandomGraphNode }).node).hasProxyConnection(proxiedNode.getNodeId())
             : false
     }
     
     const hasConnectionToProxy = (proxyNodeId: DhtAddress, direction: ProxyDirection): boolean => {
-        const client = (proxiedNode.stack.getStreamrNode()!.getStreamPartDelivery(STREAM_PART_ID) as { client: ProxyClient }).client
+        const client = (proxiedNode.stack.getStreamrNode().getStreamPartDelivery(STREAM_PART_ID) as { client: ProxyClient }).client
         return client.hasConnection(proxyNodeId, direction)
     }
 
@@ -77,7 +77,7 @@ describe('Proxy connections', () => {
         })
         await proxyNode1.start()
         proxyNode1.setStreamPartEntryPoints(STREAM_PART_ID, [proxyNodeDescriptor1])
-        proxyNode1.stack.getStreamrNode()!.joinStreamPart(STREAM_PART_ID)
+        proxyNode1.stack.getStreamrNode().joinStreamPart(STREAM_PART_ID)
         proxyNode2 = createNetworkNode({
             layer0: {
                 entryPoints: [proxyNodeDescriptor1],
@@ -90,7 +90,7 @@ describe('Proxy connections', () => {
         })
         await proxyNode2.start()
         proxyNode2.setStreamPartEntryPoints(STREAM_PART_ID, [proxyNodeDescriptor1])
-        proxyNode2.stack.getStreamrNode()!.joinStreamPart(STREAM_PART_ID)
+        proxyNode2.stack.getStreamrNode().joinStreamPart(STREAM_PART_ID)
         proxiedNode = createNetworkNode({
             layer0: {
                 entryPoints: [proxyNode1.getPeerDescriptor()],
@@ -109,7 +109,7 @@ describe('Proxy connections', () => {
     it('happy path publishing', async () => {
         await proxiedNode.setProxies(STREAM_PART_ID, [proxyNode1.getPeerDescriptor()], ProxyDirection.PUBLISH, PROXIED_NODE_USER_ID, 1)
         await Promise.all([
-            waitForEvent3(proxyNode1.stack.getStreamrNode()! as any, 'newMessage'),
+            waitForEvent3(proxyNode1.stack.getStreamrNode() as any, 'newMessage'),
             proxiedNode.broadcast(MESSAGE)
         ])
     })
@@ -117,7 +117,7 @@ describe('Proxy connections', () => {
     it('happy path subscribing', async () => {
         await proxiedNode.setProxies(STREAM_PART_ID, [proxyNode1.getPeerDescriptor()], ProxyDirection.SUBSCRIBE, PROXIED_NODE_USER_ID, 1)
         await Promise.all([
-            waitForEvent3(proxiedNode.stack.getStreamrNode()! as any, 'newMessage'),
+            waitForEvent3(proxiedNode.stack.getStreamrNode() as any, 'newMessage'),
             proxyNode1.broadcast(MESSAGE)
         ])
     })
@@ -196,7 +196,7 @@ describe('Proxy connections', () => {
         await proxyNode1.leave(STREAM_PART_ID)
         await waitForCondition(() => hasConnectionToProxy(proxyNode1.getNodeId(), ProxyDirection.SUBSCRIBE))
         expect(hasConnectionFromProxy(proxyNode1)).toBe(false)
-        proxyNode1.stack.getStreamrNode()!.joinStreamPart(STREAM_PART_ID)
+        proxyNode1.stack.getStreamrNode().joinStreamPart(STREAM_PART_ID)
         await waitForCondition(() => hasConnectionToProxy(proxyNode1.getNodeId(), ProxyDirection.SUBSCRIBE), 25000)
         // TODO why wait is needed?
         await wait(100)

package/test/end-to-end/proxy-key-exchange.test.ts

@@ -44,10 +44,10 @@ describe('proxy group key exchange', () => {
         })
         await proxyNode.start()
         proxyNode.setStreamPartEntryPoints(STREAM_PART_ID, [proxyNodeDescriptor])
-        proxyNode.stack.getStreamrNode()!.joinStreamPart(STREAM_PART_ID)
+        proxyNode.stack.getStreamrNode().joinStreamPart(STREAM_PART_ID)
         publisher = createNetworkNode({
             layer0: {
-                entryPoints: [publisherDescriptor],
+                entryPoints: [proxyNodeDescriptor],
                 peerDescriptor: publisherDescriptor,
             }
         })
@@ -55,7 +55,7 @@ describe('proxy group key exchange', () => {
 
         subscriber = createNetworkNode({
             layer0: {
-                entryPoints: [subscriberDescriptor],
+                entryPoints: [proxyNodeDescriptor],
                 peerDescriptor: subscriberDescriptor,
             }
         })
@@ -98,7 +98,7 @@ describe('proxy group key exchange', () => {
         })
 
         await Promise.all([
-            waitForEvent3(publisher.stack.getStreamrNode()! as any, 'newMessage'),
+            waitForEvent3(publisher.stack.getStreamrNode() as any, 'newMessage'),
             subscriber.broadcast(request)
         ])
     })
@@ -130,7 +130,7 @@ describe('proxy group key exchange', () => {
         })
 
         await Promise.all([
-            waitForEvent3(subscriber.stack.getStreamrNode()! as any, 'newMessage'),
+            waitForEvent3(subscriber.stack.getStreamrNode() as any, 'newMessage'),
             publisher.broadcast(response)
         ])
     })

package/test/end-to-end/webrtc-full-node-network.test.ts

@@ -33,8 +33,8 @@ describe('Full node network with WebRTC connections', () => {
             }
         })
         await entryPoint.start()
-        entryPoint.getStreamrNode()!.setStreamPartEntryPoints(streamPartId, [epPeerDescriptor])
-        entryPoint.getStreamrNode()!.joinStreamPart(streamPartId)
+        entryPoint.getStreamrNode().setStreamPartEntryPoints(streamPartId, [epPeerDescriptor])
+        entryPoint.getStreamrNode().joinStreamPart(streamPartId)
 
         await Promise.all(range(NUM_OF_NODES).map(async () => {
             const peerDescriptor = createMockPeerDescriptor()
@@ -62,15 +62,15 @@ describe('Full node network with WebRTC connections', () => {
     it('happy path', async () => {
         await Promise.all(nodes.map((node) =>
             waitForCondition(() => {
-                return node.getStreamrNode()!.getNeighbors(streamPartId).length >= 3
+                return node.getStreamrNode().getNeighbors(streamPartId).length >= 3
             }
             , 30000)
         ))
         let receivedMessageCount = 0
         const successIds: string[] = []
         nodes.forEach((node) => {
-            node.getStreamrNode()!.on('newMessage', () => {
-                successIds.push(getNodeIdFromPeerDescriptor(node.getStreamrNode()!.getPeerDescriptor()))
+            node.getStreamrNode().on('newMessage', () => {
+                successIds.push(getNodeIdFromPeerDescriptor(node.getStreamrNode().getPeerDescriptor()))
                 receivedMessageCount += 1
             })
         })
@@ -79,7 +79,7 @@ describe('Full node network with WebRTC connections', () => {
             streamPartId,
             randomEthereumAddress()
         )
-        entryPoint.getStreamrNode()!.broadcast(msg)
+        entryPoint.getStreamrNode().broadcast(msg)
         await waitForCondition(() => receivedMessageCount === NUM_OF_NODES)
     }, 120000)
 

package/test/end-to-end/websocket-full-node-network.test.ts

@@ -30,8 +30,8 @@ describe('Full node network with WebSocket connections only', () => {
             }
         })
         await entryPoint.start()
-        entryPoint.getStreamrNode()!.setStreamPartEntryPoints(streamPartId, [epPeerDescriptor])
-        entryPoint.getStreamrNode()!.joinStreamPart(streamPartId)
+        entryPoint.getStreamrNode().setStreamPartEntryPoints(streamPartId, [epPeerDescriptor])
+        entryPoint.getStreamrNode().joinStreamPart(streamPartId)
 
         await Promise.all(range(NUM_OF_NODES).map(async (i) => {
             const node = new NetworkStack({
@@ -60,15 +60,15 @@ describe('Full node network with WebSocket connections only', () => {
     it('happy path', async () => {
         await Promise.all(nodes.map((node) =>
             waitForCondition(() => {
-                return node.getStreamrNode()!.getNeighbors(streamPartId).length >= 4
+                return node.getStreamrNode().getNeighbors(streamPartId).length >= 4
             }
             , 30000)
         ))
         let receivedMessageCount = 0
         const successIds: string[] = []
         nodes.forEach((node) => {
-            node.getStreamrNode()!.on('newMessage', () => {
-                successIds.push(getNodeIdFromPeerDescriptor(node.getStreamrNode()!.getPeerDescriptor()))
+            node.getStreamrNode().on('newMessage', () => {
+                successIds.push(getNodeIdFromPeerDescriptor(node.getStreamrNode().getPeerDescriptor()))
                 receivedMessageCount += 1
             })
         })
@@ -78,7 +78,7 @@ describe('Full node network with WebSocket connections only', () => {
             streamPartId,
             randomEthereumAddress()
         )
-        entryPoint.getStreamrNode()!.broadcast(msg)
+        entryPoint.getStreamrNode().broadcast(msg)
         await waitForCondition(() => receivedMessageCount === NUM_OF_NODES)
     }, 220000)
 

package/test/integration/Handshakes.test.ts

@@ -92,7 +92,8 @@ describe('Handshakes', () => {
             neighbors,
             connectionLocker: mockConnectionLocker,
             rpcCommunicator: rpcCommunicator2,
-            maxNeighborCount: 4
+            maxNeighborCount: 4,
+            ongoingHandshakes: new Set()
         })
 
     })

package/test/integration/NetworkStack.test.ts

@@ -34,9 +34,9 @@ describe('NetworkStack', () => {
         })
 
         await stack1.start()
-        stack1.getStreamrNode()!.setStreamPartEntryPoints(STREAM_PART_ID, [epDescriptor])
+        stack1.getStreamrNode().setStreamPartEntryPoints(STREAM_PART_ID, [epDescriptor])
         await stack2.start()
-        stack2.getStreamrNode()!.setStreamPartEntryPoints(STREAM_PART_ID, [epDescriptor])
+        stack2.getStreamrNode().setStreamPartEntryPoints(STREAM_PART_ID, [epDescriptor])
     })
 
     afterEach(async () => {

package/test/integration/NodeInfoRpc.test.ts

@@ -95,7 +95,8 @@ describe('NetworkStack NodeInfoRpc', () => {
                     controlLayerNeighbors: [normalizePeerDescriptor(otherPeerDescriptor)],
                     deliveryLayerNeighbors: [normalizePeerDescriptor(otherPeerDescriptor)]
                 }
-            ]
+            ],
+            version: expect.any(String)
         })
         expect(result.streamPartitions.length).toEqual(2)
     })

package/test/unit/GroupKeyResponseTranslator.test.ts

@@ -15,7 +15,7 @@ describe('GroupKeyResponseTranslator', () => {
     })
     const newGroupKey: GroupKey = {
         id: 'id',
-        data: hexToBinary('0000')!
+        data: hexToBinary('0000')
     }
     const newGroupKeyResponse: GroupKeyResponse = {
         requestId: 'request',

package/test/unit/Handshaker.test.ts

@@ -40,7 +40,8 @@ describe('Handshaker', () => {
             randomNodeView,
             rpcCommunicator,
             maxNeighborCount,
-            rpcRequestTimeout: 5000
+            rpcRequestTimeout: 5000,
+            ongoingHandshakes: new Set()
         })
     })
 

package/test/unit/NeighborUpdateRpcLocal.test.ts

@@ -1,4 +1,4 @@
-import { ListeningRpcCommunicator, getNodeIdFromPeerDescriptor } from '@streamr/dht'
+import { DhtAddress, ListeningRpcCommunicator, getNodeIdFromPeerDescriptor } from '@streamr/dht'
 import { NeighborFinder } from '../../src/logic/neighbor-discovery/NeighborFinder'
 import { NeighborUpdateRpcLocal } from '../../src/logic/neighbor-discovery/NeighborUpdateRpcLocal'
 import { createMockPeerDescriptor } from '../utils/utils'
@@ -20,6 +20,7 @@ describe('NeighborUpdateRpcLocal', () => {
     let nearbyNodeView: NodeList
     let neighborFinder: NeighborFinder
     let rpcCommunicator: ListeningRpcCommunicator
+    let ongoingHandshakes: Set<DhtAddress>
 
     const addNeighbors = (count: number) => {
         for (let i = 0; i < count; i++) {
@@ -42,6 +43,7 @@ describe('NeighborUpdateRpcLocal', () => {
         const connectionLocker = {
             unlockConnection: jest.fn()
         } as any
+        ongoingHandshakes = new Set()
 
         rpcLocal = new NeighborUpdateRpcLocal({
             localPeerDescriptor,
@@ -51,7 +53,8 @@ describe('NeighborUpdateRpcLocal', () => {
             streamPartId,
             rpcCommunicator,
             neighborTargetCount,
-            connectionLocker
+            connectionLocker,
+            ongoingHandshakes
         })
     })
 
@@ -126,4 +129,15 @@ describe('NeighborUpdateRpcLocal', () => {
         expect(neighbors.has(getNodeIdFromPeerDescriptor(caller))).toEqual(false)
     })
 
+    it('does not ask to be removed if there is an ongoing handshake to the caller', async () => {
+        const caller = createMockPeerDescriptor()
+        ongoingHandshakes.add(getNodeIdFromPeerDescriptor(caller))
+        const res = await rpcLocal.neighborUpdate({
+            streamPartId,
+            neighborDescriptors: [localPeerDescriptor],
+            removeMe: false
+        }, { incomingSourceDescriptor: caller } as any)
+        expect(res.removeMe).toEqual(false)
+    })
+
 })

package/tsconfig.jest.json

@@ -6,7 +6,8 @@
     },
     "include": [
         "src/**/*",
-        "test/**/*"
+        "test/**/*",
+        "package.json"
     ],
     "references": [
         { "path": "../protocol/tsconfig.node.json" },