diff --git a/mirai-core-api/compatibility-validation/android/api/android.api b/mirai-core-api/compatibility-validation/android/api/android.api
index 363c47194..95ef68d0a 100644
--- a/mirai-core-api/compatibility-validation/android/api/android.api
+++ b/mirai-core-api/compatibility-validation/android/api/android.api
@@ -5689,6 +5689,62 @@ public final class net/mamoe/mirai/utils/DeviceInfo$Version$Companion {
public final fun serializer ()Lkotlinx/serialization/KSerializer;
}
+public final class net/mamoe/mirai/utils/DeviceInfoBuilder {
+ public static final field Companion Lnet/mamoe/mirai/utils/DeviceInfoBuilder$Companion;
+ public fun <init> ()V
+ public final fun androidId (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun androidId ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun apn (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun apn ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun baseBand (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun baseBand ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun board (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun board ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun bootId (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun bootId ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun bootloader (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun bootloader ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun brand (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun brand ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun build ()Lnet/mamoe/mirai/utils/DeviceInfo;
+ public final fun device (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun device ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun display (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun display ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun fingerprint (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun fingerprint ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public static final fun fromPrototype (Lnet/mamoe/mirai/utils/DeviceInfo;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public static final fun fromRandom ()Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public static final fun fromRandom (Lkotlin/random/Random;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun imei (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun imsiMd5 (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun imsiMd5 ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun macAddress (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun macAddress ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun model (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun model ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun osType (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun osType ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun procVersion (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun procVersion ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun product (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun product ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun simInfo (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun simInfo ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun version (Lnet/mamoe/mirai/utils/DeviceInfo$Version;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun wifiBSSID (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun wifiBSSID ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun wifiSSID (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun wifiSSID ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+}
+
+public final class net/mamoe/mirai/utils/DeviceInfoBuilder$Companion {
+ public final fun fromPrototype (Lnet/mamoe/mirai/utils/DeviceInfo;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun fromRandom ()Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun fromRandom (Lkotlin/random/Random;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public static synthetic fun fromRandom$default (Lnet/mamoe/mirai/utils/DeviceInfoBuilder$Companion;Lkotlin/random/Random;ILjava/lang/Object;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+}
+
public final class net/mamoe/mirai/utils/DeviceInfoKt {
public static final fun generateDeviceInfoData (Lnet/mamoe/mirai/utils/DeviceInfo;)[B
public static final synthetic fun serializeToString (Lnet/mamoe/mirai/utils/DeviceInfo;)Ljava/lang/String;
diff --git a/mirai-core-api/compatibility-validation/jvm/api/jvm.api b/mirai-core-api/compatibility-validation/jvm/api/jvm.api
index 44c975ba0..0d96fb644 100644
--- a/mirai-core-api/compatibility-validation/jvm/api/jvm.api
+++ b/mirai-core-api/compatibility-validation/jvm/api/jvm.api
@@ -5689,6 +5689,62 @@ public final class net/mamoe/mirai/utils/DeviceInfo$Version$Companion {
public final fun serializer ()Lkotlinx/serialization/KSerializer;
}
+public final class net/mamoe/mirai/utils/DeviceInfoBuilder {
+ public static final field Companion Lnet/mamoe/mirai/utils/DeviceInfoBuilder$Companion;
+ public fun <init> ()V
+ public final fun androidId (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun androidId ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun apn (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun apn ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun baseBand (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun baseBand ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun board (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun board ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun bootId (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun bootId ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun bootloader (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun bootloader ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun brand (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun brand ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun build ()Lnet/mamoe/mirai/utils/DeviceInfo;
+ public final fun device (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun device ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun display (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun display ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun fingerprint (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun fingerprint ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public static final fun fromPrototype (Lnet/mamoe/mirai/utils/DeviceInfo;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public static final fun fromRandom ()Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public static final fun fromRandom (Lkotlin/random/Random;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun imei (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun imsiMd5 (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun imsiMd5 ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun macAddress (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun macAddress ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun model (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun model ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun osType (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun osType ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun procVersion (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun procVersion ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun product (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun product ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun simInfo (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun simInfo ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun version (Lnet/mamoe/mirai/utils/DeviceInfo$Version;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun wifiBSSID (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun wifiBSSID ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun wifiSSID (Ljava/lang/String;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun wifiSSID ([B)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+}
+
+public final class net/mamoe/mirai/utils/DeviceInfoBuilder$Companion {
+ public final fun fromPrototype (Lnet/mamoe/mirai/utils/DeviceInfo;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun fromRandom ()Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public final fun fromRandom (Lkotlin/random/Random;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+ public static synthetic fun fromRandom$default (Lnet/mamoe/mirai/utils/DeviceInfoBuilder$Companion;Lkotlin/random/Random;ILjava/lang/Object;)Lnet/mamoe/mirai/utils/DeviceInfoBuilder;
+}
+
public final class net/mamoe/mirai/utils/DeviceInfoKt {
public static final fun generateDeviceInfoData (Lnet/mamoe/mirai/utils/DeviceInfo;)[B
public static final synthetic fun serializeToString (Lnet/mamoe/mirai/utils/DeviceInfo;)Ljava/lang/String;
diff --git a/mirai-core-api/src/commonMain/kotlin/utils/DeviceInfo.kt b/mirai-core-api/src/commonMain/kotlin/utils/DeviceInfo.kt
index 896a7be28..71a1b700f 100644
--- a/mirai-core-api/src/commonMain/kotlin/utils/DeviceInfo.kt
+++ b/mirai-core-api/src/commonMain/kotlin/utils/DeviceInfo.kt
@@ -23,15 +23,47 @@ import kotlin.jvm.JvmSynthetic
import kotlin.random.Random
internal const val DeviceInfoConstructorDeprecationMessage =
- "Constructor and serializer of DeviceInfo is deprecated and will be removed in the future." +
- "This is because new properties can be added and it requires too much effort to maintain public stability." +
- "Please use DeviceInfo.serializeToString and DeviceInfo.deserializeFromString instead."
+ "DeviceInfo 构造器将会在未来删除. " +
+ "这是因为构造器导致维护变得十分困难. " +
+ "若要构造 DeviceInfo 实例, 请使用 DeviceInfoBuilder." +
+ "若要序列化, 请使用 DeviceInfo.serializeToString 和 DeviceInfo.deserializeFromString."
+
+internal const val DeviceInfoConstructorReplaceWith = "DeviceInfoBuilder.create()" +
+ ".display(display)" +
+ ".product(product)" +
+ ".device(device)" +
+ ".board(board)" +
+ ".brand(brand)" +
+ ".model(model)" +
+ ".bootloader(bootloader)" +
+ ".fingerprint(fingerprint)" +
+ ".bootId(bootId)" +
+ ".procVersion(procVersion)" +
+ ".baseBand(baseBand)" +
+ ".version(version)" +
+ ".simInfo(simInfo)" +
+ ".osType(osType)" +
+ ".macAddress(macAddress)" +
+ ".wifiBSSID(wifiBSSID)" +
+ ".wifiSSID(wifiSSID)" +
+ ".imsiMd5(imsiMd5)" +
+ ".imei(imei)" +
+ ".apn(apn)" +
+ ".androidId(androidId)" +
+ ".build()"
/**
* 表示设备信息
+ * @see DeviceInfoBuilder
*/
public expect class DeviceInfo
-@Deprecated(DeviceInfoConstructorDeprecationMessage, level = DeprecationLevel.WARNING)
+@Deprecated(
+ DeviceInfoConstructorDeprecationMessage, level = DeprecationLevel.WARNING,
+ replaceWith = ReplaceWith(
+ DeviceInfoConstructorReplaceWith,
+ "net.mamoe.mirai.utils.DeviceInfoBuilder"
+ )
+)
@DeprecatedSinceMirai(warningSince = "2.15") // planned internal
public constructor(
display: ByteArray,
@@ -117,6 +149,7 @@ public constructor(
/**
* 生成随机 [DeviceInfo]
*
+ * @see DeviceInfoBuilder
* @since 2.0
*/
@JvmStatic
@@ -125,6 +158,7 @@ public constructor(
/**
* 使用特定随机数生成器生成 [DeviceInfo]
*
+ * @see DeviceInfoBuilder
* @since 2.9
*/
@JvmStatic
diff --git a/mirai-core-api/src/commonMain/kotlin/utils/DeviceInfoBuilder.kt b/mirai-core-api/src/commonMain/kotlin/utils/DeviceInfoBuilder.kt
new file mode 100644
index 000000000..6468edff2
--- /dev/null
+++ b/mirai-core-api/src/commonMain/kotlin/utils/DeviceInfoBuilder.kt
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2019-2023 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/dev/LICENSE
+ */
+
+package net.mamoe.mirai.utils
+
+import net.mamoe.mirai.utils.DeviceInfoBuilder.Companion.fromPrototype
+import net.mamoe.mirai.utils.DeviceInfoBuilder.Companion.fromRandom
+import kotlin.jvm.JvmOverloads
+import kotlin.jvm.JvmStatic
+import kotlin.random.Random
+
+/**
+ * [DeviceInfo] 的构建器.
+ *
+ * 通过 [fromPrototype] 或 [fromRandom] 可以构造一个构建器, 调用其各属性方法后使用 [build] 即可构建实例.
+ *
+ * @see build
+ *
+ * @since 2.15
+ */
+public class DeviceInfoBuilder internal constructor(
+ private val prototype: DeviceInfo = DeviceInfo.random()
+) {
+ private var display: ByteArray? = null
+ public fun display(value: ByteArray): DeviceInfoBuilder = apply {
+ this.display = value
+ }
+
+ public fun display(value: String): DeviceInfoBuilder = apply {
+ this.display = value.encodeToByteArray()
+ }
+
+ private var product: ByteArray? = prototype.product
+ public fun product(value: ByteArray): DeviceInfoBuilder = apply {
+ this.product = value
+ }
+
+ public fun product(value: String): DeviceInfoBuilder = apply {
+ this.product = value.encodeToByteArray()
+ }
+
+ private var device: ByteArray? = null
+ public fun device(value: ByteArray): DeviceInfoBuilder = apply {
+ this.device = value
+ }
+
+ public fun device(value: String): DeviceInfoBuilder = apply {
+ this.device = value.encodeToByteArray()
+ }
+
+ private var board: ByteArray? = null
+ public fun board(value: ByteArray): DeviceInfoBuilder = apply {
+ this.board = value
+ }
+
+ public fun board(value: String): DeviceInfoBuilder = apply {
+ this.board = value.encodeToByteArray()
+ }
+
+ private var brand: ByteArray? = null
+ public fun brand(value: ByteArray): DeviceInfoBuilder = apply {
+ this.brand = value
+ }
+
+ public fun brand(value: String): DeviceInfoBuilder = apply {
+ this.brand = value.encodeToByteArray()
+ }
+
+ private var model: ByteArray? = null
+ public fun model(value: ByteArray): DeviceInfoBuilder = apply {
+ this.model = value
+ }
+
+ public fun model(value: String): DeviceInfoBuilder = apply {
+ this.model = value.encodeToByteArray()
+ }
+
+ private var bootloader: ByteArray? = null
+ public fun bootloader(value: ByteArray): DeviceInfoBuilder = apply {
+ this.bootloader = value
+ }
+
+ public fun bootloader(value: String): DeviceInfoBuilder = apply {
+ this.bootloader = value.encodeToByteArray()
+ }
+
+ private var fingerprint: ByteArray? = null
+ public fun fingerprint(value: ByteArray): DeviceInfoBuilder = apply {
+ this.fingerprint = value
+ }
+
+ public fun fingerprint(value: String): DeviceInfoBuilder = apply {
+ this.fingerprint = value.encodeToByteArray()
+ }
+
+ private var bootId: ByteArray? = null
+ public fun bootId(value: ByteArray): DeviceInfoBuilder = apply {
+ this.bootId = value
+ }
+
+ public fun bootId(value: String): DeviceInfoBuilder = apply {
+ this.bootId = value.encodeToByteArray()
+ }
+
+ private var procVersion: ByteArray? = null
+ public fun procVersion(value: ByteArray): DeviceInfoBuilder = apply {
+ this.procVersion = value
+ }
+
+ public fun procVersion(value: String): DeviceInfoBuilder = apply {
+ this.procVersion = value.encodeToByteArray()
+ }
+
+ private var baseBand: ByteArray? = null
+ public fun baseBand(value: ByteArray): DeviceInfoBuilder = apply {
+ this.baseBand = value
+ }
+
+ public fun baseBand(value: String): DeviceInfoBuilder = apply {
+ this.baseBand = value.encodeToByteArray()
+ }
+
+ private var version: DeviceInfo.Version? = null
+ public fun version(value: DeviceInfo.Version): DeviceInfoBuilder = apply {
+ this.version = value
+ }
+
+ private var simInfo: ByteArray? = null
+ public fun simInfo(value: ByteArray): DeviceInfoBuilder = apply {
+ this.simInfo = value
+ }
+
+ public fun simInfo(value: String): DeviceInfoBuilder = apply {
+ this.simInfo = value.encodeToByteArray()
+ }
+
+ private var osType: ByteArray? = null
+ public fun osType(value: ByteArray): DeviceInfoBuilder = apply {
+ this.osType = value
+ }
+
+ public fun osType(value: String): DeviceInfoBuilder = apply {
+ this.osType = value.encodeToByteArray()
+ }
+
+ private var macAddress: ByteArray? = null
+ public fun macAddress(value: ByteArray): DeviceInfoBuilder = apply {
+ this.macAddress = value
+ }
+
+ public fun macAddress(value: String): DeviceInfoBuilder = apply {
+ this.macAddress = value.encodeToByteArray()
+ }
+
+ private var wifiBSSID: ByteArray? = null
+ public fun wifiBSSID(value: ByteArray): DeviceInfoBuilder = apply {
+ this.wifiBSSID = value
+ }
+
+ public fun wifiBSSID(value: String): DeviceInfoBuilder = apply {
+ this.wifiBSSID = value.encodeToByteArray()
+ }
+
+ private var wifiSSID: ByteArray? = null
+ public fun wifiSSID(value: ByteArray): DeviceInfoBuilder = apply {
+ this.wifiSSID = value
+ }
+
+ public fun wifiSSID(value: String): DeviceInfoBuilder = apply {
+ this.wifiSSID = value.encodeToByteArray()
+ }
+
+ private var imsiMd5: ByteArray? = null
+ public fun imsiMd5(value: ByteArray): DeviceInfoBuilder = apply {
+ this.imsiMd5 = value
+ }
+
+ public fun imsiMd5(value: String): DeviceInfoBuilder = apply {
+ this.imsiMd5 = value.encodeToByteArray()
+ }
+
+ private var imei: String? = null
+ public fun imei(value: String): DeviceInfoBuilder = apply {
+ this.imei = value
+ }
+
+
+ private var apn: ByteArray? = null
+ public fun apn(value: ByteArray): DeviceInfoBuilder = apply {
+ this.apn = value
+ }
+
+ public fun apn(value: String): DeviceInfoBuilder = apply {
+ this.apn = value.encodeToByteArray()
+ }
+
+ private var androidId: ByteArray? = null
+ public fun androidId(value: ByteArray): DeviceInfoBuilder = apply {
+ this.androidId = value
+ }
+
+ public fun androidId(value: String): DeviceInfoBuilder = apply {
+ this.androidId = value.encodeToByteArray()
+ }
+
+
+ public fun build(): DeviceInfo {
+ @Suppress("DEPRECATION")
+ return DeviceInfo(
+ display = display ?: prototype.display.copyOf(),
+ product = product ?: prototype.product.copyOf(),
+ device = device ?: prototype.device.copyOf(),
+ board = board ?: prototype.board.copyOf(),
+ brand = brand ?: prototype.brand.copyOf(),
+ model = model ?: prototype.model.copyOf(),
+ bootloader = bootloader ?: prototype.bootloader.copyOf(),
+ fingerprint = fingerprint ?: prototype.fingerprint.copyOf(),
+ bootId = bootId ?: prototype.bootId.copyOf(),
+ procVersion = procVersion ?: prototype.procVersion.copyOf(),
+ baseBand = baseBand ?: prototype.baseBand.copyOf(),
+ version = version ?: prototype.version,
+ simInfo = simInfo ?: prototype.simInfo.copyOf(),
+ osType = osType ?: prototype.osType.copyOf(),
+ macAddress = macAddress ?: prototype.macAddress.copyOf(),
+ wifiBSSID = wifiBSSID ?: prototype.wifiBSSID.copyOf(),
+ wifiSSID = wifiSSID ?: prototype.wifiSSID.copyOf(),
+ imsiMd5 = imsiMd5 ?: prototype.imsiMd5.copyOf(),
+ imei = imei ?: prototype.imei,
+ apn = apn ?: prototype.apn.copyOf(),
+ androidId = androidId ?: prototype.androidId.copyOf(),
+ )
+ }
+
+ public companion object {
+ /**
+ * 构造一个以随机属性填充的 [DeviceInfoBuilder].
+ */
+ @JvmStatic
+ @JvmOverloads
+ public fun fromRandom(random: Random = Random.Default): DeviceInfoBuilder =
+ DeviceInfoBuilder(DeviceInfo.random(random))
+
+ /**
+ * 构造一个复制 [prototype] 属性的 [DeviceInfoBuilder].
+ */
+ @JvmStatic
+ public fun fromPrototype(prototype: DeviceInfo): DeviceInfoBuilder = DeviceInfoBuilder(prototype)
+ }
+}
diff --git a/mirai-core-api/src/jvmBaseMain/kotlin/utils/DeviceInfo.kt b/mirai-core-api/src/jvmBaseMain/kotlin/utils/DeviceInfo.kt
index 92b733bf9..e6bb32211 100644
--- a/mirai-core-api/src/jvmBaseMain/kotlin/utils/DeviceInfo.kt
+++ b/mirai-core-api/src/jvmBaseMain/kotlin/utils/DeviceInfo.kt
@@ -16,6 +16,10 @@ import kotlinx.serialization.json.Json
import java.io.File
import kotlin.random.Random
+/**
+ * 表示设备信息
+ * @see DeviceInfoBuilder
+ */
@Serializable(DeviceInfoV1LegacySerializer::class)
public actual class DeviceInfo
@Deprecated(DeviceInfoConstructorDeprecationMessage, level = DeprecationLevel.WARNING)
@@ -151,6 +155,7 @@ public actual constructor(
/**
* 生成随机 [DeviceInfo]
*
+ * @see DeviceInfoBuilder
* @since 2.0
*/
@JvmStatic
@@ -159,6 +164,7 @@ public actual constructor(
/**
* 使用特定随机数生成器生成 [DeviceInfo]
*
+ * @see DeviceInfoBuilder
* @since 2.9
*/
@JvmStatic
diff --git a/mirai-core-api/src/nativeMain/kotlin/utils/DeviceInfo.kt b/mirai-core-api/src/nativeMain/kotlin/utils/DeviceInfo.kt
index 52d14f05b..ff21cdb40 100644
--- a/mirai-core-api/src/nativeMain/kotlin/utils/DeviceInfo.kt
+++ b/mirai-core-api/src/nativeMain/kotlin/utils/DeviceInfo.kt
@@ -13,6 +13,10 @@ import kotlinx.serialization.Serializable
import kotlinx.serialization.Transient
import kotlin.random.Random
+/**
+ * 表示设备信息
+ * @see DeviceInfoBuilder
+ */
@Serializable(DeviceInfoV1LegacySerializer::class)
public actual class DeviceInfo
@Deprecated(DeviceInfoConstructorDeprecationMessage, level = DeprecationLevel.WARNING)
@@ -90,6 +94,7 @@ public actual constructor(
/**
* 生成随机 [DeviceInfo]
*
+ * @see DeviceInfoBuilder
* @since 2.0
*/
public actual fun random(): DeviceInfo = random(Random.Default)
@@ -97,6 +102,7 @@ public actual constructor(
/**
* 使用特定随机数生成器生成 [DeviceInfo]
*
+ * @see DeviceInfoBuilder
* @since 2.9
*/
public actual fun random(random: Random): DeviceInfo {