fix: 统一消息格式

This reverts commit 9d92270931.

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCat",
   "slug": "NapCat",
   "description": "现代化的 OneBot 11 协议实现",
-  "version": "2.0.10",
+  "version": "2.0.13",
   "icon": "./logo.png",
   "authors": [
     {

package.json

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

script/BootWay05_init.bat

@@ -0,0 +1,77 @@
+@echo off
+REM Check if the script is running as administrator
+openfiles >nul 2>&1
+if %errorlevel% neq 0 (
+    REM If not, restart the script in administrator mode
+    echo Requesting administrator privileges...
+    powershell -Command "Start-Process cmd -ArgumentList '/c %~f0 %*' -Verb RunAs"
+    exit /b
+)
+
+cd /d %~dp0
+
+set currentPath=%cd%
+set currentPath=%currentPath:\=/%
+
+REM Generate JavaScript code
+set "jsCode=(async () =^>await import('file:///%currentPath%/napcat.mjs'))();"
+
+REM Save JavaScript code to a file
+echo %jsCode% > loadScript.js
+echo JavaScript code has been generated and saved to loadScript.js
+
+REM Set NAPCAT_PATH environment variable to the address of loadScript.js in the current directory
+set NAPCAT_PATH=%cd%\loadScript.js
+
+REM Get QQ path and cache it
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set "RetString=%%b"
+)
+
+set "pathWithoutUninstall=%RetString:Uninstall.exe=%"
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+echo %QQPath%>qq_path_cache.txt
+echo QQ path %QQPath% has been cached to qq_path_cache.txt
+
+REM Exit if QQ path is invalid
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+
+REM Collect dbghelp.dll path and HASH information
+set QQdir=%~dp0
+set oldDllPath=%QQdir%dbghelp.dll
+set newDllPath=%currentPath%\dbghelp.dll
+
+for /f "tokens=*" %%A in ('certutil -hashfile "%oldDllPath%" MD5') do (
+    if not defined oldDllHash set oldDllHash=%%A
+)
+for /f "tokens=*" %%A in ('certutil -hashfile "%newDllPath%" MD5') do (
+    if not defined newDllHash set newDllHash=%%A
+)
+
+REM Compare the HASH of the old and new dbghelp.dll, and replace the old one if they are different
+if "%oldDllHash%" neq "%newDllHash%" (
+    tasklist /fi "imagename eq QQ.exe" 2>nul | find /i "QQ.exe" >nul
+    if %errorlevel% equ 0 (
+        REM If the file is in use, prompt the user to close QQ
+        echo dbghelp.dll is in use, please close QQ first.
+    ) else (
+        copy /y "%newDllPath%" "%oldDllPath%"
+        if %errorlevel% neq 0 (
+            echo Copy dbghelp.dll failed, please check and try again.
+            pause
+            exit /b
+        ) else (
+            echo dbghelp.dll has been updated.
+            echo Please run BootWay05_run.bat to start QQ.
+            echo If you update QQ in the future, please run BootWay05_init.bat again.
+            pause
+            exit /b
+        )
+    )
+)

script/BootWay05_run.bat

@@ -0,0 +1,10 @@
+@echo off
+set /p QQPath=<qq_path_cache.txt
+echo QQ path %QQPath% has been read from qq_path_cache.txt
+echo If failed to start QQ, please try running this script in administrator mode.
+
+set NAPCAT_PATH=%cd%\loadScript.js
+
+REM Launch QQ.exe with params provided
+
+"%QQPath%" --enable-logging  %*

script/BootWay05_run.utf8.bat

@@ -0,0 +1,13 @@
+@echo off
+
+chcp 65001
+
+set /p QQPath=<qq_path_cache.txt
+echo QQ path %QQPath% has been read from qq_path_cache.txt
+echo If failed to start QQ, please try running this script in administrator mode.
+
+set NAPCAT_PATH=%cd%\loadScript.js
+
+REM Launch QQ.exe with params provided
+
+"%QQPath%" --enable-logging  %*

src/common/framework/napcat.ts

@@ -2,7 +2,7 @@ import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
 
-export const napcat_version = '2.0.10';
+export const napcat_version = '2.0.13';
 
 export class NapCatPathWrapper {
     binaryPath: string;

src/framework/napcat.cjs

@@ -87,13 +87,12 @@ function pollForNTInitializationCheck() {
             try {
                 if (ntIsInitialized_Internal()) {
                     isSolve = true;
+                    clearInterval(intervalRef);
                     resolve(true);
                 }
             } catch (error) {
                 reject(error);
-            } finally {
+            }  
-                clearInterval(intervalRef);
-            }
         }, 500);
     });
 }
