refactor(core): move internal logic to MessageParsingContext [skip build]

Author: Wesley-Young

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/Bot.kt

@@ -49,10 +49,10 @@ import org.ntqqrev.acidify.internal.util.triSha1
 import org.ntqqrev.acidify.internal.util.unescapeHttp
 import org.ntqqrev.acidify.logging.*
 import org.ntqqrev.acidify.message.*
-import org.ntqqrev.acidify.message.BotEssenceMessage.Companion.toBotEssenceMessage
-import org.ntqqrev.acidify.message.BotForwardedMessage.Companion.parseForwardedMessage
-import org.ntqqrev.acidify.message.BotIncomingMessage.Companion.parseMessage
 import org.ntqqrev.acidify.message.internal.MessageBuildingContext
+import org.ntqqrev.acidify.message.internal.MessageParsingContext.Companion.parseForwardedMessage
+import org.ntqqrev.acidify.message.internal.MessageParsingContext.Companion.parseMessage
+import org.ntqqrev.acidify.message.internal.MessageParsingContext.Companion.toBotEssenceMessage
 import org.ntqqrev.acidify.struct.*
 import org.ntqqrev.acidify.struct.BotFriendRequest.Companion.parseFilteredFriendRequest
 import org.ntqqrev.acidify.struct.BotFriendRequest.Companion.parseFriendRequest

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/event/internal/MsgPushSignal.kt

@@ -11,9 +11,9 @@ import org.ntqqrev.acidify.internal.packet.message.PushMsg
 import org.ntqqrev.acidify.internal.packet.message.PushMsgType
 import org.ntqqrev.acidify.internal.packet.message.extra.*
 import org.ntqqrev.acidify.internal.protobuf.invoke
-import org.ntqqrev.acidify.message.BotIncomingMessage.Companion.parseMessage
 import org.ntqqrev.acidify.message.BotIncomingSegment
 import org.ntqqrev.acidify.message.MessageScene
+import org.ntqqrev.acidify.message.internal.MessageParsingContext.Companion.parseMessage
 import org.ntqqrev.acidify.struct.BotGroupNotification
 import org.ntqqrev.acidify.struct.RequestState
 import kotlin.time.Clock

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/message/BotEssenceMessage.kt

@@ -1,8 +1,5 @@
 package org.ntqqrev.acidify.message
 
