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

Rearrange packages for component system

Browse Source
This commit is contained in:
Him188 2021-04-18 00:41:09 +08:00
parent 0443fe4576
commit 9db3a5ef4f
48 changed files with 114 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mirai-core/src/commonMain/kotlin/MiraiImpl.kt
View File

@ -324,8 +324,7 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor {
override suspend fun getRawGroupList(bot: Bot): Sequence<Long> {
bot.asQQAndroidBot()
return bot.network.run {
FriendList.GetTroopListSimplify(bot.client)
.sendAndExpect<FriendList.GetTroopListSimplify.Response>(retry = 2)
FriendList.GetTroopListSimplify(bot.client).sendAndExpect(retry = 2)
}.groups.asSequence().map { it.groupUin.shl(32) and it.groupCode }
}
@ -345,7 +344,7 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor {
targetGroupUin = groupUin,
targetGroupCode = groupCode,
nextUin = nextUin
).sendAndExpect<FriendList.GetTroopMemberList.Response>(retry = 3)
).sendAndExpect(retry = 3)
sequence += data.members.asSequence().map { troopMemberInfo ->
MemberInfoImpl(bot.client, troopMemberInfo, ownerId)
}
@ -389,7 +388,7 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor {
messageIds,
messageInternalIds,
time,
).sendAndExpect<PbMessageSvc.PbMsgWithDraw.Response>()
).sendAndExpect()
}
response is PbMessageSvc.PbMsgWithDraw.Response.Success
@ -411,7 +410,7 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor {
messageIds,
messageInternalIds,
time,
).sendAndExpect<PbMessageSvc.PbMsgWithDraw.Response>()
).sendAndExpect()
}
response is PbMessageSvc.PbMsgWithDraw.Response.Success
@ -729,7 +728,7 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor {
client = bot.client,
messageData = data,
dstUin = sendMessageHandler.targetUin
).sendAndExpect<MultiMsg.ApplyUp.Response>()
).sendAndExpect()
}
val resId: String

12
mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
View File

@ -16,19 +16,19 @@ import net.mamoe.mirai.Mirai
import net.mamoe.mirai.contact.Group
import net.mamoe.mirai.internal.contact.checkIsGroupImpl
import net.mamoe.mirai.internal.network.Packet
import net.mamoe.mirai.internal.network.component.ComponentStorage
import net.mamoe.mirai.internal.network.component.ConcurrentComponentStorage
import net.mamoe.mirai.internal.network.components.*
import net.mamoe.mirai.internal.network.context.SsoProcessorContextImpl
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.handler.component.ComponentStorage
import net.mamoe.mirai.internal.network.handler.component.ConcurrentComponentStorage
import net.mamoe.mirai.internal.network.handler.components.*
import net.mamoe.mirai.internal.network.handler.context.NetworkHandlerContextImpl
import net.mamoe.mirai.internal.network.handler.context.SsoProcessorContextImpl
import net.mamoe.mirai.internal.network.handler.impl.netty.NettyNetworkHandlerFactory
import net.mamoe.mirai.internal.network.handler.NetworkHandlerContextImpl
import net.mamoe.mirai.internal.network.handler.selector.FactoryKeepAliveNetworkHandlerSelector
import net.mamoe.mirai.internal.network.handler.selector.SelectorNetworkHandler
import net.mamoe.mirai.internal.network.handler.state.LoggingStateObserver
import net.mamoe.mirai.internal.network.handler.state.SafeStateObserver
import net.mamoe.mirai.internal.network.handler.state.StateObserver
import net.mamoe.mirai.internal.network.handler.state.safe
import net.mamoe.mirai.internal.network.impl.netty.NettyNetworkHandlerFactory
import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacket
import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacketWithRespType
import net.mamoe.mirai.internal.network.protocol.packet.login.StatSvc

2
mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt
View File

@ -18,7 +18,7 @@ import net.mamoe.mirai.event.events.*
import net.mamoe.mirai.internal.message.OfflineFriendImage
import net.mamoe.mirai.internal.message.contextualBugReportException
import net.mamoe.mirai.internal.message.getImageType
import net.mamoe.mirai.internal.network.handler.context.BdhSession
import net.mamoe.mirai.internal.network.context.BdhSession
import net.mamoe.mirai.internal.network.highway.ChannelKind
import net.mamoe.mirai.internal.network.highway.Highway
import net.mamoe.mirai.internal.network.highway.ResourceKind.PRIVATE_IMAGE

