@streamr/dht 100.0.0-testnet-one.0 → 100.0.0-testnet-one.2

package/test/integration/WebsocketConnectionManagement.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable promise/no-nesting */
 
-import { MetricsContext, waitForCondition } from '@streamr/utils'
+import { MetricsContext, waitForCondition, waitForEvent3 } from '@streamr/utils'
 import { ConnectionManager } from '../../src/connection/ConnectionManager'
 import { DefaultConnectorFacade, DefaultConnectorFacadeConfig } from '../../src/connection/ConnectorFacade'
 import { ConnectionType } from '../../src/connection/IConnection'
@@ -10,6 +10,7 @@ import { PeerID } from '../../src/helpers/PeerID'
 import * as Err from '../../src/helpers/errors'
 import { Message, MessageType, NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { RpcMessage } from '../../src/proto/packages/proto-rpc/protos/ProtoRpc'
+import { TransportEvents } from '../../src/transport/ITransport'
 
 const createConfig = (localPeerDescriptor: PeerDescriptor, opts: Omit<DefaultConnectorFacadeConfig, 'createLocalPeerDescriptor'>) => {
     return {
@@ -26,11 +27,12 @@ describe('Websocket Connection Management', () => {
     const serviceId = 'test'
     let wsServerManager: ConnectionManager
     let noWsServerManager: ConnectionManager
+    let biggerNoWsServerManager: ConnectionManager
 
     const simulator = new Simulator()
 
     const wsServerConnectorPeerDescriptor: PeerDescriptor = {
-        nodeId: PeerID.fromString('peerWithServer').value,
+        nodeId: PeerID.fromString('2').value,
         type: NodeType.NODEJS,
         websocket: {
             host: '127.0.0.1',
@@ -40,12 +42,18 @@ describe('Websocket Connection Management', () => {
     }
 
     const noWsServerConnectorPeerDescriptor: PeerDescriptor = {
-        nodeId: PeerID.fromString('peerWithoutServer').value,
+        nodeId: PeerID.fromString('1').value,
+        type: NodeType.NODEJS,
+    }
+
+    const biggerNoWsServerConnectorPeerDescriptor: PeerDescriptor = {
+        nodeId: PeerID.fromString('3').value,
         type: NodeType.NODEJS,
     }
 
     let connectorTransport1: SimulatorTransport
     let connectorTransport2: SimulatorTransport
+    let connectorTransport3: SimulatorTransport
 
     beforeEach(async () => {
 
@@ -53,6 +61,8 @@ describe('Websocket Connection Management', () => {
         await connectorTransport1.start()
         connectorTransport2 = new SimulatorTransport(noWsServerConnectorPeerDescriptor, simulator)
         await connectorTransport2.start()
+        connectorTransport3 = new SimulatorTransport(biggerNoWsServerConnectorPeerDescriptor, simulator)
+        await connectorTransport3.start()
 
         const config1 = createConfig(wsServerConnectorPeerDescriptor, {
             transport: connectorTransport1,
@@ -62,22 +72,29 @@ describe('Websocket Connection Management', () => {
         const config2 = createConfig(noWsServerConnectorPeerDescriptor, {
             transport: connectorTransport2
         })
+        const config3 = createConfig(biggerNoWsServerConnectorPeerDescriptor, {
+            transport: connectorTransport3
+        })
 
         wsServerManager = new ConnectionManager(config1)
         noWsServerManager = new ConnectionManager(config2)
+        biggerNoWsServerManager = new ConnectionManager(config3)
 
         await wsServerManager.start()
         await noWsServerManager.start()
+        await biggerNoWsServerManager.start()
     })
 
     afterEach(async () => {
         await wsServerManager.stop()
         await noWsServerManager.stop()
+        await biggerNoWsServerManager.stop()
         await connectorTransport1.stop()
         await connectorTransport2.stop()
+        await connectorTransport3.stop()
     })
 
-    it('Can open connections to serverless peer', (done) => {
+    it('Can open connections to serverless peer with smaller peerId', (done) => {
         const dummyMessage: Message = {
             serviceId,
             body: {
@@ -99,6 +116,50 @@ describe('Websocket Connection Management', () => {
         wsServerManager.send(dummyMessage)
     })
 
+    it('Can open connections to serverless peer with bigger peerId', (done) => {
+        const dummyMessage: Message = {
+            serviceId,
+            body: {
+                oneofKind: 'rpcMessage',
+                rpcMessage: RpcMessage.create()
+            },
+            messageType: MessageType.RPC,
+            messageId: 'mockerer',
+            targetDescriptor: biggerNoWsServerConnectorPeerDescriptor
+        }
+        biggerNoWsServerManager.on('message', (message: Message) => {
+            expect(message.messageId).toEqual('mockerer')
+            expect(wsServerManager.getConnection(biggerNoWsServerConnectorPeerDescriptor)!.connectionType).toEqual(ConnectionType.WEBSOCKET_SERVER)
+            expect(biggerNoWsServerManager.getConnection(wsServerConnectorPeerDescriptor)!.connectionType).toEqual(ConnectionType.WEBSOCKET_CLIENT)
+
+            done()
+        })
+
+        wsServerManager.send(dummyMessage)
+    })
+
+    it('Failed connection requests are cleaned up', async () => {
+        const dummyMessage: Message = {
+            serviceId,
+            body: {
+                oneofKind: 'rpcMessage',
+                rpcMessage: RpcMessage.create()
+            },
+            messageType: MessageType.RPC,
+            messageId: 'mockerer',
+            targetDescriptor: {
+                nodeId: new Uint8Array([1, 2, 4]),
+                type: NodeType.NODEJS
+            }
+        }
+
+        await Promise.allSettled([
+            waitForEvent3<TransportEvents>(wsServerManager, 'disconnected', 15000),
+            wsServerManager.send(dummyMessage)
+        ])
+        expect(wsServerManager.getConnection(dummyMessage.targetDescriptor!)).toBeUndefined()
+    }, 20000)
+    
     it('Can open connections to peer with server', async () => {
         const dummyMessage: Message = {
             serviceId,

package/test/integration/WebsocketConnectorRpc.test.ts

@@ -67,16 +67,14 @@ describe('WebsocketConnectorRpc', () => {
         },
         { targetDescriptor: peerDescriptor2 },
         )
-        const res1 = await response1
-        expect(res1.accepted).toEqual(true)
-
+        await response1
+        
         const response2 = client2.requestConnection({
             ip: '127.0.0.1',
             port: 9111
         },
         { targetDescriptor: peerDescriptor1 },
         )
-        const res2 = await response2
-        expect(res2.accepted).toEqual(true)
+        await response2
     })
 })

package/test/unit/SortedContactList.test.ts

@@ -13,7 +13,7 @@ describe('SortedContactList', () => {
     const item4 = createItem(new Uint8Array([0, 0, 0, 4]))
 
     it('compares Ids correctly', async () => {
-        const list = new SortedContactList(item0.getPeerId(), 10)
+        const list = new SortedContactList({ referenceId: item0.getPeerId(), maxSize: 10, allowToContainReferenceId: true, emitEvents: false })
         expect(list.compareIds(item0.getPeerId(), item0.getPeerId())).toBe(0)
         expect(list.compareIds(item1.getPeerId(), item1.getPeerId())).toBe(0)
         expect(list.compareIds(item0.getPeerId(), item1.getPeerId())).toBe(-1)
@@ -23,9 +23,9 @@ describe('SortedContactList', () => {
         expect(list.compareIds(item2.getPeerId(), item3.getPeerId())).toBe(-1)
         expect(list.compareIds(item1.getPeerId(), item4.getPeerId())).toBe(-3)
     })
-    
+
     it('orders itself correctly', async () => {
-        const list = new SortedContactList(item0.getPeerId(), 10)
+        const list = new SortedContactList({ referenceId: item0.getPeerId(), maxSize: 10, allowToContainReferenceId: true, emitEvents: false })
         list.addContact(item3)
         list.addContact(item2)
         list.addContact(item1)
@@ -35,9 +35,9 @@ describe('SortedContactList', () => {
         expect(contacts[1]).toEqual(item2)
         expect(contacts[2]).toEqual(item3)
     })
-    
+
     it('handles contacted nodes correctly', async () => {
-        const list = new SortedContactList(item0.getPeerId(), 10)
+        const list = new SortedContactList({ referenceId: item0.getPeerId(), maxSize: 10, allowToContainReferenceId: false, emitEvents: false })
         list.addContact(item3)
         list.addContact(item2)
         list.addContact(item1)
@@ -49,7 +49,7 @@ describe('SortedContactList', () => {
     })
 
     it('cannot exceed maxSize', async () => {
-        const list = new SortedContactList(item0.getPeerId(), 3)
+        const list = new SortedContactList({ referenceId: item0.getPeerId(), maxSize: 3, allowToContainReferenceId: false, emitEvents: true })
         const onContactRemoved = jest.fn()
         list.on('contactRemoved', onContactRemoved)
         list.addContact(item1)
@@ -62,7 +62,7 @@ describe('SortedContactList', () => {
     })
 
     it('removing contacts', async () => {
-        const list = new SortedContactList(item0.getPeerId(), 8)
+        const list = new SortedContactList({ referenceId: item0.getPeerId(), maxSize: 8, allowToContainReferenceId: false, emitEvents: true })
         const onContactRemoved = jest.fn()
         list.on('contactRemoved', onContactRemoved)
         list.addContact(item4)
@@ -79,8 +79,13 @@ describe('SortedContactList', () => {
         expect(ret).toEqual(false)
     })
 
-    it('get closes contacts', () => {
-        const list = new SortedContactList(item0.getPeerId(), 8)
+    it('get closest contacts', () => {
+        const list = new SortedContactList({
+            referenceId: item0.getPeerId(), 
+            maxSize: 8, 
+            allowToContainReferenceId: false, 
+            emitEvents: false 
+        })
         list.addContact(item1)
         list.addContact(item3)
         list.addContact(item4)
@@ -90,7 +95,7 @@ describe('SortedContactList', () => {
     })
 
     it('get active contacts', () => {
-        const list = new SortedContactList(item0.getPeerId(), 8)
+        const list = new SortedContactList({ referenceId: item0.getPeerId(), maxSize: 8, allowToContainReferenceId: false, emitEvents: false })
         list.addContact(item1)
         list.addContact(item3)
         list.addContact(item4)