-import kotlinx.serialization.json.int
-import kotlinx.serialization.json.jsonPrimitive
-import org.ntqqrev.acidify.internal.packet.misc.GroupEssenceMsgItem
 import kotlin.js.JsExport
 
 /**
@@ -28,27 +25,4 @@ class BotEssenceMessage internal constructor(
     val operatorName: String,
     val operationTime: Long,
     val segments: List<BotEssenceSegment>
-) {
-    companion object {
-        internal fun GroupEssenceMsgItem.toBotEssenceMessage(groupUin: Long) = BotEssenceMessage(
-            groupUin = groupUin,
-            messageSeq = this.msgSeq,
-            messageTime = this.senderTime,
-            senderUin = this.senderUin.toLongOrNull() ?: 0L,
-            senderName = this.senderNick,
-            operatorUin = this.addDigestUin.toLongOrNull() ?: 0L,
-            operatorName = this.addDigestNick,
-            operationTime = this.addDigestTime,
-            segments = this.msgContent.mapNotNull { element ->
-                val msgType = element["msg_type"]?.jsonPrimitive?.int ?: return@mapNotNull null
-                when (msgType) {
-                    1 -> BotEssenceSegment.Text(element["text"]?.jsonPrimitive?.content ?: "")
-                    2 -> BotEssenceSegment.Face(element["face_index"]?.jsonPrimitive?.int ?: 0)
-                    3 -> BotEssenceSegment.Image(element["image_url"]?.jsonPrimitive?.content ?: "")
-                    4 -> BotEssenceSegment.Video(element["file_thumbnail_url"]?.jsonPrimitive?.content ?: "")
-                    else -> null
-                }
-            }
-        ).takeIf { it.segments.isNotEmpty() }
-    }
-}
+)

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/message/BotForwardedMessage.kt

@@ -1,9 +1,5 @@
 package org.ntqqrev.acidify.message
 
-import org.ntqqrev.acidify.Bot
-import org.ntqqrev.acidify.internal.packet.message.CommonMessage
-import org.ntqqrev.acidify.internal.protobuf.PbObject
-import org.ntqqrev.acidify.message.BotIncomingMessage.Companion.buildSegments
 import kotlin.js.JsExport
 
 /**
@@ -21,30 +17,5 @@ class BotForwardedMessage internal constructor(
 ) {
     lateinit var segments: List<BotIncomingSegment>
         internal set
-
-    companion object {
-        internal fun Bot.parseForwardedMessage(raw: PbObject<CommonMessage>): BotForwardedMessage? {
-            val routingHead = raw.get { routingHead }
-            val contentHead = raw.get { contentHead }
-            val senderName = routingHead.get { commonC2C }.get { name }.takeIf { it.isNotEmpty() }
-                ?: routingHead.get { group }.get { groupCard }.takeIf { it.isNotEmpty() }
-                ?: "QQ用户"
-            val avatarUrl = contentHead.get { forwardExt }.get { avatar }
-            val message = BotForwardedMessage(
-                senderName = senderName,
-                avatarUrl = avatarUrl,
-                timestamp = contentHead.get { time }
-            )
-            val segments = buildSegments(
-                elems = raw.get { messageBody }.get { richText }.get { this.elems },
-                scene = MessageScene.FRIEND
-            )
-            if (segments.isEmpty()) {
-                return null
-            }
-            message.segments = segments
-            return message
-        }
-    }
 }
 

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/message/BotIncomingMessage.kt

@@ -1,14 +1,7 @@
 package org.ntqqrev.acidify.message
 
-import org.ntqqrev.acidify.Bot
 import org.ntqqrev.acidify.internal.packet.message.CommonMessage
-import org.ntqqrev.acidify.internal.packet.message.Elem
-import org.ntqqrev.acidify.internal.packet.message.PushMsgType
-import org.ntqqrev.acidify.internal.packet.message.extra.PrivateFileExtra
 import org.ntqqrev.acidify.internal.protobuf.PbObject
-import org.ntqqrev.acidify.internal.protobuf.invoke
-import org.ntqqrev.acidify.message.internal.IncomingSegmentFactory
-import org.ntqqrev.acidify.message.internal.MessageParsingContext
 import kotlin.js.JsExport
 
 /**
@@ -60,128 +53,4 @@ class BotIncomingMessage internal constructor(
         val groupCard: String,
         val specialTitle: String
     )
-
-    companion object {
-        internal val factories = listOf<IncomingSegmentFactory<*>>(
-            IncomingSegmentFactory.Text,
-            IncomingSegmentFactory.Mention,
-            IncomingSegmentFactory.Face,
-            IncomingSegmentFactory.Reply,
-            IncomingSegmentFactory.Image,
-            IncomingSegmentFactory.Record,
-            IncomingSegmentFactory.Video,
-            IncomingSegmentFactory.File,
-            IncomingSegmentFactory.Forward,
-            IncomingSegmentFactory.MarketFace,
-            IncomingSegmentFactory.LightApp,
-        )
-
-        internal fun Bot.parseMessage(raw: PbObject<CommonMessage>): BotIncomingMessage? {
-            val contentHead = raw.get { contentHead }
-            val pushMsgType = PushMsgType.from(contentHead.get { type }) ?: return null
-            val draftMsg = buildDraftMessage(raw, pushMsgType) ?: return null
-            val segments = if (pushMsgType != PushMsgType.FriendFileMessage) {
-                buildSegments(raw.get { messageBody }.get { richText }.get { elems }, draftMsg.scene) {
-                    draftMsg.extraInfo = it
-                }
-            } else {
-                val notOnlineFile = PrivateFileExtra(raw.get { messageBody }.get { msgContent })
-                    .get { notOnlineFile }
-                listOf(
-                    BotIncomingSegment.File(
-                        fileId = notOnlineFile.get { fileUuid },
-                        fileName = notOnlineFile.get { fileName },
-                        fileSize = notOnlineFile.get { fileSize },
-                        fileHash = notOnlineFile.get { fileIdCrcMedia }
-                    )
-                )
-            }
-
-            if (segments.isEmpty()) {
-                return null
-            }
-
-            draftMsg.segments = segments
-            return draftMsg
-        }
-
-        private fun Bot.buildDraftMessage(raw: PbObject<CommonMessage>, pushMsgType: PushMsgType): BotIncomingMessage? {
-            val routingHead = raw.get { routingHead }
-            val contentHead = raw.get { contentHead }
-
-            return when (pushMsgType) {
-                PushMsgType.FriendMessage,
-                PushMsgType.FriendRecordMessage,
-                PushMsgType.FriendFileMessage -> {
-                    val isSelfSend = routingHead.get { fromUin } == this.uin
-                    BotIncomingMessage(
-                        scene = MessageScene.FRIEND,
-                        peerUin = if (isSelfSend) routingHead.get { toUin } else routingHead.get { fromUin },
-                        peerUid = if (isSelfSend) routingHead.get { toUid } else routingHead.get { fromUid },
-                        sequence = contentHead.get { clientSequence },
-                        timestamp = contentHead.get { time },
-                        senderUin = routingHead.get { fromUin },
-                        senderUid = routingHead.get { fromUid },
-                        clientSequence = contentHead.get { sequence }, // weird
-                        random = contentHead.get { random },
-                        messageUid = contentHead.get { msgUid },
-                        raw = raw,
-                    )
-                }
-
-                PushMsgType.GroupMessage -> {
-                    BotIncomingMessage(
-                        scene = MessageScene.GROUP,
-                        peerUin = routingHead.get { group }.get { groupCode },
-                        peerUid = routingHead.get { toUid },
-                        sequence = contentHead.get { sequence },
-                        timestamp = contentHead.get { time },
-                        senderUin = routingHead.get { fromUin },
-                        senderUid = routingHead.get { fromUid },
-                        clientSequence = contentHead.get { clientSequence },
-                        random = contentHead.get { random },
-                        messageUid = contentHead.get { msgUid },
-                        raw = raw,
-                    )
-                }
-
-                else -> return null
-            }
-        }
-
-        internal fun Bot.buildSegments(
-            elems: List<PbObject<Elem>>,
-            scene: MessageScene,
-            onExtraInfo: ((ExtraInfo) -> Unit)? = null
-        ): List<BotIncomingSegment> {
-            val segments = mutableListOf<BotIncomingSegment>()
-            val ctx = MessageParsingContext(scene, elems, this)
-            while (ctx.hasNext()) {
-                ctx.tryPeekType { this.extraInfo }?.let {
-                    onExtraInfo?.invoke(
-                        ExtraInfo(
-                            nick = it.get { nick },
-                            groupCard = it.get { groupCard },
-                            specialTitle = it.get { senderTitle },
-                        )
-                    )
-                    ctx.consume()
-                    continue
-                }
-
-                var matched = false
-                for (factory in factories) {
-                    val segment = factory.tryParse(ctx) ?: continue
-                    segments += segment
-                    matched = true
-                    break
-                }
-                if (!matched) {
-                    ctx.skip()
-                }
-            }
-
-            return segments
-        }
-    }
 }

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/message/internal/IncomingSegmentFactory.kt

@@ -15,10 +15,10 @@ import org.ntqqrev.acidify.internal.protobuf.invoke
 import org.ntqqrev.acidify.internal.util.BinaryReader
 import org.ntqqrev.acidify.internal.util.Prefix
 import org.ntqqrev.acidify.internal.util.readUInt32BE
-import org.ntqqrev.acidify.message.BotIncomingMessage.Companion.buildSegments
 import org.ntqqrev.acidify.message.BotIncomingSegment
 import org.ntqqrev.acidify.message.ImageSubType
 import org.ntqqrev.acidify.message.MessageScene
+import org.ntqqrev.acidify.message.internal.MessageParsingContext.Companion.buildSegments
 import kotlin.math.min
 
 internal interface IncomingSegmentFactory<T : BotIncomingSegment> {