2
mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt
View File

@ -22,8 +22,8 @@ import net.mamoe.mirai.event.events.*
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.contact.info.MemberInfoImpl
import net.mamoe.mirai.internal.message.OfflineGroupImage
import net.mamoe.mirai.internal.network.context.BdhSession
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.handler.context.BdhSession
import net.mamoe.mirai.internal.network.highway.ChannelKind
import net.mamoe.mirai.internal.network.highway.Highway
import net.mamoe.mirai.internal.network.highway.ResourceKind.GROUP_IMAGE

4
mirai-core/src/commonMain/kotlin/network/QQAndroidClient.kt
View File

@ -19,8 +19,8 @@ import kotlinx.io.core.toByteArray
import net.mamoe.mirai.data.OnlineStatus
import net.mamoe.mirai.internal.BotAccount
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.handler.context.AccountSecrets
import net.mamoe.mirai.internal.network.handler.context.SsoSession
import net.mamoe.mirai.internal.network.context.AccountSecrets
import net.mamoe.mirai.internal.network.context.SsoSession
import net.mamoe.mirai.internal.network.protocol.SyncingCacheList
import net.mamoe.mirai.internal.network.protocol.data.jce.FileStoragePushFSSvcList
import net.mamoe.mirai.internal.network.protocol.packet.Tlv

