cleanups general code and public API (#175)

Co-authored-by: olme04 <olme04>

Author: olme04

build.gradle.kts

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-import groovy.util.Node
-import groovy.util.NodeList
-import org.gradle.api.publish.maven.internal.artifact.FileBasedMavenArtifact
+import groovy.util.*
+import org.gradle.api.publish.maven.internal.artifact.*
 import org.jetbrains.kotlin.gradle.dsl.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.*
 import org.jetbrains.kotlin.konan.target.*
@@ -162,20 +161,21 @@ subprojects {
                         useExperimentalAnnotation("kotlinx.coroutines.InternalCoroutinesApi")
                         useExperimentalAnnotation("kotlinx.coroutines.ObsoleteCoroutinesApi")
                         useExperimentalAnnotation("kotlinx.coroutines.FlowPreview")
+                        useExperimentalAnnotation("kotlinx.coroutines.DelicateCoroutinesApi")
 
-                        useExperimentalAnnotation("io.ktor.util.KtorExperimentalAPI")
                         useExperimentalAnnotation("io.ktor.util.InternalAPI")
                         useExperimentalAnnotation("io.ktor.utils.io.core.internal.DangerousInternalIoApi")
 
                         useExperimentalAnnotation("io.rsocket.kotlin.TransportApi")
                         useExperimentalAnnotation("io.rsocket.kotlin.ExperimentalMetadataApi")
                         useExperimentalAnnotation("io.rsocket.kotlin.ExperimentalStreamsApi")
+                        useExperimentalAnnotation("io.rsocket.kotlin.RSocketLoggingApi")
                     }
                 }
             }
 
             if (isLibProject && !isTestProject) {
-                explicitApiWarning() //TODO change to strict before release
+                explicitApi()
                 sourceSets["commonTest"].dependencies {
                     implementation(project(":rsocket-test"))
                 }
@@ -204,8 +204,10 @@ subprojects {
     }
 }
 
-fun publishPlatformArtifactsInRootModule(platformPublication:MavenPublication,
-                                         kotlinMultiplatformPublication: MavenPublication) {
+fun publishPlatformArtifactsInRootModule(
+    platformPublication: MavenPublication,
+    kotlinMultiplatformPublication: MavenPublication
+) {
     lateinit var platformXml: XmlProvider
 
     platformPublication.pom.withXml { platformXml = this }
@@ -312,7 +314,7 @@ subprojects {
             dependsOn(tasks.withType<Sign>())
         }
 
-        tasks.matching { it.name == "generatePomFileForKotlinMultiplatformPublication"}.configureEach {
+        tasks.matching { it.name == "generatePomFileForKotlinMultiplatformPublication" }.configureEach {
             dependsOn(tasks["generatePomFileForJvmPublication"])
         }
     }
@@ -421,7 +423,7 @@ if (sonatypeUsername != null && sonatypePassword != null) {
                                         it
                                     )
                                 }
-                                else -> it.artifactId = "${project.name}-$type"
+                                else                  -> it.artifactId = "${project.name}-$type"
                             }
                         }
                     }

examples/interactions/src/jvmMain/kotlin/RequestResponseErrorExample.kt

@@ -16,7 +16,6 @@
 
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.core.*
-import io.rsocket.kotlin.payload.*
 import io.rsocket.kotlin.transport.local.*
 import kotlinx.coroutines.*
 

examples/interactions/src/jvmMain/kotlin/RequestResponseExample.kt

@@ -16,7 +16,6 @@
 
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.core.*
-import io.rsocket.kotlin.payload.*
 import io.rsocket.kotlin.transport.local.*
 import kotlinx.coroutines.*
 

examples/interactions/src/jvmMain/kotlin/ServerRequestExample.kt

@@ -16,7 +16,6 @@
 
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.core.*
-import io.rsocket.kotlin.payload.*
 import io.rsocket.kotlin.transport.local.*
 import kotlinx.coroutines.*
 

examples/multiplatform-chat/src/clientMain/kotlin/Api.kt

@@ -17,7 +17,6 @@
 import io.ktor.client.*
 import io.ktor.client.features.websocket.*
 import io.ktor.network.selector.*
-import io.ktor.network.sockets.*
 import io.ktor.util.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.core.*

examples/multiplatform-chat/src/clientMain/kotlin/ChatApi.kt

@@ -16,7 +16,6 @@
 
 import io.ktor.utils.io.core.*
 import io.rsocket.kotlin.*
-import io.rsocket.kotlin.payload.*
 import kotlinx.serialization.*
 import kotlinx.serialization.protobuf.*
 

examples/multiplatform-chat/src/serverJvmMain/kotlin/App.kt

@@ -16,7 +16,6 @@
 
 import io.ktor.application.*
 import io.ktor.network.selector.*
-import io.ktor.network.sockets.*
 import io.ktor.routing.*
 import io.ktor.server.cio.*
 import io.ktor.server.engine.*

examples/nodejs-tcp-transport/src/jsMain/kotlin/Server.kt

@@ -18,7 +18,6 @@ import io.ktor.utils.io.core.*
 import io.ktor.utils.io.js.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.core.*
-import io.rsocket.kotlin.frame.io.*
 import io.rsocket.kotlin.payload.*
 import io.rsocket.kotlin.transport.*
 import kotlinx.coroutines.*
@@ -145,3 +144,17 @@ class NodeJsTcpConnection(private val socket: Socket) : Connection {
         return receiveChannel.receive()
     }
 }
+
+private fun ByteReadPacket.readLength(): Int {
+    val b = readByte().toInt() and 0xFF shl 16
+    val b1 = readByte().toInt() and 0xFF shl 8
+    val b2 = readByte().toInt() and 0xFF
+    return b or b1 or b2
+}
+
+private fun BytePacketBuilder.writeLength(length: Int) {
+    require(length and 0xFFFFFF.inv() == 0) { "Length is larger than 24 bits" }
+    writeByte((length shr 16).toByte())
+    writeByte((length shr 8).toByte())
+    writeByte(length.toByte())
+}

playground/src/commonMain/kotlin/TCP.kt

@@ -15,7 +15,6 @@
  */
 
 import io.ktor.network.selector.*
-import io.ktor.network.sockets.*
 import io.rsocket.kotlin.core.*
 import io.rsocket.kotlin.payload.*
 import io.rsocket.kotlin.transport.ktor.*

rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/Annotations.kt

@@ -37,3 +37,12 @@ public annotation class ExperimentalMetadataApi
     message = "This is an API to customize request strategy of streams. This API can change in future in non backwards-compatible manner."
 )
 public annotation class ExperimentalStreamsApi
+
+@Retention(value = AnnotationRetention.BINARY)
+@RequiresOptIn(
+    level = RequiresOptIn.Level.WARNING,
+    message = "This is mostly internal API used for logging. This API can change in future in non backwards-compatible manner."
+)
+public annotation class RSocketLoggingApi
+
+