Merge pull request #810 from InsanusMokrassar/9.4.2

9.4.2

.github/workflows/packages_publishing.yml

@@ -22,9 +22,10 @@ jobs:
         run: ./gradlew build
       - name: Publish to Gitea
         continue-on-error: true
-        run: ./gradlew publishAllPublicationsToGiteaRepository
+        run: ./gradlew publishAllPublicationsToInmoNexusRepository
         env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          INMONEXUS_USER: ${{ secrets.INMONEXUS_USER }}
+          INMONEXUS_PASSWORD: ${{ secrets.INMONEXUS_PASSWORD }}
       - name: Publish to GithubPackages
         continue-on-error: true
         run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel

CHANGELOG.md

@@ -1,5 +1,17 @@
 # TelegramBotAPI changelog
 
+## 9.4.2
+
+* `Version`:
+  * `Serialization`: `1.6.1` -> `1.6.2`
+  * `Ktor`: `2.3.6` -> `2.3.7`
+  * `MicroUtils`: `0.20.15` -> `0.20.19`
+  * `UUID`: `0.8.1` -> `0.8.2`
+
+## 9.4.1
+
+* Replace warning about two bots from `LongPolling` to `DefaultKtorRequestsExecutor`
+
 ## 9.4.0
 
 * `Version`:

build.gradle

@@ -25,7 +25,7 @@ allprojects {
         mavenLocal()
         mavenCentral()
         google()
-        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
+        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
     }
     if (it != rootProject.findProject("docs")) {
         tasks.whenTaskAdded { task ->

gradle.properties

@@ -6,4 +6,4 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 library_group=dev.inmo
-library_version=9.4.0
+library_version=9.4.2

gradle/libs.versions.toml

@@ -1,19 +1,19 @@
 [versions]
 
 kotlin = "1.9.21"
-kotlin-serialization = "1.6.1"
+kotlin-serialization = "1.6.2"
 kotlin-coroutines = "1.7.3"
 
 javax-activation = "1.1.1"
 
 korlibs = "4.0.10"
-uuid = "0.8.1"
+uuid = "0.8.2"
-ktor = "2.3.6"
+ktor = "2.3.7"
 
-ksp = "1.9.20-1.0.14"
+ksp = "1.9.21-1.0.15"
-kotlin-poet = "1.15.1"
+kotlin-poet = "1.15.3"
 
-microutils = "0.20.15"
+microutils = "0.20.19"
 kslog = "1.3.1"
 
 versions = "0.50.0"

publish.gradle

@@ -50,18 +50,14 @@ publishing {
             
                 }
             }
-            if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
+            if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
                 maven {
-                    name = "Gitea"
+                    name = "InmoNexus"
-                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
             
-                    credentials(HttpHeaderCredentials) {
+                    credentials {
-                        name = "Authorization"
+                        username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
-                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
+                        password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
-                    }
-            
-                    authentication {
-                        header(HttpHeaderAuthentication)
                     }
             
                 }

publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/DefaultKtorRequestsExecutor.kt

@@ -1,13 +1,12 @@
 package dev.inmo.tgbotapi.bot.ktor.base
 
-import dev.inmo.kslog.common.KSLog
+import dev.inmo.kslog.common.*
-import dev.inmo.kslog.common.e
+import dev.inmo.micro_utils.coroutines.defaultSafelyExceptionHandler
-import dev.inmo.kslog.common.i
-import dev.inmo.kslog.common.v
 import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.tgbotapi.bot.BaseRequestsExecutor
 import dev.inmo.tgbotapi.bot.exceptions.BotException
 import dev.inmo.tgbotapi.bot.exceptions.CommonBotException
+import dev.inmo.tgbotapi.bot.exceptions.GetUpdatesConflict
 import dev.inmo.tgbotapi.bot.exceptions.newRequestException
 import dev.inmo.tgbotapi.bot.ktor.KtorCallFactory
 import dev.inmo.tgbotapi.bot.ktor.KtorPipelineStepsHolder
@@ -102,8 +101,13 @@ class DefaultKtorRequestsExecutor internal constructor(
                     }
                     is BotException -> e
                     else -> CommonBotException(cause = e)
-                }.also {
+                }.also { newException ->
-                    logger.v(e) { "Result exception on handling of $request: $it" }
+                    logger.v(newException) { "Result exception on handling of $request is an exception" }
+                    if (newException is GetUpdatesConflict) {
+                        logger.w(newException) {
+                            "Warning!!! Other bot with the same bot token requests updates with getUpdate in parallel"
+                        }
+                    }
                 }
             } ?.let { Result.failure(it) } ?: it
             pipelineStepsHolder.onRequestReturnResult(result, request, callsFactories).also {

tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt

@@ -114,9 +114,6 @@ fun TelegramBot.longPollingFlow(
                     if (e is RequestException) {
                         delay(1000L)
                     }
-                    if (e is GetUpdatesConflict && (exceptionsHandler == null || exceptionsHandler == defaultSafelyExceptionHandler)) {
-                        println("Warning!!! Other bot with the same bot token requests updates with getUpdate in parallel")
-                    }
                 }
             ) {
                 execute(