Added Ktor closure tests and Cancellation tests, + minor fixes

docs/environment.md

@@ -392,7 +392,7 @@ Here is a 'simple' guide for solving problems:
 - Docker
     - `Cannot connect to the Docker daemon` - open `Docker Desktop`
 - Kotlin/Js or Kotlin/Wasm
-  - `kotlinUpgradePackageLock` or `kotlinWasmUpgradePackageLock` (and also `kotlinNpmInstall` or `kotlinWasmNpmInstall`)
+  - `kotlinUpgradeYarnLock` or `kotlinWasmUpgradeYarnLock` (and also `kotlinNpmInstall` or `kotlinWasmNpmInstall`)
   have a funny tendency to fail sometimes, and you don't know why. 
 
     I'll tell you! 
@@ -403,7 +403,7 @@ Here is a 'simple' guide for solving problems:
     If something doesn't work, your steps are:
     - Delete `package-lock.json` file
     - Delete `<REPO_ROOT>/build/js` / `<REPO_ROOT>/build/wasm`
-    - Run `kotlinUpgradePackageLock` / `kotlinWasmUpgradePackageLock`
+    - Run `kotlinUpgradeYarnLock` / `kotlinWasmUpgradeYarnLock`
     - If the problem persists:
       - Check that `<REPO_ROOT>/build/<target>/.npmrc` AND `<REPO_ROOT>/build/<target>/.yarnrc` are present
       - Check that `.yarnrc` contains one line: `registry: "https://packages.jetbrains.team/npm/p/krpc/build-deps/"`
@@ -479,7 +479,7 @@ all included builds (not subprojects) must reflect the change.
 - `checkLegacyAbi` / `updateLegacyAbi` - ABI checks. 
 See https://kotlinlang.org/docs/whatsnew22.html#binary-compatibility-validation-included-in-kotlin-gradle-plugin.
 Former BCV: https://github.com/Kotlin/binary-compatibility-validator
-- `kotlinUpgradePackageLock` / `kotlinWasmUpgradePackageLock` - update [kotlin-js-store](../kotlin-js-store) contents, 
+- `kotlinUpgradeYarnLock` / `kotlinWasmUpgradeYarnLock` - update [kotlin-js-store](../kotlin-js-store) contents, 
 usually after Kotlin version update.
 - `updateDocsChangelog` - put modified [CONTRIBUTING.md](../CONTRIBUTING.md) into [topics](pages/kotlinx-rpc/topics)
 - `detekt` - run detekt checks.

gradle-conventions/src/main/kotlin/util/tasks/npm.kt

@@ -10,11 +10,14 @@ import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootEnvSpec
+import org.jetbrains.kotlin.gradle.targets.wasm.nodejs.WasmNodeJsRootExtension
 import org.jetbrains.kotlin.gradle.targets.wasm.yarn.WasmYarnPlugin
 import org.jetbrains.kotlin.gradle.targets.wasm.yarn.WasmYarnRootEnvSpec
+import org.jetbrains.kotlin.gradle.targets.web.nodejs.BaseNodeJsRootExtension
 import org.jetbrains.kotlin.gradle.targets.web.yarn.BaseYarnRootEnvSpec
 import org.jetbrains.kotlin.gradle.targets.web.yarn.CommonYarnPlugin
 import util.other.optionalProperty
@@ -25,12 +28,13 @@ import java.io.File
 private inline fun <
     reified Plugin : CommonYarnPlugin,
     reified Spec : BaseYarnRootEnvSpec,
+    reified NodeJsExtension: BaseNodeJsRootExtension,
 > Project.registerCustomNpmTasks(
     target: String,
     useProxy: Boolean,
 ) {
     val capitalizedTarget = target.replaceFirstChar { it.titlecase() }
-    tasks.register("execute${capitalizedTarget}NpmLogin") {
+    val login = tasks.register("execute${capitalizedTarget}NpmLogin") {
         if (!useProxyRepositories) {
             return@register
         }
@@ -82,6 +86,12 @@ private inline fun <
                 downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
             }
         }
+
+        extensions.configure<NodeJsExtension> {
+            npmInstallTaskProvider.configure {
+                dependsOn(login)
+            }
+        }
     }
 }
 
