Add websocket to interop client (libp2p#429)

Author: StefanBratanov

interop-test-client/README.md

@@ -15,8 +15,8 @@ The first thing to be able to run the test locally is build the images of each l
 being tested. You need to run the following steps for each one of the implementations that you are
 planning to run:
 
-1. Checkout the project https://github.com/libp2p.
-2. Navigate to test-plans/impl/<IMPL>/<VERSION>; where <IMPL> is the implementation that you want to
+1. Checkout the project https://github.com/libp2p/test-plans.
+2. Navigate to transport-interop/impl/<IMPL>/<VERSION>; where <IMPL> is the implementation that you want to
    build (e.g. `jvm`) and <VERSION> is what version you want (e.g. `v1.2`).
 3. Once in the specific version folder run `make` to build the image. This will create a
    `image.json` file with the hash of the Docker image built.

interop-test-client/src/main/kotlin/io/libp2p/interop/InteropTestAgent.kt

@@ -21,13 +21,16 @@ import io.libp2p.security.noise.NoiseXXSecureChannel
 import io.libp2p.security.tls.TlsSecureChannel.Companion.ECDSA
 import io.libp2p.transport.quic.QuicTransport
 import io.libp2p.transport.tcp.TcpTransport
+import io.libp2p.transport.ws.WsTransport
 import redis.clients.jedis.Jedis
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.TimeUnit
 import java.util.stream.Collectors
 import kotlin.random.Random
 import kotlin.system.exitProcess
 
+const val TCP = "tcp"
+const val WS = "ws"
 const val QUIC_V1 = "quic-v1"
 private const val REDIS_KEY_LISTENER_ADDRESS = "listenerAddr"
 
@@ -38,12 +41,19 @@ class InteropTestAgent(val params: InteropTestParams) {
 
     init {
         val port = 10000 + Random.nextInt(50000)
-        val isTcp = "tcp" == params.transport
-        val ip = params.ip
-        val protocol = if (isTcp) "tcp" else "udp"
-        val maybeQuicSuffix = (if (isTcp) "" else "/quic-v1")
+        val transport = params.transport
+        val protocol = when (transport) {
+            TCP -> TCP
+            WS -> TCP
+            else -> "udp"
+        }
+        val maybeSuffix = when (transport) {
+            TCP -> ""
+            WS -> "/ws"
+            else -> "/quic-v1"
+        }
         val address =
-            Multiaddr.fromString("/ip4/$ip/$protocol/${port}$maybeQuicSuffix")
+            Multiaddr.fromString("/ip4/${params.ip}/$protocol/${port}$maybeSuffix")
 
         val privateKey = generateEd25519KeyPair().first
         val peerID = fromPubKey(privateKey.publicKey())
@@ -73,10 +83,10 @@ class InteropTestAgent(val params: InteropTestParams) {
         listenAddresses: ArrayList<String>
     ): Host = hostJ(Builder.Defaults.None, fn = {
         it.identity.factory = { privateKey }
-        if (params.transport == QUIC_V1) {
-            it.secureTransports.add(QuicTransport::ECDSA)
-        } else {
-            it.transports.add(::TcpTransport)
+        when (params.transport) {
+            QUIC_V1 -> it.secureTransports.add(QuicTransport::ECDSA)
+            WS -> it.transports.add(::WsTransport)
+            else -> it.transports.add(::TcpTransport)
         }
 
         if ("noise" == params.security) {