http event with bug

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/Session.kt

@@ -13,6 +13,8 @@ import kotlinx.coroutines.*
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.api.http.queue.MessageQueue
 import net.mamoe.mirai.event.Listener
+import net.mamoe.mirai.event.events.BotEvent
+import net.mamoe.mirai.event.subscribeAlways
 import net.mamoe.mirai.event.subscribeMessages
 import net.mamoe.mirai.message.MessagePacket
 import kotlin.coroutines.CoroutineContext
@@ -102,12 +104,10 @@ class TempSession internal constructor(coroutineContext: CoroutineContext) : Ses
 class AuthedSession internal constructor(val bot: Bot, coroutineContext: CoroutineContext) : Session(coroutineContext) {
 
     val messageQueue = MessageQueue()
-    private val _listener: Listener<MessagePacket<*, *>>
+    private val _listener: Listener<BotEvent>
 
     init {
-        bot.subscribeMessages {
-            _listener = always { this.run(messageQueue::add) } // this aka messagePacket
-        }
+        _listener = bot.subscribeAlways{ this.run(messageQueue::add) }
     }
 
     override fun close() {

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/MessageDTO.kt

@@ -66,7 +66,7 @@ data class UnknownMessageDTO(val text: String) : MessageDTO()
 *   Abstract Class
 * */
 @Serializable
-sealed class MessagePacketDTO : DTO {
+sealed class MessagePacketDTO : EventDTO() {
     lateinit var messageChain : MessageChainDTO
 }
 

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/queue/MessageQueue.kt

@@ -9,20 +9,20 @@
 
 package net.mamoe.mirai.api.http.queue
 
+import net.mamoe.mirai.event.events.BotEvent
 import net.mamoe.mirai.message.GroupMessage
-import net.mamoe.mirai.message.MessagePacket
 import net.mamoe.mirai.message.data.MessageSource
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentLinkedDeque
 
-class MessageQueue : ConcurrentLinkedDeque<MessagePacket<*, *>>() {
+class MessageQueue : ConcurrentLinkedDeque<BotEvent>() {
 
     val quoteCache = ConcurrentHashMap<Long, GroupMessage>()
 
-    fun fetch(size: Int): List<MessagePacket<*, *>> {
+    fun fetch(size: Int): List<BotEvent> {
         var count = size
         quoteCache.clear()
-        val ret = ArrayList<MessagePacket<*, *>>(count)
+        val ret = ArrayList<BotEvent>(count)
         while (!this.isEmpty() && count-- > 0) {
             val packet = pop()
             ret.add(packet)

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/util/Json.kt

@@ -13,7 +13,6 @@ import kotlinx.serialization.*
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.SerializersModule
 import net.mamoe.mirai.api.http.data.common.*
-import net.mamoe.mirai.message.data.MessageSource
 
 // 解析失败时直接返回null，由路由判断响应400状态
 @UseExperimental(ImplicitReflectionSerializer::class)
@@ -45,11 +44,47 @@ else MiraiJson.json.stringify(serializer, this)
  */
 object MiraiJson {
     val json = Json(context = SerializersModule {
+
+        polymorphic(EventDTO.serializer()) {
+            BotEventDTO::class with BotEventDTO.serializer()
+            MessagePacketDTO::class with MessagePacketDTO.serializer()
+        }
+
+
         polymorphic(MessagePacketDTO.serializer()) {
             GroupMessagePacketDTO::class with GroupMessagePacketDTO.serializer()
             FriendMessagePacketDTO::class with FriendMessagePacketDTO.serializer()
             UnKnownMessagePacketDTO::class with UnKnownMessagePacketDTO.serializer()
         }
+
+        // Bot Event Polymorphic
+        polymorphic(BotEventDTO.serializer()) {
+            BotOnlineEventDTO::class with BotOnlineEventDTO.serializer()
+            BotOfflineEventActiveDTO::class with BotOfflineEventActiveDTO.serializer()
+            BotOfflineEventForceDTO::class with BotOfflineEventForceDTO.serializer()
+            BotOfflineEventDroppedDTO::class with BotOfflineEventDroppedDTO.serializer()
+            BotReloginEventDTO::class with BotReloginEventDTO.serializer()
+            BotGroupPermissionChangeEventDTO::class with BotGroupPermissionChangeEventDTO.serializer()
+            BotMuteEventDTO::class with BotMuteEventDTO.serializer()
+            BotUnmuteEventDTO::class with BotUnmuteEventDTO.serializer()
+            BotJoinGroupEventDTO::class with BotJoinGroupEventDTO.serializer()
+            GroupNameChangeEventDTO::class with GroupNameChangeEventDTO.serializer()
+            GroupEntranceAnnouncementChangeEventDTO::class with GroupEntranceAnnouncementChangeEventDTO.serializer()
+            GroupMuteAllEventDTO::class with GroupMuteAllEventDTO.serializer()
+            GroupAllowAnonymousChatEventDTO::class with GroupAllowAnonymousChatEventDTO.serializer()
+            GroupAllowConfessTalkEventDTO::class with GroupAllowConfessTalkEventDTO.serializer()
+            GroupAllowMemberInviteEventDTO::class with GroupAllowMemberInviteEventDTO.serializer()
+            MemberJoinEventDTO::class with MemberJoinEventDTO.serializer()
+            MemberLeaveEventKickDTO::class with MemberLeaveEventKickDTO.serializer()
+            MemberLeaveEventQuitDTO::class with MemberLeaveEventQuitDTO.serializer()
+            MemberCardChangeEventDTO::class with MemberCardChangeEventDTO.serializer()
+            MemberSpecialTitleChangeEventDTO::class with MemberSpecialTitleChangeEventDTO.serializer()
+            MemberPermissionChangeEventDTO::class with MemberPermissionChangeEventDTO.serializer()
+            MemberMuteEventDTO::class with MemberMuteEventDTO.serializer()
+            MemberUnmuteEventDTO::class with MemberUnmuteEventDTO.serializer()
+        }
+
+        // Message Polymorphic
         polymorphic(MessageDTO.serializer()) {
             MessageSourceDTO::class with MessageSourceDTO.serializer()
             AtDTO::class with AtDTO.serializer()