@@ -107,19 +106,13 @@ function registerInitCallback(callback) {
 
 async function fetchServices(timeout = 10000) {
     return Promise.race([
-        new Promise((resolve) => {
+        pollForNTInitializationCheck(),
-            setTimeout(() => {
-                pollForNTInitializationCheck().then(() => {
-                    resolve(true);
-                });
-            });
-        }),
         new Promise((resolve) => {
             setTimeout(() => resolve(false), timeout);
         }),
     ]).then(result => result ?
         { wrapperSession, wrapperNodeApi, wrapperLoginService } :
-        Promise.reject(),
+        Promise.reject("fetchServices Timeout!"),
     );
 }
 let getWebUiUrlFunc = undefined;

src/onebot/action/go-cqhttp/GetForwardMsg.ts

@@ -40,7 +40,7 @@ export class GoCQHTTPGetForwardMsgAction extends BaseAction<Payload, any> {
         }
         const msgList = data.msgList;
         const messages = (await Promise.all(msgList.map(async msg => {
-            const resMsg = await OB11Constructor.message(this.CoreContext, msg, 'array');
+            const resMsg = await OB11Constructor.message(this.CoreContext, this.OneBotContext, msg);
             if (!resMsg) return;
             resMsg.message_id = MessageUnique.createMsg({
                 guildId: '',

src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts

@@ -53,7 +53,7 @@ export default class GetFriendMsgHistory extends BaseAction<Payload, Response> {
             msg.id = MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
         }));
         //转换消息
-        const ob11MsgList = (await Promise.all(msgList.map(msg => OB11Constructor.message(this.CoreContext, msg, 'array')))).filter(msg => !!msg);
+        const ob11MsgList = (await Promise.all(msgList.map(msg => OB11Constructor.message(this.CoreContext, this.OneBotContext, msg)))).filter(msg => !!msg);
         return { 'messages': ob11MsgList };
     }
 }

src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts

@@ -48,7 +48,7 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Resp
         }));
 
         //转换消息
-        const ob11MsgList = (await Promise.all(msgList.map(msg => OB11Constructor.message(this.CoreContext, msg, 'array')))).filter(msg => !!msg);
+        const ob11MsgList = (await Promise.all(msgList.map(msg => OB11Constructor.message(this.CoreContext, this.OneBotContext, msg)))).filter(msg => !!msg);
         return { 'messages': ob11MsgList };
     }
 }

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -69,7 +69,7 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
                 }
             }
         } else {
-            // Mlikiowa V2.0.10 Refactor Todo
+            // Mlikiowa V2.0.13 Refactor Todo
             // retMember.last_sent_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.lastSpeakTime || date.toString());
             // retMember.join_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.joinTime || date.toString());
         }

src/onebot/action/group/GetGroupMemberList.ts

