grpc-native: Make TlsCredentials build() method internal

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

Author: Jozott00

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

@@ -34,7 +34,6 @@ public fun TlsServerCredentials(
 public interface TlsClientCredentialsBuilder {
     public fun trustManager(rootCertsPem: String): TlsClientCredentialsBuilder
     public fun keyManager(certChainPem: String, privateKeyPem: String): TlsClientCredentialsBuilder
-    public fun build(): ClientCredentials
 }
 
 public enum class TlsClientAuth {
@@ -59,11 +58,13 @@ public enum class TlsClientAuth {
 public interface TlsServerCredentialsBuilder {
     public fun trustManager(rootCertsPem: String): TlsServerCredentialsBuilder
     public fun clientAuth(clientAuth: TlsClientAuth): TlsServerCredentialsBuilder
-    public fun build(): ServerCredentials
 }
 
 internal expect fun TlsClientCredentialsBuilder(): TlsClientCredentialsBuilder
 internal expect fun TlsServerCredentialsBuilder(
     certChain: String,
     privateKey: String,
 ): TlsServerCredentialsBuilder
+
+internal expect fun TlsClientCredentialsBuilder.build(): ClientCredentials
+internal expect fun TlsServerCredentialsBuilder.build(): ServerCredentials

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

@@ -16,35 +16,49 @@ public actual typealias InsecureServerCredentials = io.grpc.InsecureServerCreden
 public actual typealias TlsClientCredentials = io.grpc.TlsChannelCredentials
 public actual typealias TlsServerCredentials = io.grpc.TlsServerCredentials
 
-internal actual fun TlsClientCredentialsBuilder(): TlsClientCredentialsBuilder =
-    object : TlsClientCredentialsBuilder {
-        private var cb = TlsClientCredentials.newBuilder()
-
-
-        override fun trustManager(rootCertsPem: String): TlsClientCredentialsBuilder {
-            cb.trustManager(rootCertsPem.byteInputStream())
-            return this
-        }
-
-        override fun keyManager(
-            certChainPem: String,
-            privateKeyPem: String,
-        ): TlsClientCredentialsBuilder {
-            cb.keyManager(certChainPem.byteInputStream(), privateKeyPem.byteInputStream())
-            return this
-        }
-
-        override fun build(): ClientCredentials {
-            return cb.build()
-        }
-    }
-
+internal actual fun TlsClientCredentialsBuilder(): TlsClientCredentialsBuilder = JvmTlsCLientCredentialBuilder()
 internal actual fun TlsServerCredentialsBuilder(
     certChain: String,
     privateKey: String,
-): TlsServerCredentialsBuilder = object : TlsServerCredentialsBuilder {
+): TlsServerCredentialsBuilder = JvmTlsServerCredentialBuilder(certChain, privateKey)
+
+internal actual fun TlsClientCredentialsBuilder.build(): ClientCredentials {
+    return (this as JvmTlsCLientCredentialBuilder).build()
+}
+
+internal actual fun TlsServerCredentialsBuilder.build(): ServerCredentials {
+    return (this as JvmTlsServerCredentialBuilder).build()
+}
+
+private class JvmTlsCLientCredentialBuilder : TlsClientCredentialsBuilder {
+    private var cb = TlsClientCredentials.newBuilder()
+
+
+    override fun trustManager(rootCertsPem: String): TlsClientCredentialsBuilder {
+        cb.trustManager(rootCertsPem.byteInputStream())
+        return this
+    }
+
+    override fun keyManager(
+        certChainPem: String,
+        privateKeyPem: String,
+    ): TlsClientCredentialsBuilder {
+        cb.keyManager(certChainPem.byteInputStream(), privateKeyPem.byteInputStream())
+        return this
+    }
+
+    fun build(): ClientCredentials {
+        return cb.build()
+    }
+}
+
+private class JvmTlsServerCredentialBuilder(certChain: String, privateKey: String) : TlsServerCredentialsBuilder {
     private var sb = TlsServerCredentials.newBuilder()
 
+    init {
+        sb.keyManager(certChain.byteInputStream(), privateKey.byteInputStream())
+    }
+
     override fun trustManager(rootCertsPem: String): TlsServerCredentialsBuilder {
         sb.trustManager(rootCertsPem.byteInputStream())
         return this
@@ -55,15 +69,13 @@ internal actual fun TlsServerCredentialsBuilder(
         return this
     }
 
-    init {
-        sb.keyManager(certChain.byteInputStream(), privateKey.byteInputStream())
-    }
 
-    override fun build(): ServerCredentials {
+    fun build(): ServerCredentials {
         return sb.build()
     }
 }
 
+
 private fun TlsClientAuth.toJava(): io.grpc.TlsServerCredentials.ClientAuth = when (this) {
     TlsClientAuth.NONE -> io.grpc.TlsServerCredentials.ClientAuth.NONE
     TlsClientAuth.OPTIONAL -> io.grpc.TlsServerCredentials.ClientAuth.OPTIONAL

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

@@ -78,38 +78,48 @@ public fun InsecureServerCredentials(): ServerCredentials {
     )
 }
 
-internal actual fun TlsClientCredentialsBuilder(): TlsClientCredentialsBuilder =
-    object : TlsClientCredentialsBuilder {
-        var optionsBuilder = TlsCredentialsOptionsBuilder()
+internal actual fun TlsClientCredentialsBuilder(): TlsClientCredentialsBuilder = NativeTlsClientCredentialsBuilder()
+internal actual fun TlsServerCredentialsBuilder(
+    certChain: String,
+    privateKey: String,
+): TlsServerCredentialsBuilder = NativeTlsServerCredentialsBuilder(certChain, privateKey)
 
-        override fun trustManager(rootCertsPem: String): TlsClientCredentialsBuilder {
-            optionsBuilder.trustManager(rootCertsPem)
-            return this
-        }
+internal actual fun TlsClientCredentialsBuilder.build(): ClientCredentials {
+    return (this as NativeTlsClientCredentialsBuilder).build()
+}
 
-        override fun keyManager(
-            certChainPem: String,
-            privateKeyPem: String,
-        ): TlsClientCredentialsBuilder {
-            optionsBuilder.keyManager(certChainPem, privateKeyPem)
-            return this
-        }
+internal actual fun TlsServerCredentialsBuilder.build(): ServerCredentials {
+    return (this as NativeTlsServerCredentialsBuilder).build()
+}
 
-        override fun build(): ClientCredentials {
-            val opts = optionsBuilder.build()
-            val creds = grpc_tls_credentials_create(opts)
-                ?: run {
-                    grpc_tls_credentials_options_destroy(opts);
-                    error("TLS channel credential creation failed")
-                }
-            return TlsClientCredentials(creds)
-        }
+private class NativeTlsClientCredentialsBuilder : TlsClientCredentialsBuilder {
+    var optionsBuilder = TlsCredentialsOptionsBuilder()
+
+    override fun trustManager(rootCertsPem: String): TlsClientCredentialsBuilder {
+        optionsBuilder.trustManager(rootCertsPem)
+        return this
     }
 
-internal actual fun TlsServerCredentialsBuilder(
-    certChain: String,
-    privateKey: String,
-): TlsServerCredentialsBuilder = object : TlsServerCredentialsBuilder {
+    override fun keyManager(
+        certChainPem: String,
+        privateKeyPem: String,
+    ): TlsClientCredentialsBuilder {
+        optionsBuilder.keyManager(certChainPem, privateKeyPem)
+        return this
+    }
+
+    fun build(): ClientCredentials {
+        val opts = optionsBuilder.build()
+        val creds = grpc_tls_credentials_create(opts)
+            ?: run {
+                grpc_tls_credentials_options_destroy(opts);
+                error("TLS channel credential creation failed")
+            }
+        return TlsClientCredentials(creds)
+    }
+}
+
+private class NativeTlsServerCredentialsBuilder(certChain: String, privateKey: String) : TlsServerCredentialsBuilder {
     var optionsBuilder = TlsCredentialsOptionsBuilder()
 
     init {
@@ -126,7 +136,7 @@ internal actual fun TlsServerCredentialsBuilder(
         return this
     }
 
-    override fun build(): TlsServerCredentials {
+    fun build(): TlsServerCredentials {
         val opts = optionsBuilder.build()
         val creds = grpc_tls_server_credentials_create(opts)
             ?: run {