github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-25 13:03:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

StateObserver: Make beforeStateResume and afterStateResume suspend

Browse Source
This commit is contained in:
Him188 2022-05-13 23:05:18 +01:00
parent bdf125e26d
commit 5deee909a9
4 changed files with 21 additions and 19 deletions

12
mirai-core/src/commonMain/kotlin/network/handler/state/CombinedStateObserver.kt
View File

@ -1,10 +1,10 @@
/*
* Copyright 2019-2021 Mamoe Technologies and contributors.
* Copyright 2019-2022 Mamoe Technologies and contributors.
*
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
*
* https://github.com/mamoe/mirai/blob/master/LICENSE
* https://github.com/mamoe/mirai/blob/dev/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.state
@ -39,11 +39,11 @@ internal class CombinedStateObserver(
list.forEach { it.exceptionOnCreatingNewState(networkHandler, previousState, exception) }
}
override fun beforeStateResume(networkHandler: NetworkHandler, state: NetworkHandlerSupport.BaseStateImpl) {
override suspend fun beforeStateResume(networkHandler: NetworkHandler, state: NetworkHandlerSupport.BaseStateImpl) {
list.forEach { it.beforeStateResume(networkHandler, state) }
}
override fun afterStateResume(
override suspend fun afterStateResume(
networkHandler: NetworkHandler,
state: NetworkHandlerSupport.BaseStateImpl,
result: Result<Unit>,

20
mirai-core/src/commonMain/kotlin/network/handler/state/LoggingStateObserver.kt
View File

@ -1,10 +1,10 @@
/*
* Copyright 2019-2021 Mamoe Technologies and contributors.
* Copyright 2019-2022 Mamoe Technologies and contributors.
*
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
*
* https://github.com/mamoe/mirai/blob/master/LICENSE
* https://github.com/mamoe/mirai/blob/dev/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.state
@ -12,8 +12,10 @@ package net.mamoe.mirai.internal.network.handler.state
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.handler.NetworkHandlerSupport
import net.mamoe.mirai.utils.MiraiLogger
import net.mamoe.mirai.utils.coroutineName
import net.mamoe.mirai.utils.debug
import net.mamoe.mirai.utils.systemProp
import kotlin.coroutines.coroutineContext
internal class LoggingStateObserver(
val logger: MiraiLogger,
@ -51,21 +53,21 @@ internal class LoggingStateObserver(
logger.debug { "State changed: ${previousState.correspondingState} -> $exception" }
}
override fun beforeStateResume(networkHandler: NetworkHandler, state: NetworkHandlerSupport.BaseStateImpl) {
logger.debug { "State resuming: ${state.correspondingState}." }
override suspend fun beforeStateResume(networkHandler: NetworkHandler, state: NetworkHandlerSupport.BaseStateImpl) {
logger.debug { "State resuming: [${coroutineContext.coroutineName}] ${state.correspondingState}" }
}
override fun afterStateResume(
override suspend fun afterStateResume(
networkHandler: NetworkHandler,
state: NetworkHandlerSupport.BaseStateImpl,
result: Result<Unit>,
) {
result.fold(
onSuccess = {
logger.debug { "State resumed: ${state.correspondingState}." }
logger.debug { "State resumed: [${coroutineContext.coroutineName}] ${state.correspondingState}." }
},
onFailure = {
logger.debug { "State resumed: ${state.correspondingState} ${result.exceptionOrNull()}" }
logger.debug { "State resumed: [${coroutineContext.coroutineName}] ${state.correspondingState} ${result.exceptionOrNull()}" }
}
)
}

4
mirai-core/src/commonMain/kotlin/network/handler/state/SafeStateObserver.kt
View File

@ -76,7 +76,7 @@ internal class SafeStateObserver(
}
}
override fun beforeStateResume(networkHandler: NetworkHandler, state: NetworkHandlerSupport.BaseStateImpl) {
override suspend fun beforeStateResume(networkHandler: NetworkHandler, state: NetworkHandlerSupport.BaseStateImpl) {
try {
delegate.beforeStateResume(networkHandler, state)
} catch (e: Throwable) {
@ -87,7 +87,7 @@ internal class SafeStateObserver(
}
}
override fun afterStateResume(
override suspend fun afterStateResume(
networkHandler: NetworkHandler,
state: NetworkHandlerSupport.BaseStateImpl,
result: Result<Unit>,

4
mirai-core/src/commonMain/kotlin/network/handler/state/StateObserver.kt
View File

@ -49,14 +49,14 @@ internal interface StateObserver {
) {
}
fun beforeStateResume(
suspend fun beforeStateResume(
networkHandler: NetworkHandler,
state: NetworkHandlerSupport.BaseStateImpl,
) {
}
fun afterStateResume(
suspend fun afterStateResume(
networkHandler: NetworkHandler,
state: NetworkHandlerSupport.BaseStateImpl,
result: Result<Unit>,