mamoe · Him188 · May 21, 2023 · Apr 8, 2023 · Apr 9, 2023 · Apr 9, 2023
diff --git a/mirai-core-api/compatibility-validation/android/api/android.api b/mirai-core-api/compatibility-validation/android/api/android.api
@@ -5584,8 +5584,9 @@ public final class net/mamoe/mirai/utils/BotConfiguration$MiraiProtocol : java/l
 
 public final class net/mamoe/mirai/utils/DeviceInfo {
 	public static final field Companion Lnet/mamoe/mirai/utils/DeviceInfo$Companion;
-	public synthetic fun <init> (I[B[B[B[B[B[B[B[B[B[B[BLnet/mamoe/mirai/utils/DeviceInfo$Version;[B[B[B[B[B[BLjava/lang/String;[BLkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public synthetic fun <init> (I[B[B[B[B[B[B[B[B[B[B[BLnet/mamoe/mirai/utils/DeviceInfo$Version;[B[B[B[B[B[BLjava/lang/String;[B[BLkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> ([B[B[B[B[B[B[B[B[B[B[BLnet/mamoe/mirai/utils/DeviceInfo$Version;[B[B[B[B[B[BLjava/lang/String;[B)V
+	public fun <init> ([B[B[B[B[B[B[B[B[B[B[BLnet/mamoe/mirai/utils/DeviceInfo$Version;[B[B[B[B[B[BLjava/lang/String;[B[B)V
 	public fun equals (Ljava/lang/Object;)Z
 	public static final fun from (Ljava/io/File;)Lnet/mamoe/mirai/utils/DeviceInfo;
 	public static final fun from (Ljava/io/File;Lkotlinx/serialization/json/Json;)Lnet/mamoe/mirai/utils/DeviceInfo;
@@ -5608,13 +5609,17 @@ public final class net/mamoe/mirai/utils/DeviceInfo {
 	public final fun getOsType ()[B
 	public final fun getProcVersion ()[B
 	public final fun getProduct ()[B
+	public final fun getQimei16 ()Ljava/lang/String;
+	public final fun getQimei36 ()Ljava/lang/String;
 	public final fun getSimInfo ()[B
 	public final fun getVersion ()Lnet/mamoe/mirai/utils/DeviceInfo$Version;
 	public final fun getWifiBSSID ()[B
 	public final fun getWifiSSID ()[B
 	public fun hashCode ()I
 	public static final fun random ()Lnet/mamoe/mirai/utils/DeviceInfo;
 	public static final fun random (Lkotlin/random/Random;)Lnet/mamoe/mirai/utils/DeviceInfo;
+	public final fun setQimei16 (Ljava/lang/String;)V
+	public final fun setQimei36 (Ljava/lang/String;)V
 	public static final fun write$Self (Lnet/mamoe/mirai/utils/DeviceInfo;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 

diff --git a/mirai-core-api/compatibility-validation/jvm/api/jvm.api b/mirai-core-api/compatibility-validation/jvm/api/jvm.api
@@ -5584,8 +5584,9 @@ public final class net/mamoe/mirai/utils/BotConfiguration$MiraiProtocol : java/l
 
 public final class net/mamoe/mirai/utils/DeviceInfo {
 	public static final field Companion Lnet/mamoe/mirai/utils/DeviceInfo$Companion;
-	public synthetic fun <init> (I[B[B[B[B[B[B[B[B[B[B[BLnet/mamoe/mirai/utils/DeviceInfo$Version;[B[B[B[B[B[BLjava/lang/String;[BLkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public synthetic fun <init> (I[B[B[B[B[B[B[B[B[B[B[BLnet/mamoe/mirai/utils/DeviceInfo$Version;[B[B[B[B[B[BLjava/lang/String;[B[BLkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> ([B[B[B[B[B[B[B[B[B[B[BLnet/mamoe/mirai/utils/DeviceInfo$Version;[B[B[B[B[B[BLjava/lang/String;[B)V
+	public fun <init> ([B[B[B[B[B[B[B[B[B[B[BLnet/mamoe/mirai/utils/DeviceInfo$Version;[B[B[B[B[B[BLjava/lang/String;[B[B)V
 	public fun equals (Ljava/lang/Object;)Z
 	public static final fun from (Ljava/io/File;)Lnet/mamoe/mirai/utils/DeviceInfo;
 	public static final fun from (Ljava/io/File;Lkotlinx/serialization/json/Json;)Lnet/mamoe/mirai/utils/DeviceInfo;
@@ -5608,13 +5609,17 @@ public final class net/mamoe/mirai/utils/DeviceInfo {
 	public final fun getOsType ()[B
 	public final fun getProcVersion ()[B
 	public final fun getProduct ()[B
+	public final fun getQimei16 ()Ljava/lang/String;
+	public final fun getQimei36 ()Ljava/lang/String;
 	public final fun getSimInfo ()[B
 	public final fun getVersion ()Lnet/mamoe/mirai/utils/DeviceInfo$Version;
 	public final fun getWifiBSSID ()[B
 	public final fun getWifiSSID ()[B
 	public fun hashCode ()I
 	public static final fun random ()Lnet/mamoe/mirai/utils/DeviceInfo;
 	public static final fun random (Lkotlin/random/Random;)Lnet/mamoe/mirai/utils/DeviceInfo;
+	public final fun setQimei16 (Ljava/lang/String;)V
+	public final fun setQimei36 (Ljava/lang/String;)V
 	public static final fun write$Self (Lnet/mamoe/mirai/utils/DeviceInfo;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 

diff --git a/mirai-core-api/src/commonMain/kotlin/utils/DeviceInfo.kt b/mirai-core-api/src/commonMain/kotlin/utils/DeviceInfo.kt
@@ -46,8 +46,40 @@ public expect class DeviceInfo(
     wifiSSID: ByteArray,
     imsiMd5: ByteArray,
     imei: String,
-    apn: ByteArray
+    apn: ByteArray,
+    androidId: ByteArray,
 ) {
+    @Deprecated(
+        "This DeviceInfo constructor may randomize field `androidId` without your random instance. " +
+                "It is better to specify `androidId` explicitly.",
+        replaceWith = ReplaceWith(
+            "net.mamoe.mirai.utils.DeviceInfo(display, product, device, board, brand, model, " +
+                    "bootloader, fingerprint, bootId, procVersion, baseBand, version, simInfo, osType, " +
+                    "macAddress, wifiBSSID, wifiSSID, imsiMd5, imei, apn, )"
+        )
+    )
+    public constructor(
+        display: ByteArray,
+        product: ByteArray,
+        device: ByteArray,
+        board: ByteArray,
+        brand: ByteArray,
+        model: ByteArray,
+        bootloader: ByteArray,
+        fingerprint: ByteArray,
+        bootId: ByteArray,
+        procVersion: ByteArray,
+        baseBand: ByteArray,
+        version: Version,
+        simInfo: ByteArray,
+        osType: ByteArray,
+        macAddress: ByteArray,
+        wifiBSSID: ByteArray,
+        wifiSSID: ByteArray,
+        imsiMd5: ByteArray,
+        imei: String,
+        apn: ByteArray,
+    )
 
     public val display: ByteArray
     public val product: ByteArray
@@ -69,14 +101,22 @@ public expect class DeviceInfo(
     public val imsiMd5: ByteArray
     public val imei: String
     public val apn: ByteArray
-
     public val androidId: ByteArray
+
     public val ipAddress: ByteArray
 
     @Transient
     @MiraiInternalApi
     public val guid: ByteArray
 
+    @Transient
+    @MiraiInternalApi
+    public var qimei16: String?
+
+    @Transient
+    @MiraiInternalApi
+    public var qimei36: String?
+
 
     // @Serializable: use DeviceInfoVersionSerializer in commonMain.
     public class Version(
@@ -160,7 +200,8 @@ internal object DeviceInfoCommonImpl {
         wifiSSID = "<unknown ssid>".toByteArray(),
         imsiMd5 = getRandomByteArray(16, random).md5(),
         imei = "86${getRandomIntString(12, random)}".let { it + luhn(it) },
-        apn = "wifi".toByteArray()
+        apn = "wifi".toByteArray(),
+        androidId = getRandomByteArray(8, random).toUHexString("").lowercase().encodeToByteArray()
     )
 
     /**
@@ -187,6 +228,8 @@ internal object DeviceInfoCommonImpl {
         if (deviceInfo === other) return true
         if (!isSameType(this, other)) return false
 
+        // also remember to add equal compare to JvmDeviceInfoTest.`can read legacy v1`
+        // when adding new field compare here.
         if (!display.contentEquals(other.display)) return false
         if (!product.contentEquals(other.product)) return false
         if (!device.contentEquals(other.device)) return false
@@ -208,6 +251,9 @@ internal object DeviceInfoCommonImpl {
         if (imei != other.imei) return false
         if (!apn.contentEquals(other.apn)) return false
         if (!guid.contentEquals(other.guid)) return false
+        if (!androidId.contentEquals(other.androidId)) return false
+        if (qimei16 != other.qimei16) return false
+        if (qimei36 != other.qimei36) return false
 
         return true
     }
@@ -235,6 +281,9 @@ internal object DeviceInfoCommonImpl {
         result = 31 * result + imei.hashCode()
         result = 31 * result + apn.contentHashCode()
         result = 31 * result + guid.contentHashCode()
+        result = 31 * result + androidId.contentHashCode()
+        result = 31 * result + qimei16.hashCode()
+        result = 31 * result + qimei36.hashCode()
         return result
     }
 }
@@ -355,7 +404,8 @@ internal object DeviceInfoManager {
                 wifiSSID = wifiSSID,
                 imsiMd5 = imsiMd5,
                 imei = imei,
-                apn = apn
+                apn = apn,
+                androidId = getRandomByteArray(8).toUHexString("").lowercase().encodeToByteArray()
             )
         }
     }
@@ -404,7 +454,58 @@ internal object DeviceInfoManager {
             this.wifiSSID.toByteArray(),
             this.imsiMd5.data,
             this.imei,
-            this.apn.toByteArray()
+            this.apn.toByteArray(),
+            androidId = getRandomByteArray(8).toUHexString("").lowercase().encodeToByteArray()
+        )
+    }
+
+
+    @Serializable
+    class V3(
+        val display: String,
+        val product: String,
+        val device: String,
+        val board: String,
+        val brand: String,
+        val model: String,
+        val bootloader: String,
+        val fingerprint: String,
+        val bootId: String,
+        val procVersion: String,
+        val baseBand: HexString,
+        val version: Version,
+        val simInfo: String,
+        val osType: String,
+        val macAddress: String,
+        val wifiBSSID: String,
+        val wifiSSID: String,
+        val imsiMd5: HexString,
+        val imei: String,
+        val apn: String,
+        val androidId: String,
+    ) : Info {
+        override fun toDeviceInfo(): DeviceInfo = DeviceInfo(
+            this.display.toByteArray(),
+            this.product.toByteArray(),
+            this.device.toByteArray(),
+            this.board.toByteArray(),
+            this.brand.toByteArray(),
+            this.model.toByteArray(),
+            this.bootloader.toByteArray(),
+            this.fingerprint.toByteArray(),
+            this.bootId.toByteArray(),
+            this.procVersion.toByteArray(),
+            this.baseBand.data,
+            this.version.trans(),
+            this.simInfo.toByteArray(),
+            this.osType.toByteArray(),
+            this.macAddress.toByteArray(),
+            this.wifiBSSID.toByteArray(),
+            this.wifiSSID.toByteArray(),
+            this.imsiMd5.data,
+            this.imei,
+            this.apn.toByteArray(),
+            this.androidId.toByteArray()
         )
     }
 
@@ -426,7 +527,7 @@ internal object DeviceInfoManager {
         }
     }
 
-    fun DeviceInfo.toCurrentInfo(): V2 = V2(
+    fun DeviceInfo.toCurrentInfo(): V3 = V3(
         display.decodeToString(),
         product.decodeToString(),
         device.decodeToString(),
@@ -446,7 +547,8 @@ internal object DeviceInfoManager {
         wifiSSID.decodeToString(),
         HexString(imsiMd5),
         imei,
-        apn.decodeToString()
+        apn.decodeToString(),
+        androidId.decodeToString(),
     )
 
     internal val format = Json {
@@ -467,21 +569,25 @@ internal object DeviceInfoManager {
              * @since 2.9
              */
             2 -> format.decodeFromJsonElement(Wrapper.serializer(V2.serializer()), element).data
+            /**
+             * @since 2.15
+             */
+            3 -> format.decodeFromJsonElement(Wrapper.serializer(V3.serializer()), element).data
             else -> throw IllegalArgumentException("Unsupported deviceInfoVersion: $version")
         }.toDeviceInfo()
     }
 
     fun serialize(info: DeviceInfo, format: Json = this.format): String {
         return format.encodeToString(
-            Wrapper.serializer(V2.serializer()),
-            Wrapper(2, info.toCurrentInfo())
+            Wrapper.serializer(V3.serializer()),
+            Wrapper(3, info.toCurrentInfo())
         )
     }
 
     fun toJsonElement(info: DeviceInfo, format: Json = this.format): JsonElement {
         return format.encodeToJsonElement(
-            Wrapper.serializer(V2.serializer()),
-            Wrapper(2, info.toCurrentInfo())
+            Wrapper.serializer(V3.serializer()),
+            Wrapper(3, info.toCurrentInfo())
         )
     }
 }

diff --git a/mirai-core-api/src/commonTest/kotlin/utils/DeviceInfoTest.kt b/mirai-core-api/src/commonTest/kotlin/utils/DeviceInfoTest.kt
@@ -88,7 +88,7 @@ class CommonDeviceInfoTest {
          */
 
         val element = DeviceInfoManager.toJsonElement(device)
-        assertEquals(2, element.jsonObject["deviceInfoVersion"]!!.jsonPrimitive.content.toInt())
+        assertEquals(3, element.jsonObject["deviceInfoVersion"]!!.jsonPrimitive.content.toInt())
 
         val imsiMd5 = element.jsonObject["data"]!!.jsonObject["imsiMd5"]!!.jsonPrimitive.content
         assertEquals(

diff --git a/mirai-core-api/src/jvmBaseMain/kotlin/utils/DeviceInfo.kt b/mirai-core-api/src/jvmBaseMain/kotlin/utils/DeviceInfo.kt
@@ -16,7 +16,7 @@ import java.io.File
 import kotlin.random.Random
 
 @Serializable
-public actual class DeviceInfo actual constructor(
+public actual class DeviceInfo public actual constructor(
     public actual val display: ByteArray,
     public actual val product: ByteArray,
     public actual val device: ByteArray,
@@ -36,9 +36,46 @@ public actual class DeviceInfo actual constructor(
     public actual val wifiSSID: ByteArray,
     public actual val imsiMd5: ByteArray,
     public actual val imei: String,
-    public actual val apn: ByteArray
+    public actual val apn: ByteArray,
+    public actual val androidId: ByteArray,
 ) {
-    public actual val androidId: ByteArray get() = display
+    @Deprecated(
+        "This DeviceInfo constructor may randomize field `androidId` without your random instance. " +
+                "It is better to specify `android` id explicitly.",
+        replaceWith = ReplaceWith(
+            "net.mamoe.mirai.utils.DeviceInfo(display, product, device, board, brand, model, " +
+                    "bootloader, fingerprint, bootId, procVersion, baseBand, version, simInfo, osType, " +
+                    "macAddress, wifiBSSID, wifiSSID, imsiMd5, imei, apn, )"
+        )
+    )
+    public actual constructor(
+        display: ByteArray,
+        product: ByteArray,
+        device: ByteArray,
+        board: ByteArray,
+        brand: ByteArray,
+        model: ByteArray,
+        bootloader: ByteArray,
+        fingerprint: ByteArray,
+        bootId: ByteArray,
+        procVersion: ByteArray,
+        baseBand: ByteArray,
+        version: Version,
+        simInfo: ByteArray,
+        osType: ByteArray,
+        macAddress: ByteArray,
+        wifiBSSID: ByteArray,
+        wifiSSID: ByteArray,
+        imsiMd5: ByteArray,
+        imei: String,
+        apn: ByteArray
+    ) : this(
+        display, product, device, board, brand, model, bootloader,
+        fingerprint, bootId, procVersion, baseBand, version, simInfo,
+        osType, macAddress, wifiBSSID, wifiSSID, imsiMd5, imei, apn,
+        androidId = getRandomByteArray(8).toUHexString("").lowercase().encodeToByteArray()
+    )
+
     public actual val ipAddress: ByteArray get() = byteArrayOf(192.toByte(), 168.toByte(), 1, 123)
 
     init {
@@ -49,6 +86,14 @@ public actual class DeviceInfo actual constructor(
     @MiraiInternalApi
     public actual val guid: ByteArray = generateGuid(androidId, macAddress)
 
+    @MiraiInternalApi
+    @Transient
+    public actual var qimei16: String? = null
+
+    @MiraiInternalApi
+    @Transient
+    public actual var qimei36: String? = null
+
     @Serializable
     public actual class Version actual constructor(
         public actual val incremental: ByteArray,