@@ -83,7 +83,7 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
                 }
             }
         } else {
-            // Mlikiowa V2.0.10 Refactor Todo
+            // Mlikiowa V2.0.13 Refactor Todo
             // _groupMembers.forEach(async item => {
             //   item.last_sent_time = parseInt((await getGroupMember(payload.group_id.toString(), item.user_id))?.lastSpeakTime || date.toString());
             //   item.join_time = parseInt((await getGroupMember(payload.group_id.toString(), item.user_id))?.joinTime || date.toString());

src/onebot/action/msg/GetMsg.ts

@@ -37,8 +37,8 @@ class GetMsg extends BaseAction<Payload, OB11Message> {
         const msg = await NTQQMsgApi.getMsgsByMsgId(
             peer,
             [msgIdWithPeer?.MsgId || payload.message_id.toString()]);
-        const retMsg = await OB11Constructor.message(this.CoreContext, msg.msgList[0], 'array');
+        const retMsg = await OB11Constructor.message(this.CoreContext, this.OneBotContext, msg.msgList[0], 'array');
-        if(!retMsg) throw Error('消息为空');
+        if (!retMsg) throw Error('消息为空');
         try {
             retMsg.message_id = MessageUnique.createMsg(peer, msg.msgList[0].msgId)!;
             retMsg.message_seq = retMsg.message_id;

src/onebot/action/msg/SendMsg/create-send-elements.ts

@@ -56,7 +56,7 @@ const _handlers: {
         if (atQQ === 'all') return SendMsgElementConstructor.at(coreContext, atQQ, atQQ, AtType.atAll, '全体成员');
 
         // then the qq is a group member
-        // Mlikiowa V2.0.10 Refactor Todo
+        // Mlikiowa V2.0.13 Refactor Todo
         const uid = await coreContext.apis.UserApi.getUidByUinV2(atQQ);
         if (!uid) throw new Error('Get Uid Error');
         return SendMsgElementConstructor.at(coreContext, atQQ, uid, AtType.atUser, '');
@@ -161,7 +161,7 @@ const _handlers: {
         } else {
             postData = data;
         }
-        // Mlikiowa V2.0.10 Refactor Todo
+        // Mlikiowa V2.0.13 Refactor Todo
         const signUrl = obContext.configLoader.configData.musicSignUrl;
         if (!signUrl) {
             if (data.type === 'qq') {

src/onebot/action/msg/SendMsg/index.ts

@@ -105,6 +105,7 @@ async function createContext(coreContext: NapCatCore, payload: OB11PostSendMsg,
         return {
             chatType: isBuddy ? ChatType.friend : ChatType.temp,
             peerUid: Uid!,
+            guildId: payload.group_id?.toString() || '',
         };
     }
     throw '请指定 group_id 或 user_id';

src/onebot/action/user/GetRecentContact.ts

@@ -24,7 +24,7 @@ export default class GetRecentContact extends BaseAction<Payload, any> {
             const FastMsg = await NTQQMsgApi.getMsgsByMsgId({ chatType: t.chatType, peerUid: t.peerUid }, [t.msgId]);
             if (FastMsg.msgList.length > 0) {
                 //扩展ret.info.changedList
-                const lastestMsg = await OB11Constructor.message(this.CoreContext, FastMsg.msgList[0], 'array');
+                const lastestMsg = await OB11Constructor.message(this.CoreContext, this.OneBotContext,FastMsg.msgList[0], 'array');
                 return {
                     lastestMsg: lastestMsg,
                     peerUin: t.peerUin,

src/onebot/helper/data.ts

@@ -42,9 +42,15 @@ import { OB11BaseNoticeEvent } from '../event/notice/OB11BaseNoticeEvent';
 import { OB11GroupEssenceEvent } from '../event/notice/OB11GroupEssenceEvent';
 import { MessageUnique } from '@/common/utils/MessageUnique';
 import { NapCatCore } from '@/core';
+import { NapCatOneBot11Adapter } from '..';
 
 export class OB11Constructor {
-    static async message(core: NapCatCore, msg: RawMessage, messagePostFormat: any): Promise<OB11Message | undefined> {
+    static async message(
+        core: NapCatCore,
+        obcore: NapCatOneBot11Adapter,
+        msg: RawMessage,
+        messagePostFormat: string = obcore.configLoader.configData.messagePostFormat
+    ): Promise<OB11Message | undefined> {
         if (msg.senderUin == "0") return;
         if (msg.peerUin == "0") return;
         //跳过空消息
@@ -344,7 +350,7 @@ export class OB11Constructor {
                     MultiMsg.parentMsgPeer = ParentMsgPeer;
                     MultiMsg.parentMsgIdList = msg.parentMsgIdList;
                     MultiMsg.id = MessageUnique.createMsg(ParentMsgPeer, MultiMsg.msgId);//该ID仅用查看 无法调用
-                    const msgList = await OB11Constructor.message(core, MultiMsg, 'array');
+                    const msgList = await OB11Constructor.message(core, obcore, MultiMsg, messagePostFormat);
                     if (!msgList) continue;
                     message_data['data']['content'].push(msgList);
                     //console.log("合并消息", msgList);
@@ -411,7 +417,7 @@ export class OB11Constructor {
             return;
         }
         //log("group msg", msg);
-        // Mlikiowa V2.0.10 Refactor Todo
+        // Mlikiowa V2.0.13 Refactor Todo
         // if (msg.senderUin && msg.senderUin !== '0') {
         //   const member = await getGroupMember(msg.peerUid, msg.senderUin);
         //   if (member && member.cardName !== msg.sendMemberName) {

src/onebot/index.ts

@@ -253,9 +253,9 @@ export class NapCatOneBot11Adapter {
                 if (msg.sendStatus == 2 && !msgIdSend.get(msg.msgId)) {
                     msgIdSend.put(msg.msgId, true);
                     // 完成后再post
-                    OB11Constructor.message(this.core, msg, this.configLoader.configData.messagePostFormat)
+                    OB11Constructor.message(this.core, this, msg)
                         .then((ob11Msg) => {
-                            if(!ob11Msg) return;
+                            if (!ob11Msg) return;
                             ob11Msg.target_id = parseInt(msg.peerUin);
                             if (this.configLoader.configData.reportSelfMessage) {
                                 msg.id = MessageUnique.createMsg({
@@ -425,8 +425,8 @@ export class NapCatOneBot11Adapter {
     private async emitMsg(message: RawMessage) {
         const { debug, reportSelfMessage, messagePostFormat } = this.configLoader.configData;
         this.context.logger.logDebug('收到新消息 RawMessage', message);
-        OB11Constructor.message(this.core, message, messagePostFormat).then((ob11Msg) => {
+        OB11Constructor.message(this.core, this, message, messagePostFormat).then((ob11Msg) => {
-            if(!ob11Msg) return;
+            if (!ob11Msg) return;
             this.context.logger.logDebug('转化为 OB11Message', ob11Msg);
             if (debug) {
                 ob11Msg.raw = message;
@@ -483,7 +483,7 @@ export class NapCatOneBot11Adapter {
                     let operatorId = message.senderUin;
                     for (const element of message.elements) {
                         const operatorUid = element.grayTipElement?.revokeElement.operatorUid;
-                        if(!operatorUid) return;
+                        if (!operatorUid) return;
                         const operator = await this.core.apis.GroupApi.getGroupMember(message.peerUin, operatorUid);
                         operatorId = operator?.uin || message.senderUin;
                     }

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V2.0.10', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.0.13', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([

static/assets/renderer.js

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