grpc-pb: Move checking

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

Author: Jozott00

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

@@ -98,6 +98,8 @@ public interface WireDecoder : AutoCloseable {
     }
 }
 
+public expect fun checkForPlatformDecodeException(block: () -> Unit)
+
 /**
  * Creates a platform-specific [WireDecoder].
  *
@@ -108,4 +110,4 @@ public interface WireDecoder : AutoCloseable {
  *
  * @param source The buffer containing the encoded wire-format data.
  */
-internal expect fun WireDecoder(source: Buffer): WireDecoder
+public expect fun WireDecoder(source: Buffer): WireDecoder

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

@@ -60,4 +60,4 @@ public interface WireEncoder {
 }
 
 
-internal expect fun WireEncoder(sink: Sink): WireEncoder
+public expect fun WireEncoder(sink: Sink): WireEncoder

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

@@ -15,79 +15,79 @@ internal class WireDecoderJvm(source: Buffer) : WireDecoder {
     // there is no way to omit coping here
     internal val codedInputStream: CodedInputStream = CodedInputStream.newInstance(source.asInputStream())
 
-    override fun readTag(): KTag? = checked {
+    override fun readTag(): KTag? {
         val tag = codedInputStream.readTag().toUInt()
         if (tag == 0u) {
             return null
         }
         return KTag.from(tag)
     }
 
-    override fun readBool(): Boolean = checked {
+    override fun readBool(): Boolean {
         return codedInputStream.readBool()
     }
 
-    override fun readInt32(): Int = checked {
+    override fun readInt32(): Int {
         return codedInputStream.readInt32()
     }
 
-    override fun readInt64(): Long = checked {
+    override fun readInt64(): Long {
         return codedInputStream.readInt64()
     }
 
-    override fun readUInt32(): UInt = checked {
+    override fun readUInt32(): UInt {
         // todo check java unsigned types
         return codedInputStream.readUInt32().toUInt()
     }
 
-    override fun readUInt64(): ULong = checked {
+    override fun readUInt64(): ULong {
         // todo check java unsigned types
         return codedInputStream.readUInt64().toULong()
     }
 
-    override fun readSInt32(): Int = checked {
+    override fun readSInt32(): Int {
         return codedInputStream.readSInt32()
     }
 
-    override fun readSInt64(): Long = checked {
+    override fun readSInt64(): Long {
         return codedInputStream.readSInt64()
     }
 
-    override fun readFixed32(): UInt = checked {
+    override fun readFixed32(): UInt {
         // todo check java unsigned types
         return codedInputStream.readFixed32().toUInt()
     }
 
-    override fun readFixed64(): ULong = checked {
+    override fun readFixed64(): ULong {
         // todo check java unsigned types
         return codedInputStream.readFixed64().toULong()
     }
 
-    override fun readSFixed32(): Int = checked {
+    override fun readSFixed32(): Int {
         return codedInputStream.readSFixed32()
     }
 
-    override fun readSFixed64(): Long = checked {
+    override fun readSFixed64(): Long {
         return codedInputStream.readSFixed64()
     }
 
-    override fun readFloat(): Float = checked {
+    override fun readFloat(): Float {
         return codedInputStream.readFloat()
     }
 
-    override fun readDouble(): Double = checked {
+    override fun readDouble(): Double {
         return codedInputStream.readDouble()
     }
 
-    override fun readEnum(): Int = checked {
+    override fun readEnum(): Int {
         return codedInputStream.readEnum()
     }
 
-    override fun readString(): String = checked {
+    override fun readString(): String {
         return codedInputStream.readStringRequireUtf8()
     }
 
-    override fun readBytes(): ByteArray = checked {
+    override fun readBytes(): ByteArray {
         return codedInputStream.readByteArray()
     }
 
@@ -114,21 +114,19 @@ internal class WireDecoderJvm(source: Buffer) : WireDecoder {
     )
 }
 
-internal actual fun WireDecoder(source: Buffer): WireDecoder {
-    return WireDecoderJvm(source)
-}
 
-/**
- * Turns a [InvalidProtocolBufferException] into our own [ProtobufDecodingException].
- */
-private inline fun <reified T> checked(block: () -> T): T {
+public actual fun checkForPlatformDecodeException(block: () -> Unit) {
     try {
         return block()
     } catch (e: InvalidProtocolBufferException) {
         throw e.toDecodingException()
     }
 }
 
+public actual fun WireDecoder(source: Buffer): WireDecoder {
+    return WireDecoderJvm(source)
+}
+
 private fun InvalidProtocolBufferException.toDecodingException(): ProtobufDecodingException {
     return ProtobufDecodingException(message ?: "Failed to decode protobuf message.", cause)
 }

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

@@ -198,7 +198,7 @@ private class WireEncoderJvm(sink: Sink) : WireEncoder {
     }
 }
 
-internal actual fun WireEncoder(sink: Sink): WireEncoder {
+public actual fun WireEncoder(sink: Sink): WireEncoder {
     return WireEncoderJvm(sink)
 }
 

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

@@ -301,4 +301,8 @@ internal class WireDecoderNative(private val source: Buffer) : WireDecoder {
     }
 }
 
-internal actual fun WireDecoder(source: Buffer): WireDecoder = WireDecoderNative(source)
+public actual fun WireDecoder(source: Buffer): WireDecoder = WireDecoderNative(source)
+
+public actual fun checkForPlatformDecodeException(block: () -> Unit) {
+    block()
+}

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

@@ -178,7 +178,7 @@ internal class WireEncoderNative(private val sink: Sink) : WireEncoder {
     }
 }
 
-internal actual fun WireEncoder(sink: Sink): WireEncoder = WireEncoderNative(sink)
+public actual fun WireEncoder(sink: Sink): WireEncoder = WireEncoderNative(sink)
 
 
 // the current implementation is slow, as it iterates through the list, to write each element individually,

protoc-gen/src/main/kotlin/kotlinx/rpc/protobuf/ModelToKotlinCommonGenerator.kt

@@ -252,7 +252,9 @@ class ModelToKotlinCommonGenerator(
             function("decode", modifiers = "override", args = "stream: $sourceFqName", returnType = msgFqName) {
                 scope("$PB_PKG.WireDecoder(stream as $bufferFqName).use") {
                     code("val msg = ${declaration.internalClassFullName()}()")
-                    code("${declaration.internalClassFullName()}.decodeWith(msg, it)")
+                    scope("$PB_PKG.checkForPlatformDecodeException", nlAfterClosed = false) {
+                        code("${declaration.internalClassFullName()}.decodeWith(msg, it)")
+                    }
                     code("msg.checkRequiredFields()")
                     code("return msg")
                 }