-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Split ktor transports implementation (#219)
* make `rsocket-transport-ktor-*` modules just provide standalone transport implementations * introduce `rsocket-ktor-client/server` modules with plugins and future more deep ktor integrations
- Loading branch information
olme04
authored
Apr 13, 2022
1 parent
ea22902
commit 9198a98
Showing
18 changed files
with
394 additions
and
160 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * Copyright 2015-2020 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. | ||
| */ | ||
|
|
||
| plugins { | ||
| rsocket.template.library | ||
| } | ||
|
|
||
| kotlin { | ||
| configureCommon { | ||
| main { | ||
| dependencies { | ||
| api(projects.rsocketKtor) | ||
| api(libs.ktor.client.websockets) | ||
| } | ||
| } | ||
| } | ||
| configureJvm() | ||
| configureJs() | ||
| configureNative() | ||
| } | ||
|
|
||
| description = "Ktor Client RSocket plugin" |
74 changes: 74 additions & 0 deletions
74
...-ktor/rsocket-ktor-client/src/commonMain/kotlin/io/rsocket/kotlin/ktor/client/Builders.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * Copyright 2015-2020 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.ktor.client | ||
|
|
||
| import io.ktor.client.* | ||
| import io.ktor.client.plugins.* | ||
| import io.ktor.client.plugins.websocket.* | ||
| import io.ktor.client.request.* | ||
| import io.ktor.http.* | ||
| import io.ktor.utils.io.core.internal.* | ||
| import io.ktor.utils.io.pool.* | ||
| import io.rsocket.kotlin.* | ||
| import io.rsocket.kotlin.transport.* | ||
| import io.rsocket.kotlin.transport.ktor.websocket.* | ||
| import kotlin.coroutines.* | ||
|
|
||
| public suspend fun HttpClient.rSocket( | ||
| request: HttpRequestBuilder.() -> Unit, | ||
| ): RSocket = plugin(RSocketSupport).run { | ||
| connector.connect(KtorClientTransport(this@rSocket, request, bufferPool)) | ||
| } | ||
|
|
||
| public suspend fun HttpClient.rSocket( | ||
| urlString: String, | ||
| secure: Boolean = false, | ||
| request: HttpRequestBuilder.() -> Unit = {}, | ||
| ): RSocket = rSocket { | ||
| url { | ||
| this.protocol = if (secure) URLProtocol.WSS else URLProtocol.WS | ||
| this.port = protocol.defaultPort | ||
| takeFrom(urlString) | ||
| } | ||
| request() | ||
| } | ||
|
|
||
| public suspend fun HttpClient.rSocket( | ||
| host: String? = null, | ||
| port: Int? = null, | ||
| path: String? = null, | ||
| secure: Boolean = false, | ||
| request: HttpRequestBuilder.() -> Unit = {}, | ||
| ): RSocket = rSocket { | ||
| url { | ||
| this.protocol = if (secure) URLProtocol.WSS else URLProtocol.WS | ||
| this.port = protocol.defaultPort | ||
| set(host = host, port = port, path = path) | ||
| } | ||
| request() | ||
| } | ||
|
|
||
| private class KtorClientTransport( | ||
| private val client: HttpClient, | ||
| private val request: HttpRequestBuilder.() -> Unit, | ||
| private val pool: ObjectPool<ChunkBuffer> | ||
| ) : ClientTransport { | ||
| override val coroutineContext: CoroutineContext get() = client.coroutineContext | ||
|
|
||
| @TransportApi | ||
| override suspend fun connect(): Connection = WebSocketConnection(client.webSocketSession(request), pool) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * Copyright 2015-2020 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. | ||
| */ | ||
|
|
||
| plugins { | ||
| rsocket.template.library | ||
| } | ||
|
|
||
| kotlin { | ||
| configureCommon { | ||
| main { | ||
| dependencies { | ||
| api(projects.rsocketKtor) | ||
| api(libs.ktor.server.websockets) | ||
| } | ||
| } | ||
| test { | ||
| dependencies { | ||
| implementation(projects.rsocketKtor.rsocketKtorClient) | ||
| implementation(projects.rsocketTransportTests) //port provider | ||
| implementation(libs.ktor.client.cio) | ||
| implementation(libs.ktor.server.cio) | ||
| } | ||
| } | ||
| } | ||
| configureJvm() | ||
| configureNative(NativeTargets.Nix) | ||
| } | ||
|
|
||
| description = "Ktor Server RSocket Plugin" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
...t-ktor/rsocket-ktor-server/src/commonMain/kotlin/io/rsocket/kotlin/ktor/server/Routing.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Copyright 2015-2020 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.ktor.server | ||
|
|
||
| import io.ktor.server.application.* | ||
| import io.ktor.server.routing.* | ||
| import io.ktor.server.websocket.* | ||
| import io.ktor.utils.io.core.internal.* | ||
| import io.ktor.utils.io.pool.* | ||
| import io.rsocket.kotlin.* | ||
| import io.rsocket.kotlin.transport.* | ||
| import io.rsocket.kotlin.transport.ktor.websocket.* | ||
| import kotlinx.coroutines.* | ||
|
|
||
| public fun Route.rSocket( | ||
| path: String? = null, | ||
| protocol: String? = null, | ||
| acceptor: ConnectionAcceptor, | ||
| ): Unit = application.plugin(RSocketSupport).run { | ||
| server.bindIn(application, KtorServerTransport(this@rSocket, path, protocol, bufferPool), acceptor) | ||
| } | ||
|
|
||
| private class KtorServerTransport( | ||
| private val route: Route, | ||
| private val path: String?, | ||
| private val protocol: String?, | ||
| private val pool: ObjectPool<ChunkBuffer> | ||
| ) : ServerTransport<Unit> { | ||
| @TransportApi | ||
| override fun CoroutineScope.start(accept: suspend CoroutineScope.(Connection) -> Unit) { | ||
| val handler: suspend DefaultWebSocketServerSession.() -> Unit = { | ||
| val connection = WebSocketConnection(this, pool) | ||
| accept(connection) | ||
| } | ||
| when (path) { | ||
| null -> route.webSocket(protocol, handler) | ||
| else -> route.webSocket(path, protocol, handler) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.