grpc-native: Move internal decode/encoding into grpc.pb package and move common proto generation to commonTest

Signed-off-by: Johannes Zottele <[email protected]>

Author: Jozott00

gradle-plugin/src/main/kotlin/kotlinx/rpc/proto/DefaultProtoSourceSet.kt

@@ -100,7 +100,7 @@ internal fun Project.createProtoExtensions() {
         findOrCreateAndConfigure("jvmTest", null)
 
         sourceSets.configureEach {
-            if (name == "jvmMain" || name == "jvmTest" || name == "nativeTest") {
+            if (name == "jvmMain" || name == "jvmTest" || name == "nativeTest" || name == "commonTest") {
                 findOrCreateAndConfigure(name, this)
             }
         }

grpc/grpc-core/build.gradle.kts

@@ -4,7 +4,6 @@
 
 import kotlinx.rpc.buf.tasks.BufGenerateTask
 import kotlinx.rpc.proto.kotlinMultiplatform
-import org.gradle.kotlin.dsl.withType
 import org.gradle.internal.extensions.stdlib.capitalized
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.tasks.CInteropProcess
@@ -123,8 +122,8 @@ kotlin {
                     )
                 }
 
-                val libUpbTask = "cinterop${libprotowire.name.capitalized()}${it.targetName.capitalized()}"
-                tasks.named(libUpbTask, CInteropProcess::class) {
+                val libProtowireTask = "cinterop${libprotowire.name.capitalized()}${it.targetName.capitalized()}"
+                tasks.named(libProtowireTask, CInteropProcess::class) {
                     dependsOn(buildGrpcppCLib)
                 }
 
@@ -139,8 +138,15 @@ protoSourceSets {
             exclude("exclude/**")
         }
     }
+
+    configureEach {
+        proto {
+            exclude("exclude/**")
+        }
+    }
 }
 
