rsocket · whyoleg · May 13, 2024 · Apr 15, 2024
diff --git a/rsocket-ktor/build.gradle.kts b/rsocket-ktor/build.gradle.kts
@@ -30,7 +30,7 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             api(projects.rsocketCore)
-            api(projects.rsocketTransportKtorWebsocket)
+            api(projects.rsocketTransportKtorWebsocketInternal)
             //TODO ContentNegotiation will be here later
         }
     }

diff --git a/...-ktor/rsocket-ktor-client/src/commonMain/kotlin/io/rsocket/kotlin/ktor/client/Builders.kt b/...-ktor/rsocket-ktor-client/src/commonMain/kotlin/io/rsocket/kotlin/ktor/client/Builders.kt
@@ -23,7 +23,7 @@ import io.ktor.client.request.*
 import io.ktor.http.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.transport.*
-import io.rsocket.kotlin.transport.ktor.websocket.*
+import io.rsocket.kotlin.transport.ktor.websocket.internal.*
 import kotlin.coroutines.*
 
 public suspend fun HttpClient.rSocket(

diff --git a/...t-ktor/rsocket-ktor-server/src/commonMain/kotlin/io/rsocket/kotlin/ktor/server/Routing.kt b/...t-ktor/rsocket-ktor-server/src/commonMain/kotlin/io/rsocket/kotlin/ktor/server/Routing.kt
@@ -21,7 +21,7 @@ import io.ktor.server.routing.*
 import io.ktor.server.websocket.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.transport.*
-import io.rsocket.kotlin.transport.ktor.websocket.*
+import io.rsocket.kotlin.transport.ktor.websocket.internal.*
 import kotlinx.coroutines.*
 
 public fun Route.rSocket(

diff --git a/rsocket-transport-ktor/api/rsocket-transport-ktor.api b/rsocket-transport-ktor/api/rsocket-transport-ktor.api
diff --git a/rsocket-transport-ktor/build.gradle.kts b/rsocket-transport-ktor/build.gradle.kts
diff --git a/rsocket-transport-ktor/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/dummy.kt b/rsocket-transport-ktor/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/dummy.kt
diff --git a/...or-tcp/api/rsocket-transport-ktor-tcp.api → ...or-tcp/api/rsocket-transport-ktor-tcp.api b/...or-tcp/api/rsocket-transport-ktor-tcp.api → ...or-tcp/api/rsocket-transport-ktor-tcp.api
diff --git a/...ocket-transport-ktor-tcp/build.gradle.kts → rsocket-transports/ktor-tcp/build.gradle.kts b/...ocket-transport-ktor-tcp/build.gradle.kts → rsocket-transports/ktor-tcp/build.gradle.kts
@@ -29,8 +29,7 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             implementation(projects.rsocketInternalIo)
-
-            api(projects.rsocketTransportKtor)
+            api(projects.rsocketCore)
             api(libs.ktor.network)
         }
         commonTest.dependencies {

diff --git a/.../transport/ktor/tcp/TcpClientTransport.kt → .../transport/ktor/tcp/TcpClientTransport.kt b/.../transport/ktor/tcp/TcpClientTransport.kt → .../transport/ktor/tcp/TcpClientTransport.kt
diff --git a/...otlin/transport/ktor/tcp/TcpConnection.kt → ...otlin/transport/ktor/tcp/TcpConnection.kt b/...otlin/transport/ktor/tcp/TcpConnection.kt → ...otlin/transport/ktor/tcp/TcpConnection.kt
diff --git a/.../transport/ktor/tcp/TcpServerTransport.kt → .../transport/ktor/tcp/TcpServerTransport.kt b/.../transport/ktor/tcp/TcpServerTransport.kt → .../transport/ktor/tcp/TcpServerTransport.kt
diff --git a/...otlin/transport/ktor/tcp/TcpServerTest.kt → ...otlin/transport/ktor/tcp/TcpServerTest.kt b/...otlin/transport/ktor/tcp/TcpServerTest.kt → ...otlin/transport/ktor/tcp/TcpServerTest.kt
diff --git a/...in/transport/ktor/tcp/TcpTransportTest.kt → ...in/transport/ktor/tcp/TcpTransportTest.kt b/...in/transport/ktor/tcp/TcpTransportTest.kt → ...in/transport/ktor/tcp/TcpTransportTest.kt
diff --git a/...n/transport/ktor/tcp/defaultDispatcher.kt → ...n/transport/ktor/tcp/defaultDispatcher.kt b/...n/transport/ktor/tcp/defaultDispatcher.kt → ...n/transport/ktor/tcp/defaultDispatcher.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2024 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.

diff --git a/...n/transport/ktor/tcp/defaultDispatcher.kt → ...n/transport/ktor/tcp/defaultDispatcher.kt b/...n/transport/ktor/tcp/defaultDispatcher.kt → ...n/transport/ktor/tcp/defaultDispatcher.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2024 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.

diff --git a/...ocket-transport-ktor-websocket-client.api → ...ocket-transport-ktor-websocket-client.api b/...ocket-transport-ktor-websocket-client.api → ...ocket-transport-ktor-websocket-client.api
diff --git a/...rt-ktor-websocket-client/build.gradle.kts → ...ts/ktor-websocket-client/build.gradle.kts b/...rt-ktor-websocket-client/build.gradle.kts → ...ts/ktor-websocket-client/build.gradle.kts
@@ -29,7 +29,8 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(projects.rsocketTransportKtorWebsocket)
+            implementation(projects.rsocketTransportKtorWebsocketInternal)
+            api(projects.rsocketCore)
             api(libs.ktor.client.core)
             api(libs.ktor.client.websockets)
         }

diff --git a/...socket/client/WebSocketClientTransport.kt → ...socket/client/WebSocketClientTransport.kt b/...socket/client/WebSocketClientTransport.kt → ...socket/client/WebSocketClientTransport.kt
@@ -26,7 +26,7 @@ import io.ktor.client.request.*
 import io.ktor.http.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.transport.*
-import io.rsocket.kotlin.transport.ktor.websocket.*
+import io.rsocket.kotlin.transport.ktor.websocket.internal.*
 import kotlinx.coroutines.*
 import kotlin.coroutines.*
 
@@ -37,7 +37,7 @@ public fun <T : HttpClientEngineConfig> WebSocketClientTransport(
     context: CoroutineContext = EmptyCoroutineContext,
     engine: T.() -> Unit = {},
     webSockets: WebSockets.Config.() -> Unit = {},
-    request: HttpRequestBuilder.() -> Unit
+    request: HttpRequestBuilder.() -> Unit,
 ): ClientTransport {
     val clientEngine = engineFactory.create(engine)
 

diff --git a/...et/client/ClientWebSocketTransportTest.kt → ...et/client/ClientWebSocketTransportTest.kt b/...et/client/ClientWebSocketTransportTest.kt → ...et/client/ClientWebSocketTransportTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-2024 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.

diff --git a/.../api/rsocket-transport-ktor-websocket.api → ...ket-transport-ktor-websocket-internal.api b/.../api/rsocket-transport-ktor-websocket.api → ...ket-transport-ktor-websocket-internal.api
@@ -1,4 +1,4 @@
-public final class io/rsocket/kotlin/transport/ktor/websocket/WebSocketConnection : io/rsocket/kotlin/Connection, kotlinx/coroutines/CoroutineScope {
+public final class io/rsocket/kotlin/transport/ktor/websocket/internal/WebSocketConnection : io/rsocket/kotlin/Connection, kotlinx/coroutines/CoroutineScope {
 	public fun <init> (Lio/ktor/websocket/WebSocketSession;)V
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 	public fun receive (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

diff --git a/...transport-ktor-websocket/build.gradle.kts → .../ktor-websocket-internal/build.gradle.kts b/...transport-ktor-websocket/build.gradle.kts → .../ktor-websocket-internal/build.gradle.kts
@@ -29,7 +29,8 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(projects.rsocketTransportKtor)
+            implementation(projects.rsocketInternalIo)
+            api(projects.rsocketCore)
             api(libs.ktor.websockets)
         }
     }

diff --git a/...ort/ktor/websocket/WebSocketConnection.kt → ...websocket/internal/WebSocketConnection.kt b/...ort/ktor/websocket/WebSocketConnection.kt → ...websocket/internal/WebSocketConnection.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.rsocket.kotlin.transport.ktor.websocket
+package io.rsocket.kotlin.transport.ktor.websocket.internal
 
 import io.ktor.utils.io.core.*
 import io.ktor.websocket.*

diff --git a/...ocket-transport-ktor-websocket-server.api → ...ocket-transport-ktor-websocket-server.api b/...ocket-transport-ktor-websocket-server.api → ...ocket-transport-ktor-websocket-server.api
diff --git a/...rt-ktor-websocket-server/build.gradle.kts → ...ts/ktor-websocket-server/build.gradle.kts b/...rt-ktor-websocket-server/build.gradle.kts → ...ts/ktor-websocket-server/build.gradle.kts
@@ -28,7 +28,8 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(projects.rsocketTransportKtorWebsocket)
+            implementation(projects.rsocketTransportKtorWebsocketInternal)
+            api(projects.rsocketCore)
             api(libs.ktor.server.host.common)
             api(libs.ktor.server.websockets)
         }

diff --git a/...socket/server/WebSocketServerTransport.kt → ...socket/server/WebSocketServerTransport.kt b/...socket/server/WebSocketServerTransport.kt → ...socket/server/WebSocketServerTransport.kt
@@ -22,7 +22,7 @@ import io.ktor.server.routing.*
 import io.ktor.server.websocket.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.transport.*
-import io.rsocket.kotlin.transport.ktor.websocket.*
+import io.rsocket.kotlin.transport.ktor.websocket.internal.*
 
 //TODO: will be reworked later with transport API rework
 

diff --git a/...ocket/server/CIOWebSocketTransportTest.kt → ...ocket/server/CIOWebSocketTransportTest.kt b/...ocket/server/CIOWebSocketTransportTest.kt → ...ocket/server/CIOWebSocketTransportTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2024 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.

diff --git a/...ebsocket/server/WebSocketTransportTest.kt → ...ebsocket/server/WebSocketTransportTest.kt b/...ebsocket/server/WebSocketTransportTest.kt → ...ebsocket/server/WebSocketTransportTest.kt
diff --git a/...bsocket/server/WebSocketTransportTests.kt → ...bsocket/server/WebSocketTransportTests.kt b/...bsocket/server/WebSocketTransportTests.kt → ...bsocket/server/WebSocketTransportTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2024 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.

diff --git a/...ort-local/api/rsocket-transport-local.api → ...rts/local/api/rsocket-transport-local.api b/...ort-local/api/rsocket-transport-local.api → ...rts/local/api/rsocket-transport-local.api
diff --git a/rsocket-transport-local/build.gradle.kts → rsocket-transports/local/build.gradle.kts b/rsocket-transport-local/build.gradle.kts → rsocket-transports/local/build.gradle.kts
diff --git a/...kotlin/transport/local/LocalConnection.kt → ...kotlin/transport/local/LocalConnection.kt b/...kotlin/transport/local/LocalConnection.kt → ...kotlin/transport/local/LocalConnection.kt
diff --git a/...ket/kotlin/transport/local/LocalServer.kt → ...ket/kotlin/transport/local/LocalServer.kt b/...ket/kotlin/transport/local/LocalServer.kt → ...ket/kotlin/transport/local/LocalServer.kt
diff --git a/...lin/transport/local/LocalTransportTest.kt → ...lin/transport/local/LocalTransportTest.kt b/...lin/transport/local/LocalTransportTest.kt → ...lin/transport/local/LocalTransportTest.kt
diff --git a/...ket-transport-nodejs-tcp/build.gradle.kts → ...et-transports/nodejs-tcp/build.gradle.kts b/...ket-transport-nodejs-tcp/build.gradle.kts → ...et-transports/nodejs-tcp/build.gradle.kts
diff --git a/...rt/nodejs/tcp/FrameWithLengthAssembler.kt → ...rt/nodejs/tcp/FrameWithLengthAssembler.kt b/...rt/nodejs/tcp/FrameWithLengthAssembler.kt → ...rt/nodejs/tcp/FrameWithLengthAssembler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-2024 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.

diff --git a/...ransport/nodejs/tcp/TcpClientTransport.kt → ...ransport/nodejs/tcp/TcpClientTransport.kt b/...ransport/nodejs/tcp/TcpClientTransport.kt → ...ransport/nodejs/tcp/TcpClientTransport.kt
diff --git a/...lin/transport/nodejs/tcp/TcpConnection.kt → ...lin/transport/nodejs/tcp/TcpConnection.kt b/...lin/transport/nodejs/tcp/TcpConnection.kt → ...lin/transport/nodejs/tcp/TcpConnection.kt
diff --git a/...ransport/nodejs/tcp/TcpServerTransport.kt → ...ransport/nodejs/tcp/TcpServerTransport.kt b/...ransport/nodejs/tcp/TcpServerTransport.kt → ...ransport/nodejs/tcp/TcpServerTransport.kt
diff --git a/...tlin/transport/nodejs/tcp/internal/ext.kt → ...tlin/transport/nodejs/tcp/internal/ext.kt b/...tlin/transport/nodejs/tcp/internal/ext.kt → ...tlin/transport/nodejs/tcp/internal/ext.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2024 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.

diff --git a/...ansport/nodejs/tcp/internal/nodejs.net.kt → ...ansport/nodejs/tcp/internal/nodejs.net.kt b/...ansport/nodejs/tcp/internal/nodejs.net.kt → ...ansport/nodejs/tcp/internal/nodejs.net.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2024 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.

diff --git a/.../transport/nodejs/tcp/TcpTransportTest.kt → .../transport/nodejs/tcp/TcpTransportTest.kt b/.../transport/nodejs/tcp/TcpTransportTest.kt → .../transport/nodejs/tcp/TcpTransportTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -28,18 +28,19 @@ plugins {
 projects("rsocket-kotlin") {
     module("rsocket-internal-io")
     module("rsocket-core")
-    module("rsocket-test")
 
+    module("rsocket-test")
     module("rsocket-transport-tests")
-    module("rsocket-transport-local")
-    module("rsocket-transport-nodejs-tcp")
-
-    //ktor transport modules
-    module("rsocket-transport-ktor", prefix = null) {
-        module("rsocket-transport-ktor-tcp")
-        module("rsocket-transport-ktor-websocket")
-        module("rsocket-transport-ktor-websocket-client")
-        module("rsocket-transport-ktor-websocket-server")
+
+    // transports
+    folder("rsocket-transports", "rsocket-transport") {
+        module("local")
+        module("nodejs-tcp")
+
+        module("ktor-tcp")
+        module("ktor-websocket-internal")
+        module("ktor-websocket-client")
+        module("ktor-websocket-server")
     }
 
     //deep ktor integration module