From 4f1a22cd200033b3056810df22fd30edadd45ca8 Mon Sep 17 00:00:00 2001 From: Him188 Date: Wed, 28 Jul 2021 10:51:51 +0800 Subject: [PATCH] Move `BdhSession` from package `context` to `components` --- .../commonMain/kotlin/contact/AbstractUser.kt | 2 +- .../commonMain/kotlin/contact/GroupImpl.kt | 2 +- .../network/components/BdhSessionSyncer.kt | 17 +++++++++++---- .../kotlin/network/context/BdhSession.kt | 21 ------------------- .../kotlin/network/highway/Highway.kt | 2 +- .../protocol/packet/login/ConfigPushSvc.kt | 6 +----- 6 files changed, 17 insertions(+), 33 deletions(-) delete mode 100644 mirai-core/src/commonMain/kotlin/network/context/BdhSession.kt diff --git a/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt b/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt index 962494537..bc9222711 100644 --- a/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt +++ b/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt @@ -18,7 +18,7 @@ import net.mamoe.mirai.internal.QQAndroidBot 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.context.BdhSession +import net.mamoe.mirai.internal.network.components.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 diff --git a/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt b/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt index 2bc5d7aa2..929bf63f5 100644 --- a/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt +++ b/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt @@ -24,7 +24,7 @@ import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.contact.announcement.AnnouncementsImpl 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.components.BdhSession import net.mamoe.mirai.internal.network.handler.NetworkHandler import net.mamoe.mirai.internal.network.handler.logger import net.mamoe.mirai.internal.network.highway.ChannelKind diff --git a/mirai-core/src/commonMain/kotlin/network/components/BdhSessionSyncer.kt b/mirai-core/src/commonMain/kotlin/network/components/BdhSessionSyncer.kt index aa92d7604..7bd266bd1 100644 --- a/mirai-core/src/commonMain/kotlin/network/components/BdhSessionSyncer.kt +++ b/mirai-core/src/commonMain/kotlin/network/components/BdhSessionSyncer.kt @@ -12,19 +12,17 @@ package net.mamoe.mirai.internal.network.components import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.serialization.KSerializer +import kotlinx.serialization.Serializable 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.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 import java.io.File - -private val ServerListSerializer: KSerializer> = - SetSerializer(ServerAddress.serializer()) +import java.util.concurrent.CopyOnWriteArraySet internal interface BdhSessionSyncer { val bdhSession: CompletableDeferred @@ -43,6 +41,17 @@ internal interface BdhSessionSyncer { companion object : ComponentKey } +@Serializable +internal class BdhSession( + val sigSession: ByteArray, + val sessionKey: ByteArray, + var ssoAddresses: MutableSet> = CopyOnWriteArraySet(), + var otherAddresses: MutableSet> = CopyOnWriteArraySet(), +) + +private val ServerListSerializer: KSerializer> = + SetSerializer(ServerAddress.serializer()) + @OptIn(ExperimentalCoroutinesApi::class) internal class BdhSessionSyncerImpl( private val configuration: BotConfiguration, diff --git a/mirai-core/src/commonMain/kotlin/network/context/BdhSession.kt b/mirai-core/src/commonMain/kotlin/network/context/BdhSession.kt deleted file mode 100644 index fe8c78af1..000000000 --- a/mirai-core/src/commonMain/kotlin/network/context/BdhSession.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2019-2021 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. - * - * https://github.com/mamoe/mirai/blob/master/LICENSE - */ - -package net.mamoe.mirai.internal.network.context - -import kotlinx.serialization.Serializable -import java.util.concurrent.CopyOnWriteArraySet - -@Serializable -internal class BdhSession( - val sigSession: ByteArray, - val sessionKey: ByteArray, - var ssoAddresses: MutableSet> = CopyOnWriteArraySet(), - var otherAddresses: MutableSet> = CopyOnWriteArraySet(), -) \ No newline at end of file diff --git a/mirai-core/src/commonMain/kotlin/network/highway/Highway.kt b/mirai-core/src/commonMain/kotlin/network/highway/Highway.kt index ef09518fd..aa9014a8b 100644 --- a/mirai-core/src/commonMain/kotlin/network/highway/Highway.kt +++ b/mirai-core/src/commonMain/kotlin/network/highway/Highway.kt @@ -22,8 +22,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.components.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 diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/ConfigPushSvc.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/ConfigPushSvc.kt index 361517793..5ec4c7580 100644 --- a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/ConfigPushSvc.kt +++ b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/ConfigPushSvc.kt @@ -16,11 +16,7 @@ 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.components.BdhSessionSyncer -import net.mamoe.mirai.internal.network.components.EventDispatcher -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.components.* import net.mamoe.mirai.internal.network.networkType import net.mamoe.mirai.internal.network.protocol.data.jce.FileStoragePushFSSvcList import net.mamoe.mirai.internal.network.protocol.data.jce.PushResp