feat: test ws/noise/tls

Expand matrix of tested transports/encrypters.

This added webrtc-direct initially too but it's
very unreliable so it will happen in a follow up.

Author: achingbrain

perf/impl/js-libp2p/v1.0/index.js

@@ -3,7 +3,8 @@ import { noise } from '@chainsafe/libp2p-noise'
 import { yamux } from '@chainsafe/libp2p-yamux'
 import { perf } from '@libp2p/perf'
 import { tcp } from '@libp2p/tcp'
-import { multiaddr } from '@multiformats/multiaddr'
+import { webSockets } from '@libp2p/websockets'
+import { multiaddr, fromStringTuples } from '@multiformats/multiaddr'
 import { createLibp2p } from 'libp2p'
 
 const argv = parseArgs({
@@ -15,10 +16,17 @@ const argv = parseArgs({
     'server-address': {
       type: 'string'
     },
+    'server-multiaddr': {
+      type: 'string'
+    },
     transport: {
       type: 'string',
       default: 'tcp'
     },
+    encryption: {
+      type: 'string',
+      default: 'noise'
+    },
     'upload-bytes': {
       type: 'string',
       default: '0'
@@ -32,49 +40,79 @@ const argv = parseArgs({
 
 /**
  * @param {boolean} runServer
- * @param {string} serverIpAddress
+ * @param {string} serverPublicSocketAddress
+ * @param {string} serverMultiaddr
  * @param {string} transport
+ * @param {string} encryption
  * @param {number} uploadBytes
  * @param {number} downloadBytes
  */
-export async function main (runServer, serverIpAddress, transport, uploadBytes, downloadBytes) {
-  const { host, port } = splitHostPort(serverIpAddress)
+export async function main (runServer, serverPublicSocketAddress, serverMultiaddr, transport, encryption, uploadBytes, downloadBytes) {
+  const { host, port } = splitHostPort(serverPublicSocketAddress)
 
   const config = {
-    transports: [
-      tcp()
-    ],
+    addresses: {},
+    transports: [],
     streamMuxers: [
       yamux()
     ],
     connectionEncryption: [
       noise()
     ],
-    connectionManager: {
-      minConnections: 0
-    },
     services: {
       perf: perf()
     }
   }
 
+  if (transport === 'tcp') {
+    config.transports = [
+      tcp()
+    ]
+  } else if (transport === 'ws') {
+    config.transports = [
+      webSockets()
+    ]
+  }
+
   if (runServer) {
-    Object.assign(config, {
-      addresses: {
-        listen: [
-          // #TODO: right now we only support tcp
-          `/ip4/${host}/tcp/${port}`
-        ]
-      }
-    })
+    if (transport === 'tcp') {
+      config.addresses.listen = [
+        `/ip4/${host}/tcp/${port}`
+      ]
+    } else if (transport === 'ws') {
+      config.addresses.listen = [
+        `/ip4/${host}/tcp/${port}/ws`
+      ]
+    }
   }
 
   const node = await createLibp2p(config)
 
   await node.start()
 
-  if (!runServer) {
-    for await (const output of node.services.perf.measurePerformance(multiaddr(`/ip4/${host}/tcp/${port}`), uploadBytes, downloadBytes)) {
+  if (runServer) {
+    // print our multiaddr (may have certhashes in it)
+    console.error(node.getMultiaddrs()[0].toString())
+  } else {
+    // replace server host/port with values from public address
+    const privateMa = multiaddr(serverMultiaddr)
+    const tuples = privateMa.stringTuples()
+
+    for (let i = 0; i < tuples.length; i++) {
+      // ipv4
+      if (tuples[i][0] === 4) {
+        tuples[i][1] = host
+      }
+
+      // udp
+      if (tuples[i][0] === 6 || tuples[i][0] === 273) {
+        tuples[i][1] = port
+      }
+    }
+
+    const serverMa = fromStringTuples(tuples)
+
+    for await (const output of node.services.perf.measurePerformance(serverMa, uploadBytes, downloadBytes)) {
       // eslint-disable-next-line no-console
       console.log(JSON.stringify(output))
     }
@@ -101,7 +139,7 @@ function splitHostPort (address) {
   }
 }
 
-main(argv.values['run-server'] === 'true', argv.values['server-address'], argv.values.transport, Number(argv.values['upload-bytes']), Number(argv.values['download-bytes'])).catch((err) => {
+main(argv.values['run-server'] === 'true', argv.values['server-address'], argv.values['server-multiaddr'], argv.values.transport, argv.values.encryption, Number(argv.values['upload-bytes']), Number(argv.values['download-bytes'])).catch((err) => {
   // eslint-disable-next-line no-console
   console.error(err)
   process.exit(1)