@@ -100,8 +110,8 @@ fun Project.configureNpm() {
     val kotlinMasterBuild by optionalProperty()
     val useProxy = useProxyRepositories
 
-    registerCustomNpmTasks<YarnPlugin, YarnRootEnvSpec>("js", useProxy)
-    registerCustomNpmTasks<WasmYarnPlugin, WasmYarnRootEnvSpec>("wasm", useProxy)
+    registerCustomNpmTasks<YarnPlugin, YarnRootEnvSpec, NodeJsRootExtension>("js", useProxy)
+    registerCustomNpmTasks<WasmYarnPlugin, WasmYarnRootEnvSpec, WasmNodeJsRootExtension>("wasm", useProxy)
 
     // necessary for CI js tests
     rootProject.plugins.withType<YarnPlugin> {

kotlin-js-store/wasm/yarn.lock

@@ -35,9 +35,9 @@
   integrity sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==
 
 "@types/node@*":
-  version "24.5.0"
-  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/@types/node/-/node-24.5.0.tgz#70a482e6b1d50e603729d74e62a9a43705ddc9d7"
-  integrity sha512-y1dMvuvJspJiPSDZUQ+WMBvF7dpnEqN4x9DDC9ie5Fs/HUZJA3wFp7EhHoVaKX/iI0cRoECV8X2jL8zi0xrHCg==
+  version "24.5.1"
+  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/@types/node/-/node-24.5.1.tgz#dab6917c47113eb4502d27d06e89a407ec0eff95"
+  integrity sha512-/SQdmUP2xa+1rdx7VwB9yPq8PaKej8TD5cQ+XfKDPWWC+VDJU4rvVVagXqKUzhKjtFoNA8rXDJAkCxQPAe00+Q==
   dependencies:
     undici-types "~7.12.0"
 
@@ -83,9 +83,9 @@ b4a@^1.6.4:
   integrity sha512-ZovbrBV0g6JxK5cGUF1Suby1vLfKjv4RWi8IxoaO/Mon8BDD9I21RxjHFtgQ+kskJqLAVyQZly3uMBui+vhc8Q==
 
 bare-events@^2.2.0, bare-events@^2.5.4:
-  version "2.6.1"
-  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/bare-events/-/bare-events-2.6.1.tgz#f793b28bdc3dcf147d7cf01f882a6f0b12ccc4a2"
-  integrity sha512-AuTJkq9XmE6Vk0FJVNq5QxETrSA/vKHarWVBG5l/JbdCL1prJemiyJqUS0jrlXO0MftuPq4m3YVYhoNc5+aE/g==
+  version "2.7.0"
+  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/bare-events/-/bare-events-2.7.0.tgz#46596dae9c819c5891eb2dcc8186326ed5a6da54"
+  integrity sha512-b3N5eTW1g7vXkw+0CXh/HazGTcO5KYuu/RCNaJbDMPI6LHDi+7qe8EmxKUVe1sUbY2KZOVZFyj62x0OEz9qyAA==
 
 bare-fs@^4.0.1:
   version "4.4.4"
@@ -620,12 +620,7 @@ wrappy@1:
   resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-ws@8.18.0:
-  version "8.18.0"
-  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
-  integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
-
-ws@^8.18.2:
+ws@8.18.3, ws@^8.18.2:
   version "8.18.3"
   resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
   integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==

kotlin-js-store/yarn.lock

@@ -134,9 +134,9 @@
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/node@*", "@types/node@>=10.0.0":
-  version "24.5.0"
-  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/@types/node/-/node-24.5.0.tgz#70a482e6b1d50e603729d74e62a9a43705ddc9d7"
-  integrity sha512-y1dMvuvJspJiPSDZUQ+WMBvF7dpnEqN4x9DDC9ie5Fs/HUZJA3wFp7EhHoVaKX/iI0cRoECV8X2jL8zi0xrHCg==
+  version "24.5.1"
+  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/@types/node/-/node-24.5.1.tgz#dab6917c47113eb4502d27d06e89a407ec0eff95"
+  integrity sha512-/SQdmUP2xa+1rdx7VwB9yPq8PaKej8TD5cQ+XfKDPWWC+VDJU4rvVVagXqKUzhKjtFoNA8rXDJAkCxQPAe00+Q==
   dependencies:
     undici-types "~7.12.0"
 
@@ -393,9 +393,9 @@ balanced-match@^1.0.0:
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 bare-events@^2.2.0, bare-events@^2.5.4:
-  version "2.6.1"
-  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/bare-events/-/bare-events-2.6.1.tgz#f793b28bdc3dcf147d7cf01f882a6f0b12ccc4a2"
-  integrity sha512-AuTJkq9XmE6Vk0FJVNq5QxETrSA/vKHarWVBG5l/JbdCL1prJemiyJqUS0jrlXO0MftuPq4m3YVYhoNc5+aE/g==
+  version "2.7.0"
+  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/bare-events/-/bare-events-2.7.0.tgz#46596dae9c819c5891eb2dcc8186326ed5a6da54"
+  integrity sha512-b3N5eTW1g7vXkw+0CXh/HazGTcO5KYuu/RCNaJbDMPI6LHDi+7qe8EmxKUVe1sUbY2KZOVZFyj62x0OEz9qyAA==
 
 bare-fs@^4.0.1:
   version "4.4.4"
@@ -810,9 +810,9 @@ ee-first@1.1.1:
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 electron-to-chromium@^1.5.218:
-  version "1.5.218"
-  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/electron-to-chromium/-/electron-to-chromium-1.5.218.tgz#921042a011a98a4620853c9d391ab62bcc124400"
-  integrity sha512-uwwdN0TUHs8u6iRgN8vKeWZMRll4gBkz+QMqdS7DDe49uiK68/UX92lFb61oiFPrpYZNeZIqa4bA7O6Aiasnzg==
+  version "1.5.220"
+  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/electron-to-chromium/-/electron-to-chromium-1.5.220.tgz#a9853fa5edcf51f4c7db369144377cf31d783b8f"
+  integrity sha512-TWXijEwR1ggr4BdAKrb1nMNqYLTx1/4aD1fkeZU+FVJGTKu53/T7UyHKXlqEX3Ub02csyHePbHmkvnrjcaYzMA==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -858,7 +858,7 @@ engine.io@~6.6.0:
 
 enhanced-resolve@^5.17.2:
   version "5.18.3"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44"
+  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44"
   integrity sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==
   dependencies:
     graceful-fs "^4.2.4"
@@ -1486,7 +1486,7 @@ karma-webpack@5.0.1:
 
 karma@6.4.4:
   version "6.4.4"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
+  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
   integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
   dependencies:
     "@colors/colors" "1.5.0"
@@ -1521,7 +1521,7 @@ kind-of@^6.0.2:
 
 kotlin-web-helpers@2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.1.0.tgz#6cd4b0f0dc3baea163929c8638155b8d19c55a74"
+  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/kotlin-web-helpers/-/kotlin-web-helpers-2.1.0.tgz#6cd4b0f0dc3baea163929c8638155b8d19c55a74"
   integrity sha512-NAJhiNB84tnvJ5EQx7iER3GWw7rsTZkX9HVHZpe7E3dDBD/dhTzqgSwNU3MfQjniy2rB04bP24WM9Z32ntUWRg==
   dependencies:
     format-util "^1.0.5"
@@ -1654,7 +1654,7 @@ mkdirp@^0.5.5:
 
 mocha@11.7.1:
   version "11.7.1"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.1.tgz#91948fecd624fb4bd154ed260b7e1ad3910d7c7a"
+  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/mocha/-/mocha-11.7.1.tgz#91948fecd624fb4bd154ed260b7e1ad3910d7c7a"
   integrity sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==
   dependencies:
     browser-stdout "^1.3.1"
@@ -2496,7 +2496,7 @@ webpack-sources@^3.3.3:
 
 webpack@5.100.2:
   version "5.100.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.100.2.tgz#e2341facf9f7de1d702147c91bcb65b693adf9e8"
+  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/webpack/-/webpack-5.100.2.tgz#e2341facf9f7de1d702147c91bcb65b693adf9e8"
   integrity sha512-QaNKAvGCDRh3wW1dsDjeMdDXwZm2vqq3zn6Pvq4rHOEOGSaUMgOOjG2Y9ZbIGzpfkJk9ZYTHpDqgDfeBDcnLaw==
   dependencies:
     "@types/eslint-scope" "^3.7.7"
@@ -2572,12 +2572,7 @@ wrappy@1:
   resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-ws@8.18.0:
-  version "8.18.0"
-  resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
-  integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
-
-ws@^8.18.2:
+ws@8.18.3, ws@^8.18.2:
   version "8.18.3"
   resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
   integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==

krpc/krpc-client/src/commonMain/kotlin/kotlinx/rpc/krpc/client/KrpcClient.kt

@@ -16,6 +16,7 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.channels.ClosedSendChannelException
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
@@ -215,7 +216,9 @@ public abstract class KrpcClient : RpcClient, KrpcEndpoint {
                 connector.subscribeToGenericMessages(::handleGenericMessage)
                 connector.subscribeToProtocolMessages(::handleProtocolMessage)
 
-                connector.sendMessage(KrpcProtocolMessage.Handshake(KrpcPlugin.ALL))
+                connector.sendMessageChecked(KrpcProtocolMessage.Handshake(KrpcPlugin.ALL)) {
+                    // ignore, we are already cancelled and have a cause
+                }
             }
         }
 
@@ -476,7 +479,9 @@ public abstract class KrpcClient : RpcClient, KrpcEndpoint {
                 connectionId = outgoingStream.connectionId,
                 serviceId = outgoingStream.serviceId,
             )
-            sender.sendMessage(message)
+            connector.sendMessageChecked(message) {
+                // ignore, we are already cancelled and have a cause
+            }
 
             // stop the flow and its coroutine, other flows are not affected
             throw e
@@ -490,7 +495,9 @@ public abstract class KrpcClient : RpcClient, KrpcEndpoint {
                 connectionId = outgoingStream.connectionId,
                 serviceId = outgoingStream.serviceId,
             )
-            sender.sendMessage(message)
+            connector.sendMessageChecked(message) {
+                // ignore, we are already cancelled and have a cause
+            }
 
             throw cause
         }
