diff --git a/samples/chat/README.md b/samples/chat/README.md
index f83991ef5..6d9b3fc39 100644
--- a/samples/chat/README.md
+++ b/samples/chat/README.md
@@ -1,13 +1,17 @@
 # chat
 
 * api - shared chat API for both client and server
-* client - client API implementation as requests to RSocket with Protobuf serialization. Works on JVM(TCP/WS), JS(WS),
-  Native(TCP). Tasks for running sample clients:
-  * JVM: `run`
-  * Native: `runDebugExecutableNative` / `runReleaseExecutableNative`
-  * NodeJs: `jsNodeRun`
-  * Browser: `jsBrowserRun`
-* server - server API implementation with storage in ordinary concurrent map and exposing it through RSocket with
-  Protobuf serialization. Can be started on JVM(TCP+WS) and Native(TCP). Tasks for running sample servers:
-  * JVM: `run`
-  * Native: `runDebugExecutableNative` / `runReleaseExecutableNative`
+* client - client API implementation via requesting to RSocket with Protobuf serialization.
+  Works on JVM(TCP/WS), Native(TCP/WS), NodeJS(WS/TCP), Browser(WS).
+  Tasks for running clients:
+    * JVM: `run`
+    * Native: `runDebugExecutableNative` / `runReleaseExecutableNative`
+    * NodeJs: `nodejsNodeRun` / `nodejsNodeDevelopmentRun` / `nodejsNodeProductionRun`
+    * Browser: `browserBrowserRun` / `browserBrowserDevelopmentRun` / `browserBrowserProductionRun`
+* server - server API implementation with storage in concurrent map
+  and exposing it through RSocket with Protobuf serialization.
+  Can be started on JVM(TCP/WS), Native(TCP/WS), NodeJS(TCP).
+  Tasks for running servers:
+    * JVM: `run`
+    * Native: `runDebugExecutableNative` / `runReleaseExecutableNative`
+    * NodeJs: `jsNodeRun` / `jsNodeDevelopmentRun` / `jsNodeProductionRun`
diff --git a/samples/chat/api/build.gradle.kts b/samples/chat/api/build.gradle.kts
index 22eb57613..e0df9283c 100644
--- a/samples/chat/api/build.gradle.kts
+++ b/samples/chat/api/build.gradle.kts
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.jetbrains.kotlin.konan.target.*
 
 plugins {
@@ -10,7 +26,7 @@ val kotlinxSerializationVersion: String by rootProject
 
 kotlin {
     jvm()
-    js(IR) {
+    js {
         browser()
         nodejs()
     }
diff --git a/samples/chat/api/src/commonMain/kotlin/ChatApi.kt b/samples/chat/api/src/commonMain/kotlin/ChatApi.kt
index 2ed70347a..f7d700b14 100644
--- a/samples/chat/api/src/commonMain/kotlin/ChatApi.kt
+++ b/samples/chat/api/src/commonMain/kotlin/ChatApi.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.api
 
 import kotlinx.serialization.*
diff --git a/samples/chat/api/src/commonMain/kotlin/MessageApi.kt b/samples/chat/api/src/commonMain/kotlin/MessageApi.kt
index c69709709..c30797b2f 100644
--- a/samples/chat/api/src/commonMain/kotlin/MessageApi.kt
+++ b/samples/chat/api/src/commonMain/kotlin/MessageApi.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.api
 
 import kotlinx.coroutines.flow.*
diff --git a/samples/chat/api/src/commonMain/kotlin/Serialization.kt b/samples/chat/api/src/commonMain/kotlin/Serialization.kt
index 8515da20d..f590e9302 100644
--- a/samples/chat/api/src/commonMain/kotlin/Serialization.kt
+++ b/samples/chat/api/src/commonMain/kotlin/Serialization.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.api
 
 import io.ktor.utils.io.core.*
diff --git a/samples/chat/api/src/commonMain/kotlin/Servers.kt b/samples/chat/api/src/commonMain/kotlin/Servers.kt
new file mode 100644
index 000000000..efb6f09b2
--- /dev/null
+++ b/samples/chat/api/src/commonMain/kotlin/Servers.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.api
+
+enum class TransportType { TCP, WS }
+
+data class ServerAddress(val port: Int, val type: TransportType)
+
+object Servers {
+    object JVM {
+        val TCP = ServerAddress(port = 8001, type = TransportType.TCP)
+        val WS = ServerAddress(port = 8002, type = TransportType.WS)
+    }
+
+    object JS {
+        val TCP = ServerAddress(port = 7001, type = TransportType.TCP)
+    }
+
+    object Native {
+        val TCP = ServerAddress(port = 9001, type = TransportType.TCP)
+        val WS = ServerAddress(port = 9002, type = TransportType.WS)
+    }
+
+    val WS = setOf(
+        JVM.WS,
+        Native.WS
+    )
+    val TCP = setOf(
+        JVM.TCP,
+        JS.TCP,
+        Native.TCP
+    )
+
+    val ALL = WS + TCP
+}
diff --git a/samples/chat/api/src/commonMain/kotlin/UserApi.kt b/samples/chat/api/src/commonMain/kotlin/UserApi.kt
index 05ba6c64f..3d92a1a33 100644
--- a/samples/chat/api/src/commonMain/kotlin/UserApi.kt
+++ b/samples/chat/api/src/commonMain/kotlin/UserApi.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.api
 
 import kotlinx.serialization.*
diff --git a/samples/chat/client/build.gradle.kts b/samples/chat/client/build.gradle.kts
index b02aaa553..0aef81492 100644
--- a/samples/chat/client/build.gradle.kts
+++ b/samples/chat/client/build.gradle.kts
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.jetbrains.kotlin.konan.target.*
 
 plugins {
@@ -17,10 +33,12 @@ kotlin {
     jvm {
         withJava()
     }
-    js(IR) {
+    js("browser") {
         browser {
             binaries.executable()
         }
+    }
+    js("nodejs") {
         nodejs {
             binaries.executable()
         }
@@ -33,7 +51,6 @@ kotlin {
     }?.binaries {
         executable {
             entryPoint = "io.rsocket.kotlin.samples.chat.client.main"
-            freeCompilerArgs += "-Xdisable-phases=EscapeAnalysis" //TODO
         }
     }
 
@@ -41,17 +58,30 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(project(":api"))
-                implementation("io.rsocket.kotlin:rsocket-transport-ktor-client:$rsocketVersion")
+                implementation("io.rsocket.kotlin:rsocket-transport-ktor-websocket-client:$rsocketVersion")
             }
         }
         val jvmMain by getting {
             dependencies {
+                implementation("io.rsocket.kotlin:rsocket-transport-ktor-tcp:$rsocketVersion")
                 implementation("io.ktor:ktor-client-cio:$ktorVersion")
             }
         }
-        val jsMain by getting {
+        findByName("nativeMain")?.apply {
+            dependencies {
+                implementation("io.rsocket.kotlin:rsocket-transport-ktor-tcp:$rsocketVersion")
+                implementation("io.ktor:ktor-client-cio:$ktorVersion")
+            }
+        }
+        val browserMain by getting {
+            dependencies {
+                implementation("io.ktor:ktor-client-js:$ktorVersion")
+            }
+        }
+        val nodejsMain by getting {
             dependencies {
-                implementation("io.ktor:ktor-client-core:$ktorVersion")
+                implementation("io.ktor:ktor-client-js:$ktorVersion")
+                implementation("io.rsocket.kotlin:rsocket-transport-nodejs-tcp:$rsocketVersion")
             }
         }
     }
diff --git a/samples/chat/client/src/browserMain/kotlin/App.kt b/samples/chat/client/src/browserMain/kotlin/App.kt
new file mode 100644
index 000000000..cd54f5fed
--- /dev/null
+++ b/samples/chat/client/src/browserMain/kotlin/App.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.client
+
+import io.rsocket.kotlin.samples.chat.api.*
+import kotlinx.coroutines.*
+
+suspend fun main() {
+    coroutineScope {
+        //only WS is supported on browser JS
+        // native WS server is incompatible with js WS client
+        (Servers.WS - Servers.Native.WS).forEach {
+            val client = ApiClient(it, "Yuri")
+            launch {
+                client.use(it, "RSocket is awesome! (from browser)")
+            }
+        }
+    }
+}
diff --git a/samples/chat/client/src/browserMain/kotlin/clientTransport.kt b/samples/chat/client/src/browserMain/kotlin/clientTransport.kt
new file mode 100644
index 000000000..e18a78b7c
--- /dev/null
+++ b/samples/chat/client/src/browserMain/kotlin/clientTransport.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.client
+
+import io.ktor.client.engine.js.*
+import io.rsocket.kotlin.samples.chat.api.*
+import io.rsocket.kotlin.transport.*
+import io.rsocket.kotlin.transport.ktor.websocket.client.*
+
+internal actual fun clientTransport(
+    type: TransportType,
+    host: String,
+    port: Int
+): ClientTransport = when (type) {
+    TransportType.TCP -> error("TCP is not supported")
+    TransportType.WS  -> WebSocketClientTransport(Js, host, port)
+}
diff --git a/samples/chat/client/src/jsMain/resources/index.html b/samples/chat/client/src/browserMain/resources/index.html
similarity index 82%
rename from samples/chat/client/src/jsMain/resources/index.html
rename to samples/chat/client/src/browserMain/resources/index.html
index 6b9fe7dff..f98970589 100644
--- a/samples/chat/client/src/jsMain/resources/index.html
+++ b/samples/chat/client/src/browserMain/resources/index.html
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2015-2020 the original author or authors.
+  ~ Copyright 2015-2022 the original author or authors.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <meta charset="UTF-8">
-  <title>Chat</title>
+    <meta charset="UTF-8">
+    <title>Chat</title>
 </head>
 <body>
 
 </body>
-<script src="chat-client.js"></script>
+<script src="client.js"></script>
 </html>
diff --git a/samples/chat/client/src/commonMain/kotlin/ApiClient.kt b/samples/chat/client/src/commonMain/kotlin/ApiClient.kt
index 52a2b5793..0d65623e2 100644
--- a/samples/chat/client/src/commonMain/kotlin/ApiClient.kt
+++ b/samples/chat/client/src/commonMain/kotlin/ApiClient.kt
@@ -1,6 +1,24 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.client
 
 import io.rsocket.kotlin.*
+import io.rsocket.kotlin.core.*
+import io.rsocket.kotlin.payload.*
 import io.rsocket.kotlin.samples.chat.api.*
 import kotlinx.serialization.*
 
@@ -11,3 +29,16 @@ class ApiClient(rSocket: RSocket) {
     val chats = ChatApiClient(rSocket, proto)
     val messages = MessageApiClient(rSocket, proto)
 }
+
+suspend fun ApiClient(
+    address: ServerAddress,
+    name: String
+): ApiClient {
+    println("Connecting client to: $address")
+    val connector = RSocketConnector {
+        connectionConfig {
+            setupPayload { buildPayload { data(name) } }
+        }
+    }
+    return ApiClient(connector.connect(ClientTransport(address)))
+}
diff --git a/samples/chat/client/src/commonMain/kotlin/ChatApiClient.kt b/samples/chat/client/src/commonMain/kotlin/ChatApiClient.kt
index b815fba44..1e4adb562 100644
--- a/samples/chat/client/src/commonMain/kotlin/ChatApiClient.kt
+++ b/samples/chat/client/src/commonMain/kotlin/ChatApiClient.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.client
 
 import io.rsocket.kotlin.*
diff --git a/samples/chat/client/src/commonMain/kotlin/MessageApiClient.kt b/samples/chat/client/src/commonMain/kotlin/MessageApiClient.kt
index 832685601..1aca51d46 100644
--- a/samples/chat/client/src/commonMain/kotlin/MessageApiClient.kt
+++ b/samples/chat/client/src/commonMain/kotlin/MessageApiClient.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.client
 
 import io.rsocket.kotlin.*
diff --git a/samples/chat/client/src/commonMain/kotlin/UserApiClient.kt b/samples/chat/client/src/commonMain/kotlin/UserApiClient.kt
index cf9b74b7f..6fcb53156 100644
--- a/samples/chat/client/src/commonMain/kotlin/UserApiClient.kt
+++ b/samples/chat/client/src/commonMain/kotlin/UserApiClient.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.client
 
 import io.rsocket.kotlin.*
diff --git a/samples/chat/client/src/commonMain/kotlin/clientTransport.common.kt b/samples/chat/client/src/commonMain/kotlin/clientTransport.common.kt
new file mode 100644
index 000000000..c054af0de
--- /dev/null
+++ b/samples/chat/client/src/commonMain/kotlin/clientTransport.common.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.client
+
+import io.rsocket.kotlin.samples.chat.api.*
+import io.rsocket.kotlin.transport.*
+
+fun ClientTransport(address: ServerAddress): ClientTransport =
+    clientTransport(address.type, "localhost", address.port)
+
+internal expect fun clientTransport(
+    type: TransportType,
+    host: String,
+    port: Int
+): ClientTransport
diff --git a/samples/chat/client/src/commonMain/kotlin/connect.kt b/samples/chat/client/src/commonMain/kotlin/connect.kt
deleted file mode 100644
index 488e7685c..000000000
--- a/samples/chat/client/src/commonMain/kotlin/connect.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.rsocket.kotlin.samples.chat.client
-
-import io.ktor.client.*
-import io.ktor.client.features.websocket.*
-import io.rsocket.kotlin.core.*
-import io.rsocket.kotlin.payload.*
-import io.rsocket.kotlin.transport.ktor.*
-import io.rsocket.kotlin.transport.ktor.client.*
-
-private fun connector(name: String): RSocketConnector = RSocketConnector {
-    connectionConfig {
-        setupPayload { buildPayload { data(name) } }
-    }
-}
-
-//not supported on native
-suspend fun connectToApiUsingWS(name: String, port: Int = 9000): ApiClient {
-    val client = HttpClient {
-        install(WebSockets)
-        install(RSocketSupport) {
-            connector = connector(name)
-        }
-    }
-
-    return ApiClient(client.rSocket(port = port))
-}
-
-//not supported on JS
-suspend fun connectToApiUsingTCP(name: String, port: Int = 8000): ApiClient {
-    val transport = TcpClientTransport("0.0.0.0", port)
-    return ApiClient(connector(name).connect(transport))
-}
diff --git a/samples/chat/client/src/commonMain/kotlin/usage.kt b/samples/chat/client/src/commonMain/kotlin/usage.kt
index 9fbc72a1d..736eefa20 100644
--- a/samples/chat/client/src/commonMain/kotlin/usage.kt
+++ b/samples/chat/client/src/commonMain/kotlin/usage.kt
@@ -1,19 +1,33 @@
-package io.rsocket.kotlin.samples.chat.client
-
-import kotlinx.coroutines.flow.*
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-suspend fun ApiClient.use(message: String) {
+package io.rsocket.kotlin.samples.chat.client
 
-    users.all().forEach {
-        println(it)
-    }
+import io.rsocket.kotlin.samples.chat.api.*
 
+suspend fun ApiClient.use(
+    receiver: ServerAddress,
+    message: String
+) {
     val chat = chats.all().firstOrNull() ?: chats.new("rsocket-kotlin chat")
 
     val sentMessage = messages.send(chat.id, message)
-    println(sentMessage)
+    println("Send to [$receiver]: $sentMessage")
 
     messages.messages(chat.id, -1).collect {
-        println("Received: $it")
+        println("Received from [$receiver]: $it")
     }
 }
diff --git a/samples/chat/client/src/jsMain/kotlin/App.kt b/samples/chat/client/src/jsMain/kotlin/App.kt
deleted file mode 100644
index 0fb473e7b..000000000
--- a/samples/chat/client/src/jsMain/kotlin/App.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.rsocket.kotlin.samples.chat.client
-
-suspend fun main() {
-    connectToApiUsingWS("Yuri").use("RSocket is awesome! (from JS WS)")
-}
diff --git a/samples/chat/client/src/jvmMain/kotlin/App.kt b/samples/chat/client/src/jvmMain/kotlin/App.kt
index 485e66e8f..c32db17db 100644
--- a/samples/chat/client/src/jvmMain/kotlin/App.kt
+++ b/samples/chat/client/src/jvmMain/kotlin/App.kt
@@ -1,20 +1,29 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.client
 
-import kotlin.random.*
+import io.rsocket.kotlin.samples.chat.api.*
+import kotlinx.coroutines.*
 
-suspend fun main() {
-    when (Random.nextInt(3)) {
-        0 -> {
-            println("Connect WS")
-            connectToApiUsingWS("Oleg").use("RSocket is awesome! (from JVM WS)")
-        }
-        1 -> {
-            println("Connect TCP")
-            connectToApiUsingTCP("Hanna").use("RSocket is awesome! (from JVM TCP)")
-        }
-        2 -> {
-            println("Connect TCP native")
-            connectToApiUsingTCP("Someone", 7000).use("RSocket is awesome! (from JVM TCP)")
+fun main(): Unit = runBlocking {
+    Servers.ALL.forEach {
+        val client = ApiClient(it, "Oleg")
+        launch {
+            client.use(it, "RSocket is awesome! (from JVM)")
         }
     }
 }
diff --git a/samples/chat/client/src/jvmMain/kotlin/clientTransport.kt b/samples/chat/client/src/jvmMain/kotlin/clientTransport.kt
new file mode 100644
index 000000000..f6978757e
--- /dev/null
+++ b/samples/chat/client/src/jvmMain/kotlin/clientTransport.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.client
+
+import io.ktor.client.engine.cio.*
+import io.rsocket.kotlin.samples.chat.api.*
+import io.rsocket.kotlin.transport.*
+import io.rsocket.kotlin.transport.ktor.tcp.*
+import io.rsocket.kotlin.transport.ktor.websocket.client.*
+
+internal actual fun clientTransport(
+    type: TransportType,
+    host: String,
+    port: Int
+): ClientTransport = when (type) {
+    TransportType.TCP -> TcpClientTransport(host, port)
+    TransportType.WS  -> WebSocketClientTransport(CIO, host, port)
+}
diff --git a/samples/chat/client/src/nativeMain/kotlin/App.kt b/samples/chat/client/src/nativeMain/kotlin/App.kt
index 546821bdd..866f0e0f0 100644
--- a/samples/chat/client/src/nativeMain/kotlin/App.kt
+++ b/samples/chat/client/src/nativeMain/kotlin/App.kt
@@ -1,17 +1,29 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.client
 
+import io.rsocket.kotlin.samples.chat.api.*
 import kotlinx.coroutines.*
-import kotlin.random.*
 
-fun main() = runBlocking {
-    when (Random.nextInt(2)) {
-        0 -> {
-            println("Connect TCP")
-            connectToApiUsingTCP("Gloria").use("RSocket is awesome! (from Native TCP)")
-        }
-        1 -> {
-            println("Connect TCP native")
-            connectToApiUsingTCP("Kolya", 7000).use("RSocket is awesome! (from Native TCP)")
+fun main(): Unit = runBlocking {
+    Servers.ALL.forEach {
+        val client = ApiClient(it, "Gloria")
+        launch {
+            client.use(it, "RSocket is awesome! (from Native)")
         }
     }
 }
diff --git a/samples/chat/client/src/nativeMain/kotlin/clientTransport.kt b/samples/chat/client/src/nativeMain/kotlin/clientTransport.kt
new file mode 100644
index 000000000..f6978757e
--- /dev/null
+++ b/samples/chat/client/src/nativeMain/kotlin/clientTransport.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.client
+
+import io.ktor.client.engine.cio.*
+import io.rsocket.kotlin.samples.chat.api.*
+import io.rsocket.kotlin.transport.*
+import io.rsocket.kotlin.transport.ktor.tcp.*
+import io.rsocket.kotlin.transport.ktor.websocket.client.*
+
+internal actual fun clientTransport(
+    type: TransportType,
+    host: String,
+    port: Int
+): ClientTransport = when (type) {
+    TransportType.TCP -> TcpClientTransport(host, port)
+    TransportType.WS  -> WebSocketClientTransport(CIO, host, port)
+}
diff --git a/samples/chat/client/src/nodejsMain/kotlin/App.kt b/samples/chat/client/src/nodejsMain/kotlin/App.kt
new file mode 100644
index 000000000..ebe4aa589
--- /dev/null
+++ b/samples/chat/client/src/nodejsMain/kotlin/App.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.client
+
+import io.rsocket.kotlin.samples.chat.api.*
+import kotlinx.coroutines.*
+
+suspend fun main() {
+    coroutineScope {
+        // native WS server is incompatible with js WS client
+        (Servers.ALL - Servers.Native.WS).forEach {
+            val client = ApiClient(it, "Kolya")
+            launch {
+                client.use(it, "RSocket is awesome! (from nodeJS)")
+            }
+        }
+    }
+}
diff --git a/samples/chat/client/src/nodejsMain/kotlin/clientTransport.kt b/samples/chat/client/src/nodejsMain/kotlin/clientTransport.kt
new file mode 100644
index 000000000..feb5e9266
--- /dev/null
+++ b/samples/chat/client/src/nodejsMain/kotlin/clientTransport.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.client
+
+import io.ktor.client.engine.js.*
+import io.rsocket.kotlin.samples.chat.api.*
+import io.rsocket.kotlin.transport.*
+import io.rsocket.kotlin.transport.ktor.websocket.client.*
+import io.rsocket.kotlin.transport.nodejs.tcp.*
+
+internal actual fun clientTransport(
+    type: TransportType,
+    host: String,
+    port: Int
+): ClientTransport = when (type) {
+    TransportType.TCP -> TcpClientTransport(port, host)
+    TransportType.WS  -> WebSocketClientTransport(Js, host, port)
+}
diff --git a/samples/chat/gradle.properties b/samples/chat/gradle.properties
index 5be8976ec..755ef36a5 100644
--- a/samples/chat/gradle.properties
+++ b/samples/chat/gradle.properties
@@ -1,12 +1,30 @@
+#
+# Copyright 2015-2022 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 group=io.rsocket.kotlin.sample.chat
 version=1.0.0
-kotlinVersion=1.6.10
-ktorVersion=1.6.7
-kotlinxSerializationVersion=1.3.1
-rsocketVersion=0.14.3
+kotlinVersion=1.6.20
+ktorVersion=2.0.0
+kotlinxSerializationVersion=1.3.2
+rsocketVersion=0.15.4
 kotlin.js.compiler=ir
 kotlin.mpp.stability.nowarn=true
-kotlin.native.enableDependencyPropagation=false
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-#TODO native debug binary fail for ktor
-kotlin.native.cacheKind.linuxX64=none
\ No newline at end of file
+kotlin.native.binary.memoryModel=experimental
+kotlin.native.binary.freezing=disabled
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configureondemand=true
+org.gradle.jvmargs=-Xmx2g
+org.gradle.vfs.watch=true
diff --git a/samples/chat/gradle/wrapper/gradle-wrapper.properties b/samples/chat/gradle/wrapper/gradle-wrapper.properties
index d2880ba80..aa991fcea 100644
--- a/samples/chat/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/chat/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/samples/chat/server/build.gradle.kts b/samples/chat/server/build.gradle.kts
index f249fcafa..648e3c534 100644
--- a/samples/chat/server/build.gradle.kts
+++ b/samples/chat/server/build.gradle.kts
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.jetbrains.kotlin.konan.target.*
 
 plugins {
@@ -17,6 +33,11 @@ kotlin {
     jvm {
         withJava()
     }
+    js {
+        nodejs {
+            binaries.executable()
+        }
+    }
     when {
         HostManager.hostIsLinux -> linuxX64("native")
         HostManager.hostIsMingw -> null //no native support for TCP in ktor mingwX64("clientNative")
@@ -25,7 +46,6 @@ kotlin {
     }?.binaries {
         executable {
             entryPoint = "io.rsocket.kotlin.samples.chat.server.main"
-            freeCompilerArgs += "-Xdisable-phases=EscapeAnalysis" //TODO
         }
     }
 
@@ -33,15 +53,28 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(project(":api"))
-                implementation("io.rsocket.kotlin:rsocket-transport-ktor:$rsocketVersion")
+
                 implementation("io.ktor:ktor-utils:$ktorVersion") //for concurrent map implementation and shared list
             }
         }
         val jvmMain by getting {
             dependencies {
-                implementation("io.rsocket.kotlin:rsocket-transport-ktor-server:$rsocketVersion")
+                implementation("io.rsocket.kotlin:rsocket-transport-ktor-tcp:$rsocketVersion")
+                implementation("io.rsocket.kotlin:rsocket-transport-ktor-websocket-server:$rsocketVersion")
                 implementation("io.ktor:ktor-server-cio:$ktorVersion")
             }
         }
+        findByName("nativeMain")?.apply {
+            dependencies {
+                implementation("io.rsocket.kotlin:rsocket-transport-ktor-tcp:$rsocketVersion")
+                implementation("io.rsocket.kotlin:rsocket-transport-ktor-websocket-server:$rsocketVersion")
+                implementation("io.ktor:ktor-server-cio:$ktorVersion")
+            }
+        }
+        val jsMain by getting {
+            dependencies {
+                implementation("io.rsocket.kotlin:rsocket-transport-nodejs-tcp:$rsocketVersion")
+            }
+        }
     }
 }
diff --git a/samples/chat/server/src/commonMain/kotlin/ChatApi.kt b/samples/chat/server/src/commonMain/kotlin/ChatApi.kt
index b169f0848..a3adc84a5 100644
--- a/samples/chat/server/src/commonMain/kotlin/ChatApi.kt
+++ b/samples/chat/server/src/commonMain/kotlin/ChatApi.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.server
 
 import io.rsocket.kotlin.samples.chat.api.*
diff --git a/samples/chat/server/src/commonMain/kotlin/Chats.kt b/samples/chat/server/src/commonMain/kotlin/Chats.kt
index 72475c256..bf8ebe8bf 100644
--- a/samples/chat/server/src/commonMain/kotlin/Chats.kt
+++ b/samples/chat/server/src/commonMain/kotlin/Chats.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.server
 
 import io.rsocket.kotlin.samples.chat.api.*
diff --git a/samples/chat/server/src/commonMain/kotlin/MessageApi.kt b/samples/chat/server/src/commonMain/kotlin/MessageApi.kt
index f00a64cdb..661dbd104 100644
--- a/samples/chat/server/src/commonMain/kotlin/MessageApi.kt
+++ b/samples/chat/server/src/commonMain/kotlin/MessageApi.kt
@@ -1,18 +1,32 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.server
 
 import io.ktor.util.collections.*
 import io.rsocket.kotlin.samples.chat.api.*
-import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*
 import kotlinx.coroutines.flow.*
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class MessageApiImpl(
     private val messages: Messages,
     private val chats: Chats,
 ) : MessageApi {
 
-    private val listeners = ConcurrentList<SendChannel<Message>>()
+    private val listeners = ConcurrentSet<SendChannel<Message>>()
 
     override suspend fun send(chatId: Int, content: String): Message {
         if (chatId !in chats) error("No chat with id '$chatId'")
@@ -29,7 +43,7 @@ class MessageApiImpl(
 
     override fun messages(chatId: Int, fromMessageId: Int): Flow<Message> = flow {
         messages.takeAfter(chatId, fromMessageId).forEach { emit(it) }
-        emitAll(channelFlow<Message> {
+        emitAll(channelFlow {
             listeners += channel
             awaitClose {
                 listeners -= channel
diff --git a/samples/chat/server/src/commonMain/kotlin/Messages.kt b/samples/chat/server/src/commonMain/kotlin/Messages.kt
index 0fe931bd3..fbda725f9 100644
--- a/samples/chat/server/src/commonMain/kotlin/Messages.kt
+++ b/samples/chat/server/src/commonMain/kotlin/Messages.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.server
 
 import io.rsocket.kotlin.samples.chat.api.*
diff --git a/samples/chat/server/src/commonMain/kotlin/Session.kt b/samples/chat/server/src/commonMain/kotlin/Session.kt
index 922c44338..b844a2bc9 100644
--- a/samples/chat/server/src/commonMain/kotlin/Session.kt
+++ b/samples/chat/server/src/commonMain/kotlin/Session.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.server
 
 import kotlin.coroutines.*
diff --git a/samples/chat/server/src/commonMain/kotlin/UserApi.kt b/samples/chat/server/src/commonMain/kotlin/UserApi.kt
index 04b140ea8..475ce6d2b 100644
--- a/samples/chat/server/src/commonMain/kotlin/UserApi.kt
+++ b/samples/chat/server/src/commonMain/kotlin/UserApi.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.server
 
 import io.rsocket.kotlin.samples.chat.api.*
diff --git a/samples/chat/server/src/commonMain/kotlin/Users.kt b/samples/chat/server/src/commonMain/kotlin/Users.kt
index 498e02fc2..f07553b4f 100644
--- a/samples/chat/server/src/commonMain/kotlin/Users.kt
+++ b/samples/chat/server/src/commonMain/kotlin/Users.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.server
 
 import io.rsocket.kotlin.samples.chat.api.*
diff --git a/samples/chat/server/src/commonMain/kotlin/acceptor.kt b/samples/chat/server/src/commonMain/kotlin/acceptor.kt
index bc3033918..5395ec40d 100644
--- a/samples/chat/server/src/commonMain/kotlin/acceptor.kt
+++ b/samples/chat/server/src/commonMain/kotlin/acceptor.kt
@@ -1,13 +1,48 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.server
 
 import io.rsocket.kotlin.*
+import io.rsocket.kotlin.core.*
 import io.rsocket.kotlin.samples.chat.api.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import kotlinx.serialization.*
 
+suspend fun startServer(vararg addresses: ServerAddress) {
+    val server = RSocketServer {
+
+    }
+    val job = SupervisorJob()
+    val scope = CoroutineScope(
+        job + CoroutineExceptionHandler { coroutineContext, throwable ->
+            println("Error happened $coroutineContext: $throwable")
+        }
+    )
+    val acceptor = createAcceptor()
+    addresses.forEach {
+        println("Start server at: $it")
+        server.bindIn(scope, ServerTransport(it), acceptor)
+    }
+    job.join()
+}
+
 @OptIn(ExperimentalSerializationApi::class)
-fun acceptor(): ConnectionAcceptor {
+private fun createAcceptor(): ConnectionAcceptor {
     val proto = ConfiguredProtoBuf
     val users = Users()
     val chats = Chats()
diff --git a/samples/chat/server/src/commonMain/kotlin/expects.kt b/samples/chat/server/src/commonMain/kotlin/expects.kt
index 2999a7acc..a3275e827 100644
--- a/samples/chat/server/src/commonMain/kotlin/expects.kt
+++ b/samples/chat/server/src/commonMain/kotlin/expects.kt
@@ -1,6 +1,21 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.server
 
-import io.ktor.util.*
 import io.ktor.util.collections.*
 
 expect class Counter() {
@@ -9,7 +24,6 @@ expect class Counter() {
 
 expect fun currentMillis(): Long
 
-@OptIn(InternalAPI::class)
 class Storage<T : Any> {
     private val map: MutableMap<Int, T> = ConcurrentMap()
     private val id = Counter()
diff --git a/samples/chat/server/src/commonMain/kotlin/serverTransport.common.kt b/samples/chat/server/src/commonMain/kotlin/serverTransport.common.kt
new file mode 100644
index 000000000..33c3b39ec
--- /dev/null
+++ b/samples/chat/server/src/commonMain/kotlin/serverTransport.common.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.server
+
+import io.rsocket.kotlin.samples.chat.api.*
+import io.rsocket.kotlin.transport.*
+
+fun ServerTransport(address: ServerAddress): ServerTransport<*> =
+    serverTransport(address.type, "0.0.0.0", address.port)
+
+expect fun serverTransport(
+    type: TransportType,
+    host: String,
+    port: Int
+): ServerTransport<*>
diff --git a/samples/chat/server/src/jsMain/kotlin/App.kt b/samples/chat/server/src/jsMain/kotlin/App.kt
new file mode 100644
index 000000000..75869a0e1
--- /dev/null
+++ b/samples/chat/server/src/jsMain/kotlin/App.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.server
+
+import io.rsocket.kotlin.samples.chat.api.*
+
+suspend fun main() {
+    startServer(Servers.JS.TCP)
+}
diff --git a/samples/chat/server/src/jsMain/kotlin/expects.js.kt b/samples/chat/server/src/jsMain/kotlin/expects.js.kt
new file mode 100644
index 000000000..a209e833b
--- /dev/null
+++ b/samples/chat/server/src/jsMain/kotlin/expects.js.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.server
+
+import kotlin.js.*
+
+actual class Counter {
+    private var value = 0
+    actual fun next(): Int = value++
+}
+
+actual fun currentMillis(): Long = Date.now().toLong()
diff --git a/samples/chat/server/src/jsMain/kotlin/serverTransport.kt b/samples/chat/server/src/jsMain/kotlin/serverTransport.kt
new file mode 100644
index 000000000..2179fdcc5
--- /dev/null
+++ b/samples/chat/server/src/jsMain/kotlin/serverTransport.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.server
+
+import io.rsocket.kotlin.samples.chat.api.*
+import io.rsocket.kotlin.transport.*
+import io.rsocket.kotlin.transport.nodejs.tcp.*
+
+actual fun serverTransport(
+    type: TransportType,
+    host: String,
+    port: Int
+): ServerTransport<*> = when (type) {
+    TransportType.TCP -> TcpServerTransport(port, host)
+    TransportType.WS  -> error("WebSocket is not supported")
+}
diff --git a/samples/chat/server/src/jvmMain/kotlin/App.kt b/samples/chat/server/src/jvmMain/kotlin/App.kt
index 30ebbcb67..3cd204e7e 100644
--- a/samples/chat/server/src/jvmMain/kotlin/App.kt
+++ b/samples/chat/server/src/jvmMain/kotlin/App.kt
@@ -1,31 +1,23 @@
-package io.rsocket.kotlin.samples.chat.server
-
-import io.ktor.application.*
-import io.ktor.routing.*
-import io.ktor.server.cio.*
-import io.ktor.server.engine.*
-import io.ktor.websocket.*
-import io.rsocket.kotlin.core.*
-import io.rsocket.kotlin.transport.ktor.*
-import io.rsocket.kotlin.transport.ktor.server.*
-
-fun main() {
-    val acceptor = acceptor()
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-    val rSocketServer = RSocketServer()
-
-    //start TCP server
-    rSocketServer.bind(TcpServerTransport("0.0.0.0", 8000), acceptor)
+package io.rsocket.kotlin.samples.chat.server
 
-    //start WS server
-    embeddedServer(CIO, port = 9000) {
-        install(WebSockets)
-        install(RSocketSupport) {
-            server = rSocketServer
-        }
+import io.rsocket.kotlin.samples.chat.api.*
 
-        routing {
-            rSocket(acceptor = acceptor)
-        }
-    }.start(true)
+suspend fun main() {
+    startServer(Servers.JVM.TCP, Servers.JVM.WS)
 }
diff --git a/samples/chat/server/src/jvmMain/kotlin/expects.jvm.kt b/samples/chat/server/src/jvmMain/kotlin/expects.jvm.kt
index becb26a89..d3bd866e0 100644
--- a/samples/chat/server/src/jvmMain/kotlin/expects.jvm.kt
+++ b/samples/chat/server/src/jvmMain/kotlin/expects.jvm.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.server
 
 import java.util.concurrent.atomic.*
diff --git a/samples/chat/server/src/jvmMain/kotlin/serverTransport.kt b/samples/chat/server/src/jvmMain/kotlin/serverTransport.kt
new file mode 100644
index 000000000..84a8b6fea
--- /dev/null
+++ b/samples/chat/server/src/jvmMain/kotlin/serverTransport.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.server
+
+import io.ktor.server.cio.*
+import io.rsocket.kotlin.samples.chat.api.*
+import io.rsocket.kotlin.transport.*
+import io.rsocket.kotlin.transport.ktor.tcp.*
+import io.rsocket.kotlin.transport.ktor.websocket.server.*
+
+actual fun serverTransport(
+    type: TransportType,
+    host: String,
+    port: Int
+): ServerTransport<*> = when (type) {
+    TransportType.TCP -> TcpServerTransport(host, port)
+    TransportType.WS  -> WebSocketServerTransport(CIO, port, host)
+}
diff --git a/samples/chat/server/src/nativeMain/kotlin/App.kt b/samples/chat/server/src/nativeMain/kotlin/App.kt
index a3a5600be..4d60112b1 100644
--- a/samples/chat/server/src/nativeMain/kotlin/App.kt
+++ b/samples/chat/server/src/nativeMain/kotlin/App.kt
@@ -1,20 +1,24 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.server
 
-import io.rsocket.kotlin.core.*
-import io.rsocket.kotlin.transport.ktor.*
+import io.rsocket.kotlin.samples.chat.api.*
 import kotlinx.coroutines.*
 
-fun main() = runBlocking {
-    val acceptor = acceptor()
-
-    val rSocketServer = RSocketServer()
-
-    //start TCP server
-    rSocketServer.bindIn(
-        CoroutineScope(CoroutineExceptionHandler { coroutineContext, throwable ->
-            println("Error happened $coroutineContext: $throwable")
-        }),
-        TcpServerTransport("0.0.0.0", 7000),
-        acceptor
-    ).handlerJob.join()
+fun main(): Unit = runBlocking {
+    startServer(Servers.Native.TCP, Servers.Native.WS)
 }
diff --git a/samples/chat/server/src/nativeMain/kotlin/expects.native.kt b/samples/chat/server/src/nativeMain/kotlin/expects.native.kt
index 8e5555080..0e2a2561d 100644
--- a/samples/chat/server/src/nativeMain/kotlin/expects.native.kt
+++ b/samples/chat/server/src/nativeMain/kotlin/expects.native.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.rsocket.kotlin.samples.chat.server
 
 import kotlin.native.concurrent.*
diff --git a/samples/chat/server/src/nativeMain/kotlin/serverTransport.kt b/samples/chat/server/src/nativeMain/kotlin/serverTransport.kt
new file mode 100644
index 000000000..84a8b6fea
--- /dev/null
+++ b/samples/chat/server/src/nativeMain/kotlin/serverTransport.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin.samples.chat.server
+
+import io.ktor.server.cio.*
+import io.rsocket.kotlin.samples.chat.api.*
+import io.rsocket.kotlin.transport.*
+import io.rsocket.kotlin.transport.ktor.tcp.*
+import io.rsocket.kotlin.transport.ktor.websocket.server.*
+
+actual fun serverTransport(
+    type: TransportType,
+    host: String,
+    port: Int
+): ServerTransport<*> = when (type) {
+    TransportType.TCP -> TcpServerTransport(host, port)
+    TransportType.WS  -> WebSocketServerTransport(CIO, port, host)
+}
diff --git a/samples/chat/settings.gradle.kts b/samples/chat/settings.gradle.kts
index 3bbe144ff..15c6fc9cb 100644
--- a/samples/chat/settings.gradle.kts
+++ b/samples/chat/settings.gradle.kts
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 pluginManagement {
     repositories {
         gradlePluginPortal()