diff --git a/CHANGELOG.md b/CHANGELOG.md index 8026af6cce..b85851f815 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## 29.0.0 +## 28.0.2 + +* `Core`: + * [#1001](https://github.com/InsanusMokrassar/ktgbotapi/issues/1001) - `[Bug] Invalid detection of isCausedByCancellation()` + * [#1002](https://github.com/InsanusMokrassar/ktgbotapi/issues/1002) - `Unable to handle UnauthorizedException with buildBehaviourWithLongPolling` + ## 28.0.1 * `Version`: diff --git a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourBuilders.kt b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourBuilders.kt index 38ae9a9d66..f6e7c7f14c 100644 --- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourBuilders.kt +++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourBuilders.kt @@ -87,6 +87,7 @@ suspend fun TelegramBot.buildBehaviourWithLongPolling( timeoutSeconds = timeoutSeconds, autoDisableWebhooks = autoDisableWebhooks, autoSkipTimeoutExceptions = autoSkipTimeoutExceptions, - mediaGroupsDebounceTimeMillis = mediaGroupsDebounceTimeMillis + mediaGroupsDebounceTimeMillis = mediaGroupsDebounceTimeMillis, + exceptionsHandler = defaultExceptionsHandler ) } diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/DefaultKtorRequestsExecutor.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/DefaultKtorRequestsExecutor.kt index d2c683f09d..40ca65a261 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/DefaultKtorRequestsExecutor.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/DefaultKtorRequestsExecutor.kt @@ -84,7 +84,7 @@ class DefaultKtorRequestsExecutor internal constructor( when (e) { is ClientRequestException -> { - val exceptionResult = runCatching { + val exceptionResult = runCatchingLogging(logger = Log) { val content = e.response.bodyAsText() val responseObject = jsonFormatter.decodeFromString(Response.serializer(), content) newRequestException( diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/CausedByCancellation.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/CausedByCancellation.kt index 3b65f8071e..08c921dffc 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/CausedByCancellation.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/CausedByCancellation.kt @@ -2,6 +2,17 @@ package dev.inmo.tgbotapi.utils import kotlinx.coroutines.CancellationException +/** + * Traverses this throwable's cause chain to find a [CancellationException]. + * + * It walks through `this` and its `cause`s until the first [CancellationException] is encountered, + * and returns that exception. If no [CancellationException] is found in the chain, returns `null`. + * + * This is useful when you need to distinguish cancellations from other failures while handling errors. + * + * @receiver the root [Throwable] to inspect + * @return the first [CancellationException] found in the cause chain, or `null` if none present + */ fun Throwable.causedCancellationException(): CancellationException? { var current = this while (current !is CancellationException) { @@ -15,4 +26,10 @@ fun Throwable.causedCancellationException(): CancellationException? { return current } -fun Throwable.isCausedByCancellation(): Boolean = causedCancellationException() == null +/** + * Checks whether this throwable (or any of its causes) is a [CancellationException]. + * + * @receiver the [Throwable] to inspect + * @return `true` if a [CancellationException] is found in the cause chain, `false` otherwise + */ +fun Throwable.isCausedByCancellation(): Boolean = causedCancellationException() != null