add: protocol supported check

cssxsh · Jun 24, 2023 · f28c983 · f28c983
1 parent 6497b3b
commit f28c983
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 24 deletions.
diff --git a/mirai-core/src/commonMain/kotlin/network/QQAndroidClient.kt b/mirai-core/src/commonMain/kotlin/network/QQAndroidClient.kt
@@ -21,6 +21,7 @@ import net.mamoe.mirai.internal.network.components.AccountSecrets
 import net.mamoe.mirai.internal.network.components.SsoSession
 import net.mamoe.mirai.internal.network.protocol.data.jce.FileStoragePushFSSvcList
 import net.mamoe.mirai.internal.network.protocol.packet.Tlv
+import net.mamoe.mirai.internal.spi.EncryptService
 import net.mamoe.mirai.internal.utils.AtomicIntSeq
 import net.mamoe.mirai.internal.utils.MiraiProtocolInternal
 import net.mamoe.mirai.internal.utils.NetworkType
@@ -82,12 +83,8 @@ internal open class QQAndroidClient(
     override var outgoingPacketSessionId: ByteArray = 0x02B05B8B.toByteArray()
     override var loginState = 0
 
-    val useAndroid by lazy {
-        bot.configuration.protocol == BotConfiguration.MiraiProtocol.ANDROID_PHONE ||
-                bot.configuration.protocol == BotConfiguration.MiraiProtocol.ANDROID_PAD
-    }
-    val usePC by lazy {
-        bot.configuration.protocol == BotConfiguration.MiraiProtocol.MACOS
+    val supportedEncrypt by lazy {
+        EncryptService.instance?.supported(bot.configuration.protocol) ?: false
     }
     var onlineStatus: OnlineStatus = OnlineStatus.ONLINE
 

diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin10.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin10.kt
@@ -85,7 +85,7 @@ internal object WtLogin10 : WtLoginExt {
                     t194(client.device.imsiMd5)
                     t511()
                     t202(client.device.wifiBSSID, client.device.wifiSSID)
-                    if (client.useAndroid) {
+                    if (client.supportedEncrypt) {
                         t544ForToken(
                             uin = client.uin,
                             protocol = client.bot.configuration.protocol,

diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin15.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin15.kt
@@ -135,7 +135,7 @@ internal object WtLogin15 : WtLoginExt {
 
                 t521() // new
                 t525(client.loginExtraData) // new
-                if (client.useAndroid) {
+                if (client.supportedEncrypt) {
                     t544ForToken(
                         uin = client.uin,
                         protocol = client.bot.configuration.protocol,

diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin2.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin2.kt
@@ -31,7 +31,7 @@ internal object WtLogin2 : WtLoginExt {
                     t104(client.t104)
                     t116(client.miscBitMap, client.subSigMap)
                     client.t547?.let { t547(it) }
-                    if (client.useAndroid) {
+                    if (client.supportedEncrypt) {
                         t544ForVerify(
                             uin = client.uin,
                             protocol = client.bot.configuration.protocol,
@@ -61,7 +61,7 @@ internal object WtLogin2 : WtLoginExt {
                     t104(client.t104)
                     t116(client.miscBitMap, client.subSigMap)
                     client.t547?.let { t547(it) }
-                    if (client.useAndroid) {
+                    if (client.supportedEncrypt) {
                         t544ForVerify(
                             uin = client.uin,
                             protocol = client.bot.configuration.protocol,

diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin7.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin7.kt
@@ -41,7 +41,7 @@ internal object WtLogin7 : WtLoginExt {
                     t17c(code.encodeToByteArray())
                     t401(client.G)
                     t198()
-                    if (client.useAndroid) {
+                    if (client.supportedEncrypt) {
                         t544ForVerify(
                             uin = client.uin,
                             protocol = client.bot.configuration.protocol,

diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin9.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin9.kt
@@ -134,18 +134,7 @@ internal object WtLogin9 : WtLoginExt {
                     // this.build().debugPrint("傻逼")
 
                     // ignored t318 because not logging in by QR
-                    if (client.useAndroid) {
-                        t544ForToken(
-                            uin = client.uin,
-                            protocol = client.bot.configuration.protocol,
-                            guid = client.device.guid,
-                            sdkVersion = client.sdkVersion,
-                            subCommandId = 9,
-                            commandStr = "810_9"
-                        )
-                    }
-
-                    if (client.usePC) {
+                    if (client.supportedEncrypt) {
                         t544ForToken(
                             uin = client.uin,
                             protocol = client.bot.configuration.protocol,
@@ -210,7 +199,7 @@ internal object WtLogin9 : WtLoginExt {
                     t521(8)
                     t318(data.tgtQR)
 
-                    if (client.usePC) {
+                    if (client.supportedEncrypt) {
                         t544ForToken(
                             uin = client.uin,
                             protocol = client.bot.configuration.protocol,

diff --git a/mirai-core/src/commonMain/kotlin/spi/EncryptService.kt b/mirai-core/src/commonMain/kotlin/spi/EncryptService.kt
@@ -39,6 +39,14 @@ public class EncryptServiceContext @MiraiInternalApi constructor(
  * @since 2.15.0
  */
 public interface EncryptService : BaseService {
+
+    /**
+     * @since 2.15
+     */
+    public fun supported(protocol: BotConfiguration.MiraiProtocol) : Boolean {
+        return protocol != BotConfiguration.MiraiProtocol.ANDROID_WATCH
+    }
+
     /**
      * Returns `null` if not supported.
      */