@@ -543,7 +550,9 @@ public abstract class KrpcClient : RpcClient, KrpcEndpoint {
                 }
             }
 
-            sender.sendMessage(message)
+            sender.sendMessageChecked(message) { e ->
+                throw CancellationException("Request cancelled", e)
+            }
         }
     }
 

krpc/krpc-core/src/commonMain/kotlin/kotlinx/rpc/krpc/internal/KrpcConnector.kt

@@ -35,6 +35,18 @@ public interface KrpcMessageSender {
     public fun drainSendQueueAndClose(message: String)
 }
 
+@InternalRpcApi
+public suspend inline fun KrpcMessageSender.sendMessageChecked(
+    message: KrpcMessage,
+    onChannelClosed: (ClosedSendChannelException) -> Unit,
+) {
+    try {
+        sendMessage(message)
+    } catch (e: ClosedSendChannelException) {
+        onChannelClosed(e)
+    }
+}
+
 internal typealias KrpcMessageSubscription<Message> = suspend (Message) -> Unit
 
 /**
@@ -72,9 +84,7 @@ public class KrpcConnector(
 
     // prevent errors ping-pong
     private suspend fun sendMessageIgnoreClosure(message: KrpcMessage) {
-        try {
-            sendMessage(message)
-        } catch (_: ClosedSendChannelException) {
+        sendMessageChecked(message) {
             // ignore
         }
     }

krpc/krpc-core/src/commonMain/kotlin/kotlinx/rpc/krpc/internal/KrpcEndpoint.kt

@@ -44,9 +44,7 @@ public interface KrpcEndpoint {
                 ).toMap()
             )
 
-            try {
-                sender.sendMessage(message)
-            } catch (_: ClosedSendChannelException) {
+            sender.sendMessageChecked(message) {
                 // ignore, call was already closed
             }
         }
@@ -76,7 +74,9 @@ public interface KrpcEndpoint {
                 connectionId = message.connectionId,
             )
 
-            sender.sendMessage(failure)
+            sender.sendMessageChecked(failure) {
+                // ignore, call was already closed
+            }
         }
     }
 

krpc/krpc-core/src/commonMain/kotlin/kotlinx/rpc/krpc/internal/KrpcReceiveHandler.kt

@@ -212,17 +212,15 @@ internal class KrpcActingReceiveHandler(
     }
 
     internal suspend fun broadcastWindowUpdate(update: Int, connectionId: Long?, serviceType: String, callId: String) {
-        try {
-            sender.sendMessage(
-                KrpcGenericMessage(
-                    connectionId = connectionId,
-                    pluginParams = mutableMapOf(
-                        KrpcPluginKey.WINDOW_UPDATE to "$update",
-                        KrpcPluginKey.WINDOW_KEY to "$serviceType/$callId",
-                    ),
-                )
+        sender.sendMessageChecked(
+            KrpcGenericMessage(
+                connectionId = connectionId,
+                pluginParams = mutableMapOf(
+                    KrpcPluginKey.WINDOW_UPDATE to "$update",
+                    KrpcPluginKey.WINDOW_KEY to "$serviceType/$callId",
+                ),
             )
-        } catch (_: ClosedSendChannelException) {
+        ) {
             // ignore, connection is closed, no more channel updates are needed
         }
     }