From 2995e47f402b9855af753eeaadb82b6175bb92fe Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Wed, 28 Jul 2021 10:55:26 +0800
Subject: [PATCH] Move `SsoProcessorContext` from package `context` to
`components`
---
mirai-core/src/commonMain/kotlin/QQAndroidBot.kt | 2 --
.../commonMain/kotlin/network/components/BotClientHolder.kt | 1 -
.../kotlin/network/components/HeartbeatProcessor.kt | 1 -
.../kotlin/network/components/HeartbeatScheduler.kt | 1 -
.../src/commonMain/kotlin/network/components/SsoProcessor.kt | 1 -
.../network/{context => components}/SsoProcessorContext.kt | 5 ++---
.../network/framework/AbstractRealNetworkHandlerTest.kt | 2 --
.../kotlin/network/framework/TestNetworkHandlerContext.kt | 2 +-
.../kotlin/network/framework/components/TestSsoProcessor.kt | 2 +-
9 files changed, 4 insertions(+), 13 deletions(-)
rename mirai-core/src/commonMain/kotlin/network/{context => components}/SsoProcessorContext.kt (91%)
diff --git a/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt b/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
index 4bbc551cb..ea84c3632 100644
--- a/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
+++ b/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
@@ -25,8 +25,6 @@ import net.mamoe.mirai.internal.network.component.ComponentStorageDelegate
import net.mamoe.mirai.internal.network.component.ConcurrentComponentStorage
import net.mamoe.mirai.internal.network.component.withFallback
import net.mamoe.mirai.internal.network.components.*
-import net.mamoe.mirai.internal.network.context.SsoProcessorContext
-import net.mamoe.mirai.internal.network.context.SsoProcessorContextImpl
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.handler.NetworkHandler.State
import net.mamoe.mirai.internal.network.handler.NetworkHandlerContextImpl
diff --git a/mirai-core/src/commonMain/kotlin/network/components/BotClientHolder.kt b/mirai-core/src/commonMain/kotlin/network/components/BotClientHolder.kt
index 9569f5fca..25ee465f9 100644
--- a/mirai-core/src/commonMain/kotlin/network/components/BotClientHolder.kt
+++ b/mirai-core/src/commonMain/kotlin/network/components/BotClientHolder.kt
@@ -12,7 +12,6 @@ package net.mamoe.mirai.internal.network.components
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.QQAndroidClient
import net.mamoe.mirai.internal.network.component.ComponentKey
-import net.mamoe.mirai.internal.network.context.SsoProcessorContext
import net.mamoe.mirai.utils.MiraiLogger
import net.mamoe.mirai.utils.lateinitMutableProperty
diff --git a/mirai-core/src/commonMain/kotlin/network/components/HeartbeatProcessor.kt b/mirai-core/src/commonMain/kotlin/network/components/HeartbeatProcessor.kt
index e375e47bc..811d8fdac 100644
--- a/mirai-core/src/commonMain/kotlin/network/components/HeartbeatProcessor.kt
+++ b/mirai-core/src/commonMain/kotlin/network/components/HeartbeatProcessor.kt
@@ -10,7 +10,6 @@
package net.mamoe.mirai.internal.network.components
import net.mamoe.mirai.internal.network.component.ComponentKey
-import net.mamoe.mirai.internal.network.context.SsoProcessorContext
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.protocol.packet.login.Heartbeat
import net.mamoe.mirai.internal.network.protocol.packet.login.StatSvc
diff --git a/mirai-core/src/commonMain/kotlin/network/components/HeartbeatScheduler.kt b/mirai-core/src/commonMain/kotlin/network/components/HeartbeatScheduler.kt
index 23321590f..ba2ea8584 100644
--- a/mirai-core/src/commonMain/kotlin/network/components/HeartbeatScheduler.kt
+++ b/mirai-core/src/commonMain/kotlin/network/components/HeartbeatScheduler.kt
@@ -12,7 +12,6 @@ package net.mamoe.mirai.internal.network.components
import kotlinx.coroutines.*
import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.network.component.ComponentStorage
-import net.mamoe.mirai.internal.network.context.SsoProcessorContext
import net.mamoe.mirai.internal.network.handler.NetworkHandlerSupport
import net.mamoe.mirai.internal.network.handler.selector.PacketTimeoutException
import net.mamoe.mirai.utils.BotConfiguration.HeartbeatStrategy.*
diff --git a/mirai-core/src/commonMain/kotlin/network/components/SsoProcessor.kt b/mirai-core/src/commonMain/kotlin/network/components/SsoProcessor.kt
index 677c99ce6..c8ba9fc80 100644
--- a/mirai-core/src/commonMain/kotlin/network/components/SsoProcessor.kt
+++ b/mirai-core/src/commonMain/kotlin/network/components/SsoProcessor.kt
@@ -15,7 +15,6 @@ import net.mamoe.mirai.internal.network.QQAndroidClient
import net.mamoe.mirai.internal.network.WLoginSigInfo
import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.network.context.AccountSecretsImpl
-import net.mamoe.mirai.internal.network.context.SsoProcessorContext
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.impl.netty.NettyNetworkHandler
import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacketWithRespType
diff --git a/mirai-core/src/commonMain/kotlin/network/context/SsoProcessorContext.kt b/mirai-core/src/commonMain/kotlin/network/components/SsoProcessorContext.kt
similarity index 91%
rename from mirai-core/src/commonMain/kotlin/network/context/SsoProcessorContext.kt
rename to mirai-core/src/commonMain/kotlin/network/components/SsoProcessorContext.kt
index 0d7d27202..c0b5d4c97 100644
--- a/mirai-core/src/commonMain/kotlin/network/context/SsoProcessorContext.kt
+++ b/mirai-core/src/commonMain/kotlin/network/components/SsoProcessorContext.kt
@@ -7,13 +7,12 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
-package net.mamoe.mirai.internal.network.context
+package net.mamoe.mirai.internal.network.components
import net.mamoe.mirai.Bot
import net.mamoe.mirai.internal.BotAccount
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.component.ComponentKey
-import net.mamoe.mirai.internal.network.components.SsoProcessor
import net.mamoe.mirai.utils.BotConfiguration
import net.mamoe.mirai.utils.DeviceInfo
@@ -31,7 +30,7 @@ internal interface SsoProcessorContext {
val protocol: BotConfiguration.MiraiProtocol
- val configuration: BotConfiguration
+ val configuration: BotConfiguration get() = bot.configuration
companion object : ComponentKey<SsoProcessorContext>
}
diff --git a/mirai-core/src/commonTest/kotlin/network/framework/AbstractRealNetworkHandlerTest.kt b/mirai-core/src/commonTest/kotlin/network/framework/AbstractRealNetworkHandlerTest.kt
index 65a24c005..2a341f992 100644
--- a/mirai-core/src/commonTest/kotlin/network/framework/AbstractRealNetworkHandlerTest.kt
+++ b/mirai-core/src/commonTest/kotlin/network/framework/AbstractRealNetworkHandlerTest.kt
@@ -16,8 +16,6 @@ import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.network.component.ConcurrentComponentStorage
import net.mamoe.mirai.internal.network.component.setAll
import net.mamoe.mirai.internal.network.components.*
-import net.mamoe.mirai.internal.network.context.SsoProcessorContext
-import net.mamoe.mirai.internal.network.context.SsoProcessorContextImpl
import net.mamoe.mirai.internal.network.framework.components.TestSsoProcessor
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.handler.NetworkHandler.State
diff --git a/mirai-core/src/commonTest/kotlin/network/framework/TestNetworkHandlerContext.kt b/mirai-core/src/commonTest/kotlin/network/framework/TestNetworkHandlerContext.kt
index a7b383d97..9508b68f2 100644
--- a/mirai-core/src/commonTest/kotlin/network/framework/TestNetworkHandlerContext.kt
+++ b/mirai-core/src/commonTest/kotlin/network/framework/TestNetworkHandlerContext.kt
@@ -14,8 +14,8 @@ import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.component.ComponentStorage
import net.mamoe.mirai.internal.network.component.ConcurrentComponentStorage
import net.mamoe.mirai.internal.network.components.SsoProcessor
+import net.mamoe.mirai.internal.network.components.SsoProcessorContextImpl
import net.mamoe.mirai.internal.network.components.SsoProcessorImpl
-import net.mamoe.mirai.internal.network.context.SsoProcessorContextImpl
import net.mamoe.mirai.internal.network.handler.NetworkHandlerContext
import net.mamoe.mirai.internal.network.handler.state.LoggingStateObserver
import net.mamoe.mirai.internal.network.handler.state.SafeStateObserver
diff --git a/mirai-core/src/commonTest/kotlin/network/framework/components/TestSsoProcessor.kt b/mirai-core/src/commonTest/kotlin/network/framework/components/TestSsoProcessor.kt
index aae705394..43340a051 100644
--- a/mirai-core/src/commonTest/kotlin/network/framework/components/TestSsoProcessor.kt
+++ b/mirai-core/src/commonTest/kotlin/network/framework/components/TestSsoProcessor.kt
@@ -13,8 +13,8 @@ import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.QQAndroidClient
import net.mamoe.mirai.internal.network.components.SsoProcessor
import net.mamoe.mirai.internal.network.components.SsoSession
+import net.mamoe.mirai.internal.network.components.createDeviceInfo
import net.mamoe.mirai.internal.network.context.AccountSecretsImpl
-import net.mamoe.mirai.internal.network.context.createDeviceInfo
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.handler.logger
import net.mamoe.mirai.internal.network.protocol.data.jce.SvcRespRegister