Refactorings

Author: Mr3zee

build.gradle.kts

@@ -4,6 +4,9 @@
 
 import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import util.libs
+import util.configureProjectReport
+import util.configureNpm
+import util.configureApiValidation
 
 plugins {
     alias(libs.plugins.serialization) apply false

gradle-conventions/common/src/main/kotlin/util/apiValidation.kt

@@ -14,12 +14,14 @@ fun Project.configureApiValidation() {
     the<ApiValidationExtension>().apply {
         ignoredPackages.add("kotlinx.rpc.internal")
         ignoredPackages.add("kotlinx.rpc.krpc.internal")
+        ignoredPackages.add("kotlinx.rpc.grpc.internal")
 
         ignoredProjects.addAll(
             listOf(
                 "compiler-plugin-tests",
                 "krpc-test",
                 "utils",
+                "protobuf-plugin",
             )
         )
 

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

@@ -4,37 +4,37 @@
 
 package kotlinx.rpc.grpc
 
+import io.grpc.stub.AbstractStub
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.job
-import kotlinx.rpc.RPCCall
-import kotlinx.rpc.RPCClient
-import kotlinx.rpc.RPCField
+import kotlinx.rpc.RpcCall
+import kotlinx.rpc.RpcClient
+import kotlinx.rpc.descriptor.RpcServiceDescriptor
 import kotlin.coroutines.CoroutineContext
 
-public class GrpcClient(
-    private val channel: ManagedChannel,
-) : RPCClient {
+public class GrpcClient(private val channel: ManagedChannel) : RpcClient {
     override val coroutineContext: CoroutineContext = SupervisorJob()
 
-    override suspend fun <T> call(call: RPCCall): T {
-        // todo perform call
-        error("not implemented")
+    override suspend fun <T> call(call: RpcCall): T {
+        val stub = grpcStubByServiceDescriptor(call.descriptor)
+        return invokeRpcMethodOnGrpcStub(stub, call)
     }
 
-    override fun <T> registerPlainFlowField(serviceScope: CoroutineScope, field: RPCField): Flow<T> {
-        error("gRPC client does not support field declarations")
+    private fun grpcStubByServiceDescriptor(descriptor: RpcServiceDescriptor<*>): AbstractStub<*> {
+        error("Not yet implemented")
     }
 
-    override fun <T> registerSharedFlowField(serviceScope: CoroutineScope, field: RPCField): SharedFlow<T> {
-        error("gRPC client does not support field declarations")
+    private suspend fun <T> invokeRpcMethodOnGrpcStub(stub: AbstractStub<*>, call: RpcCall): T {
+        error("Not yet implemented")
     }
 
-    override fun <T> registerStateFlowField(serviceScope: CoroutineScope, field: RPCField): StateFlow<T> {
-        error("gRPC client does not support field declarations")
+    override fun <T> callAsync(
+        serviceScope: CoroutineScope,
+        call: RpcCall,
+    ): Deferred<T> {
+        TODO("Not yet implemented")
     }
 
     override fun provideStubContext(serviceId: Long): CoroutineContext {
@@ -43,7 +43,7 @@ public class GrpcClient(
     }
 }
 
-public fun grpcClient(
+public fun GrpcClient(
     name: String,
     port: Int,
     configure: ManagedChannelBuilder<*>.() -> Unit = {},
@@ -52,7 +52,7 @@ public fun grpcClient(
     return GrpcClient(channel)
 }
 
-public fun grpcClient(
+public fun GrpcClient(
     target: String,
     configure: ManagedChannelBuilder<*>.() -> Unit = {},
 ): GrpcClient {

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

@@ -6,8 +6,8 @@ package kotlinx.rpc.grpc
 
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.job
-import kotlinx.rpc.RPC
-import kotlinx.rpc.RPCServer
+import kotlinx.rpc.RemoteService
+import kotlinx.rpc.RpcServer
 import kotlinx.rpc.grpc.internal.MutableHandlerRegistry
 import kotlinx.rpc.grpc.internal.ServerServiceDefinition
 import kotlin.coroutines.CoroutineContext
@@ -17,7 +17,7 @@ import kotlin.time.Duration
 public class GrpcServer internal constructor(
     override val port: Int = 8080,
     builder: ServerBuilder<*>.() -> Unit,
-) : RPCServer, Server {
+) : RpcServer, Server {
     private var isBuilt = false
     private lateinit var internalServer: Server
 
@@ -29,7 +29,7 @@ public class GrpcServer internal constructor(
     override val coroutineContext: CoroutineContext
         get() = error("coroutineContext is not available for gRPC server builder")
 
-    override fun <Service : RPC> registerService(
+    override fun <Service : RemoteService> registerService(
         serviceKClass: KClass<Service>,
         serviceFactory: (CoroutineContext) -> Service,
     ) {
@@ -45,7 +45,7 @@ public class GrpcServer internal constructor(
         }
     }
 
-    private fun <Service : RPC> getDefinition(
+    private fun <Service : RemoteService> getDefinition(
         service: Service,
         serviceKClass: KClass<Service>,
     ): ServerServiceDefinition {
@@ -85,10 +85,10 @@ public class GrpcServer internal constructor(
     }
 }
 
-public fun grpcServer(
+public fun GrpcServer(
     port: Int,
     configure: ServerBuilder<*>.() -> Unit = {},
-    builder: RPCServer.() -> Unit = {},
+    builder: RpcServer.() -> Unit = {},
 ): GrpcServer {
     return GrpcServer(port, configure).apply(builder).apply { build() }
 }

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

@@ -18,7 +18,7 @@ public interface ManagedChannel {
     public fun shutdownNow(): ManagedChannel
 }
 
-public expect abstract class ManagedChannelBuilder<T : io.grpc.ManagedChannelBuilder<T>>
+public expect abstract class ManagedChannelBuilder<T : ManagedChannelBuilder<T>>
 
 public expect fun ManagedChannelBuilder(name: String, port: Int): ManagedChannelBuilder<*>
 public expect fun ManagedChannelBuilder(target: String): ManagedChannelBuilder<*>

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

@@ -2,10 +2,22 @@
  * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
+@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
+
 package kotlinx.rpc.grpc
 
+import kotlinx.rpc.grpc.internal.HandlerRegistry
+import kotlinx.rpc.grpc.internal.ServerServiceDefinition
 import kotlin.time.Duration
 
+public expect abstract class ServerBuilder<T : ServerBuilder<T>> {
+    public abstract fun addService(service: ServerServiceDefinition): T
+
+    public abstract fun fallbackHandlerRegistry(registry: HandlerRegistry?): T
+}
+
+internal expect fun ServerBuilder(port: Int): ServerBuilder<*>
+
 public interface Server {
     public val port: Int
     public val isShutdown: Boolean

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

@@ -6,12 +6,12 @@
 
 package kotlinx.rpc.grpc.internal
 
-import kotlinx.rpc.internal.utils.InternalRPCApi
+import kotlinx.rpc.internal.utils.InternalRpcApi
 
-@InternalRPCApi
+@InternalRpcApi
 public expect abstract class HandlerRegistry
 
-@InternalRPCApi
+@InternalRpcApi
 public expect class MutableHandlerRegistry constructor() : HandlerRegistry {
     internal fun addService(service: ServerServiceDefinition): ServerServiceDefinition?
 }

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

@@ -6,7 +6,7 @@
 
 package kotlinx.rpc.grpc.internal
 
-import kotlinx.rpc.internal.utils.InternalRPCApi
+import kotlinx.rpc.internal.utils.InternalRpcApi
 
-@InternalRPCApi
+@InternalRpcApi
 public expect class ServerServiceDefinition

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

@@ -9,6 +9,13 @@ import kotlinx.coroutines.withContext
 import java.util.concurrent.TimeUnit
 import kotlin.time.Duration
 
+public actual typealias ServerBuilder<T> = io.grpc.ServerBuilder<T>
+
+internal actual fun ServerBuilder(port: Int): ServerBuilder<*> {
+    return io.grpc.ServerBuilder.forPort(port)
+}
+
+
 internal actual fun Server(builder: ServerBuilder<*>): Server {
     return builder.build().toKotlin()
 }