Update gRPC to 0.8.0

Mr3zee · Mr3zee · commit 86c1a263db4e · 2025-08-08T12:30:45.000+02:00
diff --git a/compiler-plugin/compiler-plugin-backend/src/main/kotlin/kotlinx/rpc/codegen/extension/ServiceDeclaration.kt b/compiler-plugin/compiler-plugin-backend/src/main/kotlin/kotlinx/rpc/codegen/extension/ServiceDeclaration.kt
@@ -6,7 +6,6 @@ package kotlinx.rpc.codegen.extension
 
 import kotlinx.rpc.codegen.common.RpcClassId
 import org.jetbrains.kotlin.ir.declarations.IrClass
-import org.jetbrains.kotlin.ir.declarations.IrProperty
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.declarations.IrValueParameter
 import org.jetbrains.kotlin.ir.types.IrType
@@ -19,6 +18,7 @@ class ServiceDeclaration(
     val stubClass: IrClass,
     val methods: List<Method>,
 ) {
+    // todo change to extension after KRPC-178
     val isGrpc = service.hasAnnotation(RpcClassId.grpcAnnotation)
     val fqName = service.kotlinFqName.asString()
 
diff --git a/compiler-plugin/compiler-plugin-k2/src/main/kotlin/kotlinx/rpc/codegen/FirGenerationKeys.kt b/compiler-plugin/compiler-plugin-k2/src/main/kotlin/kotlinx/rpc/codegen/FirGenerationKeys.kt
@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.name.Name
 
 internal class RpcGeneratedStubKey(
-    val isGrpc: Boolean,
     private val serviceName: Name,
 ) : GeneratedDeclarationKey() {
     override fun toString(): String {
diff --git a/compiler-plugin/compiler-plugin-k2/src/main/kotlin/kotlinx/rpc/codegen/FirRpcAdditionalCheckers.kt b/compiler-plugin/compiler-plugin-k2/src/main/kotlin/kotlinx/rpc/codegen/FirRpcAdditionalCheckers.kt
@@ -23,7 +23,6 @@ class FirRpcAdditionalCheckers(
 ) : FirAdditionalCheckersExtension(session) {
     override fun FirDeclarationPredicateRegistrar.registerPredicates() {
         register(FirRpcPredicates.rpc)
-        register(FirRpcPredicates.grpc)
         register(FirRpcPredicates.checkedAnnotationMeta)
     }
 
diff --git a/compiler-plugin/compiler-plugin-k2/src/main/kotlin/kotlinx/rpc/codegen/FirRpcPredicates.kt b/compiler-plugin/compiler-plugin-k2/src/main/kotlin/kotlinx/rpc/codegen/FirRpcPredicates.kt
@@ -9,15 +9,7 @@ import org.jetbrains.kotlin.fir.extensions.predicate.DeclarationPredicate
 
 object FirRpcPredicates {
     internal val rpc = DeclarationPredicate.create {
-        annotated(RpcClassId.rpcAnnotation.asSingleFqName()) // @Rpc
-    }
-
-    internal val rpcMeta = DeclarationPredicate.create {
-        metaAnnotated(RpcClassId.rpcAnnotation.asSingleFqName(), includeItself = true)
-    }
-
-    internal val grpc = DeclarationPredicate.create {
-        annotated(RpcClassId.grpcAnnotation.asSingleFqName()) // @Grpc
+        metaAnnotated(RpcClassId.rpcAnnotation.asSingleFqName(), includeItself = true) // @Rpc
     }
 
     internal val checkedAnnotationMeta = DeclarationPredicate.create {
diff --git a/compiler-plugin/compiler-plugin-k2/src/main/kotlin/kotlinx/rpc/codegen/FirRpcServiceGenerator.kt b/compiler-plugin/compiler-plugin-k2/src/main/kotlin/kotlinx/rpc/codegen/FirRpcServiceGenerator.kt
@@ -23,7 +23,6 @@ class FirRpcServiceGenerator(
 ) : FirDeclarationGenerationExtension(session) {
     override fun FirDeclarationPredicateRegistrar.registerPredicates() {
         register(FirRpcPredicates.rpc)
-        register(FirRpcPredicates.grpc)
     }
 
     /**
@@ -53,8 +52,7 @@ class FirRpcServiceGenerator(
             }
 
             classSymbol.isInterface && (
-                    session.predicateBasedProvider.matches(FirRpcPredicates.rpc, classSymbol) ||
-                            session.predicateBasedProvider.matches(FirRpcPredicates.grpc, classSymbol)
+                    session.predicateBasedProvider.matches(FirRpcPredicates.rpc, classSymbol)
                     ) -> {
                 setOf(RpcNames.SERVICE_STUB_NAME)
             }
@@ -100,7 +98,7 @@ class FirRpcServiceGenerator(
      * Generates [owner]'s service stub.
      * Scrapes the functions from the [owner] to generate method classes.
      */
-    private fun generateRpcServiceStubClass(owner: FirClassSymbol<*>): FirRegularClassSymbol? {
+    private fun generateRpcServiceStubClass(owner: FirClassSymbol<*>): FirRegularClassSymbol {
         return createNestedClass(owner, RpcNames.SERVICE_STUB_NAME, RpcGeneratedStubKey(owner.name)) {
             visibility = Visibilities.Public
             modality = Modality.FINAL
diff --git a/compiler-plugin/compiler-plugin-k2/src/main/kotlin/kotlinx/rpc/codegen/checkers/FirRpcAnnotationChecker.kt b/compiler-plugin/compiler-plugin-k2/src/main/kotlin/kotlinx/rpc/codegen/checkers/FirRpcAnnotationChecker.kt
@@ -24,16 +24,15 @@ object FirRpcAnnotationChecker {
         context: CheckerContext,
         reporter: DiagnosticReporter,
     ) {
-        val rpcMetaAnnotated = context.session.predicateBasedProvider.matches(FirRpcPredicates.rpcMeta, declaration)
-        val grpcAnnotated = context.session.predicateBasedProvider.matches(FirRpcPredicates.grpc, declaration)
+        val rpcMetaAnnotated = context.session.predicateBasedProvider.matches(FirRpcPredicates.rpc, declaration)
 
         val isMetaAnnotated = declaration.classKind != ClassKind.ANNOTATION_CLASS
 
         if (!declaration.isInterface && isMetaAnnotated && rpcMetaAnnotated) {
             reporter.reportOn(
                 source = declaration.symbol.rpcAnnotationSource(
                     session = context.session,
-                    predicate = FirRpcPredicates.rpcMeta,
+                    predicate = FirRpcPredicates.rpc,
                     classId = RpcClassId.rpcAnnotation,
                 ),
                 factory = FirRpcDiagnostics.WRONG_RPC_ANNOTATION_TARGET,
diff --git a/gradle-conventions/src/main/kotlin/util/apiValidation.kt b/gradle-conventions/src/main/kotlin/util/apiValidation.kt
@@ -12,6 +12,7 @@ private val excludedProjects = setOf(
     "krpc-test",
     "krpc-compatibility-tests",
     "compiler-plugin-tests",
+    "protobuf-plugin",
 )
 
 val Project.enableAbiValidation get() = name !in excludedProjects
@@ -23,6 +24,7 @@ fun AbiValidationVariantSpec.configureAbiFilters() {
             annotatedWith.add("kotlinx.rpc.internal.utils.InternalRpcApi")
             byNames.add("kotlinx.rpc.internal.**")
             byNames.add("kotlinx.rpc.krpc.internal.**")
+            byNames.add("kotlinx.rpc.grpc.internal.**")
         }
     }
 }
diff --git a/gradle-plugin/src/main/kotlin/kotlinx/rpc/GrpcExtension.kt b/gradle-plugin/src/main/kotlin/kotlinx/rpc/GrpcExtension.kt
@@ -77,9 +77,9 @@ public open class GrpcExtension @Inject constructor(objects: ObjectFactory, priv
     private fun pluginAccess(action: Action<GrpcPlugin>, locatorName: String) {
         val extension = project.the<ProtobufExtension>()
         val plugin = object : GrpcPlugin {
-            override fun options(options: Action<GenerateProtoTask.PluginOptions>) {
+            override fun options(optionsAction: Action<GenerateProtoTask.PluginOptions>) {
                 extension.generateProtoTasks.all().all {
-                    options.execute(plugins.maybeCreate(locatorName))
+                    optionsAction.execute(plugins.maybeCreate(locatorName))
                 }
             }
 
diff --git a/gradle-plugin/src/main/kotlin/kotlinx/rpc/RpcPluginConst.kt b/gradle-plugin/src/main/kotlin/kotlinx/rpc/RpcPluginConst.kt
@@ -19,7 +19,7 @@ internal object RpcPluginConst {
     private val kotlinVersion by lazy { loadKotlinVersion() }
 
     val libraryKotlinPrefixedVersion by lazy {
-        "$kotlinVersion-$PLUGIN_VERSION"
+        "$kotlinVersion-$LIBRARY_VERSION"
     }
 
     /**
diff --git a/grpc/grpc-core/gradle.properties b/grpc/grpc-core/gradle.properties
@@ -2,4 +2,4 @@
 # Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
 #
 
-kotlinx.rpc.excludeWasmWasi=true
+kotlinx.rpc.exclude.wasmWasi=true
diff --git a/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcClient.kt b/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcClient.kt
@@ -4,33 +4,27 @@
 
 package kotlinx.rpc.grpc
 
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.job
+import kotlinx.coroutines.flow.Flow
 import kotlinx.rpc.RpcCall
 import kotlinx.rpc.RpcClient
 import kotlinx.rpc.grpc.descriptor.GrpcClientDelegate
 import kotlinx.rpc.grpc.descriptor.GrpcServiceDescriptor
 import kotlinx.rpc.internal.utils.map.RpcInternalConcurrentHashMap
-import kotlin.coroutines.CoroutineContext
 
 /**
  * GrpcClient manages gRPC communication by providing implementation for making asynchronous RPC calls.
  *
- * @property channel The [ManagedChannel] used to communicate with remote gRPC services.
+ * @field channel The [ManagedChannel] used to communicate with remote gRPC services.
  */
 public class GrpcClient internal constructor(private val channel: ManagedChannel) : RpcClient {
-    override val coroutineContext: CoroutineContext = SupervisorJob()
-
     private val stubs = RpcInternalConcurrentHashMap<Long, GrpcClientDelegate>()
 
     override suspend fun <T> call(call: RpcCall): T {
         return call.delegate().call(call)
     }
 
-    override fun <T> callAsync(serviceScope: CoroutineScope, call: RpcCall): Deferred<T> {
-        return call.delegate().callAsync(call)
+    override fun <T> callServerStreaming(call: RpcCall): Flow<T> {
+        return call.delegate().callServerStreaming(call)
     }
 
     private fun RpcCall.delegate(): GrpcClientDelegate {
@@ -39,10 +33,6 @@ public class GrpcClient internal constructor(private val channel: ManagedChannel
 
         return stubs.computeIfAbsent(serviceId) { grpc.delegate.clientProvider(channel) }
     }
-
-    override fun provideStubContext(serviceId: Long): CoroutineContext {
-        return SupervisorJob(coroutineContext.job)
-    }
 }
 
 /**
diff --git a/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcServer.kt b/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcServer.kt
@@ -4,12 +4,11 @@
 
 package kotlinx.rpc.grpc
 
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.rpc.RpcServer
 import kotlinx.rpc.descriptor.serviceDescriptorOf
 import kotlinx.rpc.grpc.annotations.Grpc
 import kotlinx.rpc.grpc.descriptor.GrpcServiceDescriptor
-import kotlin.coroutines.CoroutineContext
+import kotlinx.rpc.internal.utils.map.RpcInternalConcurrentHashMap
 import kotlin.reflect.KClass
 import kotlin.time.Duration
 
@@ -32,15 +31,13 @@ public class GrpcServer internal constructor(
         MutableHandlerRegistry().apply { serverBuilder.fallbackHandlerRegistry(this) }
     }
 
-    override val coroutineContext: CoroutineContext
-        get() = error("coroutineContext is not available for gRPC server")
+    private val localRegistry = RpcInternalConcurrentHashMap<KClass<*>, ServerServiceDefinition>()
 
     override fun <@Grpc Service : Any> registerService(
         serviceKClass: KClass<Service>,
-        serviceFactory: (CoroutineContext) -> Service,
+        serviceFactory: () -> Service,
     ) {
-        val childJob = SupervisorJob()
-        val service = serviceFactory(childJob)
+        val service = serviceFactory()
 
         val definition: ServerServiceDefinition = getDefinition(service, serviceKClass)
 
@@ -51,11 +48,17 @@ public class GrpcServer internal constructor(
         }
     }
 
+    override fun <Service : Any> deregisterService(serviceKClass: KClass<Service>) {
+        localRegistry.remove(serviceKClass)?.let {
+            registry.removeService(it)
+        }
+    }
+
     private fun <@Grpc Service : Any> getDefinition(
         service: Service,
         serviceKClass: KClass<Service>,
     ): ServerServiceDefinition {
-        val descriptor = serviceDescriptorOf<Service>(serviceKClass)
+        val descriptor = serviceDescriptorOf(serviceKClass)
         val grpc = (descriptor as? GrpcServiceDescriptor<Service>)
             ?: error("Service ${descriptor.fqName} is not a gRPC service")
 
diff --git a/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/MutableHandlerRegistry.kt b/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/MutableHandlerRegistry.kt
@@ -14,4 +14,5 @@ public expect abstract class HandlerRegistry
 @Suppress("RedundantConstructorKeyword")
 internal expect class MutableHandlerRegistry constructor() : HandlerRegistry {
     internal fun addService(@Suppress("unused") service: ServerServiceDefinition): ServerServiceDefinition?
+    internal fun removeService(@Suppress("unused") service: ServerServiceDefinition): Boolean
 }
diff --git a/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/descriptor/GrpcServiceDescriptor.kt b/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/descriptor/GrpcServiceDescriptor.kt
@@ -4,7 +4,7 @@
 
 package kotlinx.rpc.grpc.descriptor
 
-import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.flow.Flow
 import kotlinx.rpc.RpcCall
 import kotlinx.rpc.descriptor.RpcServiceDescriptor
 import kotlinx.rpc.grpc.ManagedChannel
@@ -28,5 +28,5 @@ public interface GrpcDelegate<@Grpc T : Any> {
 public interface GrpcClientDelegate {
     public suspend fun <R> call(rpcCall: RpcCall): R
 
-    public fun <R> callAsync(rpcCall: RpcCall): Deferred<R>
+    public fun <R> callServerStreaming(rpcCall: RpcCall): Flow<R>
 }
diff --git a/grpc/grpc-core/src/jsMain/kotlin/kotlinx/rpc/grpc/MutableHandlerRegistry.js.kt b/grpc/grpc-core/src/jsMain/kotlin/kotlinx/rpc/grpc/MutableHandlerRegistry.js.kt
@@ -15,4 +15,8 @@ internal actual class MutableHandlerRegistry : HandlerRegistry() {
     actual fun addService(service: ServerServiceDefinition): ServerServiceDefinition? {
         error("JS target is not supported in gRPC")
     }
+
+    actual fun removeService(service: ServerServiceDefinition): Boolean {
+        error("JS target is not supported in gRPC")
+    }
 }
diff --git a/grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/MutableHandlerRegistry.native.kt b/grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/MutableHandlerRegistry.native.kt
@@ -15,4 +15,8 @@ internal actual class MutableHandlerRegistry : HandlerRegistry() {
     actual fun addService(service: ServerServiceDefinition): ServerServiceDefinition? {
         error("Native target is not supported in gRPC")
     }
+
+    actual fun removeService(service: ServerServiceDefinition): Boolean {
+        error("Native target is not supported in gRPC")
+    }
 }
diff --git a/grpc/grpc-core/src/wasmJsMain/kotlin/kotlinx/rpc/grpc/MutableHandlerRegistry.wasmJs.kt b/grpc/grpc-core/src/wasmJsMain/kotlin/kotlinx/rpc/grpc/MutableHandlerRegistry.wasmJs.kt
@@ -15,4 +15,8 @@ internal actual class MutableHandlerRegistry : HandlerRegistry() {
     actual fun addService(service: ServerServiceDefinition): ServerServiceDefinition? {
         error("WasmJS target is not supported in gRPC")
     }
+
+    actual fun removeService(service: ServerServiceDefinition): Boolean {
+        error("WasmJS target is not supported in gRPC")
+    }
 }
diff --git a/protobuf-plugin/src/main/kotlin/kotlinx/rpc/protobuf/ModelToKotlinGenerator.kt b/protobuf-plugin/src/main/kotlin/kotlinx/rpc/protobuf/ModelToKotlinGenerator.kt
@@ -2,6 +2,8 @@
  * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
+@file:Suppress("detekt.all")
+
 package kotlinx.rpc.protobuf
 
 import kotlinx.rpc.protobuf.CodeGenerator.DeclarationType
@@ -599,13 +601,13 @@ class ModelToKotlinGenerator(
             function(
                 name = "call",
                 modifiers = "override suspend",
-                args = "call: kotlinx.rpc.RpcCall",
+                args = "rpcCall: kotlinx.rpc.RpcCall",
                 typeParameters = "R",
                 returnType = "R",
             ) {
-                code("val message = (call.data as kotlinx.rpc.internal.RpcMethodClass).asArray()[0]")
+                code("val message = rpcCall.parameters[0]")
                 code("@Suppress(\"UNCHECKED_CAST\")")
-                scope("return when (call.callableName)") {
+                scope("return when (rpcCall.callableName)") {
                     service.methods.forEach { method ->
                         val inputType by method.inputType
                         val outputType by method.outputType
@@ -617,18 +619,18 @@ class ModelToKotlinGenerator(
                         importRootDeclarationIfNeeded(outputType.name, "toKotlin", true)
                     }
 
-                    code("else -> error(\"Illegal call: \${call.callableName}\")")
+                    code("else -> error(\"Illegal call: \${rpcCall.callableName}\")")
                 }
             }
 
             function(
-                name = "callAsync",
+                name = "callServerStreaming",
                 modifiers = "override",
-                args = "call: kotlinx.rpc.RpcCall",
+                args = "rpcCall: kotlinx.rpc.RpcCall",
                 typeParameters = "R",
-                returnType = "kotlinx.coroutines.Deferred<R>",
+                returnType = "kotlinx.coroutines.flow.Flow<R>",
             ) {
-                code("error(\"Async calls are not supported\")")
+                code("error(\"Flow calls are not supported\")")
             }
         }
     }
diff --git a/protobuf-plugin/src/main/kotlin/kotlinx/rpc/protobuf/ProtoToModelInterpreter.kt b/protobuf-plugin/src/main/kotlin/kotlinx/rpc/protobuf/ProtoToModelInterpreter.kt
@@ -2,6 +2,8 @@
  * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
+@file:Suppress("detekt.all")
+
 package kotlinx.rpc.protobuf
 
 import com.google.protobuf.DescriptorProtos
diff --git a/versions-root/libs.versions.toml b/versions-root/libs.versions.toml
@@ -28,10 +28,10 @@ detekt-gradle-plugin = "1.23.8"
 kover = "0.9.1"
 develocity = "3.19.2"
 common-custom-user-data = "2.3"
-grpc = "1.69.0"
+grpc = "1.73.0"
 grpc-kotlin = "1.4.1"
-protobuf = "4.29.3"
-protobuf-gradle = "0.9.4"
+protobuf = "4.31.1"
+protobuf-gradle = "0.9.5"
 
 [libraries]
 # kotlinx.rpc – references to the included builds

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ class FirRpcAdditionalCheckers(`
`23`	`23`	`) : FirAdditionalCheckersExtension(session) {`
`24`	`24`	`override fun FirDeclarationPredicateRegistrar.registerPredicates() {`
`25`	`25`	`register(FirRpcPredicates.rpc)`
`26`		`- register(FirRpcPredicates.grpc)`
`27`	`26`	`register(FirRpcPredicates.checkedAnnotationMeta)`
`28`	`27`	`}`
`29`	`28`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ private val excludedProjects = setOf(`
`12`	`12`	`"krpc-test",`
`13`	`13`	`"krpc-compatibility-tests",`
`14`	`14`	`"compiler-plugin-tests",`
	`15`	`+ "protobuf-plugin",`
`15`	`16`	`)`
`16`	`17`
`17`	`18`	`val Project.enableAbiValidation get() = name !in excludedProjects`
`@@ -23,6 +24,7 @@ fun AbiValidationVariantSpec.configureAbiFilters() {`
`23`	`24`	`annotatedWith.add("kotlinx.rpc.internal.utils.InternalRpcApi")`
`24`	`25`	`byNames.add("kotlinx.rpc.internal.**")`
`25`	`26`	`byNames.add("kotlinx.rpc.krpc.internal.**")`
	`27`	`+ byNames.add("kotlinx.rpc.grpc.internal.**")`
`26`	`28`	`}`
`27`	`29`	`}`
`28`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,9 @@ public open class GrpcExtension @Inject constructor(objects: ObjectFactory, priv`
`77`	`77`	`private fun pluginAccess(action: Action<GrpcPlugin>, locatorName: String) {`
`78`	`78`	`val extension = project.the<ProtobufExtension>()`
`79`	`79`	`val plugin = object : GrpcPlugin {`
`80`		`- override fun options(options: Action<GenerateProtoTask.PluginOptions>) {`
	`80`	`+ override fun options(optionsAction: Action<GenerateProtoTask.PluginOptions>) {`
`81`	`81`	`extension.generateProtoTasks.all().all {`
`82`		`- options.execute(plugins.maybeCreate(locatorName))`
	`82`	`+ optionsAction.execute(plugins.maybeCreate(locatorName))`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ internal object RpcPluginConst {`
`19`	`19`	`private val kotlinVersion by lazy { loadKotlinVersion() }`
`20`	`20`
`21`	`21`	`val libraryKotlinPrefixedVersion by lazy {`
`22`		`- "$kotlinVersion-$PLUGIN_VERSION"`
	`22`	`+ "$kotlinVersion-$LIBRARY_VERSION"`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`	`# Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.`
`3`	`3`	`#`
`4`	`4`
`5`		`-kotlinx.rpc.excludeWasmWasi=true`
	`5`	`+kotlinx.rpc.exclude.wasmWasi=true`