+
 rpc {
     grpc {
         val globalRootDir: String by extra
@@ -152,6 +158,15 @@ rpc {
         }
 
         project.tasks.withType<BufGenerateTask>().configureEach {
+
+            // TODO: Remove this once we remove JVM generation
+            // Set compile for common(native) option
+            if (name.endsWith("CommonTest")) {
+                protocPlugins.kotlinMultiplatform {
+                    options.set(options.getOrElse(emptyMap()) + mapOf("targetMode" to "common"))
+                }
+            }
+
             if (name.endsWith("Test")) {
                 dependsOn(gradle.includedBuild("protoc-gen").task(":jar"))
             }

grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/internal/WireDecoder.kt

@@ -4,7 +4,7 @@
 
 package kotlinx.rpc.grpc.internal
 
-import kotlinx.io.Buffer
+import kotlinx.rpc.grpc.pb.WireDecoder
 
 internal expect fun WireDecoder.pushLimit(byteLen: Int): Int
 internal expect fun WireDecoder.popLimit(limit: Int)

grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/internal/WireEncoder.kt

@@ -7,6 +7,10 @@ package kotlinx.rpc.grpc.pb
 import kotlinx.io.Buffer
 import kotlinx.rpc.internal.utils.InternalRpcApi
 
+// TODO: Evaluate if this buffer size is suitable for all targets (KRPC-186)
+// maximum buffer size to allocate as contiguous memory in bytes
+internal const val MAX_PACKED_BULK_SIZE: Int = 1_000_000
+
 /**
  * A platform-specific decoder for wire format data.
  *

grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/pb/readPacked.kt renamed to grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/internal/readPacked.kt

@@ -19,7 +19,7 @@ import kotlinx.rpc.internal.utils.InternalRpcApi
 @OptIn(ExperimentalUnsignedTypes::class)
 public interface WireEncoder {
     public fun flush()
-    public fun writeBool(field: Int, value: Boolean): Boolean
+    public fun writeBool(fieldNr: Int, value: Boolean): Boolean
     public fun writeInt32(fieldNr: Int, value: Int): Boolean
     public fun writeInt64(fieldNr: Int, value: Long): Boolean
     public fun writeUInt32(fieldNr: Int, value: UInt): Boolean

grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/pb/WireDecoder.kt

@@ -4,21 +4,21 @@
 
 package kotlinx.rpc.grpc.pb
 
-internal object WireSize
+public object WireSize
 
-internal expect fun WireSize.int32(value: Int): Int
-internal expect fun WireSize.int64(value: Long): Int
-internal expect fun WireSize.uInt32(value: UInt): Int
-internal expect fun WireSize.uInt64(value: ULong): Int
-internal expect fun WireSize.sInt32(value: Int): Int
-internal expect fun WireSize.sInt64(value: Long): Int
+public expect fun WireSize.int32(value: Int): Int
+public expect fun WireSize.int64(value: Long): Int
+public expect fun WireSize.uInt32(value: UInt): Int
+public expect fun WireSize.uInt64(value: ULong): Int
+public expect fun WireSize.sInt32(value: Int): Int
+public expect fun WireSize.sInt64(value: Long): Int
 
-internal fun WireSize.bool(value: Boolean) = int32(if (value) 1 else 0)
-internal fun WireSize.enum(value: Int) = int32(value)
-internal fun WireSize.packedInt32(value: List<Int>) = value.sumOf { int32(it) }
-internal fun WireSize.packedInt64(value: List<Long>) = value.sumOf { int64(it) }
-internal fun WireSize.packedUInt32(value: List<UInt>) = value.sumOf { uInt32(it) }
-internal fun WireSize.packedUInt64(value: List<ULong>) = value.sumOf { uInt64(it) }
-internal fun WireSize.packedSInt32(value: List<Int>) = value.sumOf { sInt32(it) }
-internal fun WireSize.packedSInt64(value: List<Long>) = value.sumOf { sInt64(it) }
-internal fun WireSize.packedEnum(value: List<Int>) = value.sumOf { enum(it) }
+public fun WireSize.bool(value: Boolean): Int = int32(if (value) 1 else 0)
+public fun WireSize.enum(value: Int): Int = int32(value)
+public fun WireSize.packedInt32(value: List<Int>): Int = value.sumOf { int32(it) }
+public fun WireSize.packedInt64(value: List<Long>): Int = value.sumOf { int64(it) }
+public fun WireSize.packedUInt32(value: List<UInt>): Int = value.sumOf { uInt32(it) }
+public fun WireSize.packedUInt64(value: List<ULong>): Int = value.sumOf { uInt64(it) }
+public fun WireSize.packedSInt32(value: List<Int>): Int = value.sumOf { sInt32(it) }
+public fun WireSize.packedSInt64(value: List<Long>): Int = value.sumOf { sInt64(it) }
+public fun WireSize.packedEnum(value: List<Int>): Int = value.sumOf { enum(it) }

grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/pb/WireEncoder.kt

@@ -5,7 +5,7 @@
 package kotlinx.rpc.grpc.pb
 
 import kotlinx.io.Buffer
-import kotlinx.rpc.grpc.test.*
+import kotlinx.rpc.grpc.test.common.*
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -30,7 +30,7 @@ class TestProtos {
 
     @Test
     fun testAllPrimitiveProto() {
-        val msg = AllPrimitives {
+        val msg = AllPrimitivesCommon {
             int32 = 12
             int64 = 1234567890123456789L
             uint32 = 12345u
@@ -48,20 +48,20 @@ class TestProtos {
             bytes = byteArrayOf(1, 2, 3)
         }
 
-        val decoded = decodeEncode(msg, { encodeWith(it) }, AllPrimitives::decodeWith)
+        val decoded = decodeEncode(msg, { encodeWith(it) }, AllPrimitivesCommon::decodeWith)
 
         assertEquals(msg.double, decoded?.double)
     }
 
     @Test
     fun testRepeatedProto() {
-        val msg = Repeated {
+        val msg = RepeatedCommon {
             listFixed32 = listOf(1, 2, 3).map { it.toUInt() }
             listInt32 = listOf(4, 5, 6)
             listString = listOf("a", "b", "c")
         }
 
-        val decoded = decodeEncode(msg, { encodeWith(it) }, Repeated::decodeWith)
+        val decoded = decodeEncode(msg, { encodeWith(it) }, RepeatedCommon::decodeWith)
 
         assertEquals(msg.listInt32, decoded?.listInt32)
         assertEquals(msg.listFixed32, decoded?.listFixed32)

grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/pb/WireSize.kt

@@ -2,11 +2,9 @@
  * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package kotlinx.rpc.grpc.internal
+package kotlinx.rpc.grpc.pb
 
 import kotlinx.io.Buffer
-import kotlinx.rpc.grpc.pb.*
-import kotlin.experimental.ExperimentalNativeApi
 import kotlin.test.*
 
 enum class TestPlatform {