fix: improve offline duplicate message

Author: linyuchen

src/main/main.ts

@@ -35,6 +35,7 @@ import { WebUIServer } from '../webui/BE/server'
 import { setFFMpegPath } from '@/common/utils/ffmpeg'
 import { pmhq } from '@/ntqqapi/native/pmhq'
 import { defaultConfig } from '@/common/defaultConfig'
+import { sleep } from '@/common/utils'
 
 declare module 'cordis' {
   interface Events {
@@ -132,8 +133,17 @@ async function onLoad() {
       selfInfo.online = true
 
       const getSelfInfo = async () => {
-        const uin = await ctx.ntUserApi.getUinByUid(data[2])
-        selfInfo.uin = uin
+        let uin: string
+        // 循环 5次 获取uin
+        for (let i = 0; i < 5; i++) {
+          try {
+            uin = await ctx.ntUserApi.getUinByUid(data[2])
+            selfInfo.uin = uin
+            break
+          }catch (e) {
+            await sleep(1000)
+          }
+        }
         const configUtil = getConfigUtil(true)
         config = configUtil.getConfig()
         ctx.parallel('llob/config-updated', config)

src/ntqqapi/core.ts

@@ -125,16 +125,27 @@ class Core extends Service {
     return returnMsg
   }
 
-  private handleMessage(msgList: RawMessage[]) {
+  private async handleMessage(msgList: RawMessage[]) {
     for (const message of msgList) {
       const msgTime = parseInt(message.msgTime)
       if (msgTime < this.startupTime) {
-        this.ctx.store.getShortIdByMsgId(message.msgId).then(existing=>{
-          // 已存在的离线消息不处理
-          if (!existing) {
-            this.ctx.parallel('nt/offline-message-created', message)
+        const uniqueId = `${message.peerUid}-${message.msgSeq}-${message.msgRandom}`
+        const existing = await this.ctx.store.getShortIdByMsgId(uniqueId)
+        if (!existing){
+          this.ctx.logger.info(uniqueId)
+          const peer = {
+            chatType: message.chatType,
+            peerUid: message.peerUin,
+            guildId: '',
           }
-        })
+          try {
+            this.ctx.store.createMsgShortId(peer, uniqueId)
+          }catch (e) {
+            this.ctx.logger.info(e)
+          }
+          // this.ctx.logger.info(message)
+          this.ctx.parallel('nt/offline-message-created', message)
+        }
         continue
       }
       if (message.senderUin && message.senderUin !== '0') {

src/ntqqapi/hook.ts

@@ -76,16 +76,20 @@ export function startHook() {
     else if (data.type === 'recv' && data.data.cmd === 'trpc.msg.olpush.OlPushService.MsgPush'){
       if (getConfigUtil().getConfig().rawMsgPB) {
         const msg = parseProtobufFromHex(data.data.pb)
-        const peerId = msg[1][1][8][1]
-        const msgRand = msg[1][2][4]
-        const msgSeq = msg[1][2][5]
-        const uniqueId = `${peerId}_${msgRand}_${msgSeq}`
-        if (msgPBMap.size > 1000) {
-          // 删除最老的记录
-          const firstKey = msgPBMap.keys().next().value
-          msgPBMap.delete(firstKey!)
+        try {
+          const peerId = msg[1][1][8][1]
+          const msgRand = msg[1][2][4]
+          const msgSeq = msg[1][2][5]
+          const uniqueId = `${peerId}_${msgRand}_${msgSeq}`
+          if (msgPBMap.size > 1000) {
+            // 删除最老的记录
+            const firstKey = msgPBMap.keys().next().value
+            msgPBMap.delete(firstKey!)
+          }
+          msgPBMap.set(uniqueId, data.data.pb)
+        }catch (e) {
+
         }
-        msgPBMap.set(uniqueId, data.data.pb)
       }
     }
   })

src/onebot11/entities.ts

@@ -176,14 +176,17 @@ export namespace OB11Entities {
           guildId: ''
         }
         try {
-          const { replayMsgSeq, replyMsgTime } = replyElement
-          const record = msg.records.find(msgRecord => msgRecord.msgId === replyElement.sourceMsgIdInRecords)
+          const { replayMsgSeq: replyMsgSeq, replyMsgTime } = replyElement
+          let record = msg.records.find(msgRecord => msgRecord.msgId === replyElement.sourceMsgIdInRecords)
+          const { msgList } = await ctx.ntMsgApi.getMsgsBySeqAndCount(peer, replyMsgSeq, 1, true, true)
+          if (!record){
+            record = msgList.find(msg=>msg.msgSeq === replyMsgSeq && msg.msgTime === replyMsgTime)
+          }
           const senderUid = replyElement.senderUidStr || record?.senderUid
           if (!record || !replyMsgTime || !senderUid) {
             ctx.logger.error('找不到回复消息', replyElement)
             continue
           }
-          const { msgList } = await ctx.ntMsgApi.getMsgsBySeqAndCount(peer, replayMsgSeq, 1, true, true)
 
           let replyMsg: RawMessage | undefined
           if (record.msgRandom !== '0') {
@@ -640,9 +643,12 @@ export namespace OB11Entities {
     msg: RawMessage,
     shortId: number
   ): Promise<OB11FriendRecallNoticeEvent | OB11GroupRecallNoticeEvent | undefined> {
-    const revokeElement = msg.elements[0].grayTipElement?.revokeElement
+    const revokeElement = msg.elements[0].grayTipElement?.revokeElement!
     if (msg.chatType === ChatType.Group) {
-      const operator = await ctx.ntGroupApi.getGroupMember(msg.peerUid, revokeElement!.operatorUid)
+      const operator = await ctx.ntGroupApi.getGroupMember(msg.peerUid, revokeElement.operatorUid)
+      if (msg.senderUin === '0' || !msg.senderUin){
+        msg.senderUin = await ctx.ntUserApi.getUinByUid(revokeElement.origMsgSenderUid!)
+      }
       return new OB11GroupRecallNoticeEvent(
         parseInt(msg.peerUid),
         parseInt(msg.senderUin!),

src/webui/BE/server.ts

@@ -147,7 +147,7 @@ export class WebUIServer extends Service {
         })
         return
       }
-      
+
       // 将存储的明文密码 hash 后与前端传来的 hash 对比
       const hashedToken = hashPassword(token)
       if (reqToken !== hashedToken) {
@@ -351,10 +351,9 @@ export class WebUIServer extends Service {
     await this.startWithPort(forcePort)
   }
 
-  private setConfig(newConfig: Config) {
+  public setConfig(newConfig: Config) {
     const oldConfig = { ...this.config }
     this.config = { onlyLocalhost: newConfig.onlyLocalhost, ...newConfig.webui }
-
   }
 
   async start() {