@streamr/dht 0.0.1-tatum.1 → 0.0.1-tatum.3

package/test/integration/WebRtcConnectionManagement.test.ts

@@ -35,10 +35,10 @@ describe('WebRTC Connection Management', () => {
         simulator = new Simulator(LatencyType.FIXED, 500)
 
         connectorTransport1 = new SimulatorTransport(peerDescriptor1, simulator)
-        manager1 = new ConnectionManager({ transportLayer: connectorTransport1, nodeName: peerDescriptor1.nodeName })
+        manager1 = new ConnectionManager({ transportLayer: connectorTransport1 })
 
         connectorTransport2 = new SimulatorTransport(peerDescriptor2, simulator)
-        manager2 = new ConnectionManager({ transportLayer: connectorTransport2, nodeName: peerDescriptor2.nodeName })
+        manager2 = new ConnectionManager({ transportLayer: connectorTransport2 })
 
         await manager1.start((_msg) => peerDescriptor1)
         await manager2.start((_msg) => peerDescriptor2)

package/test/integration/WebRtcConnectorRpc.test.ts

@@ -88,8 +88,8 @@ describe('WebRTC rpc messages', () => {
     })
 
     afterEach(async () => {
-        await rpcCommunicator1.stop()
-        await rpcCommunicator2.stop()
+        rpcCommunicator1.stop()
+        rpcCommunicator2.stop()
     })
 
     it('send connectionRequest', async () => {

package/test/integration/WebSocketConnectionManagement.test.ts

@@ -22,8 +22,9 @@ describe('WebSocket Connection Management', () => {
         kademliaId: PeerID.fromString('peerWithServer').value,
         type: NodeType.NODEJS,
         websocket: {
-            ip: '127.0.0.1',
-            port: 12223
+            host: '127.0.0.1',
+            port: 12223,
+            tls: false
         }
     }
 

package/test/integration/WebSocketConnectorRpc.test.ts

@@ -57,8 +57,8 @@ describe('WebSocketConnectorRpc', () => {
     })
 
     afterEach(async () => {
-        await rpcCommunicator1.stop()
-        await rpcCommunicator2.stop()
+        rpcCommunicator1.stop()
+        rpcCommunicator2.stop()
     })
 
     it('Happy path', async () => {
@@ -71,7 +71,7 @@ describe('WebSocketConnectorRpc', () => {
         { targetDescriptor: peerDescriptor2 },
         )
         const res1 = await response1
-        await (expect(res1.accepted)).toEqual(true)
+        expect(res1.accepted).toEqual(true)
 
         const response2 = client2.requestConnection({
             requester: peerDescriptor2,
@@ -82,6 +82,6 @@ describe('WebSocketConnectorRpc', () => {
         { targetDescriptor: peerDescriptor1 },
         )
         const res2 = await response2
-        await (expect(res2.accepted)).toEqual(true)
+        expect(res2.accepted).toEqual(true)
     })
 })

package/test/unit/WebSocketServer.test.ts

@@ -2,14 +2,7 @@ import { WebSocketServer } from '../../src/connection/WebSocket/WebSocketServer'
 
 describe('WebSocketServer', () => {
 
-    it('starts and stops with host "127.0.0.1"', async () => {
-        const server = new WebSocketServer()
-        const port = await server.start({ min: 19792, max: 19792 }, '127.0.0.1')
-        expect(port).toEqual(19792)
-        await server.stop()
-    })
-
-    it('starts and stops if no host given', async () => {
+    it('starts and stops', async () => {
         const server = new WebSocketServer()
         const port = await server.start({ min: 19792, max: 19792 })
         expect(port).toEqual(19792)

package/test/unit/webrtcReplaceInternalIpWithExternalIp.ts

@@ -0,0 +1,18 @@
+import { replaceInternalIpWithExternalIp } from '../../src/connection/WebRTC/WebRtcConnector'
+
+describe('replaceIpIfCandidateTypeIsHost', () => {
+
+    const hostCandidate = 'candidate:1 1 UDP 2013266431 127.0.0.1 30000 typ host'
+    const srflxCandidate = 'candidate:1 1 UDP 2013266431 127.0.0.1 30000 typ srflx'
+    
+    it('replaces ip if candidate type is host', () => {
+        const replaced = replaceInternalIpWithExternalIp(hostCandidate, '0.0.0.0')
+        expect(replaced).toEqual('candidate:1 1 UDP 2013266431 0.0.0.0 30000 typ host')
+    })
+
+    it('does not replace candidate if type is not host', () => {
+        const replaced = replaceInternalIpWithExternalIp(srflxCandidate, '0.0.0.0')
+        expect(replaced).toEqual(srflxCandidate)
+    })
+
+})

package/test/utils/utils.ts

@@ -66,8 +66,7 @@ export const createMockConnectionDhtNode = async (stringId: string,
 
     const mockConnectionManager = new ConnectionManager({
         ownPeerDescriptor: peerDescriptor,
-        simulator: simulator,
-        nodeName: nodeName ? nodeName : stringId
+        simulator: simulator
     })
 
     const node = new DhtNode({