fix: #444

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '3.4.1';
+export const napCatVersion = '3.4.3';

src/core/entities/msg.ts

@@ -822,6 +822,8 @@ export interface RawMessage {
     elements: MessageElement[];
 
     sourceType: MsgSourceType;
+
+    isOnlineMsg: boolean;
 }
 export interface QueryMsgsParams {
     chatInfo: Peer;

src/onebot/index.ts

@@ -311,33 +311,51 @@ export class NapCatOneBot11Adapter {
             }
         };
 
-        const msgIdSend = new LRUCache<string, boolean>(100);
+        //const msgIdSend = new LRUCache<string, boolean>(100);
         const recallMsgs = new LRUCache<string, boolean>(100);
+        msgListener.onAddSendMsg = async msg => {
+            if (msg.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS) {
+                this.apis.MsgApi.parseMessage(msg)
+                    .then((ob11Msg) => {
+                        if (!ob11Msg) return;
+                        ob11Msg.target_id = parseInt(msg.peerUin);
+                        if (this.configLoader.configData.reportSelfMessage) {
+                            msg.id = MessageUnique.createUniqueMsgId({
+                                chatType: msg.chatType,
+                                peerUid: msg.peerUid,
+                                guildId: '',
+                            }, msg.msgId);
+                            this.emitMsg(msg);
+                        } else {
+                            // logOB11Message(this.core, ob11Msg);
+                        }
+                    });
+            }
+        };
         msgListener.onMsgInfoListUpdate = async msgList => {
             this.emitRecallMsg(msgList, recallMsgs)
                 .catch(e => this.context.logger.logError.bind(this.context.logger)('处理消息失败', e));
-
-            for (const msg of msgList.filter(e => e.senderUin == this.core.selfInfo.uin)) {
-                if (msg.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS && !msgIdSend.get(msg.msgId)) {
-                    msgIdSend.put(msg.msgId, true);
-                    // 完成后再post
-                    this.apis.MsgApi.parseMessage(msg)
-                        .then((ob11Msg) => {
-                            if (!ob11Msg) return;
-                            ob11Msg.target_id = parseInt(msg.peerUin);
-                            if (this.configLoader.configData.reportSelfMessage) {
-                                msg.id = MessageUnique.createUniqueMsgId({
-                                    chatType: msg.chatType,
-                                    peerUid: msg.peerUid,
-                                    guildId: '',
-                                }, msg.msgId);
-                                this.emitMsg(msg);
-                            } else {
-                                // logOB11Message(this.core, ob11Msg);
-                            }
-                        });
-                }
-            }
+            // for (const msg of msgList.filter(e => e.senderUin == this.core.selfInfo.uin)) {
+            //     if (msg.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS && !msgIdSend.get(msg.msgId)) {
+            //         msgIdSend.put(msg.msgId, true);
+            //         // 完成后再post
+            //         this.apis.MsgApi.parseMessage(msg)
+            //             .then((ob11Msg) => {
+            //                 if (!ob11Msg) return;
+            //                 ob11Msg.target_id = parseInt(msg.peerUin);
+            //                 if (this.configLoader.configData.reportSelfMessage) {
+            //                     msg.id = MessageUnique.createUniqueMsgId({
+            //                         chatType: msg.chatType,
+            //                         peerUid: msg.peerUid,
+            //                         guildId: '',
+            //                     }, msg.msgId);
+            //                     this.emitMsg(msg);
+            //                 } else {
+            //                     // logOB11Message(this.core, ob11Msg);
+            //                 }
+            //             });
+            //     }
+            // }
         };
 
         this.context.session.getMsgService().addKernelMsgListener(
@@ -523,7 +541,7 @@ export class NapCatOneBot11Adapter {
         );
     }
 
-    private async emitMsg(message: RawMessage) {
+    private async emitMsg(message: RawMessage, parseEvent: boolean = true) {
         const { debug, reportSelfMessage, messagePostFormat } = this.configLoader.configData;
         this.context.logger.logDebug('收到新消息 RawMessage', message);
         this.apis.MsgApi.parseMessage(message, messagePostFormat).then((ob11Msg) => {

src/onebot/network/passive-websocket.ts

@@ -143,7 +143,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
     private registerHeartBeat() {
         this.heartbeatIntervalId = setInterval(() => {
             this.wsClientsMutex.runExclusive(async () => {
-                this.wsClients.forEach((wsClient) => {
+                this.wsClientWithEvent.forEach((wsClient) => {
                     if (wsClient.readyState === WebSocket.OPEN) {
                         wsClient.send(JSON.stringify(new OB11HeartbeatEvent(this.core, this.heartbeatInterval, this.core.selfInfo.online, true)));
                     }

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V3.4.1", "napcat-update-button", "secondary")
+          SettingButton("V3.4.3", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([