mirror of
https://github.com/InsanusMokrassar/PlaguBot.git
synced 2025-12-05 13:55:53 +00:00
Compare commits
146 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 279f728348 | |||
| a509e3a15a | |||
| 58ba7c1e32 | |||
| 431b1bf1f2 | |||
| ad23cc9202 | |||
| e9bf2dfc64 | |||
| 61ea5e93b3 | |||
| ff0d819bd2 | |||
| 1919d8840a | |||
| 98c539b198 | |||
| 7e02bb3583 | |||
| d6e10d1dd1 | |||
| b30aee0109 | |||
| be45f94070 | |||
| 485d0d1fbf | |||
| 69e97223ce | |||
| f067033678 | |||
| 37920521a0 | |||
| d78f8adbea | |||
| 487ce413f1 | |||
| 556ded1e84 | |||
| 605fb956a4 | |||
| b907f8d53b | |||
| 2a0cd5d6a8 | |||
| 00f3485959 | |||
| 856ae65fa8 | |||
| d9488f8ccd | |||
| 2f06a65cc6 | |||
| f3e6b55861 | |||
| 7bdb525f01 | |||
| e6a2add7f8 | |||
| 3d7cb28c92 | |||
| 81a1ed6613 | |||
| b43efb4255 | |||
| 8d3d9f8c6a | |||
| 6cb241642b | |||
| f551f471d9 | |||
| 4342e04e3f | |||
| a7fe1e3d82 | |||
| c2d6afccc2 | |||
| d928db7e74 | |||
| 893f3a95a1 | |||
| f9b7d444a6 | |||
| 47f5086ebd | |||
| bc29d4f83a | |||
| 26b34a470b | |||
| 3b507a5668 | |||
| bb06ba1ca7 | |||
| d772d275b3 | |||
| e1e7c7a547 | |||
| d8403dd3b7 | |||
| 17ac66f7fe | |||
| b23c9b755a | |||
| 629ff7ee4e | |||
| 666ba9926e | |||
| 995bce3885 | |||
| d597539b9e | |||
| c80a7a1bda | |||
| bd20c2d60f | |||
| cfd42af6bc | |||
| 5c39fd2491 | |||
| 745b9cad72 | |||
| f39947edd6 | |||
| cacc1ef828 | |||
| 136d106b4c | |||
| ddd3854d78 | |||
| 1c2bcb6907 | |||
| 8bd80c1c0c | |||
| 2234ffd55d | |||
| 1a9d8b0d5e | |||
| e00f40d06a | |||
| 9883d2b3b1 | |||
| bdfd3b816c | |||
| dd37ae0f2f | |||
| 8efe977e76 | |||
| 8290a68654 | |||
| 493a18a0f7 | |||
| 36608937af | |||
| 1b1b069d93 | |||
| 37b5b8e867 | |||
| 468310c819 | |||
| 0d27a4f6f7 | |||
| f9d131866f | |||
| 451b2bbc39 | |||
| d51e2d8e7c | |||
| 6c45a8c848 | |||
| 8a7e05580d | |||
| 8b78f2901f | |||
| cad8743ced | |||
| 8f827e9f79 | |||
| 28039df992 | |||
| 18019c37ea | |||
| 8a84f65a12 | |||
| 49f30ab939 | |||
| 8a15deceb8 | |||
| ea3273c4cf | |||
| 439972e783 | |||
| 08907291c5 | |||
| 0f4819a83d | |||
| 7abdf18491 | |||
| 98a91ea357 | |||
| 934f603a8a | |||
| 76e9cdae8d | |||
| fbe166f2b4 | |||
| 30cf190461 | |||
| 9d72d79321 | |||
| 33057dd2cb | |||
| e1bb8e9799 | |||
| fd5e979f11 | |||
| 20e1f042f1 | |||
| 0e65a425c3 | |||
| 517ab1e1a4 | |||
| 977cf32669 | |||
| 5bd1916fb5 | |||
| 8c22b418f8 | |||
| 3663f987bc | |||
| 93d15af80d | |||
| 27c5f379a4 | |||
| ae7a7b84ac | |||
| 5b98aef237 | |||
| 3755972394 | |||
| 5d5312c66f | |||
| f79fef3dae | |||
| 2c8dc80eae | |||
| a2a2fe7ef4 | |||
| 34cadab809 | |||
| 784e041519 | |||
| 4784f05c8e | |||
| e89b0a6ba2 | |||
| b48d278446 | |||
| 072a64362d | |||
| 7715f519e3 | |||
| 7982f27217 | |||
| eeb3ae1dbe | |||
| 8a73fda6fa | |||
| 05e94249af | |||
| 74c36c66f1 | |||
| 5153f732ce | |||
| fb23e9be79 | |||
| 292640b465 | |||
| a863d91bab | |||
| d1064bb9cd | |||
| a9c3b937e7 | |||
| 6757354652 | |||
| c65efb6ffb | |||
| f9cc279854 |
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@@ -8,9 +8,9 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Set up JDK 11
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v1
|
||||
with:
|
||||
java-version: 11
|
||||
java-version: 17
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew build
|
||||
|
||||
317
CHANGELOG.md
317
CHANGELOG.md
@@ -1,5 +1,322 @@
|
||||
# Changelog
|
||||
|
||||
## 10.7.1
|
||||
|
||||
## 10.7.0
|
||||
|
||||
* `Versions`:
|
||||
* `kotlin`: `2.2.0`
|
||||
* `serialization`: `1.9.0`
|
||||
* `microutils`: `0.26.2`
|
||||
* `tgbotapi`: `27.1.1`
|
||||
* `koin`: `4.1.0`
|
||||
|
||||
## 10.6.0
|
||||
|
||||
* `Versions`:
|
||||
* `microutils`: `0.25.8`
|
||||
* `tgbotapi`: `26.0.0`
|
||||
* `sqlite`: `3.50.1.0`
|
||||
|
||||
## 10.5.0
|
||||
|
||||
* `Versions`:
|
||||
* `kotlin`: `2.1.20`
|
||||
* `serialization`: `1.8.1`
|
||||
* `coroutines`: `1.10.2`
|
||||
* `microutils`: `0.25.5`
|
||||
* `tgbotapi`: `24.0.2`
|
||||
* `exposed`: `0.61.0`
|
||||
* `sqlite`: `3.49.1.0`
|
||||
* `koin`: `4.0.4`
|
||||
|
||||
## 10.4.0
|
||||
|
||||
* `Versions`:
|
||||
* `microutils`: `0.24.6`
|
||||
* `tgbotapi`: `23.2.0`
|
||||
* `exposed`: `0.59.0`
|
||||
* `sqlite`: `3.49.0.0`
|
||||
|
||||
## 10.3.1
|
||||
|
||||
* `Versions`:
|
||||
* `kotlin`: `2.1.10`
|
||||
* `serialization`: `1.8.0`
|
||||
* `coroutines`: `1.10.1`
|
||||
* `microutils`: `0.24.5`
|
||||
* `tgbotapi`: `23.1.2`
|
||||
* `exposed`: `0.58.0`
|
||||
* `sqlite`: `3.48.0.0`
|
||||
* `koin`: `4.0.2`
|
||||
|
||||
## 10.3.0
|
||||
|
||||
* `Versions`:
|
||||
* `microutils`: `0.23.2`
|
||||
* `tgbotapi`: `22.0.0`
|
||||
* `exposed`: `0.57.0`
|
||||
|
||||
## 10.2.1
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `21.0.1`
|
||||
* `Bot`:
|
||||
* Now all `CombinedSubcontextInitialAction.SubItem`s will be taken from `Koin` to setup root `subcontextInitialAction`
|
||||
|
||||
## 10.2.0
|
||||
|
||||
* `Versions`:
|
||||
* `kotlin`: `2.1.0`
|
||||
* `microutils`: `0.23.1`
|
||||
* `tgbotapi`: `21.0.0`
|
||||
* `exposed`: `0.56.0`
|
||||
* `sqlite`: `3.47.1.0`
|
||||
|
||||
## 10.1.1
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `20.0.1`
|
||||
|
||||
## 10.1.0
|
||||
|
||||
* `Versions`:
|
||||
* `kotlin`: `2.0.21`
|
||||
* `serialization`: `1.7.3`
|
||||
* `coroutines`: `1.9.0`
|
||||
* `microutils`: `0.23.0`
|
||||
* `tgbotapi`: `20.0.0`
|
||||
* `exposed`: `0.55.0`
|
||||
* `sqlite`: `3.47.0.0`
|
||||
* `koin`: `4.0.0`
|
||||
|
||||
## 10.0.0
|
||||
|
||||
**OVERALL LOGIC OF PLAGUBOT INITIALIZATION AND WORK HAS BEEN CHANGED**
|
||||
|
||||
First of all, since this update `PlaguBot` will use default `StartPlugin` logic and will be built on top of it.
|
||||
All special methods of `Plugin` will be called from one of `PlaguBot` initialization phases:
|
||||
|
||||
* `setupBotClient` will be called from `single` initialization of `telegramBot` (in `setupDI` phase)
|
||||
* `setupBotPlugin` will be called from `startPlugin` method in time of `buildBehaviourWithFSM` initialization
|
||||
|
||||
* `Plugin`:
|
||||
* Extension `Module.setupDI(Database,JsonObject)` has been dropped. Use `database` extension in `Module.setupDI(JsonObject)`
|
||||
* `Bot`:
|
||||
* `dev.inmo.plagubot.config.Config` lost its `plugins` section. Now you may retrieve plugins from `Koin` only
|
||||
* `defaultJsonFormat` became `Warning` feature due to the fact of its fully default nature
|
||||
* `PlaguBot` lost old `start` method and took two new: with `args` as `Array<String>` and `initialConfig` as `JsonObject`
|
||||
|
||||
**Migration:**
|
||||
|
||||
* If you are running bot and doing it using `StartPlugin` launcher, add `dev.inmo.plagubot.PlaguBot` explicitly
|
||||
* In plugins: replace your `setupDI` overrides with `Database` as argument by the same one, but `database` will be
|
||||
available as extension in `single` or `factory` calls (as extension to `Scope` and `Koin`)
|
||||
|
||||
## 9.3.0
|
||||
|
||||
* `Bot`:
|
||||
* Now bot is not built-in into `PlaguBot` and setted up as all other `Koin` dependencies
|
||||
* Now it is possible to use `testServer` parameter for bots out of the box
|
||||
* `Plugin`:
|
||||
* New method `setupBotClient` with arguments to let plugin setup bot more freely
|
||||
|
||||
## 9.2.0
|
||||
|
||||
* `Versions`:
|
||||
* `kotlin`: `2.0.20`
|
||||
* `serialization`: `1.7.2`
|
||||
* `microutils`: `0.22.2`
|
||||
* `tgbotapi`: `18.1.0`
|
||||
* `exposed`: `0.54.0`
|
||||
* `sqlite`: `3.46.1.0`
|
||||
|
||||
## 9.1.0
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `17.0.0`
|
||||
|
||||
## 9.0.0
|
||||
|
||||
* `Versions`:
|
||||
* `Kotlin`: `2.0.10`
|
||||
* `Serialization`: `1.7.1`
|
||||
* `MicroUtils`: `0.22.0`
|
||||
* `tgbotapi`: `16.0.0`
|
||||
* `Exposed`: `0.53.0`
|
||||
|
||||
## 8.5.1
|
||||
|
||||
* `Versions`:
|
||||
* `MicroUtils`: `0.21.4`
|
||||
* `tgbotapi`: `15.2.0`
|
||||
|
||||
## 8.5.0
|
||||
|
||||
* `Versions`:
|
||||
* `MicroUtils`: `0.21.2`
|
||||
* `tgbotapi`: `15.1.0`
|
||||
|
||||
## 8.4.0
|
||||
|
||||
* `Versions`:
|
||||
* `Coroutines`: `1.8.1`
|
||||
* `MicroUtils`: `0.21.1`
|
||||
* `tgbotapi`: `15.0.0`
|
||||
* `Exposed`: `0.51.1`
|
||||
|
||||
## 8.3.0
|
||||
|
||||
* `Versions`:
|
||||
* `Serialization`: `1.6.3`
|
||||
* `MicroUtils`: `0.20.45`
|
||||
* `tgbotapi`: `12.0.1`
|
||||
* `Exposed`: `0.49.0`
|
||||
* `SQLite`: `3.45.3.0`
|
||||
* `Koin`: `3.5.6`
|
||||
|
||||
## 8.2.0
|
||||
|
||||
* `Versions`:
|
||||
* `Coroutines`: `1.8.0`
|
||||
* `tgbotapi`: `10.1.0`
|
||||
* `MicroUtils`: `0.20.35`
|
||||
|
||||
## 8.1.1
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `10.0.1`
|
||||
* `MicroUtils`: `0.20.32`
|
||||
* `Exposed`: `0.47.0`
|
||||
|
||||
## 8.1.0
|
||||
|
||||
* Integrate `dev.inmo:micro_utils.startup` into project
|
||||
|
||||
## 8.0.0
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `10.0.0`
|
||||
* `MicroUtils`: `0.20.26`
|
||||
* `Exposed`: `0.46.0`
|
||||
|
||||
## 7.4.2
|
||||
|
||||
* `Versions`:
|
||||
* `Kotlin`: `1.9.22`
|
||||
* `tgbotapi`: `9.4.3`
|
||||
* `MicroUtils`: `0.20.23`
|
||||
* `Koin`: `3.5.7`
|
||||
|
||||
## 7.4.1
|
||||
|
||||
* `Versions`:
|
||||
* `Serialization`: `1.6.2`
|
||||
* `tgbotapi`: `9.4.2`
|
||||
* `Exposed`: `0.45.0`
|
||||
* `SQLite`: `3.44.1.0`
|
||||
* `MicroUtils`: `0.20.19`
|
||||
* `uuid`: `0.8.2`
|
||||
* `ktor`: `2.3.7`
|
||||
|
||||
## 7.3.0
|
||||
|
||||
* `Versions`:
|
||||
* `Kotlin`: `1.9.21`
|
||||
* `Serialization`: `1.6.1`
|
||||
* `tgbotapi`: `9.4.1`
|
||||
* `ktor`: `2.3.6`
|
||||
* `KSLog`: Removed explicit dependency, now it is declared in tgbotapi
|
||||
* `MicroUtils`: `0.20.15`
|
||||
|
||||
## 7.2.3
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `9.2.2`
|
||||
* `exposed`: `0.44.0`
|
||||
* `koin`: `3.5.0`
|
||||
* `ktor`: `2.3.5`
|
||||
|
||||
## 7.2.2
|
||||
|
||||
* `Bot`:
|
||||
* Now you may customize both `onStart` and `onUpdate` conflicts resolvers
|
||||
|
||||
## 7.2.1
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `9.2.1`
|
||||
* `ktor`: `2.3.4`
|
||||
|
||||
## 7.2.0
|
||||
|
||||
* `Version`:
|
||||
* `tgbotapi`: `9.2.0`
|
||||
* `kslog`: `1.1.2`
|
||||
* `sqlite`: `3.43.0.0`
|
||||
|
||||
## 7.1.0
|
||||
|
||||
* `Version`:
|
||||
* `microutils`: `0.19.9`
|
||||
* `tgbotapi`: `9.1.0`
|
||||
* `ktor`: `2.3.3`
|
||||
* `coroutines`: `1.7.3`
|
||||
* `koin`: `3.4.3`
|
||||
|
||||
## 7.0.0
|
||||
|
||||
* `Version`:
|
||||
* `microutils`: `0.19.7`
|
||||
* `tgbotapi`: `9.0.0`
|
||||
* `ktor`: `2.3.2`
|
||||
* `coroutines`: `1.7.2`
|
||||
|
||||
## 6.1.0
|
||||
|
||||
* `Version`:
|
||||
* `kotlin`: `1.8.22`
|
||||
* `microutils`: `0.19.4`
|
||||
* `tgbotapi`: `8.1.0`
|
||||
* `koin`: `3.4.2`
|
||||
* `sqlite`: `3.42.0.0`
|
||||
|
||||
## 6.0.1
|
||||
|
||||
* `Version`:
|
||||
* `microutils`: `0.19.2`
|
||||
* `tgbotapi`: `8.0.1`
|
||||
* `uuid`: `0.7.1`
|
||||
* `ktor`: `2.3.1`
|
||||
* `koin`: `3.4.1`
|
||||
|
||||
## 6.0.0
|
||||
|
||||
* `Versions`:
|
||||
* `microutils`: `0.19.1`
|
||||
* `tgbotapi`: `8.0.0`
|
||||
* `klock`: `4.0.3`
|
||||
|
||||
## 5.1.3
|
||||
|
||||
* `Versions`:
|
||||
* `serialization`: `1.5.1`
|
||||
* `microutils`: `0.18.4`
|
||||
* `tgbotapi`: `7.1.3`
|
||||
|
||||
## 5.1.2
|
||||
|
||||
* `Versions`:
|
||||
* `microutils`: `0.18.1`
|
||||
* `tgbotapi`: `7.1.2`
|
||||
|
||||
## 5.1.1
|
||||
|
||||
* `Versions`:
|
||||
* `kotlin`: `1.8.21`
|
||||
* `microutils`: `0.18.0`
|
||||
* `tgbotapi`: `7.1.1`
|
||||
|
||||
## 5.1.0
|
||||
|
||||
* `Versions`:
|
||||
|
||||
15
README.md
15
README.md
@@ -19,6 +19,8 @@ That is a set of libraries for plagubots. Look at the
|
||||
|
||||
### Technical help
|
||||
|
||||
#### FSM
|
||||
|
||||
In this bot has been used variant with FSM. That means that you may use all the [Behaviour Builder with FSM](https://bookstack.inmo.dev/books/telegrambotapi/page/behaviour-builder-with-fsm) functionality. In case you wish to setup states repo, you should use the next code in the `setupDI` of your plugin:
|
||||
|
||||
```kotlin
|
||||
@@ -41,3 +43,16 @@ single<StateHandlingErrorHandler<State>> {
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### Subcontext initial actions
|
||||
|
||||
Bot will take all the `CombinedSubcontextInitialAction.SubItem`s from `Koin` to include it in root of
|
||||
`behaviourBuilder`. To create your own subitem:
|
||||
|
||||
```kotlin
|
||||
singleWithRandomQualifier<CombinedSubcontextInitialAction.SubItem> {
|
||||
CombinedSubcontextInitialAction.SubItem {
|
||||
// do some action or throw error to rerun on next round
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
@@ -2,6 +2,7 @@ plugins {
|
||||
id 'org.jetbrains.kotlin.jvm'
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
id 'application'
|
||||
id "com.google.devtools.ksp"
|
||||
}
|
||||
|
||||
project.group="$group"
|
||||
@@ -18,7 +19,8 @@ dependencies {
|
||||
api libs.tgbotapi
|
||||
api libs.tgbotapi.behaviourBuilder.fsm
|
||||
api libs.microutils.repos.exposed
|
||||
api libs.kslog
|
||||
api libs.microutils.koin
|
||||
api libs.microutils.startup.launcher
|
||||
|
||||
api libs.sqlite
|
||||
|
||||
@@ -32,7 +34,10 @@ application {
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
ksp { // this generator do not require any arguments and we should left `ksp` empty
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
|
||||
apply plugin: 'maven-publish'
|
||||
|
||||
|
||||
task javadocJar(type: Jar) {
|
||||
from javadoc
|
||||
classifier = 'javadoc'
|
||||
archiveClassifier = 'javadoc'
|
||||
}
|
||||
task sourcesJar(type: Jar) {
|
||||
from sourceSets.main.allSource
|
||||
classifier = 'sources'
|
||||
archiveClassifier = 'sources'
|
||||
}
|
||||
|
||||
publishing {
|
||||
@@ -48,34 +50,28 @@ publishing {
|
||||
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
|
||||
maven {
|
||||
name = "Gitea"
|
||||
url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
|
||||
|
||||
credentials(HttpHeaderCredentials) {
|
||||
name = "Authorization"
|
||||
value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
|
||||
}
|
||||
|
||||
authentication {
|
||||
header(HttpHeaderAuthentication)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "InmoNexus"
|
||||
url = uri("https://nexus.inmo.dev/repository/maven-releases/")
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
|
||||
password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
|
||||
}
|
||||
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
||||
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
||||
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -84,16 +80,39 @@ publishing {
|
||||
|
||||
if (project.hasProperty("signing.gnupg.keyName")) {
|
||||
apply plugin: 'signing'
|
||||
|
||||
|
||||
signing {
|
||||
useGpgCmd()
|
||||
|
||||
|
||||
sign publishing.publications
|
||||
}
|
||||
|
||||
|
||||
task signAll {
|
||||
tasks.withType(Sign).forEach {
|
||||
dependsOn(it)
|
||||
}
|
||||
}
|
||||
|
||||
// Workaround to make android sign operations depend on signing tasks
|
||||
project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
|
||||
def signingTasks = project.getTasks().withType(Sign.class)
|
||||
mustRunAfter(signingTasks)
|
||||
}
|
||||
// Workaround to make test tasks use sign
|
||||
project.getTasks().withType(Sign.class).configureEach { signTask ->
|
||||
def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
|
||||
def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
|
||||
// These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
|
||||
|
||||
// Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
|
||||
def debugTestTask = tasks.findByName("linkDebugTest$pubName")
|
||||
if (debugTestTask != null) {
|
||||
signTask.mustRunAfter(debugTestTask)
|
||||
}
|
||||
// Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
|
||||
def testTask = tasks.findByName("compileTestKotlin$pubName")
|
||||
if (testTask != null) {
|
||||
signTask.mustRunAfter(testTask)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Bot","description":"Base PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"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"}},"type":"JVM"}
|
||||
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Bot","description":"Base PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
|
||||
@@ -1,25 +1,11 @@
|
||||
package dev.inmo.plagubot
|
||||
|
||||
import dev.inmo.kslog.common.KSLog
|
||||
import dev.inmo.kslog.common.i
|
||||
import dev.inmo.plagubot.config.Config
|
||||
import dev.inmo.plagubot.config.defaultJsonFormat
|
||||
import kotlinx.serialization.InternalSerializationApi
|
||||
import kotlinx.serialization.json.jsonObject
|
||||
import java.io.File
|
||||
|
||||
/**
|
||||
* This method by default expects one argument in [args] field: path to config
|
||||
*/
|
||||
@InternalSerializationApi
|
||||
suspend fun main(args: Array<String>) {
|
||||
KSLog.default = KSLog("PlaguBot")
|
||||
val (configPath) = args
|
||||
val file = File(configPath)
|
||||
KSLog.i("Start read config from ${file.absolutePath}")
|
||||
val json = defaultJsonFormat.parseToJsonElement(file.readText()).jsonObject
|
||||
val config = defaultJsonFormat.decodeFromJsonElement(Config.serializer(), json)
|
||||
KSLog.i("Config has been read")
|
||||
|
||||
PlaguBot(json, config).start().join()
|
||||
PlaguBot.start(args).join()
|
||||
}
|
||||
|
||||
28
bot/src/main/kotlin/dev/inmo/plagubot/KoinExtensions.kt
Normal file
28
bot/src/main/kotlin/dev/inmo/plagubot/KoinExtensions.kt
Normal file
@@ -0,0 +1,28 @@
|
||||
package dev.inmo.plagubot
|
||||
|
||||
import org.koin.core.Koin
|
||||
import org.koin.core.definition.Definition
|
||||
import org.koin.core.module.Module
|
||||
import org.koin.core.qualifier.Qualifier
|
||||
import org.koin.core.qualifier.StringQualifier
|
||||
import org.koin.core.scope.Scope
|
||||
|
||||
|
||||
val Scope.plagubot: PlaguBot
|
||||
get() = get()
|
||||
|
||||
val Koin.plagubot: PlaguBot
|
||||
get() = get()
|
||||
|
||||
private val pluginsQualifier = StringQualifier("plagubotPlugins")
|
||||
internal fun Module.singlePlugins(
|
||||
createdAtStart: Boolean = false,
|
||||
definition: Definition<List<Plugin>>
|
||||
) = single(pluginsQualifier, createdAtStart, definition)
|
||||
val Scope.plugins: List<Plugin>
|
||||
get() = get(pluginsQualifier)
|
||||
|
||||
val Koin.plugins: List<Plugin>
|
||||
get() = get(pluginsQualifier)
|
||||
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
package dev.inmo.plagubot
|
||||
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
|
||||
fun interface OnStartContextsConflictResolver {
|
||||
/**
|
||||
* @param old Old state which is currently placed on the [State.context]
|
||||
* @param new New state pretend to replace [old] one
|
||||
* @return Should return:
|
||||
*
|
||||
* * Null in case when current realization unable to resolve conflict
|
||||
* * False when current realization knows that [new] [State] must **not** replace [old] one
|
||||
* * True when current realization knows that [new] [State] must replace [old] one
|
||||
*/
|
||||
suspend operator fun invoke(old: State, new: State): Boolean?
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package dev.inmo.plagubot
|
||||
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
|
||||
fun interface OnUpdateContextsConflictResolver {
|
||||
/**
|
||||
* This method will be called when [sourceStateWithOldContext] [State.context] and [newStateWithNewContext] are not equal and currently there is
|
||||
* launched [currentStateOnNewContext] state on the chain with [State.context] from [currentStateOnNewContext]
|
||||
*
|
||||
* @param sourceStateWithOldContext Old state where from [newStateWithNewContext] came
|
||||
* @param newStateWithNewContext New state with changing [State.context] (it is different with [sourceStateWithOldContext] [State.context])
|
||||
* @param currentStateOnNewContext State which is currently running on [newStateWithNewContext] [State.context]
|
||||
* @return Should return:
|
||||
*
|
||||
* * Null in case when current realization unable to resolve conflict
|
||||
* * False when [currentStateOnNewContext] **should not** be stopped in favor to [newStateWithNewContext]
|
||||
* * True when [currentStateOnNewContext] **should** be stopped in favor to [newStateWithNewContext]
|
||||
*/
|
||||
suspend operator fun invoke(sourceStateWithOldContext: State, newStateWithNewContext: State, currentStateOnNewContext: State): Boolean?
|
||||
}
|
||||
@@ -2,69 +2,160 @@ package dev.inmo.plagubot
|
||||
|
||||
import dev.inmo.kslog.common.*
|
||||
import dev.inmo.micro_utils.common.Warning
|
||||
import dev.inmo.micro_utils.coroutines.runCatchingLogging
|
||||
import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
import dev.inmo.micro_utils.fsm.common.StatesManager
|
||||
import dev.inmo.micro_utils.fsm.common.managers.*
|
||||
import dev.inmo.micro_utils.koin.getAllDistinct
|
||||
import dev.inmo.micro_utils.startup.launcher.StartLauncherPlugin
|
||||
import dev.inmo.plagubot.config.*
|
||||
import dev.inmo.tgbotapi.bot.TelegramBot
|
||||
import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutorBuilder
|
||||
import dev.inmo.tgbotapi.bot.ktor.telegramBot
|
||||
import dev.inmo.tgbotapi.extensions.api.webhook.deleteWebhook
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.*
|
||||
import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingOfUpdatesByLongPolling
|
||||
import kotlinx.coroutines.*
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.Transient
|
||||
import kotlinx.serialization.json.JsonObject
|
||||
import org.jetbrains.exposed.sql.Database
|
||||
import kotlinx.serialization.json.*
|
||||
import org.koin.core.Koin
|
||||
import org.koin.core.KoinApplication
|
||||
import org.koin.core.context.GlobalContext
|
||||
import org.koin.core.module.Module
|
||||
import org.koin.core.scope.Scope
|
||||
import org.koin.dsl.module
|
||||
|
||||
val Scope.plagubot: PlaguBot
|
||||
get() = get()
|
||||
|
||||
val Koin.plagubot: PlaguBot
|
||||
get() = get()
|
||||
import java.io.File
|
||||
|
||||
/**
|
||||
* Central plugin-object that:
|
||||
* - Provides DI bindings for the bot, configuration and optional database
|
||||
* - Creates and configures Telegram bot client
|
||||
* - Builds BehaviourBuilder with FSM support and launches long polling
|
||||
* - Loads and initializes other plugins
|
||||
* - Exposes several start(...) overloads to bootstrap the application from JSON or strongly-typed configs
|
||||
*
|
||||
* Typical usage:
|
||||
* - Prepare JSON or typed configs
|
||||
* - Call one of start(...) methods
|
||||
* - The returned Job represents the bot lifecycle; awaiting it keeps the app running
|
||||
*/
|
||||
@OptIn(Warning::class)
|
||||
@Serializable
|
||||
data class PlaguBot(
|
||||
private val json: JsonObject,
|
||||
private val config: Config
|
||||
) : Plugin {
|
||||
@Transient
|
||||
private val bot = telegramBot(config.botToken)
|
||||
object PlaguBot : Plugin {
|
||||
/**
|
||||
* JSON format used for encoding/decoding PlaguBot-related configuration.
|
||||
*
|
||||
* Note:
|
||||
* - This property is not reactive. Set it only before starting the bot to affect configuration parsing/serialization.
|
||||
*/
|
||||
var defaultJsonFormat = dev.inmo.plagubot.config.defaultJsonFormat
|
||||
@Warning("This is not reactive set. Use this only BEFORE starting of bot") set
|
||||
|
||||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||
single { config }
|
||||
single { config.plugins }
|
||||
single { config.databaseConfig }
|
||||
single { config.databaseConfig.database }
|
||||
single { defaultJsonFormat }
|
||||
single { this@PlaguBot }
|
||||
single { bot }
|
||||
|
||||
includes(
|
||||
config.plugins.mapNotNull {
|
||||
runCatching {
|
||||
module {
|
||||
with(it) {
|
||||
setupDI(database, params)
|
||||
}
|
||||
}
|
||||
}.onFailure { e ->
|
||||
logger.w("Unable to load DI part of $it", e)
|
||||
}.getOrNull()
|
||||
/**
|
||||
* Allows other plugins to customize the [KtorRequestsExecutorBuilder] used by the bot client.
|
||||
*
|
||||
* For each plugin in DI (excluding this object), calls its own setupBotClient, passing the same [scope] and [params].
|
||||
*
|
||||
* @param scope Koin scope where the bot is being created
|
||||
* @param params Raw JSON params of the bot part of the configuration
|
||||
*/
|
||||
override fun KtorRequestsExecutorBuilder.setupBotClient(scope: Scope, params: JsonObject) {
|
||||
scope.plugins.filter { it !== this@PlaguBot }.forEach {
|
||||
with(it) {
|
||||
setupBotClient(scope, params)
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets up application DI for the bot.
|
||||
*
|
||||
* Registers:
|
||||
* - Decoded typed [Config] from provided [config] JSON
|
||||
* - Raw [JsonObject] config itself for low-level access
|
||||
* - Database-related config and database instance (if present in [Config])
|
||||
* - This [PlaguBot] plugin instance
|
||||
* - All plugins declared in launcher config as DI singletons
|
||||
* - Configured [TelegramBot] built via [telegramBot] and customized by all plugins' setupBotClient
|
||||
*
|
||||
* @param config Raw PlaguBot JSON configuration
|
||||
*/
|
||||
override fun Module.setupDI(config: JsonObject) {
|
||||
single { get<Json>().decodeFromJsonElement(Config.serializer(), config) }
|
||||
single { config }
|
||||
single { get<Config>().databaseConfig }
|
||||
single { get<Config>().databaseConfig.database }
|
||||
single { this@PlaguBot }
|
||||
singlePlugins { get<dev.inmo.micro_utils.startup.launcher.Config>().plugins.filterIsInstance<Plugin>() }
|
||||
single {
|
||||
val config = get<Config>()
|
||||
telegramBot(
|
||||
token = config.botToken,
|
||||
testServer = config.testServer,
|
||||
apiUrl = config.botApiServer
|
||||
) {
|
||||
setupBotClient(this@single, get<JsonObject>())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds and starts the bot behaviour and FSM.
|
||||
*
|
||||
* Flow:
|
||||
* - Collects [OnStartContextsConflictResolver], [OnUpdateContextsConflictResolver], [StatesManager] and [DefaultStatesManagerRepo] from DI (or creates defaults)
|
||||
* - Builds BehaviourBuilder with FSM, logs errors, and calls [setupBotPlugin] for all plugins
|
||||
* - Ensures webhook is removed before long polling with [deleteWebhook]
|
||||
* - Starts long polling via [startGettingOfUpdatesByLongPolling] using the created behaviour context as scope and filter
|
||||
* - Awaits the long-polling [Job] to keep the app alive
|
||||
*/
|
||||
override suspend fun startPlugin(koin: Koin) {
|
||||
super.startPlugin(koin)
|
||||
val scope = koin.get<CoroutineScope>()
|
||||
|
||||
lateinit var behaviourContext: BehaviourContext
|
||||
val onStartContextsConflictResolver by lazy { koin.getAllDistinct<OnStartContextsConflictResolver>() }
|
||||
val onUpdateContextsConflictResolver by lazy { koin.getAllDistinct<OnUpdateContextsConflictResolver>() }
|
||||
val bot = koin.get<TelegramBot>()
|
||||
bot.buildBehaviourWithFSM(
|
||||
scope = scope,
|
||||
defaultExceptionsHandler = {
|
||||
logger.e("Something went wrong", it)
|
||||
},
|
||||
statesManager = koin.getOrNull<StatesManager<State>>() ?: DefaultStatesManager(
|
||||
koin.getOrNull<DefaultStatesManagerRepo<State>>() ?: InMemoryDefaultStatesManagerRepo<State>(),
|
||||
onStartContextsConflictResolver = { old, new -> onStartContextsConflictResolver.firstNotNullOfOrNull { it(old, new) } ?: false },
|
||||
onUpdateContextsConflictResolver = { old, new, currentNew -> onUpdateContextsConflictResolver.firstNotNullOfOrNull { it(old, new, currentNew) } ?: false }
|
||||
),
|
||||
onStateHandlingErrorHandler = koin.getOrNull<StateHandlingErrorHandler<State>>() ?: { state, e ->
|
||||
logger.eS(e) { "Unable to handle state $state" }
|
||||
null
|
||||
},
|
||||
subcontextInitialAction = CombinedSubcontextInitialAction(koin.getAllDistinct()).subcontextInitialAction
|
||||
) {
|
||||
logger.i("Start setup of bot part")
|
||||
behaviourContext = this
|
||||
setupBotPlugin(koin)
|
||||
deleteWebhook()
|
||||
}.start()
|
||||
logger.i("Behaviour builder has been setup")
|
||||
|
||||
bot.startGettingOfUpdatesByLongPolling(scope = behaviourContext, updatesFilter = behaviourContext).also {
|
||||
logger.i("Long polling has been started")
|
||||
}.join()
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes and loads all other [Plugin]s from DI for the bot runtime.
|
||||
*
|
||||
* Each plugin is:
|
||||
* - Logged as loading started
|
||||
* - Executed via plugin.setupBotPlugin(...) inside a safe block
|
||||
* - Logged on failure (as warning) or success (as info)
|
||||
*
|
||||
* [PlaguBot] itself is excluded from this list.
|
||||
*/
|
||||
override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
|
||||
config.plugins.forEach { plugin ->
|
||||
runCatchingSafely {
|
||||
koin.plugins.filter { it !== this@PlaguBot }.forEach { plugin ->
|
||||
runCatchingLogging(logger = logger) {
|
||||
logger.i("Start loading of $plugin")
|
||||
with(plugin) {
|
||||
setupBotPlugin(koin)
|
||||
@@ -78,44 +169,151 @@ data class PlaguBot(
|
||||
}
|
||||
|
||||
/**
|
||||
* This method will create an [Job] which will be the main [Job] of ran instance
|
||||
* Starts the application using raw JSON and a launcher config, optionally overriding PlaguBot config.
|
||||
*
|
||||
* Behavior:
|
||||
* - If [PlaguBot] is not present in [config.plugins], injects it into the plugins list
|
||||
* - Optionally merges [plaguBotConfig] into [json]
|
||||
* - Delegates to [StartLauncherPlugin.start] and returns the lifecycle [Job]
|
||||
*
|
||||
* @param json Raw JSON that may contain both launcher and PlaguBot configs
|
||||
* @param config Parsed launcher configuration
|
||||
* @param plaguBotConfig Optional typed PlaguBot config to merge/add
|
||||
* @return Job representing the bot lifecycle
|
||||
*/
|
||||
suspend fun start(
|
||||
scope: CoroutineScope = CoroutineScope(Dispatchers.IO)
|
||||
json: JsonObject,
|
||||
config: dev.inmo.micro_utils.startup.launcher.Config,
|
||||
plaguBotConfig: Config? = null
|
||||
): Job {
|
||||
logger.i("Start initialization")
|
||||
val koinApp = KoinApplication.init()
|
||||
koinApp.modules(
|
||||
module {
|
||||
setupDI(config.databaseConfig.database, json)
|
||||
}
|
||||
)
|
||||
logger.i("Modules loaded")
|
||||
GlobalContext.startKoin(koinApp)
|
||||
logger.i("Koin started")
|
||||
lateinit var behaviourContext: BehaviourContext
|
||||
bot.buildBehaviourWithFSM(
|
||||
scope = scope,
|
||||
defaultExceptionsHandler = {
|
||||
logger.e("Something went wrong", it)
|
||||
},
|
||||
statesManager = koinApp.koin.getOrNull<StatesManager<State>>() ?: DefaultStatesManager(
|
||||
koinApp.koin.getOrNull<DefaultStatesManagerRepo<State>>() ?: InMemoryDefaultStatesManagerRepo<State>(),
|
||||
onStartContextsConflictResolver = { _, _ -> false }
|
||||
),
|
||||
onStateHandlingErrorHandler = koinApp.koin.getOrNull<StateHandlingErrorHandler<State>>() ?: { state, e ->
|
||||
logger.eS(e) { "Unable to handle state $state" }
|
||||
null
|
||||
}
|
||||
) {
|
||||
logger.i("Start setup of bot part")
|
||||
behaviourContext = this
|
||||
setupBotPlugin(koinApp.koin)
|
||||
deleteWebhook()
|
||||
}.start()
|
||||
logger.i("Behaviour builder has been setup")
|
||||
return bot.startGettingOfUpdatesByLongPolling(scope = behaviourContext, updatesFilter = behaviourContext).also {
|
||||
logger.i("Long polling has been started")
|
||||
KSLog.i("Config has been read")
|
||||
|
||||
// Adding of PlaguBot when it absent in config
|
||||
val (resultJson, resultConfig) = if (PlaguBot in config.plugins) {
|
||||
KSLog.i("Initial config contains PlaguBot, pass config as is to StartLauncherPlugin")
|
||||
json to config
|
||||
} else {
|
||||
KSLog.i("Start fixing of PlaguBot absence. If PlaguBot has been skipped by some reason, use dev.inmo.micro_utils.startup.launcher.main as startup point or StartLauncherPlugin directly")
|
||||
|
||||
val encodedPlaguBotConfig = plaguBotConfig ?.let {
|
||||
defaultJsonFormat.encodeToJsonElement(Config.serializer(), it).jsonObject
|
||||
} ?: JsonObject(emptyMap())
|
||||
|
||||
val resultJson = JsonObject(
|
||||
encodedPlaguBotConfig + JsonObject(
|
||||
json + Pair(
|
||||
"plugins",
|
||||
JsonArray(
|
||||
(json["plugins"] as? JsonArray ?: JsonArray(emptyList())) + JsonPrimitive(PlaguBot::class.qualifiedName!!)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
val resultConfig = defaultJsonFormat.decodeFromJsonElement(dev.inmo.micro_utils.startup.launcher.Config.serializer(), resultJson)
|
||||
resultJson to resultConfig
|
||||
}
|
||||
|
||||
KSLog.i("Config initialization done. Passing config to StartLauncherPlugin")
|
||||
return StartLauncherPlugin.start(
|
||||
resultConfig,
|
||||
resultJson
|
||||
).koin.get<CoroutineScope>().coroutineContext.job
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the application using typed launcher config and typed PlaguBot config.
|
||||
*
|
||||
* Behavior:
|
||||
* - Merges both configs into a single JSON
|
||||
* - Ensures [PlaguBot] is present in plugins list
|
||||
* - Delegates to [start] that accepts JSON and launcher config
|
||||
*
|
||||
* @param pluginsConfig Launcher configuration
|
||||
* @param plaguBotConfig Typed PlaguBot configuration
|
||||
* @return Job representing the bot lifecycle
|
||||
*/
|
||||
suspend fun start(
|
||||
pluginsConfig: dev.inmo.micro_utils.startup.launcher.Config,
|
||||
plaguBotConfig: Config
|
||||
): Job {
|
||||
val json = JsonObject(
|
||||
defaultJsonFormat.encodeToJsonElement(
|
||||
dev.inmo.micro_utils.startup.launcher.Config.serializer(),
|
||||
pluginsConfig
|
||||
).jsonObject + defaultJsonFormat.encodeToJsonElement(
|
||||
Config.serializer(),
|
||||
plaguBotConfig
|
||||
).jsonObject
|
||||
)
|
||||
val pluginsConfig = if (pluginsConfig.plugins.contains(PlaguBot)) {
|
||||
pluginsConfig
|
||||
} else {
|
||||
pluginsConfig.copy(
|
||||
plugins = pluginsConfig.plugins + PlaguBot,
|
||||
)
|
||||
}
|
||||
|
||||
return start(json, pluginsConfig)
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the application using raw JSON and a typed PlaguBot config.
|
||||
*
|
||||
* Behavior:
|
||||
* - Encodes [plaguBotConfig] and merges it into [initialJson]
|
||||
* - Delegates to [start] that takes a JSON only
|
||||
*
|
||||
* @param initialJson Initial JSON to start from
|
||||
* @param plaguBotConfig Typed PlaguBot configuration that will be encoded and merged
|
||||
* @return Job representing the bot lifecycle
|
||||
*/
|
||||
suspend fun start(
|
||||
initialJson: JsonObject,
|
||||
plaguBotConfig: Config
|
||||
): Job {
|
||||
val encodedPlaguBotConfig = defaultJsonFormat.encodeToJsonElement(Config.serializer(), plaguBotConfig).jsonObject
|
||||
|
||||
return start(
|
||||
JsonObject(initialJson + encodedPlaguBotConfig)
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the plugins system using [StartLauncherPlugin.start].
|
||||
*
|
||||
* Parsing notes:
|
||||
* - [initialJson] is decoded into launcher config
|
||||
* - If [PlaguBot] is missing from the plugins list, it will be added automatically
|
||||
*
|
||||
* By using this method it is guaranteed that [PlaguBot] will be included into the set of plugins to launch.
|
||||
*
|
||||
* @param initialJson Raw JSON that includes launcher configuration (and optionally PlaguBot config)
|
||||
* @return Job representing the bot lifecycle
|
||||
*/
|
||||
suspend fun start(initialJson: JsonObject): Job {
|
||||
val initialConfig = defaultJsonFormat.decodeFromJsonElement(dev.inmo.micro_utils.startup.launcher.Config.serializer(), initialJson)
|
||||
|
||||
return start(initialJson, initialConfig)
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the application from CLI arguments.
|
||||
*
|
||||
* Expects:
|
||||
* - Exactly one argument: path to a file with JSON configuration
|
||||
*
|
||||
* The file is read, parsed as [JsonObject], and passed to [start(JsonObject)].
|
||||
*
|
||||
* @param args Command-line arguments; first element is a path to the config file
|
||||
* @return Job representing the bot lifecycle
|
||||
*/
|
||||
suspend fun start(args: Array<String>): Job {
|
||||
KSLog.default = KSLog("PlaguBot")
|
||||
val (configPath) = args
|
||||
val file = File(configPath)
|
||||
KSLog.i("Start read config from ${file.absolutePath}")
|
||||
|
||||
val initialJson = defaultJsonFormat.parseToJsonElement(file.readText()).jsonObject
|
||||
return start(initialJson)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,15 +1,18 @@
|
||||
package dev.inmo.plagubot.config
|
||||
|
||||
import dev.inmo.micro_utils.common.Warning
|
||||
import dev.inmo.micro_utils.startup.plugin.StartPlugin
|
||||
import dev.inmo.plagubot.Plugin
|
||||
import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
|
||||
import kotlinx.serialization.SerialName
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Warning("This API is internal and can be changed without notifications of mentions of changes")
|
||||
@Warning("This API is internal and can be changed without notifications or mentions of changes")
|
||||
@Serializable
|
||||
data class Config(
|
||||
val botToken: String,
|
||||
val plugins: List<Plugin>,
|
||||
@SerialName("database")
|
||||
val databaseConfig: DatabaseConfig = DatabaseConfig(),
|
||||
val botApiServer: String = telegramBotAPIDefaultUrl,
|
||||
val testServer: Boolean = false
|
||||
)
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
package dev.inmo.plagubot.config
|
||||
|
||||
import dev.inmo.micro_utils.common.Warning
|
||||
import kotlinx.serialization.json.Json
|
||||
|
||||
@Warning("This format will not be configured throw StartPlugin system. Use it will caution, it has no any configured things")
|
||||
val defaultJsonFormat = Json {
|
||||
ignoreUnknownKeys = true
|
||||
}
|
||||
|
||||
21
build.gradle
21
build.gradle
@@ -8,6 +8,25 @@ buildscript {
|
||||
classpath libs.buildscript.kt.gradle
|
||||
classpath libs.buildscript.kt.serialization
|
||||
classpath libs.buildscript.gh.release
|
||||
classpath libs.buildscript.ksp
|
||||
}
|
||||
}
|
||||
|
||||
plugins {
|
||||
alias(libs.plugins.nmcp.aggregation)
|
||||
}
|
||||
|
||||
|
||||
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||
nmcpAggregation {
|
||||
centralPortal {
|
||||
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
||||
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
||||
validationTimeout = Duration.ofHours(4)
|
||||
publishingType = System.getenv('PUBLISHING_TYPE') != "" ? System.getenv('PUBLISHING_TYPE') : "USER_MANAGED"
|
||||
}
|
||||
|
||||
publishAllProjectsProbablyBreakingProjectIsolation()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +35,7 @@ allprojects {
|
||||
mavenCentral()
|
||||
mavenLocal()
|
||||
maven { url 'https://jitpack.io' }
|
||||
maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
|
||||
maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,22 +11,29 @@ private String getCurrentVersionChangelog() {
|
||||
return changelogDataOS.toString().trim()
|
||||
}
|
||||
|
||||
if (new File(projectDir, "secret.gradle").exists()) {
|
||||
apply from: './secret.gradle'
|
||||
def githubTokenVariableName = "GITHUB_RELEASE_TOKEN"
|
||||
def githubTokenVariableFromEnv = System.getenv(githubTokenVariableName)
|
||||
|
||||
def secretFile = new File(projectDir, "secret.gradle")
|
||||
if (secretFile.exists() || project.hasProperty(githubTokenVariableName) || (githubTokenVariableFromEnv != "" && githubTokenVariableFromEnv != null)) {
|
||||
if (secretFile.exists()) {
|
||||
apply from: './secret.gradle'
|
||||
}
|
||||
apply plugin: "com.github.breadmoirai.github-release"
|
||||
def githubReleaseToken = project.hasProperty(githubTokenVariableName) ? project.property(githubTokenVariableName).toString() : githubTokenVariableFromEnv
|
||||
|
||||
githubRelease {
|
||||
token "${project.property('GITHUB_RELEASE_TOKEN')}"
|
||||
token githubReleaseToken
|
||||
|
||||
releaseAssets.from('bot/build/distributions')
|
||||
|
||||
owner "InsanusMokrassar"
|
||||
repo "PlaguBot"
|
||||
owner = "InsanusMokrassar"
|
||||
repo = "PlaguBot"
|
||||
|
||||
tagName "v${project.version}"
|
||||
releaseName "${project.version}"
|
||||
targetCommitish "${project.version}"
|
||||
tagName = "v${project.version}"
|
||||
releaseName = "${project.version}"
|
||||
targetCommitish = "${project.version}"
|
||||
|
||||
body getCurrentVersionChangelog()
|
||||
body = getCurrentVersionChangelog()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,4 +5,4 @@ kotlin.js.generate.externals=true
|
||||
kotlin.incremental=true
|
||||
|
||||
group=dev.inmo
|
||||
version=5.1.0
|
||||
version=10.7.1
|
||||
|
||||
@@ -1,26 +1,24 @@
|
||||
[versions]
|
||||
|
||||
kt = "1.8.20"
|
||||
kt-serialization = "1.5.0"
|
||||
kt-coroutines = "1.6.4"
|
||||
kt = "2.2.0"
|
||||
kt-serialization = "1.9.0"
|
||||
kt-coroutines = "1.10.2"
|
||||
|
||||
microutils = "0.17.8"
|
||||
tgbotapi = "7.1.0"
|
||||
kslog = "1.1.1"
|
||||
microutils = "0.26.2"
|
||||
tgbotapi = "27.1.1"
|
||||
|
||||
jb-exposed = "0.41.1"
|
||||
jb-dokka = "1.8.10"
|
||||
ksp = "2.2.0-2.0.2"
|
||||
|
||||
sqlite = "3.41.2.1"
|
||||
jb-exposed = "0.61.0"
|
||||
jb-dokka = "2.0.0"
|
||||
|
||||
klock = "3.4.0"
|
||||
uuid = "0.7.0"
|
||||
sqlite = "3.50.1.0"
|
||||
|
||||
ktor = "2.3.0"
|
||||
gh-release = "2.5.2"
|
||||
|
||||
gh-release = "2.4.1"
|
||||
koin = "4.1.0"
|
||||
|
||||
koin = "3.4.0"
|
||||
nmcp = "1.0.2"
|
||||
|
||||
[libraries]
|
||||
|
||||
@@ -32,7 +30,10 @@ kt-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json"
|
||||
tgbotapi = { module = "dev.inmo:tgbotapi", version.ref = "tgbotapi" }
|
||||
tgbotapi-behaviourBuilder-fsm = { module = "dev.inmo:tgbotapi.behaviour_builder.fsm", version.ref = "tgbotapi" }
|
||||
microutils-repos-exposed = { module = "dev.inmo:micro_utils.repos.exposed", version.ref = "microutils" }
|
||||
kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
|
||||
microutils-koin = { module = "dev.inmo:micro_utils.koin", version.ref = "microutils" }
|
||||
microutils-koin-generator = { module = "dev.inmo:micro_utils.koin.generator", version.ref = "microutils" }
|
||||
microutils-startup-launcher = { module = "dev.inmo:micro_utils.startup.launcher", version.ref = "microutils" }
|
||||
microutils-startup-plugin = { module = "dev.inmo:micro_utils.startup.plugin", version.ref = "microutils" }
|
||||
|
||||
koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }
|
||||
|
||||
@@ -48,3 +49,8 @@ buildscript-kt-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin",
|
||||
buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kt" }
|
||||
buildscript-jb-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "jb-dokka" }
|
||||
buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" }
|
||||
buildscript-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
|
||||
|
||||
[plugins]
|
||||
|
||||
nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -14,11 +14,12 @@ dependencies {
|
||||
|
||||
api libs.tgbotapi
|
||||
api libs.microutils.repos.exposed
|
||||
api libs.microutils.startup.plugin
|
||||
|
||||
api libs.koin
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
|
||||
apply plugin: 'maven-publish'
|
||||
|
||||
|
||||
task javadocJar(type: Jar) {
|
||||
from javadoc
|
||||
classifier = 'javadoc'
|
||||
archiveClassifier = 'javadoc'
|
||||
}
|
||||
task sourcesJar(type: Jar) {
|
||||
from sourceSets.main.allSource
|
||||
classifier = 'sources'
|
||||
archiveClassifier = 'sources'
|
||||
}
|
||||
|
||||
publishing {
|
||||
@@ -48,34 +50,28 @@ publishing {
|
||||
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
|
||||
maven {
|
||||
name = "Gitea"
|
||||
url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
|
||||
|
||||
credentials(HttpHeaderCredentials) {
|
||||
name = "Authorization"
|
||||
value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
|
||||
}
|
||||
|
||||
authentication {
|
||||
header(HttpHeaderAuthentication)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "InmoNexus"
|
||||
url = uri("https://nexus.inmo.dev/repository/maven-releases/")
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
|
||||
password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
|
||||
}
|
||||
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
||||
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
||||
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -84,16 +80,39 @@ publishing {
|
||||
|
||||
if (project.hasProperty("signing.gnupg.keyName")) {
|
||||
apply plugin: 'signing'
|
||||
|
||||
|
||||
signing {
|
||||
useGpgCmd()
|
||||
|
||||
|
||||
sign publishing.publications
|
||||
}
|
||||
|
||||
|
||||
task signAll {
|
||||
tasks.withType(Sign).forEach {
|
||||
dependsOn(it)
|
||||
}
|
||||
}
|
||||
|
||||
// Workaround to make android sign operations depend on signing tasks
|
||||
project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
|
||||
def signingTasks = project.getTasks().withType(Sign.class)
|
||||
mustRunAfter(signingTasks)
|
||||
}
|
||||
// Workaround to make test tasks use sign
|
||||
project.getTasks().withType(Sign.class).configureEach { signTask ->
|
||||
def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
|
||||
def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
|
||||
// These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
|
||||
|
||||
// Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
|
||||
def debugTestTask = tasks.findByName("linkDebugTest$pubName")
|
||||
if (debugTestTask != null) {
|
||||
signTask.mustRunAfter(debugTestTask)
|
||||
}
|
||||
// Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
|
||||
def testTask = tasks.findByName("compileTestKotlin$pubName")
|
||||
if (testTask != null) {
|
||||
signTask.mustRunAfter(testTask)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Plugin","description":"Base dependency for whole PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"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"}},"type":"JVM"}
|
||||
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Plugin","description":"Base dependency for whole PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
|
||||
@@ -2,22 +2,18 @@ package dev.inmo.plagubot
|
||||
|
||||
import dev.inmo.kslog.common.*
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
import dev.inmo.plagubot.HelloPlugin.setupBotPlugin
|
||||
import dev.inmo.tgbotapi.extensions.api.bot.getMe
|
||||
import dev.inmo.tgbotapi.extensions.api.send.reply
|
||||
import dev.inmo.tgbotapi.extensions.api.send.sendMessage
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.*
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitText
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitTextMessage
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onUnhandledCommand
|
||||
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.serialization.SerialName
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.json.Json
|
||||
import kotlinx.serialization.json.JsonObject
|
||||
import org.jetbrains.exposed.sql.Database
|
||||
import org.koin.core.Koin
|
||||
import org.koin.core.module.Module
|
||||
|
||||
@@ -29,12 +25,8 @@ object HelloPlugin : Plugin {
|
||||
val print: String
|
||||
)
|
||||
|
||||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||
single {
|
||||
get<Json>().decodeFromJsonElement(HelloPluginConfig.serializer(), params["helloPlugin"] ?: return@single null)
|
||||
|
||||
|
||||
}
|
||||
override fun Module.setupDI(config: JsonObject) {
|
||||
registerConfig<HelloPluginConfig>("helloPlugin") { null }
|
||||
}
|
||||
|
||||
private sealed interface InternalFSMState : State {
|
||||
@@ -43,8 +35,13 @@ object HelloPlugin : Plugin {
|
||||
data class SaidHelloOnce(override val context: IdChatIdentifier) : InternalFSMState
|
||||
}
|
||||
|
||||
override suspend fun startPlugin(koin: Koin) {
|
||||
super.startPlugin(koin)
|
||||
logger.i { "This logic called BEFORE the bot will be started and setup" }
|
||||
}
|
||||
|
||||
override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
|
||||
val toPrint = koin.getOrNull<HelloPluginConfig>() ?.print ?: "Hello :)"
|
||||
val toPrint = koin.configOrNull<HelloPluginConfig>() ?.print ?: "Hello :)"
|
||||
logger.d { toPrint }
|
||||
logger.dS { getMe().toString() }
|
||||
onCommand("hello_world") {
|
||||
@@ -0,0 +1,11 @@
|
||||
package dev.inmo.plagubot
|
||||
|
||||
import org.jetbrains.exposed.sql.Database
|
||||
import org.koin.core.Koin
|
||||
import org.koin.core.scope.Scope
|
||||
|
||||
val Scope.database: Database
|
||||
get() = get()
|
||||
|
||||
val Koin.database: Database
|
||||
get() = get()
|
||||
55
plugin/src/main/kotlin/dev/inmo/plagubot/KoinExtensions.kt
Normal file
55
plugin/src/main/kotlin/dev/inmo/plagubot/KoinExtensions.kt
Normal file
@@ -0,0 +1,55 @@
|
||||
package dev.inmo.plagubot
|
||||
|
||||
import kotlinx.serialization.InternalSerializationApi
|
||||
import kotlinx.serialization.KSerializer
|
||||
import kotlinx.serialization.json.Json
|
||||
import kotlinx.serialization.json.JsonObject
|
||||
import kotlinx.serialization.serializer
|
||||
import org.jetbrains.exposed.sql.Database
|
||||
import org.koin.core.Koin
|
||||
import org.koin.core.module.Module
|
||||
import org.koin.core.scope.Scope
|
||||
import kotlin.reflect.KClass
|
||||
|
||||
/**
|
||||
* Using [single] to register `T` with serializer [configSerializer]
|
||||
*
|
||||
* @param default Will be used if [field] is absent as an alternative way of config allocation. If null passed, error
|
||||
* will be thrown
|
||||
*/
|
||||
inline fun <reified T> Module.registerConfig(configSerializer: KSerializer<T>, field: String?, noinline default: (Scope.(JsonObject) -> T?)? = null) {
|
||||
single {
|
||||
val fieldValue = get<JsonObject>().let {
|
||||
if (field == null) {
|
||||
it
|
||||
} else {
|
||||
it[field] ?: default ?.let { _ ->
|
||||
return@single default(it)
|
||||
} ?: error("Unable to take field $field from config")
|
||||
}
|
||||
}
|
||||
get<Json>().decodeFromJsonElement(configSerializer, fieldValue)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Using [single] to register config with getting of [serializer] from [kClass]
|
||||
*
|
||||
* @param default Will be used if [field] is absent as an alternative way of config allocation. If null passed, error
|
||||
* will be thrown
|
||||
*/
|
||||
@OptIn(InternalSerializationApi::class)
|
||||
inline fun <reified T : Any> Module.registerConfig(kClass: KClass<T>, field: String?, noinline default: (Scope.(JsonObject) -> T?)? = null) = registerConfig(kClass.serializer(), field, default)
|
||||
|
||||
/**
|
||||
* Using [single] to register config with getting of [serializer] from [kClass]
|
||||
*
|
||||
* @param default Will be used if [field] is absent as an alternative way of config allocation. If null passed, error
|
||||
* will be thrown
|
||||
*/
|
||||
inline fun <reified T : Any> Module.registerConfig(field: String?, noinline default: (Scope.(JsonObject) -> T?)? = null) = registerConfig(T::class, field, default)
|
||||
|
||||
inline fun <reified T : Any> Scope.config() = get<T>()
|
||||
inline fun <reified T : Any> Koin.config() = get<T>()
|
||||
inline fun <reified T : Any> Scope.configOrNull() = getOrNull<T>()
|
||||
inline fun <reified T : Any> Koin.configOrNull() = getOrNull<T>()
|
||||
@@ -1,13 +1,14 @@
|
||||
package dev.inmo.plagubot
|
||||
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
import dev.inmo.micro_utils.startup.plugin.StartPlugin
|
||||
import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutorBuilder
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextWithFSM
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.json.JsonObject
|
||||
import org.jetbrains.exposed.sql.Database
|
||||
import org.koin.core.Koin
|
||||
import org.koin.core.module.Module
|
||||
import org.koin.core.scope.Scope
|
||||
|
||||
/**
|
||||
* **ANY REALIZATION OF [Plugin] MUST HAVE CONSTRUCTOR WITH ABSENCE OF INCOMING PARAMETERS**
|
||||
@@ -17,14 +18,17 @@ import org.koin.core.module.Module
|
||||
* too.
|
||||
*/
|
||||
@Serializable(PluginSerializer::class)
|
||||
interface Plugin {
|
||||
interface Plugin : StartPlugin {
|
||||
@Deprecated("Deprecated in favor to setupBotClient with arguments")
|
||||
fun KtorRequestsExecutorBuilder.setupBotClient() {}
|
||||
|
||||
/**
|
||||
* This method will be called when this plugin should configure di module based on the incoming params
|
||||
* Will be called on stage of bot setup
|
||||
*
|
||||
* @param scope The scope of [org.koin.core.module.Module.single] of bot definition
|
||||
* @param params Params (in fact, the whole bot config)
|
||||
*/
|
||||
fun Module.setupDI(
|
||||
database: Database,
|
||||
params: JsonObject
|
||||
) {}
|
||||
fun KtorRequestsExecutorBuilder.setupBotClient(scope: Scope, params: JsonObject) = setupBotClient()
|
||||
|
||||
/**
|
||||
* Override this method in cases when you want to declare common bot behaviour. In case you wish to use FSM, you
|
||||
|
||||
Reference in New Issue
Block a user