4
mirai-core/src/commonMain/kotlin/network/handler/component/ComponentKey.kt → mirai-core/src/commonMain/kotlin/network/component/ComponentKey.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.component
package net.mamoe.mirai.internal.network.component
import kotlin.reflect.KClass
import kotlin.reflect.KClassifier
@ -25,7 +25,7 @@ internal interface ComponentKey<T : Any> {
* Get name of `T`.
*
* - If [qualified] is `false`, example: `PacketCodec`.
* - If [qualified] is `true`, example: `net.mamoe.mirai.internal.network.handler.components.PacketCodec`.
* - If [qualified] is `true`, example: `net.mamoe.mirai.internal.network.components.PacketCodec`.
*/
fun componentName(qualified: Boolean = false): String {
return getComponentTypeArgumentClassifier().renderClassifier(fullName = qualified)

2
mirai-core/src/commonMain/kotlin/network/handler/component/ComponentStorage.kt → mirai-core/src/commonMain/kotlin/network/component/ComponentStorage.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.component
package net.mamoe.mirai.internal.network.component
import org.jetbrains.annotations.TestOnly

2
mirai-core/src/commonMain/kotlin/network/handler/component/ConcurrentComponentStorage.kt → mirai-core/src/commonMain/kotlin/network/component/ConcurrentComponentStorage.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.component
package net.mamoe.mirai.internal.network.component
import net.mamoe.mirai.utils.systemProp
import java.util.concurrent.ConcurrentHashMap

2
mirai-core/src/commonMain/kotlin/network/handler/component/MutableComponentStorage.kt → mirai-core/src/commonMain/kotlin/network/component/MutableComponentStorage.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.component
package net.mamoe.mirai.internal.network.component
/**
* Facade for [component][ComponentKey]s.

2
mirai-core/src/commonMain/kotlin/network/handler/component/NoSuchComponentException.kt → mirai-core/src/commonMain/kotlin/network/component/NoSuchComponentException.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.component
package net.mamoe.mirai.internal.network.component
internal data class NoSuchComponentException(
val key: ComponentKey<*>,

8
mirai-core/src/commonMain/kotlin/network/handler/components/AccountSecretsManager.kt → mirai-core/src/commonMain/kotlin/network/components/AccountSecretsManager.kt
View File

@ -7,13 +7,13 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.components
package net.mamoe.mirai.internal.network.components
import net.mamoe.mirai.Bot
import net.mamoe.mirai.internal.BotAccount
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import net.mamoe.mirai.internal.network.handler.context.AccountSecrets
import net.mamoe.mirai.internal.network.handler.context.AccountSecretsImpl
import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.network.context.AccountSecrets
import net.mamoe.mirai.internal.network.context.AccountSecretsImpl
import net.mamoe.mirai.internal.utils.actualCacheDir
import net.mamoe.mirai.internal.utils.crypto.TEA
import net.mamoe.mirai.internal.utils.io.serialization.loadAs

8
mirai-core/src/commonMain/kotlin/network/handler/components/BdhSessionSyncer.kt → mirai-core/src/commonMain/kotlin/network/components/BdhSessionSyncer.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.components
package net.mamoe.mirai.internal.network.components
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.ExperimentalCoroutinesApi
@ -15,9 +15,9 @@ import kotlinx.serialization.KSerializer
import kotlinx.serialization.builtins.SetSerializer
import net.mamoe.mirai.internal.network.JsonForCache
import net.mamoe.mirai.internal.network.ProtoBufForCache
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import net.mamoe.mirai.internal.network.handler.component.ComponentStorage
import net.mamoe.mirai.internal.network.handler.context.BdhSession
import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.network.component.ComponentStorage
import net.mamoe.mirai.internal.network.context.BdhSession
import net.mamoe.mirai.internal.utils.actualCacheDir
import net.mamoe.mirai.utils.BotConfiguration
import net.mamoe.mirai.utils.MiraiLogger

6
mirai-core/src/commonMain/kotlin/network/handler/components/BotInitProcessor.kt → mirai-core/src/commonMain/kotlin/network/components/BotInitProcessor.kt
View File

@ -7,17 +7,17 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.components
package net.mamoe.mirai.internal.network.components
import kotlinx.atomicfu.atomic
import kotlinx.coroutines.*
import net.mamoe.mirai.event.nextEvent
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.Packet
import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.network.component.ComponentStorage
import net.mamoe.mirai.internal.network.handler.NetworkHandler.State
import net.mamoe.mirai.internal.network.handler.NetworkHandlerSupport
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import net.mamoe.mirai.internal.network.handler.component.ComponentStorage
import net.mamoe.mirai.internal.network.handler.state.StateChangedObserver
import net.mamoe.mirai.internal.network.handler.state.StateObserver
import net.mamoe.mirai.internal.network.protocol.data.proto.MsgSvc

4
mirai-core/src/commonMain/kotlin/network/handler/components/ConfigPushSyncer.kt → mirai-core/src/commonMain/kotlin/network/components/ConfigPushSyncer.kt
View File

@ -7,9 +7,9 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.components
package net.mamoe.mirai.internal.network.components
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import net.mamoe.mirai.internal.network.component.ComponentKey
internal interface ConfigPushSyncer {
suspend fun awaitSync()

4
mirai-core/src/commonMain/kotlin/network/handler/components/ContactCacheService.kt → mirai-core/src/commonMain/kotlin/network/components/ContactCacheService.kt
View File

@ -7,13 +7,13 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.components
package net.mamoe.mirai.internal.network.components
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.FriendListCache
import net.mamoe.mirai.internal.network.GroupMemberListCaches
import net.mamoe.mirai.internal.network.JsonForCache
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.utils.ScheduledJob
import net.mamoe.mirai.internal.utils.friendCacheFile
import net.mamoe.mirai.utils.createFileIfNotExists

6
mirai-core/src/commonMain/kotlin/network/handler/components/ContactUpdater.kt → mirai-core/src/commonMain/kotlin/network/components/ContactUpdater.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.components
package net.mamoe.mirai.internal.network.components
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.cancel
@ -30,8 +30,8 @@ import net.mamoe.mirai.internal.contact.info.MemberInfoImpl
import net.mamoe.mirai.internal.contact.info.StrangerInfoImpl
import net.mamoe.mirai.internal.contact.toMiraiFriendInfo
import net.mamoe.mirai.internal.network.Packet
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import net.mamoe.mirai.internal.network.handler.component.ComponentStorage
import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.network.component.ComponentStorage
import net.mamoe.mirai.internal.network.handler.logger
import net.mamoe.mirai.internal.network.isValid
import net.mamoe.mirai.internal.network.protocol.data.jce.StTroopNum

4
mirai-core/src/commonMain/kotlin/network/handler/components/NetworkHandlerReference.kt → mirai-core/src/commonMain/kotlin/network/components/NetworkHandlerReference.kt
View File

@ -7,10 +7,10 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.components
package net.mamoe.mirai.internal.network.components
import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
internal class NetworkHandlerReference(
private val getInstance: () -> NetworkHandler,

6
mirai-core/src/commonMain/kotlin/network/handler/components/OtherClientUpdater.kt → mirai-core/src/commonMain/kotlin/network/components/OtherClientUpdater.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.components
package net.mamoe.mirai.internal.network.components
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
@ -18,8 +18,8 @@ import net.mamoe.mirai.contact.deviceName
import net.mamoe.mirai.contact.platform
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.contact.createOtherClient
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import net.mamoe.mirai.internal.network.handler.component.ComponentStorage
import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.network.component.ComponentStorage
import net.mamoe.mirai.utils.MiraiLogger
import net.mamoe.mirai.utils.info

8
mirai-core/src/commonMain/kotlin/network/handler/components/PacketCodec.kt → mirai-core/src/commonMain/kotlin/network/components/PacketCodec.kt
View File

@ -7,13 +7,13 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.components
package net.mamoe.mirai.internal.network.components
import kotlinx.io.core.*
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import net.mamoe.mirai.internal.network.handler.components.PacketCodec.Companion.PacketLogger
import net.mamoe.mirai.internal.network.handler.context.SsoSession
import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.network.components.PacketCodec.Companion.PacketLogger
import net.mamoe.mirai.internal.network.context.SsoSession
import net.mamoe.mirai.internal.network.protocol.packet.*
import net.mamoe.mirai.internal.utils.crypto.TEA
import net.mamoe.mirai.internal.utils.crypto.adjustToPublicKey

6
mirai-core/src/commonMain/kotlin/network/handler/components/PacketHandler.kt → mirai-core/src/commonMain/kotlin/network/components/PacketHandler.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.components
package net.mamoe.mirai.internal.network.components
import net.mamoe.mirai.event.BroadcastControllable
import net.mamoe.mirai.event.CancellableEvent
@ -19,8 +19,8 @@ import net.mamoe.mirai.internal.contact.logMessageReceived
import net.mamoe.mirai.internal.contact.replaceMagicCodes
import net.mamoe.mirai.internal.network.Packet
import net.mamoe.mirai.internal.network.ParseErrorPacket
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import net.mamoe.mirai.internal.network.handler.component.ComponentStorage
import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.network.component.ComponentStorage
import net.mamoe.mirai.internal.network.protocol.packet.IncomingPacket
import net.mamoe.mirai.utils.MiraiLogger
import net.mamoe.mirai.utils.verbose

6
mirai-core/src/commonMain/kotlin/network/handler/components/ServerList.kt → mirai-core/src/commonMain/kotlin/network/components/ServerList.kt
View File

@ -7,11 +7,11 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.components
package net.mamoe.mirai.internal.network.components
import kotlinx.serialization.Serializable
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import net.mamoe.mirai.internal.network.handler.components.ServerList.Companion.DEFAULT_SERVER_LIST
import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.network.components.ServerList.Companion.DEFAULT_SERVER_LIST
import java.net.InetSocketAddress
import java.util.*

12
mirai-core/src/commonMain/kotlin/network/handler/components/SsoProcessor.kt → mirai-core/src/commonMain/kotlin/network/components/SsoProcessor.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.components
package net.mamoe.mirai.internal.network.components
import kotlinx.coroutines.CoroutineName
import kotlinx.coroutines.CoroutineScope
@ -15,15 +15,15 @@ import kotlinx.coroutines.launch
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.Packet
import net.mamoe.mirai.internal.network.QQAndroidClient
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.context.SsoSession
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.handler.NetworkHandlerSupport
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import net.mamoe.mirai.internal.network.handler.context.AccountSecretsImpl
import net.mamoe.mirai.internal.network.handler.context.SsoProcessorContext
import net.mamoe.mirai.internal.network.handler.context.SsoSession
import net.mamoe.mirai.internal.network.handler.impl.netty.NettyNetworkHandler
import net.mamoe.mirai.internal.network.handler.state.StateChangedObserver
import net.mamoe.mirai.internal.network.handler.state.StateObserver
import net.mamoe.mirai.internal.network.impl.netty.NettyNetworkHandler
import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacketWithRespType
import net.mamoe.mirai.internal.network.protocol.packet.login.WtLogin.Login.LoginPacketResponse
import net.mamoe.mirai.internal.network.protocol.packet.login.WtLogin.Login.LoginPacketResponse.Captcha

2
mirai-core/src/commonMain/kotlin/network/handler/components/package.kt → mirai-core/src/commonMain/kotlin/network/components/package.kt
View File

@ -10,4 +10,4 @@
/**
* 放置一些小组件
*/
package net.mamoe.mirai.internal.network.handler.components
package net.mamoe.mirai.internal.network.components

2
mirai-core/src/commonMain/kotlin/network/handler/context/AccountSecrets.kt → mirai-core/src/commonMain/kotlin/network/context/AccountSecrets.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.context
package net.mamoe.mirai.internal.network.context
import kotlinx.io.core.toByteArray
import kotlinx.serialization.Serializable

2
mirai-core/src/commonMain/kotlin/network/handler/context/BdhSession.kt → mirai-core/src/commonMain/kotlin/network/context/BdhSession.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.context
package net.mamoe.mirai.internal.network.context
import kotlinx.serialization.Serializable
import java.util.concurrent.CopyOnWriteArraySet

8
mirai-core/src/commonMain/kotlin/network/handler/context/SsoProcessorContext.kt → mirai-core/src/commonMain/kotlin/network/context/SsoProcessorContext.kt
View File

@ -7,13 +7,13 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.context
package net.mamoe.mirai.internal.network.context
import net.mamoe.mirai.internal.BotAccount
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.handler.components.AccountSecretsManager
import net.mamoe.mirai.internal.network.handler.components.SsoProcessor
import net.mamoe.mirai.internal.network.handler.components.createAccountsSecretsManager
import net.mamoe.mirai.internal.network.components.AccountSecretsManager
import net.mamoe.mirai.internal.network.components.SsoProcessor
import net.mamoe.mirai.internal.network.components.createAccountsSecretsManager
import net.mamoe.mirai.utils.BotConfiguration
import net.mamoe.mirai.utils.DeviceInfo

6
mirai-core/src/commonMain/kotlin/network/handler/context/SsoSession.kt → mirai-core/src/commonMain/kotlin/network/context/SsoSession.kt
View File

@ -7,11 +7,11 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.context
package net.mamoe.mirai.internal.network.context
import net.mamoe.mirai.internal.network.WLoginSigInfo
import net.mamoe.mirai.internal.network.handler.components.PacketCodec
import net.mamoe.mirai.internal.network.handler.components.SsoProcessor
import net.mamoe.mirai.internal.network.components.PacketCodec
import net.mamoe.mirai.internal.network.components.SsoProcessor
import net.mamoe.mirai.internal.utils.crypto.ECDH
/**

2
mirai-core/src/commonMain/kotlin/network/handler/context/package.kt → mirai-core/src/commonMain/kotlin/network/context/package.kt
View File

@ -10,4 +10,4 @@
/**
* 放各种 context
*/
package net.mamoe.mirai.internal.network.handler.context
package net.mamoe.mirai.internal.network.context

1
mirai-core/src/commonMain/kotlin/network/handler/NetworkHandler.kt
View File

@ -12,7 +12,6 @@ package net.mamoe.mirai.internal.network.handler
import kotlinx.coroutines.selects.SelectClause1
import net.mamoe.mirai.internal.network.Packet
import net.mamoe.mirai.internal.network.handler.NetworkHandler.State
import net.mamoe.mirai.internal.network.handler.selector.SelectorNetworkHandler
import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacket
import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacketWithRespType
import net.mamoe.mirai.utils.MiraiLogger

5
mirai-core/src/commonMain/kotlin/network/handler/context/NetworkHandlerContext.kt → mirai-core/src/commonMain/kotlin/network/handler/NetworkHandlerContext.kt
View File

@ -7,11 +7,10 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.context
package net.mamoe.mirai.internal.network.handler
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.handler.component.ComponentStorage
import net.mamoe.mirai.internal.network.component.ComponentStorage
import net.mamoe.mirai.utils.MiraiLogger
/**

7
mirai-core/src/commonMain/kotlin/network/handler/NetworkHandlerSupport.kt
View File

@ -12,10 +12,9 @@ package net.mamoe.mirai.internal.network.handler
import kotlinx.coroutines.*
import kotlinx.coroutines.selects.SelectClause1
import net.mamoe.mirai.internal.network.Packet
import net.mamoe.mirai.internal.network.handler.components.PacketCodec
import net.mamoe.mirai.internal.network.handler.components.PacketHandler
import net.mamoe.mirai.internal.network.handler.components.RawIncomingPacket
import net.mamoe.mirai.internal.network.handler.context.NetworkHandlerContext
import net.mamoe.mirai.internal.network.components.PacketCodec
import net.mamoe.mirai.internal.network.components.PacketHandler
import net.mamoe.mirai.internal.network.components.RawIncomingPacket
import net.mamoe.mirai.internal.network.handler.state.StateObserver
import net.mamoe.mirai.internal.network.protocol.packet.IncomingPacket
import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacket

4
mirai-core/src/commonMain/kotlin/network/handler/selector/FactoryKeepAliveNetworkHandlerSelector.kt
View File

@ -9,10 +9,10 @@
package net.mamoe.mirai.internal.network.handler.selector
import net.mamoe.mirai.internal.network.components.ServerList
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.handler.NetworkHandlerContext
import net.mamoe.mirai.internal.network.handler.NetworkHandlerFactory
import net.mamoe.mirai.internal.network.handler.components.ServerList
import net.mamoe.mirai.internal.network.handler.context.NetworkHandlerContext
/**
* [AbstractKeepAliveNetworkHandlerSelector] implementation delegating [createInstance] to [factory]

2
mirai-core/src/commonMain/kotlin/network/handler/selector/SelectorNetworkHandler.kt
View File

@ -16,7 +16,7 @@ import kotlinx.coroutines.async
import kotlinx.coroutines.selects.SelectClause1
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.handler.NetworkHandler.State
import net.mamoe.mirai.internal.network.handler.context.NetworkHandlerContext
import net.mamoe.mirai.internal.network.handler.NetworkHandlerContext
import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacket
/**

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

@ -9,9 +9,9 @@
package net.mamoe.mirai.internal.network.handler.state
import net.mamoe.mirai.internal.network.component.ComponentKey
import net.mamoe.mirai.internal.network.handler.NetworkHandler
import net.mamoe.mirai.internal.network.handler.NetworkHandlerSupport
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import net.mamoe.mirai.internal.network.handler.state.CombinedStateObserver.Companion.plus
/**

4
mirai-core/src/commonMain/kotlin/network/highway/Highway.kt
View File

@ -23,8 +23,8 @@ import kotlinx.io.core.writeFully
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.asQQAndroidBot
import net.mamoe.mirai.internal.network.QQAndroidClient
import net.mamoe.mirai.internal.network.handler.components.BdhSessionSyncer
import net.mamoe.mirai.internal.network.handler.context.BdhSession
import net.mamoe.mirai.internal.network.components.BdhSessionSyncer
import net.mamoe.mirai.internal.network.context.BdhSession
import net.mamoe.mirai.internal.network.handler.logger
import net.mamoe.mirai.internal.network.protocol.data.proto.CSDataHighwayHead
import net.mamoe.mirai.internal.network.subAppId

12
mirai-core/src/commonMain/kotlin/network/handler/impl/netty/NettyNetworkHandler.kt → mirai-core/src/commonMain/kotlin/network/impl/netty/NettyNetworkHandler.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.impl.netty
package net.mamoe.mirai.internal.network.impl.netty
import io.netty.bootstrap.Bootstrap
import io.netty.buffer.ByteBuf
@ -22,13 +22,13 @@ import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.channels.sendBlocking
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.consumeAsFlow
import net.mamoe.mirai.internal.network.components.BotInitProcessor
import net.mamoe.mirai.internal.network.components.PacketCodec
import net.mamoe.mirai.internal.network.components.RawIncomingPacket
import net.mamoe.mirai.internal.network.components.SsoProcessor
import net.mamoe.mirai.internal.network.handler.NetworkHandler.State
import net.mamoe.mirai.internal.network.handler.NetworkHandlerContext
import net.mamoe.mirai.internal.network.handler.NetworkHandlerSupport
import net.mamoe.mirai.internal.network.handler.components.BotInitProcessor
import net.mamoe.mirai.internal.network.handler.components.PacketCodec
import net.mamoe.mirai.internal.network.handler.components.RawIncomingPacket
import net.mamoe.mirai.internal.network.handler.components.SsoProcessor
import net.mamoe.mirai.internal.network.handler.context.NetworkHandlerContext
import net.mamoe.mirai.internal.network.handler.state.StateObserver
import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacket
import net.mamoe.mirai.utils.childScope

4
mirai-core/src/commonMain/kotlin/network/handler/impl/netty/NettyNetworkHandlerFactory.kt → mirai-core/src/commonMain/kotlin/network/impl/netty/NettyNetworkHandlerFactory.kt
View File

@ -7,10 +7,10 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.impl.netty
package net.mamoe.mirai.internal.network.impl.netty
import net.mamoe.mirai.internal.network.handler.NetworkHandlerContext
import net.mamoe.mirai.internal.network.handler.NetworkHandlerFactory
import net.mamoe.mirai.internal.network.handler.context.NetworkHandlerContext
import java.net.SocketAddress
internal object NettyNetworkHandlerFactory : NetworkHandlerFactory<NettyNetworkHandler> {

2
mirai-core/src/commonMain/kotlin/network/handler/impl/netty/nettyUtils.kt → mirai-core/src/commonMain/kotlin/network/impl/netty/nettyUtils.kt
View File

@ -7,7 +7,7 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal.network.handler.impl.netty
package net.mamoe.mirai.internal.network.impl.netty
import io.netty.buffer.ByteBuf
import io.netty.buffer.ByteBufInputStream

4
mirai-core/src/commonMain/kotlin/network/protocol/packet/PacketFactory.kt
View File

@ -13,7 +13,7 @@ import kotlinx.io.core.ByteReadPacket
import net.mamoe.mirai.event.Event
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.Packet
import net.mamoe.mirai.internal.network.handler.components.PacketCodec
import net.mamoe.mirai.internal.network.components.PacketCodec
import net.mamoe.mirai.internal.network.protocol.packet.chat.*
import net.mamoe.mirai.internal.network.protocol.packet.chat.image.ImgStore
import net.mamoe.mirai.internal.network.protocol.packet.chat.image.LongConn
@ -113,7 +113,7 @@ internal suspend inline fun <P : Packet?> IncomingPacketFactory<P>.decode(
*/
@Deprecated(
"Kept for binary compatibility.",
ReplaceWith("PacketCodec.PacketLogger", "net.mamoe.mirai.internal.network.handler.components.PacketCodec"),
ReplaceWith("PacketCodec.PacketLogger", "net.mamoe.mirai.internal.network.components.PacketCodec"),
level = DeprecationLevel.ERROR,
)
@PublishedApi

2
mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/MultiMsg.kt
View File

@ -19,7 +19,7 @@ import net.mamoe.mirai.internal.message.contextualBugReportException
import net.mamoe.mirai.internal.message.toRichTextElems
import net.mamoe.mirai.internal.network.Packet
import net.mamoe.mirai.internal.network.QQAndroidClient
import net.mamoe.mirai.internal.network.handler.components.PacketCodec
import net.mamoe.mirai.internal.network.components.PacketCodec
import net.mamoe.mirai.internal.network.protocol.data.proto.ImMsgBody
import net.mamoe.mirai.internal.network.protocol.data.proto.MsgComm
import net.mamoe.mirai.internal.network.protocol.data.proto.MsgTransmit

8
mirai-core/src/commonMain/kotlin/network/protocol/packet/login/ConfigPushSvc.kt
View File

@ -19,10 +19,10 @@ import net.mamoe.mirai.event.events.BotOfflineEvent
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.message.contextualBugReportException
import net.mamoe.mirai.internal.network.Packet
import net.mamoe.mirai.internal.network.handler.components.BdhSessionSyncer
import net.mamoe.mirai.internal.network.handler.components.ServerAddress
import net.mamoe.mirai.internal.network.handler.components.ServerList
import net.mamoe.mirai.internal.network.handler.context.BdhSession
import net.mamoe.mirai.internal.network.components.BdhSessionSyncer
import net.mamoe.mirai.internal.network.components.ServerAddress
import net.mamoe.mirai.internal.network.components.ServerList
import net.mamoe.mirai.internal.network.context.BdhSession
import net.mamoe.mirai.internal.network.handler.logger
import net.mamoe.mirai.internal.network.networkType
import net.mamoe.mirai.internal.network.protocol.data.jce.FileStoragePushFSSvcList

2
mirai-core/src/commonMain/kotlin/network/protocol/packet/login/StatSvc.kt
View File

@ -28,7 +28,7 @@ import net.mamoe.mirai.internal.contact.appId
import net.mamoe.mirai.internal.contact.createOtherClient
import net.mamoe.mirai.internal.message.contextualBugReportException
import net.mamoe.mirai.internal.network.*
import net.mamoe.mirai.internal.network.handler.components.ContactCacheService
import net.mamoe.mirai.internal.network.components.ContactCacheService
import net.mamoe.mirai.internal.network.protocol.data.jce.*
import net.mamoe.mirai.internal.network.protocol.data.proto.Oidb0x769
import net.mamoe.mirai.internal.network.protocol.data.proto.StatSvcGetOnline

6
mirai-core/src/commonTest/kotlin/network/ServerListTest.kt
View File

@ -9,9 +9,9 @@
package net.mamoe.mirai.internal.network
import net.mamoe.mirai.internal.network.handler.components.ServerAddress
import net.mamoe.mirai.internal.network.handler.components.ServerList
import net.mamoe.mirai.internal.network.handler.components.ServerListImpl
import net.mamoe.mirai.internal.network.components.ServerAddress
import net.mamoe.mirai.internal.network.components.ServerList
import net.mamoe.mirai.internal.network.components.ServerListImpl
import kotlin.test.*
internal class ServerListTest {

1
mirai-core/src/commonTest/kotlin/network/component/ComponentKeyTest.kt
View File

@ -9,7 +9,6 @@
package net.mamoe.mirai.internal.network.component
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import org.junit.jupiter.api.Test
import kotlin.test.assertEquals

2
mirai-core/src/commonTest/kotlin/network/component/ComponentStorageTest.kt
View File

@ -9,8 +9,6 @@
package net.mamoe.mirai.internal.network.component
import net.mamoe.mirai.internal.network.handler.component.ComponentKey
import net.mamoe.mirai.internal.network.handler.component.ConcurrentComponentStorage
import org.junit.jupiter.api.Test
import kotlin.test.assertEquals

8
mirai-core/src/commonTest/kotlin/network/handler/AbstractNetworkHandlerTest.kt
View File

@ -12,10 +12,10 @@
package net.mamoe.mirai.internal.network.handler
import net.mamoe.mirai.internal.MockBot
import net.mamoe.mirai.internal.network.handler.component.ConcurrentComponentStorage
import net.mamoe.mirai.internal.network.handler.components.SsoProcessor
import net.mamoe.mirai.internal.network.handler.components.SsoProcessorImpl
import net.mamoe.mirai.internal.network.handler.context.SsoProcessorContextImpl
import net.mamoe.mirai.internal.network.component.ConcurrentComponentStorage
import net.mamoe.mirai.internal.network.components.SsoProcessor
import net.mamoe.mirai.internal.network.components.SsoProcessorImpl
import net.mamoe.mirai.internal.network.context.SsoProcessorContextImpl
import net.mamoe.mirai.internal.network.handler.state.LoggingStateObserver
import net.mamoe.mirai.internal.network.handler.state.SafeStateObserver
import net.mamoe.mirai.internal.network.handler.state.StateObserver

11
mirai-core/src/commonTest/kotlin/network/handler/testUtils.kt
View File

@ -12,12 +12,11 @@ package net.mamoe.mirai.internal.network.handler
import kotlinx.coroutines.CompletableDeferred
import net.mamoe.mirai.internal.MockBot
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.handler.component.ComponentStorage
import net.mamoe.mirai.internal.network.handler.component.ConcurrentComponentStorage
import net.mamoe.mirai.internal.network.handler.components.SsoProcessor
import net.mamoe.mirai.internal.network.handler.components.SsoProcessorImpl
import net.mamoe.mirai.internal.network.handler.context.NetworkHandlerContext
import net.mamoe.mirai.internal.network.handler.context.SsoProcessorContextImpl
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.SsoProcessorImpl
import net.mamoe.mirai.internal.network.context.SsoProcessorContextImpl
import net.mamoe.mirai.internal.network.handler.state.LoggingStateObserver
import net.mamoe.mirai.internal.network.handler.state.SafeStateObserver
import net.mamoe.mirai.internal.network.handler.state.StateObserver

6
mirai-core/src/commonTest/kotlin/network/sessionUtils.kt
View File

@ -11,9 +11,9 @@ package net.mamoe.mirai.internal.network
import net.mamoe.mirai.event.events.BotOnlineEvent
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.handler.context.AccountSecrets
import net.mamoe.mirai.internal.network.handler.context.AccountSecretsImpl
import net.mamoe.mirai.internal.network.handler.context.SsoSession
import net.mamoe.mirai.internal.network.context.AccountSecrets
import net.mamoe.mirai.internal.network.context.AccountSecretsImpl
import net.mamoe.mirai.internal.network.context.SsoSession
import net.mamoe.mirai.internal.utils.crypto.ECDH
import net.mamoe.mirai.internal.utils.io.serialization.loadAs
import net.mamoe.mirai.internal.utils.io.serialization.toByteArray