grpc-native: Refactor channel credentials

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

Author: Jozott00

grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/credentials.kt

@@ -0,0 +1,17 @@
+/*
+ * 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/*
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+public expect abstract class ChannelCredentials
+
+public expect class InsecureChannelCredentials : ChannelCredentials
+
+public expect class TlsChannelCredentials : ChannelCredentials
+
+
+public expect fun InsecureChannelCredentials(): ChannelCredentials
+public expect fun TlsChannelCredentials(): ChannelCredentials

grpc/grpc-core/src/commonTest/kotlin/kotlinx/rpc/grpc/test/proto/GrpcbInTlsTest.kt

@@ -9,6 +9,7 @@ import hello.HelloService
 import hello.invoke
 import kotlinx.coroutines.test.runTest
 import kotlinx.rpc.grpc.GrpcClient
+import kotlinx.rpc.grpc.TlsChannelCredentials
 import kotlinx.rpc.withService
 import kotlin.test.Test
 
@@ -23,6 +24,8 @@ class GrpcbInTlsTest {
     fun testTlsCall() = runTest {
         val service = grpcClient.withService<HelloService>()
 
+        TlsChannelCredentials.create()
+
         val request = HelloRequest {
             greeting = "Postman"
         }

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

@@ -28,7 +28,9 @@ internal actual fun ManagedChannelBuilder(hostname: String, port: Int): ManagedC
     return io.grpc.ManagedChannelBuilder.forAddress(hostname, port)
 }
 
-internal actual fun ManagedChannelBuilder(target: String): ManagedChannelBuilder<*> {
+internal actual fun ManagedChannelBuilder(
+    target: String,
+): ManagedChannelBuilder<*> {
     return io.grpc.ManagedChannelBuilder.forTarget(target)
 }
 

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

@@ -0,0 +1,19 @@
+/*
+ * 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
+
+public actual typealias ChannelCredentials = io.grpc.ChannelCredentials
+
+public actual typealias TlsChannelCredentials = io.grpc.TlsChannelCredentials
+
+public actual typealias InsecureChannelCredentials = io.grpc.InsecureChannelCredentials
+
+public actual fun InsecureChannelCredentials.create(): ChannelCredentials {
+    return io.grpc.InsecureChannelCredentials.create()
+}
+
+public actual fun TlsChannelCredentials.create(): ChannelCredentials {
+    return io.grpc.TlsChannelCredentials.create()
+}

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

@@ -7,9 +7,6 @@
 package kotlinx.rpc.grpc
 
 import kotlinx.rpc.grpc.internal.GrpcChannel
-import kotlinx.rpc.grpc.internal.GrpcChannelCredentials
-import kotlinx.rpc.grpc.internal.GrpcInsecureChannelCredentials
-import kotlinx.rpc.grpc.internal.GrpcSslChannelCredentials
 import kotlinx.rpc.grpc.internal.NativeManagedChannel
 import kotlinx.rpc.grpc.internal.internalError
 
@@ -30,10 +27,10 @@ public actual abstract class ManagedChannelBuilder<T : ManagedChannelBuilder<T>>
 internal class NativeManagedChannelBuilder(
     private val target: String,
 ) : ManagedChannelBuilder<NativeManagedChannelBuilder>() {
-    private var credentials: Lazy<GrpcChannelCredentials> = lazy { GrpcSslChannelCredentials() }
+    private var credentials: Lazy<ChannelCredentials> = lazy { TlsChannelCredentials.create() }
 
     override fun usePlaintext(): NativeManagedChannelBuilder {
-        credentials = lazy { GrpcInsecureChannelCredentials() }
+        credentials = lazy { InsecureChannelCredentials.create() }
         return this
     }
 

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+@file:OptIn(ExperimentalForeignApi::class, ExperimentalNativeApi::class)
+
+package kotlinx.rpc.grpc
+
+import cnames.structs.grpc_channel_credentials
+import kotlinx.cinterop.CPointer
+import kotlinx.cinterop.ExperimentalForeignApi
+import libkgrpc.grpc_channel_credentials_release
+import libkgrpc.grpc_insecure_credentials_create
+import libkgrpc.grpc_tls_credentials_create
+import libkgrpc.grpc_tls_credentials_options_create
+import kotlin.experimental.ExperimentalNativeApi
+import kotlin.native.ref.createCleaner
+
+public actual abstract class ChannelCredentials internal constructor(
+    internal val raw: CPointer<grpc_channel_credentials>,
+) {
+    internal val rawCleaner = createCleaner(raw) {
+        grpc_channel_credentials_release(it)
+    }
+}
+
+public actual class InsecureChannelCredentials internal constructor(
+    raw: CPointer<grpc_channel_credentials>,
+) : ChannelCredentials(raw)
+
+public actual class TlsChannelCredentials internal constructor(
+    raw: CPointer<grpc_channel_credentials>,
+) : ChannelCredentials(raw)
+
+
+public actual fun InsecureChannelCredentials.Companion.create(): ChannelCredentials {
+    return InsecureChannelCredentials(
+        grpc_insecure_credentials_create() ?: error("grpc_insecure_credentials_create() returned null")
+    )
+}
+
+public actual fun TlsChannelCredentials.Companion.create(): ChannelCredentials {
+    val raw = grpc_tls_credentials_options_create()?.let {
+        grpc_tls_credentials_create(it)
+    } ?: error("Failed to create TLS credentials")
+
+    return TlsChannelCredentials(raw)
+}

grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/internal/NativeManagedChannel.kt

@@ -7,70 +7,29 @@
 package kotlinx.rpc.grpc.internal
 
 import cnames.structs.grpc_channel
-import cnames.structs.grpc_channel_credentials
 import kotlinx.atomicfu.atomic
 import kotlinx.cinterop.CPointer
 import kotlinx.cinterop.ExperimentalForeignApi
-import kotlinx.cinterop.memScoped
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.withTimeoutOrNull
+import kotlinx.rpc.grpc.ChannelCredentials
 import kotlinx.rpc.grpc.ManagedChannel
 import kotlinx.rpc.grpc.ManagedChannelPlatform
 import libkgrpc.GPR_CLOCK_REALTIME
 import libkgrpc.GRPC_PROPAGATE_DEFAULTS
 import libkgrpc.gpr_inf_future
 import libkgrpc.grpc_channel_create
 import libkgrpc.grpc_channel_create_call
-import libkgrpc.grpc_channel_credentials_release
 import libkgrpc.grpc_channel_destroy
-import libkgrpc.grpc_insecure_credentials_create
 import libkgrpc.grpc_slice_unref
-import libkgrpc.grpc_ssl_credentials_create_ex
 import kotlin.coroutines.cancellation.CancellationException
 import kotlin.experimental.ExperimentalNativeApi
 import kotlin.native.ref.createCleaner
 import kotlin.time.Duration
 
-/**
- * Wrapper for [grpc_channel_credentials].
- */
-internal sealed class GrpcChannelCredentials(
-    internal val raw: CPointer<grpc_channel_credentials>,
-) {
-    val rawCleaner = createCleaner(raw) {
-        grpc_channel_credentials_release(it)
-    }
-}
-
-/**
- * Insecure credentials.
- */
-internal class GrpcInsecureChannelCredentials() :
-    GrpcChannelCredentials(
-        grpc_insecure_credentials_create() ?: error("grpc_insecure_credentials_create() returned null")
-    )
-
-/**
- * SSL credentials.
- */
-internal class GrpcSslChannelCredentials(
-    raw: CPointer<grpc_channel_credentials>,
-) : GrpcChannelCredentials(raw) {
-
-    constructor() : this(
-        memScoped {
-            grpc_ssl_credentials_create_ex(
-                null,
-                null,
-                null,
-                null
-            ) ?: error("grpc_ssl_credentials_create() returned null")
-        }
-    )
-}
 
 /**
  * Native implementation of [ManagedChannel].
@@ -81,7 +40,7 @@ internal class GrpcSslChannelCredentials(
 internal class NativeManagedChannel(
     target: String,
     // we must store them, otherwise the credentials are getting released
-    credentials: GrpcChannelCredentials,
+    credentials: ChannelCredentials,
 ) : ManagedChannel, ManagedChannelPlatform() {
 
     // a reference to make sure the grpc_init() was called. (it is released after shutdown)

grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/internal/utils.kt

@@ -43,7 +43,7 @@ import libkgrpc.grpc_slice_unref
 import libkgrpc.grpc_status_code
 import platform.posix.memcpy
 
-internal fun internalError(message: String) {
+internal fun internalError(message: String): Nothing {
     error("Unexpected internal error: $message. Please, report the issue here: https://github.com/Kotlin/kotlinx-rpc/issues/new?template=bug_report.md")
 }