fix: error handle

manifest.json

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

napcat.webui/src/components/QQLogin.vue

@@ -58,6 +58,9 @@ let qrcodeUrl: string = '';
 const selectAccount = async (accountName: string): Promise<void> => {
     const { result, errMsg } = await qqLoginManager.setQuickLogin(accountName);
     if (result) {
+        if (heartBeatTimer) {
+            clearInterval(heartBeatTimer);
+        }
         await MessagePlugin.success('登录成功即将跳转');
         await router.push({ path: '/dashboard/basic-info' });
     } else {
@@ -85,10 +88,11 @@ const HeartBeat = async (): Promise<void> => {
         if (heartBeatTimer) {
             clearInterval(heartBeatTimer);
         }
-        //判断是否已经调转
-        if (router.currentRoute.value.path !== '/dashboard/basic-info') {
-            return;
-        }
+        // //判断是否已经调转
+        // if (router.currentRoute.value.path !== '/dashboard/basic-info') {
+        //     return;
+        // }
+        await MessagePlugin.success('登录成功即将跳转');
         await router.push({ path: '/dashboard/basic-info' });
     } else if (isLogined?.qrcodeurl && qrcodeUrl !== isLogined.qrcodeurl) {
         qrcodeUrl = isLogined.qrcodeurl;

napcat.webui/src/pages/OtherConfig.vue

@@ -12,6 +12,9 @@
                     <t-form-item label="启用本地文件到URL" name="enableLocalFile2Url" class="form-item">
                         <t-switch v-model="otherConfig.enableLocalFile2Url" />
                     </t-form-item>
+                    <t-form-item label="启用上报解析合并消息" name="parseMultMsg" class="form-item">
+                        <t-switch v-model="otherConfig.parseMultMsg" />
+                    </t-form-item>
                 </t-form>
                 <div class="button-container">
                     <t-button @click="saveConfig">保存</t-button>
@@ -30,6 +33,7 @@ import { QQLoginManager } from '@/backend/shell';
 const otherConfig = ref<Partial<OneBotConfig>>({
     musicSignUrl: '',
     enableLocalFile2Url: false,
+    parseMultMsg: true
 });
 
 const labelAlign = ref<string>();
@@ -59,6 +63,7 @@ const loadConfig = async () => {
         if (userConfig) {
             otherConfig.value.musicSignUrl = userConfig.musicSignUrl;
             otherConfig.value.enableLocalFile2Url = userConfig.enableLocalFile2Url;
+            otherConfig.value.parseMultMsg = userConfig.parseMultMsg;
         }
     } catch (error) {
         console.error('Error loading config:', error);
@@ -71,6 +76,7 @@ const saveConfig = async () => {
         if (userConfig) {
             userConfig.musicSignUrl = otherConfig.value.musicSignUrl || '';
             userConfig.enableLocalFile2Url = otherConfig.value.enableLocalFile2Url ?? false;
+            userConfig.parseMultMsg = otherConfig.value.parseMultMsg ?? true;
             const success = await setOB11Config(userConfig);
             if (success) {
                 MessagePlugin.success('配置保存成功');

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.1.21",
+  "version": "4.2.2",
   "scripts": {
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
     "build:shell": "npm run build:webui && vite build --mode shell || exit 1",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.1.21';
+export const napCatVersion = '4.2.2';

src/core/helper/msg.ts

@@ -3,12 +3,12 @@ import { PicType } from '../types';
 export async function getFileTypeForSendType(picPath: string): Promise<PicType> {
     const fileTypeResult = (await fileType.fileTypeFromFile(picPath))?.ext ?? 'jpg';
     const picTypeMap: { [key: string]: PicType } = {
-        'webp': PicType.NEWPIC_WEBP,
+        //'webp': PicType.NEWPIC_WEBP,
         'gif': PicType.NEWPIC_GIF,
-        'png': PicType.NEWPIC_APNG,
-        'jpg': PicType.NEWPIC_JPEG,
-        'jpeg': PicType.NEWPIC_JPEG,
-        'bmp': PicType.NEWPIC_BMP,
+        // 'png': PicType.NEWPIC_APNG,
+        // 'jpg': PicType.NEWPIC_JPEG,
+        // 'jpeg': PicType.NEWPIC_JPEG,
+        // 'bmp': PicType.NEWPIC_BMP,
     };
     return picTypeMap[fileTypeResult] ?? PicType.NEWPIC_JPEG;
 }

src/onebot/index.ts

@@ -213,7 +213,7 @@ export class NapCatOneBot11Adapter {
                 if (networkChange === OB11NetworkReloadType.NetWorkClose) {
                     await this.networkManager.closeSomeAdaterWhenOpen([existingAdapter]);
                 }
-            } else if(adapterConfig.enable) {
+            } else if (adapterConfig.enable) {
                 const newAdapter = new adapterClass(adapterConfig.name, adapterConfig, this.core, this.actions);
                 await this.networkManager.registerAdapterAndOpen(newAdapter);
             }
@@ -266,23 +266,30 @@ export class NapCatOneBot11Adapter {
         };
 
         msgListener.onAddSendMsg = async (msg) => {
-            if (msg.sendStatus == SendStatusType.KSEND_STATUS_SENDING) {
-                await this.core.eventWrapper.registerListen('NodeIKernelMsgListener/onMsgInfoListUpdate', (msgList: RawMessage[]) => {
-                    const report = msgList.find((e) =>
-                        e.senderUin == this.core.selfInfo.uin && e.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS && e.msgId === msg.msgId
-                    );
-                    return !!report;
-                }, 1, 300);
-                msg.id = MessageUnique.createUniqueMsgId(
-                    {
-                        chatType: msg.chatType,
-                        peerUid: msg.peerUid,
-                        guildId: '',
-                    },
-                    msg.msgId
-                );
-                //此时上报的seq不是对的 不过对onebot业务无影响
-                this.emitMsg(msg);
+            try {
+                if (msg.sendStatus == SendStatusType.KSEND_STATUS_SENDING) {
+                    const [updatemsgs] = await this.core.eventWrapper.registerListen('NodeIKernelMsgListener/onMsgInfoListUpdate', (msgList: RawMessage[]) => {
+                        const report = msgList.find((e) =>
+                            e.senderUin == this.core.selfInfo.uin && e.sendStatus !== SendStatusType.KSEND_STATUS_SENDING && e.msgId === msg.msgId
+                        );
+                        return !!report;
+                    }, 1, 10 * 60 * 1000);
+                    // 10分钟 超时
+                    const updatemsg = updatemsgs.find((e) => e.msgId === msg.msgId);
+                    if (updatemsg?.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS || updatemsg?.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS_NOSEQ) {
+                        updatemsg.id = MessageUnique.createUniqueMsgId(
+                            {
+                                chatType: updatemsg.chatType,
+                                peerUid: updatemsg.peerUid,
+                                guildId: '',
+                            },
+                            updatemsg.msgId
+                        );
+                        this.emitMsg(updatemsg);
+                    }
+                }
+            } catch (error) {
+                this.context.logger.logError('处理发送消息失败', error);
             }
         };
         msgListener.onMsgRecall = async (chatType: ChatType, uid: string, msgSeq: string) => {