mirror of
https://github.com/InsanusMokrassar/PlaguBot.git
synced 2025-09-15 13:29:46 +00:00
fix of #9
This commit is contained in:
@@ -2,11 +2,10 @@ package dev.inmo.plagubot
|
||||
|
||||
import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions
|
||||
import dev.inmo.plagubot.config.*
|
||||
import dev.inmo.plagubot.config.configSerialFormat
|
||||
import dev.inmo.plagubot.config.configJsonFormat
|
||||
import dev.inmo.tgbotapi.bot.Ktor.telegramBot
|
||||
import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviour
|
||||
import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling
|
||||
import dev.inmo.tgbotapi.types.botCommandsLimit
|
||||
import kotlinx.coroutines.*
|
||||
import kotlinx.serialization.InternalSerializationApi
|
||||
@@ -42,7 +41,7 @@ suspend inline fun initPlaguBot(
|
||||
suspend fun main(args: Array<String>) {
|
||||
val (configPath) = args
|
||||
val file = File(configPath)
|
||||
val config = configSerialFormat.decodeFromString(Config.serializer(), file.readText())
|
||||
val config = configJsonFormat.decodeFromString(ConfigSerializer, file.readText())
|
||||
|
||||
val scope = CoroutineScope(Dispatchers.Default)
|
||||
initPlaguBot(config, scope).join()
|
||||
|
@@ -2,9 +2,13 @@ package dev.inmo.plagubot.config
|
||||
|
||||
import com.github.matfax.klassindex.KlassIndex
|
||||
import dev.inmo.plagubot.Plugin
|
||||
import dev.inmo.sdi.Module
|
||||
import dev.inmo.plagubot.PluginSerializer
|
||||
import dev.inmo.sdi.*
|
||||
import kotlinx.serialization.*
|
||||
import kotlinx.serialization.json.Json
|
||||
import kotlinx.serialization.descriptors.SerialDescriptor
|
||||
import kotlinx.serialization.encoding.Decoder
|
||||
import kotlinx.serialization.encoding.Encoder
|
||||
import kotlinx.serialization.json.*
|
||||
import kotlinx.serialization.modules.*
|
||||
import kotlin.reflect.KClass
|
||||
|
||||
@@ -12,7 +16,7 @@ import kotlin.reflect.KClass
|
||||
internal inline fun <T : Plugin> KClass<T>.includeIn(builder: PolymorphicModuleBuilder<Plugin>) = builder.subclass(this, serializer())
|
||||
|
||||
@InternalSerializationApi
|
||||
internal val configSerialFormat: StringFormat
|
||||
internal val configJsonFormat: Json
|
||||
get() = Json {
|
||||
ignoreUnknownKeys = true
|
||||
serializersModule = SerializersModule {
|
||||
@@ -37,8 +41,126 @@ internal val configSerialFormat: StringFormat
|
||||
|
||||
@Serializable
|
||||
data class Config(
|
||||
val plugins: List<Plugin>,
|
||||
val plugins: List<@Contextual Plugin>,
|
||||
val database: DatabaseConfig = DatabaseConfig(),
|
||||
val botToken: String,
|
||||
@Contextual
|
||||
val params: Module? = null
|
||||
)
|
||||
|
||||
@Serializer(Plugin::class)
|
||||
private class InternalPluginSerializer(
|
||||
private val params: Module
|
||||
) : KSerializer<Plugin> {
|
||||
override val descriptor: SerialDescriptor = PluginSerializer.descriptor
|
||||
|
||||
@InternalSerializationApi
|
||||
override fun deserialize(decoder: Decoder): Plugin {
|
||||
val asJson = JsonElement.serializer().deserialize(decoder)
|
||||
|
||||
return if (asJson is JsonPrimitive) {
|
||||
params[asJson.jsonPrimitive.content] as Plugin
|
||||
} else {
|
||||
val jsonFormat = ((decoder as? JsonDecoder)?.json ?: configJsonFormat)
|
||||
jsonFormat.decodeFromJsonElement(PluginSerializer, asJson)
|
||||
}
|
||||
}
|
||||
|
||||
@InternalSerializationApi
|
||||
override fun serialize(encoder: Encoder, value: Plugin) {
|
||||
params.keys.firstOrNull { params[it] === value } ?.also {
|
||||
encoder.encodeString(it)
|
||||
} ?: PluginSerializer.serialize(encoder, value)
|
||||
}
|
||||
}
|
||||
|
||||
private val DefaultModuleSerializer = ModuleSerializer(emptyList()) {
|
||||
|
||||
}
|
||||
|
||||
@Serializer(Module::class)
|
||||
private class InternalModuleSerializer(
|
||||
private val original: JsonElement?,
|
||||
private val params: Module
|
||||
) : KSerializer<Module> {
|
||||
override val descriptor: SerialDescriptor = PluginSerializer.descriptor
|
||||
|
||||
@InternalSerializationApi
|
||||
override fun deserialize(decoder: Decoder): Module {
|
||||
val asJson = JsonElement.serializer().deserialize(decoder)
|
||||
|
||||
return if (asJson == original) {
|
||||
params
|
||||
} else {
|
||||
configJsonFormat.decodeFromJsonElement(DefaultModuleSerializer, asJson)
|
||||
}
|
||||
}
|
||||
|
||||
@InternalSerializationApi
|
||||
override fun serialize(encoder: Encoder, value: Module) = DefaultModuleSerializer.serialize(encoder, value)
|
||||
}
|
||||
|
||||
private fun internalPluginSerializerSerializersModule(
|
||||
internalPluginSerializer: InternalPluginSerializer,
|
||||
internalModuleSerializer: InternalModuleSerializer?
|
||||
) = SerializersModule {
|
||||
contextual(internalPluginSerializer)
|
||||
contextual(internalModuleSerializer ?: return@SerializersModule)
|
||||
}
|
||||
|
||||
@Serializer(Config::class)
|
||||
internal object ConfigSerializer : KSerializer<Config> {
|
||||
private val jsonSerializer = JsonObject.serializer()
|
||||
private val moduleSerializer = ModuleSerializer()
|
||||
|
||||
@InternalSerializationApi
|
||||
override fun deserialize(decoder: Decoder): Config {
|
||||
val json = jsonSerializer.deserialize(decoder)
|
||||
val jsonFormat = (decoder as? JsonDecoder) ?.json ?: configJsonFormat
|
||||
val paramsRow = json["params"]
|
||||
|
||||
val resultJsonFormat = if (paramsRow != null && paramsRow != JsonNull) {
|
||||
val params = jsonFormat.decodeFromJsonElement(
|
||||
moduleSerializer,
|
||||
paramsRow
|
||||
)
|
||||
|
||||
val pluginsSerializer = InternalPluginSerializer(params)
|
||||
val moduleSerializer = InternalModuleSerializer(paramsRow, params)
|
||||
Json(jsonFormat) {
|
||||
serializersModule = decoder.serializersModule.overwriteWith(
|
||||
internalPluginSerializerSerializersModule(pluginsSerializer, moduleSerializer)
|
||||
)
|
||||
}
|
||||
} else {
|
||||
jsonFormat
|
||||
}
|
||||
return resultJsonFormat.decodeFromJsonElement(
|
||||
Config.serializer(),
|
||||
json
|
||||
)
|
||||
}
|
||||
|
||||
@InternalSerializationApi
|
||||
override fun serialize(encoder: Encoder, value: Config) {
|
||||
if (value.params != null) {
|
||||
val pluginsSerializer = InternalPluginSerializer(value.params)
|
||||
|
||||
val jsonFormat = Json(configJsonFormat) {
|
||||
serializersModule = encoder.serializersModule.overwriteWith(
|
||||
internalPluginSerializerSerializersModule(pluginsSerializer, null)
|
||||
)
|
||||
}
|
||||
|
||||
jsonSerializer.serialize(
|
||||
encoder,
|
||||
jsonFormat.encodeToJsonElement(
|
||||
Config.serializer(),
|
||||
value
|
||||
) as JsonObject
|
||||
)
|
||||
} else {
|
||||
Config.serializer().serialize(encoder, value)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user