Adjust visibilities

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt

@@ -7,7 +7,8 @@
  * https://github.com/mamoe/mirai/blob/master/LICENSE
  */
 
-@file: Suppress("INAPPLICABLE_JVM_NAME")
+@file:Suppress("INAPPLICABLE_JVM_NAME")
+@file:OptIn(MiraiInternalAPI::class, LowLevelAPI::class)
 
 package net.mamoe.mirai.qqandroid.contact
 
@@ -47,7 +48,6 @@ internal fun GroupImpl.Companion.checkIsInstance(instance: Group) {
 }
 
 @Suppress("PropertyName")
-@OptIn(MiraiInternalAPI::class)
 internal class GroupImpl(
     bot: QQAndroidBot, override val coroutineContext: CoroutineContext,
     override val id: Long,

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/MemberImpl.kt

@@ -10,6 +10,7 @@
 package net.mamoe.mirai.qqandroid.contact
 
 import kotlinx.coroutines.launch
+import net.mamoe.mirai.LowLevelAPI
 import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.data.FriendNameRemark
 import net.mamoe.mirai.data.MemberInfo
@@ -30,9 +31,9 @@ import net.mamoe.mirai.utils.*
 import kotlin.coroutines.CoroutineContext
 import kotlin.jvm.JvmSynthetic
 
-
+@OptIn(LowLevelAPI::class)
 @Suppress("MemberVisibilityCanBePrivate")
-internal class MemberImpl(
+internal class MemberImpl  constructor(
     val qq: QQImpl, // 不要 WeakRef
     group: GroupImpl,
     override val coroutineContext: CoroutineContext,
@@ -212,6 +213,7 @@ internal class MemberImpl(
     }
 }
 
+@OptIn(LowLevelAPI::class)
 internal class MemberInfoImpl(
     jceInfo: StTroopMemberInfo,
     groupOwnerId: Long

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/QQImpl.kt

+/*
+ * Copyright 2020 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
+ */
+
+@file:OptIn(MiraiInternalAPI::class, LowLevelAPI::class)
+
 package net.mamoe.mirai.qqandroid.contact
 
 import kotlinx.io.core.Closeable
+import net.mamoe.mirai.LowLevelAPI
 import net.mamoe.mirai.contact.Contact
 import net.mamoe.mirai.contact.QQ
 import net.mamoe.mirai.data.FriendInfo

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/event/PacketReceivedEvent.kt

@@ -9,7 +9,7 @@
 
 package net.mamoe.mirai.qqandroid.event
 
-import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.event.AbstractCancellableEvent
 import net.mamoe.mirai.event.Event
 

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/JceStruct.kt

@@ -9,4 +9,4 @@
 
 package net.mamoe.mirai.qqandroid.io
 
-interface JceStruct
+internal interface JceStruct
\ No newline at end of file

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/ProtoBuf.kt

@@ -12,4 +12,4 @@ package net.mamoe.mirai.qqandroid.io
 /**
  * 仅有标示作用
  */
-interface ProtoBuf
+internal interface ProtoBuf

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/JceOld.kt

@@ -48,7 +48,7 @@ internal val CharsetGBK = Charset.forName("GBK")
 @PublishedApi
 internal val CharsetUTF8 = Charset.forName("UTF8")
 
-enum class JceCharset(val kotlinCharset: Charset) {
+internal enum class JceCharset(val kotlinCharset: Charset) {
     GBK(Charset.forName("GBK")),
     UTF8(Charset.forName("UTF8"))
 }
@@ -60,7 +60,7 @@ internal fun getSerialId(desc: SerialDescriptor, index: Int): Int? = desc.findAn
  */
 @Suppress("DEPRECATION_ERROR")
 @OptIn(InternalSerializationApi::class)
-class JceOld private constructor(private val charset: JceCharset, override val context: SerialModule = EmptyModule) :
+internal class JceOld private constructor(private val charset: JceCharset, override val context: SerialModule = EmptyModule) :
     SerialFormat, BinaryFormat {
 
     private inner class ListWriter(

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/ProtoBufWithNullableSupport.kt

@@ -42,7 +42,7 @@ internal fun extractParameters(desc: SerialDescriptor, index: Int, zeroBasedDefa
  * 代码复制自 kotlinx.serialization. 修改部分已进行标注 (详见 "MIRAI MODIFY START")
  */
 @OptIn(InternalSerializationApi::class)
-class ProtoBufWithNullableSupport(override val context: SerialModule = EmptyModule) : SerialFormat, BinaryFormat {
+internal class ProtoBufWithNullableSupport(override val context: SerialModule = EmptyModule) : SerialFormat, BinaryFormat {
 
     internal open inner class ProtobufWriter(private val encoder: ProtobufEncoder) : TaggedEncoder<ProtoDesc>() {
         override val context

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/README.md

@@ -3,8 +3,8 @@
 **序列化支持**
 
 包含:
-- QQ 的 JceStruct 相关的全自动序列化和反序列化: [Jce.kt](Jce.kt)
+- QQ 的 JceStruct 相关的全自动序列化和反序列化: [Jce.kt](jce/JceNew.kt)
 - Protocol Buffers 的 optional 支持: [ProtoBufWithNullableSupport.kt](ProtoBufWithNullableSupport.kt)
 
-其中, ProtoBufWithNullableSupport.kt 的绝大部分源码来自 `kotlinx.serialization`. 原著权归该项目作者所有.  
+其中, `ProtoBufWithNullableSupport` 的绝大部分源码来自 `kotlinx.serialization`. 原著权归该项目作者所有.  
 Mirai 所做的修改已经标记上了 `MIRAI MODIFY START`
\ No newline at end of file

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/JceNew.kt

@@ -26,7 +26,7 @@ import net.mamoe.mirai.utils.io.toReadPacket
  *
  * @author Him188
  */
-class Jce(
+internal class Jce(
     override val context: SerialModule,
     val charset: JceCharset
 ) : SerialFormat, IOFormat, BinaryFormat {

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/common.kt

@@ -19,7 +19,7 @@ import kotlinx.serialization.SerialInfo
  */
 @SerialInfo
 @Target(AnnotationTarget.PROPERTY)
-annotation class JceId(val id: Int)
+internal annotation class JceId(val id: Int)
 
 /**
  * 类中元素的 tag

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/utils.kt

@@ -31,11 +31,11 @@ import kotlin.jvm.JvmMultifileClass
 import kotlin.jvm.JvmName
 
 
-fun <T : JceStruct> ByteArray.loadAs(deserializer: DeserializationStrategy<T>, c: JceCharset = JceCharset.UTF8): T {
+internal fun <T : JceStruct> ByteArray.loadAs(deserializer: DeserializationStrategy<T>, c: JceCharset = JceCharset.UTF8): T {
     return Jce.byCharSet(c).load(deserializer, this.toReadPacket())
 }
 
-fun <T : JceStruct> BytePacketBuilder.writeJceStruct(
+internal fun <T : JceStruct> BytePacketBuilder.writeJceStruct(
     serializer: SerializationStrategy<T>,
     struct: T,
     charset: JceCharset = JceCharset.GBK
@@ -43,7 +43,7 @@ fun <T : JceStruct> BytePacketBuilder.writeJceStruct(
     Jce.byCharSet(charset).dumpTo(serializer, struct, this)
 }
 
-fun <T : JceStruct> ByteReadPacket.readJceStruct(
+internal fun <T : JceStruct> ByteReadPacket.readJceStruct(
     serializer: DeserializationStrategy<T>,
     charset: JceCharset = JceCharset.UTF8,
     length: Int = this.remaining.toInt()
@@ -55,7 +55,7 @@ fun <T : JceStruct> ByteReadPacket.readJceStruct(
 /**
  * 先解析为 [RequestPacket], 即 `UniRequest`, 再按版本解析 map, 再找出指定数据并反序列化
  */
-fun <T : JceStruct> ByteReadPacket.decodeUniPacket(deserializer: DeserializationStrategy<T>, name: String? = null): T {
+internal fun <T : JceStruct> ByteReadPacket.decodeUniPacket(deserializer: DeserializationStrategy<T>, name: String? = null): T {
     return decodeUniRequestPacketAndDeserialize(name) {
         it.read {
             discardExact(1)
@@ -67,7 +67,7 @@ fun <T : JceStruct> ByteReadPacket.decodeUniPacket(deserializer: Deserialization
 /**
  * 先解析为 [RequestPacket], 即 `UniRequest`, 再按版本解析 map, 再找出指定数据并反序列化
  */
-fun <T : ProtoBuf> ByteReadPacket.decodeUniPacket(deserializer: DeserializationStrategy<T>, name: String? = null): T {
+internal fun <T : ProtoBuf> ByteReadPacket.decodeUniPacket(deserializer: DeserializationStrategy<T>, name: String? = null): T {
     return decodeUniRequestPacketAndDeserialize(name) {
         it.read {
             discardExact(1)
@@ -76,7 +76,7 @@ fun <T : ProtoBuf> ByteReadPacket.decodeUniPacket(deserializer: DeserializationS
     }
 }
 
-fun <R> ByteReadPacket.decodeUniRequestPacketAndDeserialize(name: String? = null, block: (ByteArray) -> R): R {
+internal fun <R> ByteReadPacket.decodeUniRequestPacketAndDeserialize(name: String? = null, block: (ByteArray) -> R): R {
     val request = this.readJceStruct(RequestPacket.serializer())
 
     return block(if (name == null) when (request.iVersion?.toInt() ?: 3) {
@@ -91,31 +91,31 @@ fun <R> ByteReadPacket.decodeUniRequestPacketAndDeserialize(name: String? = null
     })
 }
 
-fun <T : JceStruct> T.toByteArray(serializer: SerializationStrategy<T>, c: JceCharset = JceCharset.GBK): ByteArray =
+internal fun <T : JceStruct> T.toByteArray(serializer: SerializationStrategy<T>, c: JceCharset = JceCharset.GBK): ByteArray =
     Jce.byCharSet(c).dump(serializer, this)
 
-fun <T : ProtoBuf> BytePacketBuilder.writeProtoBuf(serializer: SerializationStrategy<T>, v: T) {
+internal fun <T : ProtoBuf> BytePacketBuilder.writeProtoBuf(serializer: SerializationStrategy<T>, v: T) {
     this.writeFully(v.toByteArray(serializer))
 }
 
 /**
  * dump
  */
-fun <T : ProtoBuf> T.toByteArray(serializer: SerializationStrategy<T>): ByteArray {
+internal fun <T : ProtoBuf> T.toByteArray(serializer: SerializationStrategy<T>): ByteArray {
     return ProtoBufWithNullableSupport.dump(serializer, this)
 }
 
 /**
  * load
  */
-fun <T : ProtoBuf> ByteArray.loadAs(deserializer: DeserializationStrategy<T>): T {
+internal fun <T : ProtoBuf> ByteArray.loadAs(deserializer: DeserializationStrategy<T>): T {
     return ProtoBufWithNullableSupport.load(deserializer, this)
 }
 
 /**
  * load
  */
-fun <T : ProtoBuf> ByteReadPacket.readProtoBuf(
+internal fun <T : ProtoBuf> ByteReadPacket.readProtoBuf(
     serializer: DeserializationStrategy<T>,
     length: Int = this.remaining.toInt()
 ): T {
@@ -125,11 +125,11 @@ fun <T : ProtoBuf> ByteReadPacket.readProtoBuf(
 /**
  * 构造 [RequestPacket] 的 [RequestPacket.sBuffer]
  */
-fun <T : JceStruct> jceRequestSBuffer(name: String, serializer: SerializationStrategy<T>, jceStruct: T): ByteArray {
+internal fun <T : JceStruct> jceRequestSBuffer(name: String, serializer: SerializationStrategy<T>, jceStruct: T): ByteArray {
     return jceRequestSBuffer(name, serializer, jceStruct, JceCharset.GBK)
 }
 
-fun <T : JceStruct> jceRequestSBuffer(
+internal fun <T : JceStruct> jceRequestSBuffer(
     name: String,
     serializer: SerializationStrategy<T>,
     jceStruct: T,

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/messages.kt

@@ -93,7 +93,7 @@ _400Height=0x000000EB(235)
 pbReserve=<Empty ByteArray>
 }
  */
-val FACE_BUF = "00 01 00 04 52 CC F5 D0".hexToBytes()
+internal val FACE_BUF = "00 01 00 04 52 CC F5 D0".hexToBytes()
 
 internal fun Face.toJceData(): ImMsgBody.Face {
     return ImMsgBody.Face(

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/Packet.kt → mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/Packet.kt

@@ -7,7 +7,11 @@
  * https://github.com/mamoe/mirai/blob/master/LICENSE
  */
 
-package net.mamoe.mirai.data
+package net.mamoe.mirai.qqandroid.network
+
+/*
+
+// moved to `mirai-core`
 
 /**
  * 从服务器收到的包解析之后的结构化数据.
@@ -19,8 +23,9 @@ interface Packet {
      */
     interface NoLog
 }
+*/
 
-object NoPacket : Packet {
+internal object NoPacket : Packet {
     override fun toString(): String {
         return "NoPacket"
     }
@@ -29,14 +34,15 @@ object NoPacket : Packet {
 /**
  * PacketFactory 可以一次解析多个包出来. 它们将会被分别广播.
  */
-interface MultiPacket<out P : Packet> : Packet, Iterable<P>
+internal interface MultiPacket<out P : Packet> : Packet, Iterable<P>
 
-open class MultiPacketByIterable<out P : Packet>(internal val delegate: Iterable<P>) : MultiPacket<P>,
+internal open class MultiPacketByIterable<out P : Packet>(internal val delegate: Iterable<P>) : MultiPacket<P>,
     Iterable<P> by delegate {
     override fun toString(): String = "MultiPacketByIterable"
 }
 
-open class MultiPacketBySequence<out P : Packet>(internal val delegate: Sequence<P>) : MultiPacket<P> {
+internal open class MultiPacketBySequence<out P : Packet>(internal val delegate: Sequence<P>) :
+    MultiPacket<P> {
     override operator fun iterator(): Iterator<P> = delegate.iterator()
 
     override fun toString(): String = "MultiPacketBySequence"

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt

@@ -18,8 +18,6 @@ import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.Input
 import kotlinx.io.core.buildPacket
 import kotlinx.io.core.use
-import net.mamoe.mirai.data.MultiPacket
-import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.event.*
 import net.mamoe.mirai.event.events.BotOfflineEvent
 import net.mamoe.mirai.event.events.BotOnlineEvent

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/Ticket.kt

@@ -9,7 +9,7 @@
 
 package net.mamoe.mirai.qqandroid.network
 
-class Ticket(
+internal class Ticket(
     val id: Int,
     val data: ByteArray,
     val key: ByteArray?,

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt

@@ -10,7 +10,7 @@
 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
 import kotlinx.serialization.Serializable
-import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.qqandroid.io.JceStruct
 import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId
 

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt

@@ -10,7 +10,7 @@
 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
 import kotlinx.serialization.Serializable
-import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.qqandroid.io.JceStruct
 import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/ImageRequest.kt

@@ -14,7 +14,7 @@ import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.io.ProtoBuf
 import net.mamoe.mirai.utils.currentTimeSeconds
 
-interface ImgReq : ProtoBuf
+internal interface ImgReq : ProtoBuf
 
 // cmd0x352$ReqBody
 

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgSvc.kt

@@ -11,7 +11,7 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
-import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.qqandroid.io.ProtoBuf
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/EncryptMethod.kt

@@ -43,22 +43,22 @@ internal interface EncryptMethodSessionKey : EncryptMethod {
         }
 }
 
-inline class EncryptMethodSessionKeyLoginState2(override val sessionKey: ByteArray) :
+internal class EncryptMethodSessionKeyLoginState2(override val sessionKey: ByteArray) :
     EncryptMethodSessionKey {
     override val currentLoginState: Int get() = 2
 }
 
-inline class EncryptMethodSessionKeyLoginState3(override val sessionKey: ByteArray) :
+internal class EncryptMethodSessionKeyLoginState3(override val sessionKey: ByteArray) :
     EncryptMethodSessionKey {
     override val currentLoginState: Int get() = 3
 }
 
-internal inline class EncryptMethodECDH135(override val ecdh: ECDH) :
+internal class EncryptMethodECDH135(override val ecdh: ECDH) :
     EncryptMethodECDH {
     override val id: Int get() = 135
 }
 
-internal inline class EncryptMethodECDH7(override val ecdh: ECDH) :
+internal class EncryptMethodECDH7(override val ecdh: ECDH) :
     EncryptMethodECDH {
     override val id: Int get() = 7
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/IncomingPacketFactory.kt

-/*
- * Copyright 2020 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.qqandroid.network.protocol.packet
-

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/MessageMicro.kt

-/*
- * Copyright 2020 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.qqandroid.network.protocol.packet
-
-import kotlinx.serialization.SerializationStrategy
-import net.mamoe.mirai.qqandroid.io.serialization.ProtoBufWithNullableSupport
-
-interface MessageMicro
-
-
-fun <T : MessageMicro> T.toByteArray(serializer: SerializationStrategy<T>): ByteArray = ProtoBufWithNullableSupport.dump(serializer, this)
\ No newline at end of file

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/OutgoingPacketAndroid.kt

@@ -34,6 +34,7 @@ internal class OutgoingPacket constructor(
 internal val KEY_16_ZEROS = ByteArray(16)
 internal val EMPTY_BYTE_ARRAY = ByteArray(0)
 
+@Suppress("DuplicatedCode")
 @OptIn(MiraiInternalAPI::class)
 internal inline fun OutgoingPacketFactory<*>.buildOutgoingUniPacket(
     client: QQAndroidClient,
@@ -77,6 +78,7 @@ internal inline fun IncomingPacketFactory<*>.buildResponseUniPacket(
     sequenceId: Int = client.nextSsoSequenceId(),
     body: BytePacketBuilder.(sequenceId: Int) -> Unit
 ): OutgoingPacket {
+    @Suppress("DuplicatedCode")
     return OutgoingPacket(name, commandName, sequenceId, buildPacket {
         writeIntLVPacket(lengthOffset = { it + 4 }) {
             writeInt(0x0B)

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt

@@ -11,7 +11,7 @@ package net.mamoe.mirai.qqandroid.network.protocol.packet
 
 import kotlinx.io.core.*
 import kotlinx.io.pool.useInstance
-import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.event.Event
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.PbMessageSvc

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/ChatType.kt

@@ -9,10 +9,7 @@
 
 package net.mamoe.mirai.qqandroid.network.protocol.packet.chat
 
-/**
- * TROOP仍然不知道是什么
- */
-enum class ChatType(val internalID: Int) {
+internal enum class ChatType(val internalID: Int) {
 
     FRIEND(2),//可以为任何数字
 

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/PbMessageSvc.kt

@@ -10,7 +10,7 @@
 package net.mamoe.mirai.qqandroid.network.protocol.packet.chat
 
 import kotlinx.io.core.ByteReadPacket
-import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.io.serialization.readProtoBuf
 import net.mamoe.mirai.qqandroid.io.serialization.toByteArray

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/TroopManagement.kt

@@ -13,9 +13,10 @@ import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.buildPacket
 import kotlinx.io.core.readBytes
 import kotlinx.io.core.toByteArray
+import net.mamoe.mirai.LowLevelAPI
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.Member
-import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.io.serialization.*
 import net.mamoe.mirai.qqandroid.network.QQAndroidClient
@@ -30,7 +31,8 @@ import net.mamoe.mirai.utils.daysToSeconds
 import net.mamoe.mirai.utils.io.encodeToString
 import net.mamoe.mirai.data.GroupInfo as MiraiGroupInfo
 
-internal inline class GroupInfoImpl(
+@OptIn(LowLevelAPI::class)
+internal class GroupInfoImpl(
     internal val delegate: Oidb0x88d.GroupInfo
 ) : MiraiGroupInfo, Packet {
     override val uin: Long get() = delegate.groupUin ?: error("cannot find groupUin")

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/ImgStore.kt

@@ -10,7 +10,7 @@
 package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.image
 
 import kotlinx.io.core.ByteReadPacket
-import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.io.serialization.readProtoBuf
 import net.mamoe.mirai.qqandroid.io.serialization.writeProtoBuf

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/LongConn.kt

@@ -10,10 +10,10 @@
 package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.image
 
 import kotlinx.io.core.ByteReadPacket
-import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.io.serialization.readProtoBuf
 import net.mamoe.mirai.qqandroid.io.serialization.writeProtoBuf
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.qqandroid.network.QQAndroidClient
 import net.mamoe.mirai.qqandroid.network.protocol.data.proto.Cmd0x352
 import net.mamoe.mirai.qqandroid.network.protocol.data.proto.GetImgUrlReq

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.kt

@@ -7,17 +7,20 @@
  * https://github.com/mamoe/mirai/blob/master/LICENSE
  */
 
+@file: OptIn(LowLevelAPI::class)
+
 package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive
 
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.*
 import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.discardExact
+import net.mamoe.mirai.LowLevelAPI
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.MemberPermission
 import net.mamoe.mirai.data.MemberInfo
-import net.mamoe.mirai.data.MultiPacketByIterable
-import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.network.MultiPacketByIterable
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.event.events.BotJoinGroupEvent
 import net.mamoe.mirai.event.events.BotOfflineEvent
 import net.mamoe.mirai.event.events.MemberJoinEvent

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt

@@ -13,9 +13,9 @@ package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive
 
 import kotlinx.io.core.*
 import net.mamoe.mirai.contact.MemberPermission
-import net.mamoe.mirai.data.MultiPacketBySequence
-import net.mamoe.mirai.data.NoPacket
-import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.network.MultiPacketBySequence
+import net.mamoe.mirai.qqandroid.network.NoPacket
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.event.Event
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.message.GroupMessage

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/list/FriendList.kt

@@ -10,7 +10,7 @@
 package net.mamoe.mirai.qqandroid.network.protocol.packet.list
 
 import kotlinx.io.core.ByteReadPacket
-import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.io.serialization.decodeUniPacket
 import net.mamoe.mirai.qqandroid.io.serialization.jceRequestSBuffer

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/Heartbeat.kt

@@ -10,8 +10,8 @@
 package net.mamoe.mirai.qqandroid.network.protocol.packet.login
 
 import kotlinx.io.core.ByteReadPacket
-import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.qqandroid.QQAndroidBot
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.qqandroid.network.QQAndroidClient
 import net.mamoe.mirai.qqandroid.network.protocol.packet.*
 

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/StatSvc.kt

@@ -10,7 +10,7 @@
 package net.mamoe.mirai.qqandroid.network.protocol.packet.login
 
 import kotlinx.io.core.ByteReadPacket
-import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.event.events.BotOfflineEvent
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.io.serialization.*

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/WtLogin.kt

@@ -12,7 +12,7 @@ package net.mamoe.mirai.qqandroid.network.protocol.packet.login
 
 import io.ktor.util.InternalAPI
 import kotlinx.io.core.*
-import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.network.*
 import net.mamoe.mirai.qqandroid.network.protocol.LoginType

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/GuidSource.kt

@@ -25,7 +25,7 @@ import kotlin.jvm.JvmStatic
  * 17: 以前没保存但现在生成成功;
  */
 @Suppress("NON_PUBLIC_PRIMARY_CONSTRUCTOR_OF_INLINE_CLASS")
-inline class GuidSource private constructor(val id: Long) { // uint actually
+internal inline class GuidSource private constructor(val id: Long) { // uint actually
     companion object {
         /**
          * 初始值

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/NetworkType.kt

@@ -12,7 +12,7 @@ package net.mamoe.mirai.qqandroid.utils
 /**
  * 连接类型
  */
-inline class NetworkType(val value: Int) {
+internal inline class NetworkType(val value: Int) {
     companion object {
         /**
          * 移动网络

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/flags.kt

@@ -15,7 +15,7 @@ package net.mamoe.mirai.qqandroid.utils
 import kotlin.jvm.JvmMultifileClass
 import kotlin.jvm.JvmName
 
-inline class MacOrAndroidIdChangeFlag(val value: Long = 0) {
+internal inline class MacOrAndroidIdChangeFlag(val value: Long = 0) {
     fun macChanged(): MacOrAndroidIdChangeFlag =
         MacOrAndroidIdChangeFlag(this.value or 0x1)
 

mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Group.kt

@@ -11,6 +11,7 @@ package net.mamoe.mirai.contact
 
 import kotlinx.coroutines.CoroutineScope
 import net.mamoe.mirai.Bot
+import net.mamoe.mirai.LowLevelAPI
 import net.mamoe.mirai.data.MemberInfo
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
@@ -117,7 +118,7 @@ actual abstract class Group : Contact(), CoroutineScope {
      * 构造一个 [newMember].
      * 非特殊情况请不要使用这个函数. 优先使用 [get].
      */
-    @Suppress("FunctionName")
+    @LowLevelAPI
     @MiraiExperimentalAPI("dangerous")
     actual abstract fun newMember(memberInfo: MemberInfo): Member
 

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt

@@ -13,6 +13,7 @@ package net.mamoe.mirai.contact
 
 import kotlinx.coroutines.CoroutineScope
 import net.mamoe.mirai.Bot
+import net.mamoe.mirai.LowLevelAPI
 import net.mamoe.mirai.data.MemberInfo
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
@@ -121,8 +122,8 @@ expect abstract class Group() : Contact, CoroutineScope {
      * 构造一个 [newMember].
      * 非特殊情况请不要使用这个函数. 优先使用 [get].
      */
+    @LowLevelAPI
     @MiraiExperimentalAPI("dangerous")
-    @Suppress("INAPPLICABLE_JVM_NAME", "FunctionName")
     abstract fun newMember(memberInfo: MemberInfo): Member
 
     /**

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/AddFriendResult.kt

@@ -13,10 +13,12 @@
 
 package net.mamoe.mirai.data
 
+import net.mamoe.mirai.utils.MiraiExperimentalAPI
 import kotlin.jvm.JvmMultifileClass
 import kotlin.jvm.JvmName
 
 
+@MiraiExperimentalAPI
 @Suppress("ClassName")
 sealed class AddFriendResult {
     abstract class DONE internal constructor() : AddFriendResult() {

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/FriendInfo.kt

@@ -9,6 +9,9 @@
 
 package net.mamoe.mirai.data
 
+import net.mamoe.mirai.LowLevelAPI
+
+@LowLevelAPI
 interface FriendInfo {
     val uin: Long
 

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/FriendNameRemark.kt

@@ -9,7 +9,10 @@
 
 package net.mamoe.mirai.data
 
+import net.mamoe.mirai.utils.MiraiExperimentalAPI
+
 /**
  * 给好友设置的备注
  */
-inline class FriendNameRemark(val value: String) : Packet
+@MiraiExperimentalAPI
+inline class FriendNameRemark(val value: String)

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/GroupActiveData.kt

@@ -3,12 +3,14 @@ package net.mamoe.mirai.data
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import net.mamoe.mirai.utils.MiraiExperimentalAPI
 import net.mamoe.mirai.utils.SinceMirai
 
 
 /**
  * 群统计信息
  */
+@MiraiExperimentalAPI
 @SinceMirai("0.28.0")
 @Serializable
 data class GroupActiveData(

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/GroupAnnouncement.kt

@@ -2,6 +2,7 @@ package net.mamoe.mirai.data
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import net.mamoe.mirai.utils.MiraiExperimentalAPI
 
 /**
  * 群公告数据类
@@ -10,6 +11,7 @@ import kotlinx.serialization.Serializable
  * 发公告时只需要填写text，其他参数可为默认值
  *
  */
+@MiraiExperimentalAPI
 @Serializable
 data class GroupAnnouncementList(
     val ec: Int,  //状态码 0 是正常的
@@ -18,6 +20,7 @@ data class GroupAnnouncementList(
     val inst: List<GroupAnnouncement>? = null  //置顶列表？
 )
 
+@MiraiExperimentalAPI
 @Serializable
 data class GroupAnnouncement(
     @SerialName("u") val sender: Long = 0,
@@ -30,6 +33,7 @@ data class GroupAnnouncement(
     val fid:String? = null      //公告的id
 )
 
+@MiraiExperimentalAPI
 @Serializable
 data class GroupAnnouncementMsg(
     val text: String,
@@ -37,6 +41,7 @@ data class GroupAnnouncementMsg(
     val title: String? = null
 )
 
+@MiraiExperimentalAPI
 @Serializable
 data class GroupAnnouncementSettings(
     @SerialName("is_show_edit_card") val isShowEditCard: Int = 0,

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/GroupInfo.kt

 package net.mamoe.mirai.data
 
 import net.mamoe.mirai.Bot
+import net.mamoe.mirai.LowLevelAPI
 
 /**
  * 群资料.
  *
  * 通过 [Bot._lowLevelQueryGroupInfo] 得到
  */
+@LowLevelAPI
 interface GroupInfo {
     /**
      * Uin

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/MemberInfo.kt

@@ -9,8 +9,10 @@
 
 package net.mamoe.mirai.data
 
+import net.mamoe.mirai.LowLevelAPI
 import net.mamoe.mirai.contact.MemberPermission
 
+@LowLevelAPI
 interface MemberInfo : FriendInfo {
     val nameCard: String
 

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/OnlineStatus.kt

@@ -7,6 +7,8 @@
  * https://github.com/mamoe/mirai/blob/master/LICENSE
  */
 
+@file:Suppress("unused")
+
 package net.mamoe.mirai.data
 
 /**
@@ -21,14 +23,17 @@ enum class OnlineStatus(val id: Int) {
      * 离线
      */
     OFFLINE(21),
+
     /**
      * 离开
      */
     AWAY(31),
+
     /**
      * 隐身
      */
-    INVISIABLE(41),
+    INVISIBLE(41),
+
     /**
      * 忙碌
      */

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/PreviousNameList.kt

@@ -9,6 +9,8 @@
 
 package net.mamoe.mirai.data
 
+import net.mamoe.mirai.utils.MiraiExperimentalAPI
+
 /**
  * 曾用名列表
  *
@@ -16,8 +18,9 @@ package net.mamoe.mirai.data
  * - 昵称
  * - 共同群内的群名片
  */
+@MiraiExperimentalAPI
 class PreviousNameList(
     list: List<String>
-) : Packet, List<String> by list {
+) : List<String> by list {
     override fun toString(): String = this.joinToString(prefix = "PreviousNameList(", postfix = ")", separator = ", ")
 }
\ No newline at end of file

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/Profile.kt

@@ -12,10 +12,12 @@
 package net.mamoe.mirai.data
 
 import io.ktor.util.date.GMTDate
+import net.mamoe.mirai.utils.MiraiExperimentalAPI
 
 /**
  * 个人资料
  */
+@MiraiExperimentalAPI
 @Suppress("PropertyName")
 data class Profile(
     val qq: Long,
@@ -54,6 +56,7 @@ data class Profile(
 /**
  * 性别
  */
+@MiraiExperimentalAPI
 enum class Gender(val value: Byte) {
     SECRET(0),
     MALE(1),

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt

@@ -13,7 +13,6 @@ package net.mamoe.mirai.event.events
 
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.*
-import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.event.AbstractCancellableEvent
 import net.mamoe.mirai.event.BroadcastControllable
 import net.mamoe.mirai.event.CancellableEvent
@@ -21,6 +20,7 @@ import net.mamoe.mirai.event.events.ImageUploadEvent.Failed
 import net.mamoe.mirai.event.events.ImageUploadEvent.Succeed
 import net.mamoe.mirai.message.data.Image
 import net.mamoe.mirai.message.data.MessageChain
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.utils.ExternalImage
 import net.mamoe.mirai.utils.MiraiExperimentalAPI
 

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/MessagePacket.kt

@@ -19,13 +19,13 @@ import net.mamoe.mirai.contact.Contact
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.Member
 import net.mamoe.mirai.contact.QQ
-import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.event.events.BotEvent
 import net.mamoe.mirai.event.selectMessages
 import net.mamoe.mirai.event.subscribingGet
 import net.mamoe.mirai.event.subscribingGetOrNull
 import net.mamoe.mirai.event.whileSelectMessages
 import net.mamoe.mirai.message.data.*
+import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.recall
 import net.mamoe.mirai.recallIn
 import net.mamoe.mirai.utils.*

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/qqandroid.network/Packet.kt

+package net.mamoe.mirai.qqandroid.network
+
+/**
+ * 从服务器收到的包解析之后的结构化数据.
+ * 它是一个数据包工厂的处理的返回值.
+ *
+ * **InternalAPI**: 这是内部 API, 它随时都有可能被修改
+ */
+interface Packet {
+    /**
+     * 实现这个接口的包将不会被记录到日志中
+     */
+    interface NoLog
+}

mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt

@@ -11,6 +11,7 @@ package net.mamoe.mirai.contact
 
 import kotlinx.coroutines.CoroutineScope
 import net.mamoe.mirai.Bot
+import net.mamoe.mirai.LowLevelAPI
 import net.mamoe.mirai.data.MemberInfo
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
@@ -119,8 +120,7 @@ actual abstract class Group : Contact(), CoroutineScope {
      * 构造一个 [newMember].
      * 非特殊情况请不要使用这个函数. 优先使用 [get].
      */
-    @JvmName("newMember")
-    @Suppress("INAPPLICABLE_JVM_NAME", "FunctionName")
+    @LowLevelAPI
     @MiraiExperimentalAPI("dangerous")
     actual abstract fun newMember(memberInfo: MemberInfo): Member