Cleanup shared code:

whyoleg · whyoleg · commit 7c3f7e8c4853 · 2025-02-09T20:21:18.000+02:00
* create IoCompatible dispatcher
* drop unneeded test utils
* use `startSuspend`/`stopSuspend` to support web targets
diff --git a/ktor-plugins/ktor-tests/src/commonTest/kotlin/io/rsocket/kotlin/ktor/tests/WebSocketConnectionTest.kt b/ktor-plugins/ktor-tests/src/commonTest/kotlin/io/rsocket/kotlin/ktor/tests/WebSocketConnectionTest.kt
@@ -76,12 +76,12 @@ class WebSocketConnectionTest : SuspendTest {
     }
 
     override suspend fun before() {
-        server.start()
+        server.startSuspend()
         delay(1000)
     }
 
     override suspend fun after() {
-        server.stop()
+        server.stopSuspend()
         client.coroutineContext.job.cancelAndJoin()
     }
 
diff --git a/rsocket-core/src/commonTest/kotlin/io/rsocket/kotlin/internal/RSocketRequesterTest.kt b/rsocket-core/src/commonTest/kotlin/io/rsocket/kotlin/internal/RSocketRequesterTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 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.
@@ -18,6 +18,7 @@ package io.rsocket.kotlin.internal
 
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.frame.*
+import io.rsocket.kotlin.internal.io.*
 import io.rsocket.kotlin.keepalive.*
 import io.rsocket.kotlin.payload.*
 import io.rsocket.kotlin.test.*
@@ -102,7 +103,7 @@ class RSocketRequesterTest : TestWithConnection() {
             val flow = requester.requestStream(Payload.Empty).take(2).flowOn(PrefetchStrategy(1, 0))
 
             expectNoEventsIn(200)
-            flow.launchIn(connection + anotherDispatcher)
+            flow.launchIn(connection + Dispatchers.IoCompatible)
 
             awaitFrame { frame ->
                 assertTrue(frame is RequestFrame)
diff --git a/rsocket-core/src/commonTest/kotlin/io/rsocket/kotlin/transport/internal/PrioritizationFrameQueueTest.kt b/rsocket-core/src/commonTest/kotlin/io/rsocket/kotlin/transport/internal/PrioritizationFrameQueueTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 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.
@@ -16,6 +16,7 @@
 
 package io.rsocket.kotlin.transport.internal
 
+import io.rsocket.kotlin.internal.io.*
 import io.rsocket.kotlin.test.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*
@@ -62,7 +63,7 @@ class PrioritizationFrameQueueTest : SuspendTest {
     @Test
     fun testAsyncReceive() = test {
         val deferred = CompletableDeferred<Source?>()
-        launch(anotherDispatcher) {
+        launch(Dispatchers.IoCompatible) {
             deferred.complete(queue.dequeueFrame())
         }
         delay(100)
diff --git a/rsocket-core/src/jsMain/kotlin/io/rsocket/kotlin/logging/DefaultLoggerFactory.kt b/rsocket-core/src/jsMain/kotlin/io/rsocket/kotlin/logging/DefaultLoggerFactory.kt
diff --git a/rsocket-core/src/nonJvmMain/kotlin/io/rsocket/kotlin/logging/DefaultLoggerFactory.kt b/rsocket-core/src/nonJvmMain/kotlin/io/rsocket/kotlin/logging/DefaultLoggerFactory.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2025 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.
@@ -19,5 +19,5 @@ package io.rsocket.kotlin.logging
 import io.rsocket.kotlin.*
 
 @RSocketLoggingApi
-public actual val DefaultLoggerFactory: LoggerFactory
+internal actual val DefaultLoggerFactory: LoggerFactory
     get() = PrintLogger
diff --git a/rsocket-internal-io/api/rsocket-internal-io.api b/rsocket-internal-io/api/rsocket-internal-io.api
@@ -13,6 +13,10 @@ public final class io/rsocket/kotlin/internal/io/ContextKt {
 	public static final fun supervisorContext (Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
 }
 
+public final class io/rsocket/kotlin/internal/io/Context_concurrentKt {
+	public static final fun getIoCompatible (Lkotlinx/coroutines/Dispatchers;)Lkotlinx/coroutines/CoroutineDispatcher;
+}
+
 public final class io/rsocket/kotlin/internal/io/Int24Kt {
 	public static final fun readInt24 (Lkotlinx/io/Source;)I
 	public static final fun writeInt24 (Lkotlinx/io/Sink;I)V
diff --git a/rsocket-internal-io/src/commonMain/kotlin/io/rsocket/kotlin/internal/io/Context.kt b/rsocket-internal-io/src/commonMain/kotlin/io/rsocket/kotlin/internal/io/Context.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 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.
@@ -19,6 +19,8 @@ package io.rsocket.kotlin.internal.io
 import kotlinx.coroutines.*
 import kotlin.coroutines.*
 
+public expect val Dispatchers.IoCompatible: CoroutineDispatcher
+
 public fun CoroutineContext.supervisorContext(): CoroutineContext = plus(SupervisorJob(get(Job)))
 public fun CoroutineContext.childContext(): CoroutineContext = plus(Job(get(Job)))
 
diff --git a/rsocket-internal-io/src/concurrentMain/kotlin/io/rsocket/kotlin/internal/io/Context.concurrent.kt b/rsocket-internal-io/src/concurrentMain/kotlin/io/rsocket/kotlin/internal/io/Context.concurrent.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 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.
@@ -14,14 +14,8 @@
  * limitations under the License.
  */
 
-package io.rsocket.kotlin.test
+package io.rsocket.kotlin.internal.io
 
 import kotlinx.coroutines.*
 
-expect annotation class IgnoreJs()
-expect annotation class IgnoreJvm()
-expect annotation class IgnoreNative()
-
-expect val anotherDispatcher: CoroutineDispatcher
-
-expect fun identityHashCode(instance: Any): Int
+public actual val Dispatchers.IoCompatible: CoroutineDispatcher get() = IO
diff --git a/rsocket-internal-io/src/nonConcurrentMain/kotlin/io/rsocket/kotlin/internal/io/Context.nonConcurrent.kt b/rsocket-internal-io/src/nonConcurrentMain/kotlin/io/rsocket/kotlin/internal/io/Context.nonConcurrent.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 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.
@@ -14,15 +14,8 @@
  * limitations under the License.
  */
 
-package io.rsocket.kotlin.test
+package io.rsocket.kotlin.internal.io
 
 import kotlinx.coroutines.*
 
-actual annotation class IgnoreJs
-actual typealias IgnoreJvm = org.junit.Ignore
-
-actual annotation class IgnoreNative
-
-actual val anotherDispatcher: CoroutineDispatcher get() = Dispatchers.IO
-
-actual fun identityHashCode(instance: Any): Int = System.identityHashCode(instance)
+public actual val Dispatchers.IoCompatible: CoroutineDispatcher get() = Default
diff --git a/rsocket-test/src/jsMain/kotlin/io/rsocket/kotlin/test/Test.kt b/rsocket-test/src/jsMain/kotlin/io/rsocket/kotlin/test/Test.kt
diff --git a/rsocket-test/src/nativeMain/kotlin/io/rsocket/kotlin/test/Test.kt b/rsocket-test/src/nativeMain/kotlin/io/rsocket/kotlin/test/Test.kt
diff --git a/rsocket-transports/ktor-tcp/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/KtorTcpClientTransport.kt b/rsocket-transports/ktor-tcp/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/KtorTcpClientTransport.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 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.
@@ -47,7 +47,7 @@ public sealed interface KtorTcpClientTransportBuilder : RSocketTransportBuilder<
 
 private class KtorTcpClientTransportBuilderImpl : KtorTcpClientTransportBuilder {
     private var dispatcher: CoroutineContext = Dispatchers.Default
-    private var selector: KtorTcpSelector = KtorTcpSelector.FromContext(Dispatchers.IO)
+    private var selector: KtorTcpSelector = KtorTcpSelector.FromContext(Dispatchers.IoCompatible)
     private var socketOptions: SocketOptions.TCPClientSocketOptions.() -> Unit = {}
 
     override fun dispatcher(context: CoroutineContext) {
diff --git a/rsocket-transports/ktor-tcp/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/KtorTcpServerTransport.kt b/rsocket-transports/ktor-tcp/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/KtorTcpServerTransport.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 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.
@@ -50,7 +50,7 @@ public sealed interface KtorTcpServerTransportBuilder : RSocketTransportBuilder<
 
 private class KtorTcpServerTransportBuilderImpl : KtorTcpServerTransportBuilder {
     private var dispatcher: CoroutineContext = Dispatchers.Default
-    private var selector: KtorTcpSelector = KtorTcpSelector.FromContext(Dispatchers.IO)
+    private var selector: KtorTcpSelector = KtorTcpSelector.FromContext(Dispatchers.IoCompatible)
     private var socketOptions: SocketOptions.AcceptorOptions.() -> Unit = {}
 
     override fun dispatcher(context: CoroutineContext) {
diff --git a/rsocket-transports/ktor-tcp/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/TcpClientTransport.kt b/rsocket-transports/ktor-tcp/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/TcpClientTransport.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 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.
@@ -20,6 +20,7 @@ package io.rsocket.kotlin.transport.ktor.tcp
 
 import io.ktor.network.selector.*
 import io.ktor.network.sockets.*
+import io.rsocket.kotlin.internal.io.*
 import io.rsocket.kotlin.transport.*
 import kotlinx.coroutines.*
 import kotlin.coroutines.*
@@ -42,7 +43,7 @@ public fun TcpClientTransport(
     configure: SocketOptions.TCPClientSocketOptions.() -> Unit = {},
 ): ClientTransport {
     val transportJob = SupervisorJob(context[Job])
-    val transportContext = Dispatchers.IO + context + transportJob + CoroutineName("rSocket-tcp-client")
+    val transportContext = Dispatchers.IoCompatible + context + transportJob + CoroutineName("rSocket-tcp-client")
     val selector = SelectorManager(transportContext)
     Job(transportJob).invokeOnCompletion { selector.close() }
     return ClientTransport(transportContext) {
diff --git a/rsocket-transports/ktor-tcp/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/TcpServerTransport.kt b/rsocket-transports/ktor-tcp/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/TcpServerTransport.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 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.
@@ -20,14 +20,14 @@ package io.rsocket.kotlin.transport.ktor.tcp
 
 import io.ktor.network.selector.*
 import io.ktor.network.sockets.*
-import io.ktor.utils.io.core.*
+import io.rsocket.kotlin.internal.io.*
 import io.rsocket.kotlin.transport.*
 import kotlinx.coroutines.*
 
 @Deprecated(level = DeprecationLevel.ERROR, message = "Deprecated in favor of new Transport API, use KtorTcpServerInstance")
 public class TcpServer internal constructor(
     public val handlerJob: Job,
-    public val serverSocket: Deferred<ServerSocket>
+    public val serverSocket: Deferred<ServerSocket>,
 )
 
 @Suppress("DEPRECATION_ERROR")
@@ -44,7 +44,7 @@ public fun TcpServerTransport(
     configure: SocketOptions.AcceptorOptions.() -> Unit = {},
 ): ServerTransport<TcpServer> = ServerTransport { accept ->
     val serverSocketDeferred = CompletableDeferred<ServerSocket>()
-    val handlerJob = launch(Dispatchers.IO + coroutineContext) {
+    val handlerJob = launch(Dispatchers.IoCompatible + coroutineContext) {
         SelectorManager(coroutineContext).use { selector ->
             aSocket(selector).tcp().bind(localAddress, configure).use { serverSocket ->
                 serverSocketDeferred.complete(serverSocket)
diff --git a/rsocket-transports/ktor-tcp/src/commonTest/kotlin/io/rsocket/kotlin/transport/ktor/tcp/TcpTransportTest.kt b/rsocket-transports/ktor-tcp/src/commonTest/kotlin/io/rsocket/kotlin/transport/ktor/tcp/TcpTransportTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 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.
@@ -18,6 +18,7 @@ package io.rsocket.kotlin.transport.ktor.tcp
 
 import io.ktor.network.selector.*
 import io.ktor.network.sockets.*
+import io.rsocket.kotlin.internal.io.*
 import io.rsocket.kotlin.transport.tests.*
 import kotlinx.coroutines.*
 
@@ -32,7 +33,7 @@ class TcpTransportTest : TransportTest() {
 class KtorTcpTransportTest : TransportTest() {
     // a single SelectorManager for both client and server works much better in K/N
     // in user code in most of the cases, only one SelectorManager will be created
-    private val selector = SelectorManager(Dispatchers.IO)
+    private val selector = SelectorManager(Dispatchers.IoCompatible)
     override suspend fun before() {
         val server = startServer(KtorTcpServerTransport(testContext) {
             selectorManager(selector, false)
diff --git a/rsocket-transports/ktor-websocket-server/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/KtorWebSocketServerTransport.kt b/rsocket-transports/ktor-websocket-server/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/KtorWebSocketServerTransport.kt
diff --git a/rsocket-transports/ktor-websocket-server/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/WebSocketServerTransport.kt b/rsocket-transports/ktor-websocket-server/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/WebSocketServerTransport.kt

Original file line number	Diff line number	Diff line change
`@@ -76,12 +76,12 @@ class WebSocketConnectionTest : SuspendTest {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`override suspend fun before() {`
`79`		`- server.start()`
	`79`	`+ server.startSuspend()`
`80`	`80`	`delay(1000)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`override suspend fun after() {`
`84`		`- server.stop()`
	`84`	`+ server.stopSuspend()`
`85`	`85`	`client.coroutineContext.job.cancelAndJoin()`
`86`	`86`	`}`
`87`	`87`