build: v2.0.24

typo: OB11InputStatusEvent event_type

.github/workflows/release.yml

@@ -98,11 +98,16 @@ jobs:
     
     - name: Compress subdirectories
       run: |
-       for dir in */; do
+        cd ./NapCat.Shell/
-          base=$(basename "$dir")
+        zip -q -r NapCat.Shell.zip *
-          zip -r "${base}.zip" "$dir"
+        cd ..
-        done 
+        cd ./NapCat.Framework/
-    
+        zip -q -r NapCat.Framework.zip *
+        cd ..
+        rm ./NapCat.Shell.zip -rf
+        rm ./NapCat.Framework.zip -rf
+        mv ./NapCat.Shell/NapCat.Shell.zip ./
+        mv ./NapCat.Framework/NapCat.Framework.zip ./
     - name: Extract version from tag
       run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
       
@@ -118,6 +123,4 @@ jobs:
         files: |
           NapCat.Framework.zip
           NapCat.Shell.zip
-#          NapCat.darwin.x64.zip
-#          NapCat.darwin.arm64.zip
         draft: true

README.md

@@ -19,16 +19,17 @@ NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现。
 **首次使用**请务必前往[官方文档](https://napneko.github.io/)查看使用教程。
 
 ## 相关链接
+[QQ Group](https://qm.qq.com/q/VfjAq5HIMS)
 
 [Telegram Link](https://t.me/+nLZEnpne-pQ1OWFl)
 
-## 附加协议
-禁止未授权任何项目使用Core部分代码用于二次开发与分发
-
 ## 鸣谢名单
 感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot) 提供初始版本基础
 
 感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持
 
 ---
-**任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**
+
+## 使用许可
+
+任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经授权二次分发或基于 [core](./src/core) 部分代码开发。**

manifest.json

@@ -1,10 +1,10 @@
 {
   "manifest_version": 4,
   "type": "extension",
-  "name": "NapCat",
+  "name": "NapCatQQ",
-  "slug": "NapCat",
+  "slug": "NapCat.Framework",
-  "description": "OneBot v11 protocol implementation with NapCat logic",
+  "description": "高性能的 OneBot 11 协议实现",
-  "version": "2.0.8",
+  "version": "2.0.24",
   "icon": "./logo.png",
   "authors": [
     {
@@ -30,4 +30,4 @@
     "main": "./liteloader.cjs",
     "preload": "./preload.cjs"
   }
-}
+}

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.0.8",
+  "version": "2.0.24",
   "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.8';
+export const napcat_version = '2.0.24';
 
 export class NapCatPathWrapper {
     binaryPath: string;

src/common/utils/file.ts

@@ -1,10 +1,9 @@
 import fs from 'fs';
-import fsPromise, { stat } from 'fs/promises';
+import { stat } from 'fs/promises';
 import crypto, { randomUUID } from 'crypto';
 import util from 'util';
 import path from 'node:path';
 import * as fileType from 'file-type';
-import { LogWrapper } from './log';
 
 export function isGIF(path: string) {
     const buffer = Buffer.alloc(4);
@@ -13,7 +12,6 @@ export function isGIF(path: string) {
     fs.closeSync(fd);
     return buffer.toString() === 'GIF8';
 }
-
 // 定义一个异步函数来检查文件是否存在
 export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
     return new Promise((resolve, reject) => {
@@ -94,7 +92,6 @@ export async function file2base64(path: string) {
     return result;
 }
 
-
 export function calculateFileMD5(filePath: string): Promise<string> {
     return new Promise((resolve, reject) => {
         // 创建一个流式读取器
@@ -166,136 +163,98 @@ type Uri2LocalRes = {
     isLocal: boolean
 }
 
-export async function uri2local(TempDir: string, UriOrPath: string, fileName: string | null = null): Promise<Uri2LocalRes> {
+export async function checkFileV2(filePath: string) {
-    const res = {
-        success: false,
-        errMsg: '',
-        fileName: '',
-        ext: '',
-        path: '',
-        isLocal: false,
-    };
-    if (!fileName) fileName = randomUUID();
-    let filePath = path.join(TempDir, fileName);//临时目录
-    let url = null;
-    //区分path和uri
     try {
-        if (fs.existsSync(UriOrPath)) url = new URL('file://' + UriOrPath);
+        const ext: string | undefined = (await fileType.fileTypeFromFile(filePath))?.ext;
-    } catch (error: any) {
+        if (ext) {
+            fs.renameSync(filePath, filePath + `.${ext}`);
+            filePath += `.${ext}`;
+            return { success: true, ext: ext, path: filePath };
+        }
+    } catch (e) {
+        // log("获取文件类型失败", filePath,e.stack)
+    }
+    return { success: false, ext: '', path: filePath };
+}
+
+export enum FileUriType {
+    Unknown = 0,
+    Local = 1,
+    Remote = 2,
+    Base64 = 3
+}
+
+export async function checkUriType(Uri: string) {
+    //先判断是否是本地文件
+    try {
+        if (fs.existsSync(Uri)) return { Uri: Uri, Type: FileUriType.Local };
+    } catch (error) {
     }
     try {
-        url = new URL(UriOrPath);
+        //再判断是否是Http
-    } catch (error: any) {
+        if (Uri.startsWith('http://') || Uri.startsWith('https://')) {
-    }
+            return { Uri: Uri, Type: FileUriType.Remote };
-
-    //验证url
-    if (!url) {
-        res.errMsg = `UriOrPath ${UriOrPath} 解析失败,可能${UriOrPath}不存在`;
-        return res;
-    }
-
-    if (url.protocol == 'base64:') {
-        // base64转成文件
-        const base64Data = UriOrPath.split('base64://')[1];
-        try {
-            const buffer = Buffer.from(base64Data, 'base64');
-            fs.writeFileSync(filePath, buffer);
-        } catch (e: any) {
-            res.errMsg = 'base64文件下载失败,' + e.toString();
-            return res;
         }
-    } else if (url.protocol == 'http:' || url.protocol == 'https:') {
+        //再判断是否是Base64
-        // 下载文件
+        if (Uri.startsWith('base64://')) {
-        let buffer: Buffer | null = null;
+            return { Uri: Uri, Type: FileUriType.Base64 };
-        try {
-            buffer = await httpDownload(UriOrPath);
-        } catch (e: any) {
-            res.errMsg = `${url}下载失败,` + e.toString();
-            return res;
         }
-        try {
+        if (Uri.startsWith('file://')) {
-            const pathInfo = path.parse(decodeURIComponent(url.pathname));
+            let pathname: string;
-            if (pathInfo.name) {
+            let filePath: string;
-                fileName = pathInfo.name;
-                if (pathInfo.ext) {
-                    fileName += pathInfo.ext;
-                    // res.ext = pathInfo.ext
-                }
-            }
-            fileName = fileName.replace(/[/\\:*?"<>|]/g, '_');
-            res.fileName = fileName;
-            filePath = path.join(TempDir, randomUUID() + fileName);
-            fs.writeFileSync(filePath, buffer);
-        } catch (e: any) {
-            res.errMsg = `${url}下载失败,` + e.toString();
-            return res;
-        }
-    } else {
-        let pathname: string;
-        if (url.protocol === 'file:') {
             // await fs.copyFile(url.pathname, filePath);
-            pathname = decodeURIComponent(url.pathname);
+            pathname = decodeURIComponent(new URL(Uri).pathname);
             if (process.platform === 'win32') {
                 filePath = pathname.slice(1);
             } else {
                 filePath = pathname;
             }
-        } else {
+            return { Uri: filePath, Type: FileUriType.Local };
-            // 26702执行forword file文件操作 不应该在这里乱来
-            // const cache = await dbUtil.getFileCacheByName(uri);
-            // if (cache) {
-            //   filePath = cache.path;
-            // } else {
-            //   filePath = uri;
-            // }
-        }
-        res.isLocal = true;
-    }
-    // else{
-    //     res.errMsg = `不支持的file协议,` + url.protocol
-    //     return res
-    // }
-    // if (isGIF(filePath) && !res.isLocal) {
-    //     await fs.rename(filePath, filePath + ".gif");
-    //     filePath += ".gif";
-    // }
-    if (!res.isLocal && !res.ext) {
-        try {
-            const ext: string | undefined = (await fileType.fileTypeFromFile(filePath))?.ext;
-            if (ext) {
-                fs.renameSync(filePath, filePath + `.${ext}`);
-                filePath += `.${ext}`;
-                res.fileName += `.${ext}`;
-                res.ext = ext;
-            }
-        } catch (e) {
-            // log("获取文件类型失败", filePath,e.stack)
-        }
-    }
-    res.success = true;
-    res.path = filePath;
-    return res;
-}
-
-export async function copyFolder(sourcePath: string, destPath: string, logger: LogWrapper) {
-    try {
-        const entries = await fsPromise.readdir(sourcePath, { withFileTypes: true });
-        await fsPromise.mkdir(destPath, { recursive: true });
-        for (const entry of entries) {
-            const srcPath = path.join(sourcePath, entry.name);
-            const dstPath = path.join(destPath, entry.name);
-            if (entry.isDirectory()) {
-                await copyFolder(srcPath, dstPath, logger);
-            } else {
-                try {
-                    await fsPromise.copyFile(srcPath, dstPath);
-                } catch (error) {
-                    logger.logError(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`);
-                    // 这里可以决定是否要继续复制其他文件
-                }
-            }
         }
     } catch (error) {
-        logger.logError('复制文件夹时出错:', error);
     }
+    return { Uri: Uri, Type: FileUriType.Unknown };
 }
+
+export async function uri2local(dir: string, uri: string, filename: string | undefined = undefined): Promise<Uri2LocalRes> {
+    const { Uri: HandledUri, Type: UriType } = await checkUriType(uri);
+    //解析失败
+
+    if (UriType == FileUriType.Unknown) {
+        return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
+    }
+    //解析File协议和本地文件
+    if (UriType == FileUriType.Local) {
+        const fileExt = path.extname(HandledUri);
+        const filename = path.basename(HandledUri, fileExt);
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: HandledUri, isLocal: true };
+    }
+    //接下来都要有文件名
+    if (!filename) filename = randomUUID();
+    //解析Http和Https协议
+    if (UriType == FileUriType.Remote) {
+        const fileExt = path.extname(HandledUri);
+
+        const fileName = filename + fileExt;
+        const filePath = path.join(dir, fileName);
+        const buffer = await httpDownload(HandledUri);
+        fs.writeFileSync(filePath, buffer);
+        return { success: true, errMsg: '', fileName: fileName, ext: fileExt, path: filePath, isLocal: true };
+    }
+    //解析Base64
+    if (UriType == FileUriType.Base64) {
+        const base64 = HandledUri.replace(/^base64:\/\//, '');
+        const buffer = Buffer.from(base64, 'base64');
+        let filePath = path.join(dir, filename);
+        let fileExt = '';
+        fs.writeFileSync(filePath, buffer);
+        const { success, ext, path: fileTypePath } = await checkFileV2(filePath);
+        if (success) {
+            filePath = fileTypePath;
+            fileExt = ext;
+            filename = path.basename(filePath, fileExt);
+        }
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
+    }
+    return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
+}

src/common/utils/helper.ts

@@ -53,12 +53,6 @@ export async function runAllWithTimeout<T>(tasks: Promise<T>[], timeout: number)
         .map((result) => (result as { status: 'fulfilled'; value: T }).value);
 }
 
-export function getMd5(s: string) {
-    const h = crypto.createHash('md5');
-    h.update(s);
-    return h.digest('hex');
-}
-
 export function isNull(value: any) {
     return value === undefined || value === null;
 }
@@ -137,28 +131,6 @@ export function getQQVersionConfigPath(exePath: string = ''): string | undefined
     return configVersionInfoPath;
 }
 
-export async function deleteOldFiles(directoryPath: string, daysThreshold: number) {
-    try {
-        const files = await fsPromise.readdir(directoryPath);
-
-        for (const file of files) {
-            const filePath = path.join(directoryPath, file);
-            const stats = await fsPromise.stat(filePath);
-            const lastModifiedTime = stats.mtimeMs;
-            const currentTime = Date.now();
-            const timeDifference = currentTime - lastModifiedTime;
-            const daysDifference = timeDifference / (1000 * 60 * 60 * 24);
-
-            if (daysDifference > daysThreshold) {
-                await fsPromise.unlink(filePath); // Delete the file
-                //console.log(`Deleted: ${filePath}`);
-            }
-        }
-    } catch (error) {
-        //console.error('Error deleting files:', error);
-    }
-}
-
 export function calcQQLevel(level: QQLevel) {
     const { crownNum, sunNum, moonNum, starNum } = level;
     return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;

src/core/apis/file.ts

@@ -117,31 +117,31 @@ export class NTQQFileApi {
                     filePath: string
                 }) => Promise<unknown>,
             (fileTransNotifyInfo: OnRichMediaDownloadCompleteParams) => void
-        >(
+                >(
-            'NodeIKernelMsgService/downloadRichMedia',
+                'NodeIKernelMsgService/downloadRichMedia',
-            'NodeIKernelMsgListener/onRichMediaDownloadComplete',
+                'NodeIKernelMsgListener/onRichMediaDownloadComplete',
-            1,
+                1,
-            timeout,
+                timeout,
-            (arg: OnRichMediaDownloadCompleteParams) => {
+                (arg: OnRichMediaDownloadCompleteParams) => {
-                if (arg.msgId === msgId) {
+                    if (arg.msgId === msgId) {
-                    return true;
+                        return true;
-                }
+                    }
-                return false;
+                    return false;
-            },
+                },
-            {
+                {
-                fileModelId: '0',
+                    fileModelId: '0',
-                downloadSourceType: 0,
+                    downloadSourceType: 0,
-                triggerType: 1,
+                    triggerType: 1,
-                msgId: msgId,
+                    msgId: msgId,
-                chatType: chatType,
+                    chatType: chatType,
-                peerUid: peerUid,
+                    peerUid: peerUid,
-                elementId: elementId,
+                    elementId: elementId,
-                thumbSize: 0,
+                    thumbSize: 0,
-                downloadType: 1,
+                    downloadType: 1,
-                filePath: thumbPath,
+                    filePath: thumbPath,
-            },
+                },
-        );
+                );
-        let msg = await this.core.apis.MsgApi.getMsgsByMsgId({
+        const msg = await this.core.apis.MsgApi.getMsgsByMsgId({
             guildId: '',
             chatType: chatType,
             peerUid: peerUid,
@@ -150,13 +150,13 @@ export class NTQQFileApi {
             return data[1].filePath;
         }
         //获取原始消息
-        let FileElements = msg?.msgList[0]?.elements?.find(e => e.elementId === elementId);
+        const FileElements = msg?.msgList[0]?.elements?.find(e => e.elementId === elementId);
         if (!FileElements) {
             //失败则就乱来 Todo
             return data[1].filePath;
         }
         //从原始消息获取文件路径
-        let filePath =
+        const filePath =
             FileElements?.fileElement?.filePath ||
             FileElements?.pttElement?.filePath ||
             FileElements?.videoElement?.filePath ||
@@ -280,10 +280,10 @@ export class NTQQFileApi {
         let id = '';
         const Listener = this.core.eventWrapper.RegisterListen<(params: OnListener) => void>
             (
-                'NodeIKernelSearchListener/onSearchFileKeywordsResult',
+            'NodeIKernelSearchListener/onSearchFileKeywordsResult',
-                1,
+            1,
-                20000,
+            20000,
-                (params) => id !== '' && params.searchId == id,
+            (params) => id !== '' && params.searchId == id,
             );
         id = await Event!(keys, 12);
         const [ret] = (await Listener);

src/core/apis/friend.ts

@@ -26,10 +26,6 @@ export class NTQQFriendApi {
         return Array.from(data.values());
     }
 
-    async getBuddyIdMapCache(refresh = false): Promise<LimitedHashTable<string, string>> {
-        return await this.getBuddyIdMap(refresh);
-    }
-
     async getBuddyIdMap(refresh = false): Promise<LimitedHashTable<string, string>> {
         const uids: string[] = [];
         const retMap: LimitedHashTable<string, string> = new LimitedHashTable<string, string>(5000);
@@ -83,12 +79,12 @@ export class NTQQFriendApi {
     async getFriends(forced = false): Promise<User[]> {
         const [_retData, _BuddyArg] = await this.core.eventWrapper.CallNormalEvent<(force: boolean) => Promise<any>, (arg: OnBuddyChangeParams) => void>
             (
-                'NodeIKernelBuddyService/getBuddyList',
+            'NodeIKernelBuddyService/getBuddyList',
-                'NodeIKernelBuddyListener/onBuddyListChange',
+            'NodeIKernelBuddyListener/onBuddyListChange',
-                1,
+            1,
-                5000,
+            5000,
-                () => true,
+            () => true,
-                forced,
+            forced,
             );
         const friends: User[] = [];
         for (const categoryItem of _BuddyArg) {

src/core/apis/msg.ts

@@ -1,4 +1,4 @@
-import { ChatType, GetFileListParam, Peer, RawMessage, SendMessageElement } from '@/core/entities';
+import { ChatType, GetFileListParam, Peer, RawMessage, SendMessageElement, SendStatusType } from '@/core/entities';
 import { InstanceContext, NapCatCore } from '@/core';
 import { onGroupFileInfoUpdateParamType } from '@/core/listeners';
 import { GeneralCallResult } from '@/core/services/common';
@@ -37,7 +37,6 @@ export class NTQQMsgApi {
         emojiId = emojiId.toString();
         return this.context.session.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiId.length > 3 ? '2' : '1', set);
     }
-
     async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string): Promise<GeneralCallResult & {
         msgList: RawMessage[]
     } | undefined> {
@@ -103,18 +102,18 @@ export class NTQQMsgApi {
         const data = await this.core.eventWrapper.CallNormalEvent<
             (GroupCode: string, params: GetFileListParam) => Promise<unknown>,
             (groupFileListResult: onGroupFileInfoUpdateParamType) => void
-        >(
+                >(
-            'NodeIKernelRichMediaService/getGroupFileList',
+                'NodeIKernelRichMediaService/getGroupFileList',
-            'NodeIKernelMsgListener/onGroupFileInfoUpdate',
+                'NodeIKernelMsgListener/onGroupFileInfoUpdate',
-            1,
+                1,
-            5000,
+                5000,
-            (groupFileListResult: onGroupFileInfoUpdateParamType) => {
+                (groupFileListResult: onGroupFileInfoUpdateParamType) => {
                 //Developer Mlikiowa Todo: 此处有问题 无法判断是否成功
-                return true;
+                    return true;
-            },
+                },
-            GroupCode,
+                GroupCode,
-            params,
+                params,
-        );
+                );
         return data[1].item;
     }
 
@@ -129,64 +128,9 @@ export class NTQQMsgApi {
             peerUid: peer.peerUid,
         }, msgIds);
     }
-
-    async sendMsgV2(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-        function generateMsgId() {
-            const timestamp = Math.floor(Date.now() / 1000);
-            const random = Math.floor(Math.random() * Math.pow(2, 32));
-            const buffer = Buffer.alloc(8);
-            buffer.writeUInt32BE(timestamp, 0);
-            buffer.writeUInt32BE(random, 4);
-            const msgId = BigInt('0x' + buffer.toString('hex')).toString();
-            return msgId;
-        }
-
-        // 此处有采用Hack方法 利用数据返回正确得到对应消息
-        // 与之前 Peer队列 MsgSeq队列 真正的MsgId并发不同
-        // 谨慎采用 目前测试暂无问题  Developer.Mlikiowa
-        let msgId: string;
-        try {
-            msgId = await this.getMsgUnique(peer.chatType, await this.getServerTime());
-        } catch (error) {
-            //if (!napCatCore.session.getMsgService()['generateMsgUniqueId'])
-            //兜底识别策略V2
-            msgId = generateMsgId().toString();
-        }
-        const data = await this.core.eventWrapper.CallNormalEvent<
-            (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
-            (msgList: RawMessage[]) => void
-        >(
-            'NodeIKernelMsgService/sendMsg',
-            'NodeIKernelMsgListener/onMsgInfoListUpdate',
-            1,
-            timeout,
-            (msgRecords: RawMessage[]) => {
-                for (const msgRecord of msgRecords) {
-                    if (msgRecord.msgId === msgId && msgRecord.sendStatus === 2) {
-                        return true;
-                    }
-                }
-                return false;
-            },
-            msgId,
-            peer,
-            msgElements,
-            new Map(),
-        );
-        const retMsg = data[1].find(msgRecord => {
-            if (msgRecord.msgId === msgId) {
-                return true;
-            }
-        });
-        return retMsg;
-    }
-
-    sendMsgEx(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-        //return NTQQMsgApi.sendMsgV1(peer, msgElements, waitComplete, timeout);
-    }
     async PrepareTempChat(toUserUid: string, GroupCode: string, nickname: string) {
         //By Jadx/Ida Mlikiowa
-        let TempGameSession = {
+        const TempGameSession = {
             nickname: "",
             gameAppId: "",
             selfTinyId: "",
@@ -210,34 +154,34 @@ export class NTQQMsgApi {
     async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
         //唉？ ！我有个想法
         if (peer.chatType === ChatType.temp && peer.guildId && peer.guildId !== '') {
-            let member = await this.core.apis.GroupApi.getGroupMember(peer.guildId, peer.peerUid!);
+            const member = await this.core.apis.GroupApi.getGroupMember(peer.guildId, peer.peerUid!);
             if (member) {
                 await this.PrepareTempChat(peer.peerUid, peer.guildId, member.nick);
             }
         }
-        const msgId = await this.getMsgUnique(peer.chatType, await this.getServerTime());
+        const msgId = await this.generateMsgUniqueId(peer.chatType, await this.getServerTime());
         peer.guildId = msgId;
         const data = await this.core.eventWrapper.CallNormalEvent<
             (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
             (msgList: RawMessage[]) => void
-        >(
+                >(
-            'NodeIKernelMsgService/sendMsg',
+                'NodeIKernelMsgService/sendMsg',
-            'NodeIKernelMsgListener/onMsgInfoListUpdate',
+                'NodeIKernelMsgListener/onMsgInfoListUpdate',
-            1,
+                1,
-            timeout,
+                timeout,
-            (msgRecords: RawMessage[]) => {
+                (msgRecords: RawMessage[]) => {
-                for (const msgRecord of msgRecords) {
+                    for (const msgRecord of msgRecords) {
-                    if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) {
+                        if (msgRecord.guildId === msgId && msgRecord.sendStatus === SendStatusType.KSEND_STATUS_SUCCESS) {
-                        return true;
+                            return true;
+                        }
                     }
-                }
+                    return false;
-                return false;
+                },
-            },
+                '0',
-            '0',
+                peer,
-            peer,
+                msgElements,
-            msgElements,
+                new Map(),
-            new Map(),
+                );
-        );
         const retMsg = data[1].find(msgRecord => {
             if (msgRecord.guildId === msgId) {
                 return true;
@@ -246,21 +190,14 @@ export class NTQQMsgApi {
         return retMsg;
     }
 
-    async getMsgUnique(chatType: number, time: string) {
+    async generateMsgUniqueId(chatType: number, time: string) {
-        if (this.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
+        return this.context.session.getMsgService().generateMsgUniqueId(chatType, time);
-            return this.context.session.getMsgService().generateMsgUniqueId(chatType, time);
-        }
-        return this.context.session.getMsgService().getMsgUniqueId(time);
     }
 
     async getServerTime() {
         return this.context.session.getMSFService().getServerTime();
     }
 
-    async getServerTimeV2() {
-        return this.core.eventWrapper.callNoListenerEvent<() => string>('NodeIKernelMsgService/getServerTime', 5000);
-    }
-
     async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
         return this.context.session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], new Map());
     }
@@ -272,31 +209,31 @@ export class NTQQMsgApi {
         const data = await this.core.eventWrapper.CallNormalEvent<
             (msgInfo: typeof msgInfos, srcPeer: Peer, destPeer: Peer, comment: Array<any>, attr: Map<any, any>) => Promise<unknown>,
             (msgList: RawMessage[]) => void
-        >(
+                >(
-            'NodeIKernelMsgService/multiForwardMsgWithComment',
+                'NodeIKernelMsgService/multiForwardMsgWithComment',
-            'NodeIKernelMsgListener/onMsgInfoListUpdate',
+                'NodeIKernelMsgListener/onMsgInfoListUpdate',
-            1,
+                1,
-            5000,
+                5000,
-            (msgRecords: RawMessage[]) => {
+                (msgRecords: RawMessage[]) => {
-                for (const msgRecord of msgRecords) {
+                    for (const msgRecord of msgRecords) {
-                    if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == this.core.selfInfo.uid) {
+                        if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == this.core.selfInfo.uid) {
-                        return true;
+                            return true;
+                        }
                     }
-                }
+                    return false;
-                return false;
+                },
-            },
+                msgInfos,
-            msgInfos,
+                srcPeer,
-            srcPeer,
+                destPeer,
-            destPeer,
+                [],
-            [],
+                new Map(),
-            new Map(),
+                );
-        );
         for (const msg of data[1]) {
             const arkElement = msg.elements.find(ele => ele.arkElement);
             if (!arkElement) {
                 continue;
             }
-            const forwardData: any = JSON.parse(arkElement.arkElement.bytesData);
+            const forwardData: any = JSON.parse(arkElement.arkElement?.bytesData || "");
             if (forwardData.app != 'com.tencent.multimsg') {
                 continue;
             }

src/core/apis/user.ts

@@ -127,25 +127,7 @@ export class NTQQUserApi {
     }
 
     async getUserDetailInfo(uid: string) {
-        if (this.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
+        return this.fetchUserDetailInfo(uid);
-            return this.fetchUserDetailInfo(uid);
-        }
-        return this.getUserDetailInfoOld(uid);
-    }
-
-    async getUserDetailInfoOld(uid: string) {
-        type EventService = NodeIKernelProfileService['getUserDetailInfoWithBizInfo'];
-        type EventListener = NodeIKernelProfileListener['onProfileDetailInfoChanged'];
-        const [_retData, profile] = await this.core.eventWrapper.CallNormalEvent<EventService, EventListener>(
-            'NodeIKernelProfileService/getUserDetailInfoWithBizInfo',
-            'NodeIKernelProfileListener/onProfileDetailInfoChanged',
-            2,
-            5000,
-            (profile) => profile.uid === uid,
-            uid,
-            [0],
-        );
-        return profile;
     }
 
     async modifySelfProfile(param: ModifyProfileParams) {
@@ -155,16 +137,10 @@ export class NTQQUserApi {
     //需要异常处理
     async getCookies(domain: string) {
         const ClientKeyData = await this.forceFetchClientKey();
-        const requestUrl = `https://ssl.ptlogin2.qq.com/jump?${
+        const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + this.core.selfInfo.uin +
-            new URLSearchParams({
+            '&clientkey=' + ClientKeyData.clientKey + '&u1=https%3A%2F%2F' + domain + '%2F' + this.core.selfInfo.uin + '%2Finfocenter&keyindex=19%27';
-                ptlang: '1033',
+        const cookies: { [key: string]: string; } = await RequestUtil.HttpsGetCookies(requestUrl);
-                clientuin: this.core.selfInfo.uin,
+        return cookies;
-                clientkey: ClientKeyData.clientKey,
-                u1: `https://user.qzone.qq.com/${this.core.selfInfo.uin}/infocenter`,
-                keyindex: '19',
-            })
-        }`;
-        return await RequestUtil.HttpsGetCookies(requestUrl);
     }
 
     async getPSkey(domainList: string[]) {
@@ -209,26 +185,6 @@ export class NTQQUserApi {
         return skey;
     }
 
-    /**
-     * @deprecated
-     */
-    async getUidByUin(Uin: string) {
-        if (this.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
-            return await this.getUidByUinV2(Uin);
-        }
-        return await this.getUidByUinV1(Uin);
-    }
-
-    /**
-     * @deprecated
-     */
-    async getUinByUid(Uid: string) {
-        if (this.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
-            return await this.getUinByUidV2(Uid);
-        }
-        return await this.getUinByUidV1(Uid);
-    }
-
     //后期改成流水线处理
     async getUidByUinV2(Uin: string) {
         let uid = (await this.context.session.getProfileService().getUidByUin('FriendsServiceImpl', [Uin])).get(Uin);
@@ -237,11 +193,6 @@ export class NTQQUserApi {
         if (uid) return uid;
         uid = (await this.context.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
         if (uid) return uid;
-        // console.log((await this.core.getApiContext().FriendApi.getBuddyIdMapCache(true)));
-        uid = (await this.core.apis.FriendApi.getBuddyIdMapCache(true)).getValue(Uin);//从Buddy缓存获取Uid
-        if (uid) return uid;
-        uid = (await this.core.apis.FriendApi.getBuddyIdMap(true)).getValue(Uin);
-        if (uid) return uid;
         const unveifyUid = (await this.getUserDetailInfoByUinV2(Uin)).detail.uid;//从QQ Native 特殊转换
         if (unveifyUid.indexOf('*') == -1) uid = unveifyUid;
         //if (uid) return uid;
@@ -256,44 +207,12 @@ export class NTQQUserApi {
         if (uin) return uin;
         uin = (await this.context.session.getUixConvertService().getUin([Uid])).uinInfo.get(Uid);
         if (uin) return uin;
-        uin = (await this.core.apis.FriendApi.getBuddyIdMapCache(true)).getKey(Uid);//从Buddy缓存获取Uin
-        if (uin) return uin;
         uin = (await this.core.apis.FriendApi.getBuddyIdMap(true)).getKey(Uid);
         if (uin) return uin;
         uin = (await this.getUserDetailInfo(Uid)).uin; //从QQ Native 转换
         return uin;
     }
 
-    async getUidByUinV1(Uin: string) {
-        // 通用转换开始尝试
-        let uid = (await this.context.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
-        if (!uid) {
-            const unveifyUid = (await this.getUserDetailInfoByUin(Uin)).info.uid;//从QQ Native 特殊转换 方法三
-            if (unveifyUid.indexOf('*') == -1) {
-                uid = unveifyUid;
-            }
-        }
-        return uid;
-    }
-
-    async getUinByUidV1(Uid: string) {
-        const ret = await this.core.eventWrapper.callNoListenerEvent<(Uin: string[]) => Promise<{
-            uinInfo: Map<string, string>
-        }>>
-            ('NodeIKernelUixConvertService/getUin', 5000, [Uid]);
-        let uin = ret.uinInfo.get(Uid);
-        if (!uin) {
-            uin = (await this.getUserDetailInfo(Uid)).uin; //从QQ Native 转换
-        }
-        // if (!uin) {
-        //   uin = (await NTQQFriendApi.getFriends(false)).find((t) => { t.uid == Uid })?.uin;  //从QQ Native 缓存转换
-        // }
-        // if (!uin) {
-        //   uin = (await NTQQFriendApi.getFriends(true)).find((t) => { t.uid == Uid })?.uin;  //从QQ Native 非缓存转换
-        // }
-        return uin;
-    }
-
     async getRecentContactListSnapShot(count: number) {
         return await this.context.session.getRecentContactService().getRecentContactListSnapShot(count);
     }

src/core/core.ts

@@ -93,6 +93,9 @@ export class NapCatCore {
         msgListener.onRecvMsg = (msgs) => {
             msgs.forEach(msg => this.context.logger.logMessage(msg, this.selfInfo));
         };
+        msgListener.onAddSendMsg = (msg) => {
+            this.context.logger.logMessage(msg, this.selfInfo);
+        };
         //await sleep(2500);
         this.context.session.getMsgService().addKernelMsgListener(
             new this.context.wrapper.NodeIKernelMsgListener(proxiedListenerOf(msgListener, this.context.logger)),

src/core/entities/msg.ts

@@ -614,13 +614,28 @@ export interface PicElement {
     originImageUrl?: string;  // http url, 没有host，host是https://gchat.qpic.cn/, 带download参数的是https://multimedia.nt.qq.com.cn
 }
 
-export enum GrayTipElementSubType {
+export enum NTGrayTipElementSubTypeV2 {
-    INVITE_NEW_MEMBER = 12,
+    GRAYTIP_ELEMENT_SUBTYPE_AIOOP = 15,
-    MEMBER_NEW_TITLE = 17
+    GRAYTIP_ELEMENT_SUBTYPE_BLOCK = 14,
+    GRAYTIP_ELEMENT_SUBTYPE_BUDDY = 5,
+    GRAYTIP_ELEMENT_SUBTYPE_BUDDYNOTIFY = 9,
+    GRAYTIP_ELEMENT_SUBTYPE_EMOJIREPLY = 3,
+    GRAYTIP_ELEMENT_SUBTYPE_ESSENCE = 7,
+    GRAYTIP_ELEMENT_SUBTYPE_FEED = 6,
+    GRAYTIP_ELEMENT_SUBTYPE_FEEDCHANNELMSG = 11,
+    GRAYTIP_ELEMENT_SUBTYPE_FILE = 10,
+    GRAYTIP_ELEMENT_SUBTYPE_GROUP = 4,
+    GRAYTIP_ELEMENT_SUBTYPE_GROUPNOTIFY = 8,
+    GRAYTIP_ELEMENT_SUBTYPE_JSON = 17,
+    GRAYTIP_ELEMENT_SUBTYPE_LOCALMSG = 13,
+    GRAYTIP_ELEMENT_SUBTYPE_PROCLAMATION = 2,
+    GRAYTIP_ELEMENT_SUBTYPE_REVOKE = 1,
+    GRAYTIP_ELEMENT_SUBTYPE_UNKNOWN = 0,
+    GRAYTIP_ELEMENT_SUBTYPE_WALLET = 16,
+    GRAYTIP_ELEMENT_SUBTYPE_XMLMSG = 12,
 }
-
 export interface GrayTipElement {
-    subElementType: GrayTipElementSubType;
+    subElementType: NTGrayTipElementSubTypeV2;
     revokeElement: {
         operatorRole: string;
         operatorUid: string;
@@ -876,6 +891,12 @@ export enum NTSubMsgType {
     KMSGSUBTYPEMIXTEXT = 0,
     KMSGSUBTYPETENCENTDOC = 6
 }
+export enum SendStatusType {
+    KSEND_STATUS_FAILED = 0,
+    KSEND_STATUS_SENDING = 1,
+    KSEND_STATUS_SUCCESS = 2,
+    KSEND_STATUS_SUCCESS_NOSEQ = 3
+}
 export interface RawMessage {
     parentMsgPeer: Peer;
 
@@ -935,7 +956,7 @@ export interface RawMessage {
     /**
      * 消息状态，别人发的 2 是已撤回，自己发的 2 是已发送
      */
-    sendStatus?: number;
+    sendStatus?: SendStatusType;
 
     /**
      * 撤回时间，"0" 是没有撤回

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);
     });
 }
@@ -113,7 +112,7 @@ async function fetchServices(timeout = 10000) {
         }),
     ]).then(result => result ?
         { wrapperSession, wrapperNodeApi, wrapperLoginService } :
-        Promise.reject(),
+        Promise.reject("fetchServices Timeout!"),
     );
 }
 let getWebUiUrlFunc = undefined;

src/framework/napcat.ts

@@ -13,7 +13,7 @@ import { NapCatOneBot11Adapter } from '@/onebot';
 
 //Framework ES入口文件
 export async function getWebUiUrl() {
-    let WebUiConfigData = (await WebUiConfig.GetWebUIConfig());
+    const WebUiConfigData = (await WebUiConfig.GetWebUIConfig());
     return "http://127.0.0.1:" + WebUiConfigData.port + '/webui/?token=' + WebUiConfigData.token;
 }
 export async function NCoreInitFramework(

src/framework/renderer.js

@@ -1,14 +1,38 @@
+
 export const onSettingWindowCreated = async (view) => {
-    view.style.width = "100%";
+
-    view.style.height = "100%";
+    // view.style.width = "100%";
-    //添加iframe
+    // view.style.height = "100%";
-    const iframe = document.createElement("iframe");
+    // //添加iframe
-    iframe.src = await window.napcat.getWebUiUrl();
+    // const iframe = document.createElement("iframe");
-    iframe.width = "100%";
+    // iframe.src = await window.napcat.getWebUiUrl();
-    iframe.height = "100%";
+    // iframe.width = "100%";
-    iframe.style.border = "none";
+    // iframe.height = "100%";
-    //去掉iframe滚动条
+    // iframe.style.border = "none";
-    //iframe.scrolling = "no";
+    // //去掉iframe滚动条
-    //有滚动条何尝不是一种美
+    // //iframe.scrolling = "no";
-    view.appendChild(iframe);
+    // //有滚动条何尝不是一种美
+    // view.appendChild(iframe);
+    let webui = await window.napcat.getWebUiUrl();
+    let panel = `
+    <setting-section data-title="">
+    <setting-panel>
+        <setting-list data-direction="column">
+            <setting-item>
+                <setting-button data-type="primary" class="nc_openwebui">打开配置页面</setting-button>
+            </setting-item>
+                <setting-item>
+                <div>
+                    <setting-text class="nc_webui">WebUi</setting-text>
+                </div>
+            </setting-item>
+        </setting-list>
+    </setting-panel>
+</setting-section>
+    `;
+    view.innerHTML = panel;
+    view.querySelector(".nc_openwebui").addEventListener("click", () => {
+        window.open(webui, "_blank");
+    });
+    view.querySelector(".nc_webui").innerText = webui;
 };

src/onebot/action/extends/FetchCustomFace.ts

@@ -5,7 +5,7 @@ import { ActionName } from '../types';
 const SchemaData = {
     type: 'object',
     properties: {
-        count: { type: 'number' },
+        count: { type: ['number', 'string'] },
     },
 } as const satisfies JSONSchema;
 
@@ -17,7 +17,7 @@ export class FetchCustomFace extends BaseAction<Payload, string[]> {
 
     async _handle(payload: Payload) {
         //48 可能正好是QQ需要的一个页面的数量 Tagged Mlikiowa
-        const ret = await this.CoreContext.apis.MsgApi.fetchFavEmojiList(payload.count || 48);
+        const ret = await this.CoreContext.apis.MsgApi.fetchFavEmojiList(parseInt((payload.count || '0').toString()) || 48);
         return ret.emojiInfoList.map(e => e.url);
     }
 }

src/onebot/action/extends/FetchEmojiLike.ts

@@ -12,7 +12,7 @@ const SchemaData = {
         emojiId: { type: 'string' },
         emojiType: { type: 'string' },
         message_id: { type: ['string', 'number'] },
-        count: { type: 'number' },
+        count: { type: ['string', 'number'] },
     },
     required: ['emojiId', 'emojiType', 'message_id'],
 } as const satisfies JSONSchema;
@@ -22,12 +22,11 @@ type Payload = FromSchema<typeof SchemaData>;
 export class FetchEmojiLike extends BaseAction<Payload, any> {
     actionName = ActionName.FetchEmojiLike;
     PayloadSchema = SchemaData;
-
     async _handle(payload: Payload) {
         const NTQQMsgApi = this.CoreContext.apis.MsgApi;
         const msgIdPeer = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
         if (!msgIdPeer) throw new Error('消息不存在');
         const msg = (await NTQQMsgApi.getMsgsByMsgId(msgIdPeer.Peer, [msgIdPeer.MsgId])).msgList[0];
-        return await NTQQMsgApi.getMsgEmojiLikesList(msgIdPeer.Peer, msg.msgSeq, payload.emojiId, payload.emojiType, payload.count);
+        return await NTQQMsgApi.getMsgEmojiLikesList(msgIdPeer.Peer, msg.msgSeq, payload.emojiId, payload.emojiType, parseInt((payload.count || '0').toString()) || 20);
     }
 }

src/onebot/action/extends/GetCollectionList.ts

@@ -5,8 +5,8 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 const SchemaData = {
     type: 'object',
     properties: {
-        category: { type: 'number' },
+        category: { type: ['number', 'string'] },
-        count: { type: 'number' },
+        count: { type: ['number', 'string'] },
     },
     required: ['category', 'count'],
 } as const satisfies JSONSchema;
@@ -16,9 +16,8 @@ type Payload = FromSchema<typeof SchemaData>;
 export class GetCollectionList extends BaseAction<Payload, any> {
     actionName = ActionName.GetCollectionList;
     PayloadSchema = SchemaData;
-
     async _handle(payload: Payload) {
         const NTQQCollectionApi = this.CoreContext.apis.CollectionApi;
-        return await NTQQCollectionApi.getAllCollection(payload.category, payload.count);
+        return await NTQQCollectionApi.getAllCollection(parseInt(payload.category.toString()), parseInt(payload.count.toString()));
     }
 }

src/onebot/action/extends/GetFriendWithCategory.ts

@@ -4,16 +4,10 @@ import { ActionName } from '../types';
 
 export class GetFriendWithCategory extends BaseAction<void, any> {
     actionName = ActionName.GetFriendsWithCategory;
-
     async _handle(payload: void) {
-        if (this.CoreContext.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
+        return (await this.CoreContext.apis.FriendApi.getBuddyV2ExWithCate(true)).map(category => ({
-            //全新逻辑
+            ...category,
-            return (await this.CoreContext.apis.FriendApi.getBuddyV2ExWithCate(true)).map(category => ({
+            buddyList: OB11Constructor.friendsV2(category.buddyList),
-                ...category,
+        }));
-                buddyList: OB11Constructor.friendsV2(category.buddyList),
-            }));
-        } else {
-            throw new Error('this ntqq version not support, must be 26702 or later');
-        }
     }
 }

src/onebot/action/extends/GetProfileLike.ts

@@ -9,7 +9,7 @@ export class GetProfileLike extends BaseAction<void, any> {
         const ret = await NTQQUserApi.getProfileLike(this.CoreContext.selfInfo.uid);
         const listdata: any[] = ret.info.userLikeInfos[0].favoriteInfo.userInfos;
         for (let i = 0; i < listdata.length; i++) {
-            listdata[i].uin = parseInt((await NTQQUserApi.getUinByUid(listdata[i].uid)) || '');
+            listdata[i].uin = parseInt((await NTQQUserApi.getUinByUidV2(listdata[i].uid)) || '');
         }
         return listdata;
     }

src/onebot/action/extends/GetRobotUinRange.ts

@@ -5,7 +5,6 @@ export class GetRobotUinRange extends BaseAction<void, Array<any>> {
     actionName = ActionName.GetRobotUinRange;
 
     async _handle(payload: void) {
-        // console.log(await NTQQUserApi.getRobotUinRange());
         const NTQQUserApi = this.CoreContext.apis.UserApi;
         return await NTQQUserApi.getRobotUinRange();
     }

src/onebot/action/extends/OCRImage.ts

@@ -3,7 +3,6 @@ import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { checkFileReceived, uri2local } from '@/common/utils/file';
 import fs from 'fs';
-
 const SchemaData = {
     type: 'object',
     properties: {

src/onebot/action/extends/SetOnlineStatus.ts

@@ -6,9 +6,9 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 const SchemaData = {
     type: 'object',
     properties: {
-        status: { type: 'number' },
+        status: { type: ['number', 'string'] },
-        extStatus: { type: 'number' },
+        extStatus: { type: ['number', 'string'] },
-        batteryStatus: { type: 'number' },
+        batteryStatus: { type: ['number', 'string'] },
     },
     required: ['status', 'extStatus', 'batteryStatus'],
 } as const satisfies JSONSchema;
@@ -20,14 +20,12 @@ export class SetOnlineStatus extends BaseAction<Payload, null> {
     PayloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        // 可设置状态
-        // { status: 10, extStatus: 1027, batteryStatus: 0 }
-        // { status: 30, extStatus: 0, batteryStatus: 0 }
-        // { status: 50, extStatus: 0, batteryStatus: 0 }
-        // { status: 60, extStatus: 0, batteryStatus: 0 }
-        // { status: 70, extStatus: 0, batteryStatus: 0 }
         const NTQQUserApi = this.CoreContext.apis.UserApi;
-        const ret = await NTQQUserApi.setSelfOnlineStatus(payload.status, payload.extStatus, payload.batteryStatus);
+        const ret = await NTQQUserApi.setSelfOnlineStatus(
+            parseInt(payload.status.toString()),
+            parseInt(payload.extStatus.toString()),
+            parseInt(payload.batteryStatus.toString())
+        );
         if (ret.result !== 0) {
             throw new Error('设置在线状态失败');
         }

src/onebot/action/extends/SetSelfProfile.ts

@@ -7,7 +7,7 @@ const SchemaData = {
     properties: {
         nick: { type: 'string' },
         longNick: { type: 'string' },
-        sex: { type: 'number' },//传Sex值？建议传0
+        sex: { type: ['number', 'string'] },//传Sex值？建议传0
     },
     required: ['nick', 'longNick', 'sex'],
 } as const satisfies JSONSchema;
@@ -23,7 +23,7 @@ export class SetSelfProfile extends BaseAction<Payload, any | null> {
         const ret = await NTQQUserApi.modifySelfProfile({
             nick: payload.nick,
             longNick: payload.longNick,
-            sex: payload.sex,
+            sex: parseInt(payload.sex.toString()),
             birthday: { birthday_year: '', birthday_month: '', birthday_day: '' },
             location: undefined,
         });

src/onebot/action/file/GetFile.ts

@@ -28,19 +28,6 @@ const GetFileBase_PayloadSchema = {
 export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
     PayloadSchema: any = GetFileBase_PayloadSchema;
 
-    private getElement(msg: RawMessage): { id: string, element: VideoElement | FileElement } {
-        let element = msg.elements.find(e => e.fileElement);
-        if (!element) {
-            element = msg.elements.find(e => e.videoElement);
-            if (element) {
-                return { id: element.elementId, element: element.videoElement };
-            } else {
-                throw new Error('找不到文件');
-            }
-        }
-        return { id: element.elementId, element: element.fileElement };
-    }
-
     async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
         const NTQQFriendApi = this.CoreContext.apis.FriendApi;
         const NTQQUserApi = this.CoreContext.apis.UserApi;
@@ -92,7 +79,7 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
                     file_size: fileSize,
                     file_name: fileName,
                 };
-                if (true/*enableLocalFile2Url*/) {
+                if (true/*enableLocalFile2Url*/ && downloadPath) {
                     try {
                         res.base64 = await fs.readFile(downloadPath, 'base64');
                     } catch (e) {
@@ -132,7 +119,7 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
                 file_size: NTSearchNameResult[0].fileSize.toString(),
                 file_name: NTSearchNameResult[0].fileName,
             };
-            if (true/*enableLocalFile2Url*/) {
+            if (true/*enableLocalFile2Url*/ && downloadPath) {
                 try {
                     res.base64 = await fs.readFile(downloadPath, 'base64');
                 } catch (e) {

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

@@ -13,7 +13,7 @@ interface FileResponse {
 const SchemaData = {
     type: 'object',
     properties: {
-        thread_count: { type: 'number' },
+        thread_count: { type: ['number', 'string'] },
         url: { type: 'string' },
         base64: { type: 'string' },
         name: { type: 'string' },

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

@@ -39,15 +39,16 @@ export class GoCQHTTPGetForwardMsgAction extends BaseAction<Payload, any> {
             throw Error('找不到相关的聊天记录' + data?.errMsg);
         }
         const msgList = data.msgList;
-        const messages = await Promise.all(msgList.map(async msg => {
+        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: '',
                 chatType: msg.chatType,
                 peerUid: msg.peerUid,
             }, msg.msgId)!;
             return resMsg;
-        }));
+        }))).filter(msg => !!msg);
         messages.map(msg => {
             (<OB11ForwardMessage>msg).content = msg.message;
             delete (<any>msg).message;

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')));
+        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')));
+        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/SetModelShow.ts

@@ -0,0 +1,10 @@
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+
+export default class SetModelShow extends BaseAction<null, null> {
+    actionName = ActionName.SetModelShow;
+
+    async _handle(payload: null): Promise<null> {
+        return null;
+    }
+}

src/onebot/action/group/DelEssenceMsg.ts

@@ -20,9 +20,7 @@ export default class DelEssenceMsg extends BaseAction<Payload, any> {
     async _handle(payload: Payload): Promise<any> {
         const NTQQGroupApi = this.CoreContext.apis.GroupApi;
         const msg = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
-        if (!msg) {
+        if (!msg) throw new Error('msg not found');
-            throw new Error('msg not found');
-        }
         return await NTQQGroupApi.removeGroupEssence(
             msg.Peer.peerUid,
             msg.MsgId,

src/onebot/action/group/GetGroupEssence.ts

@@ -9,7 +9,7 @@ const SchemaData = {
         group_id: { type: ['number', 'string'] },
         pages: { type: 'number' },
     },
-    required: ['group_id', 'pages'],
+    required: ['group_id'],
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
@@ -20,7 +20,7 @@ export class GetGroupEssence extends BaseAction<Payload, GroupEssenceMsgRet> {
 
     async _handle(payload: Payload) {
         const NTQQWebApi = this.CoreContext.apis.WebApi;
-        const ret = await NTQQWebApi.getGroupEssenceMsg(payload.group_id.toString(), payload.pages.toString());
+        const ret = await NTQQWebApi.getGroupEssenceMsg(payload.group_id.toString(), (payload.pages || "0").toString());
         if (!ret) {
             throw new Error('获取失败');
         }

src/onebot/action/group/GetGroupInfo.ts

@@ -21,11 +21,8 @@ class GetGroupInfo extends BaseAction<Payload, OB11Group> {
     async _handle(payload: Payload) {
         const NTQQGroupApi = this.CoreContext.apis.GroupApi;
         const group = (await NTQQGroupApi.getGroups()).find(e => e.groupCode == payload.group_id.toString());
-        if (group) {
+        if (!group) throw `群${payload.group_id}不存在`;
-            return OB11Constructor.group(group);
+        return OB11Constructor.group(group);
-        } else {
-            throw `群${payload.group_id}不存在`;
-        }
     }
 }
 

src/onebot/action/group/GetGroupList.ts

@@ -20,7 +20,7 @@ class GetGroupList extends BaseAction<Payload, OB11Group[]> {
 
     async _handle(payload: Payload) {
         const NTQQGroupApi = this.CoreContext.apis.GroupApi;
-        const groupList: Group[] = await NTQQGroupApi.getGroups(payload?.no_cache === true || payload.no_cache === 'true');
+        const groupList: Group[] = await NTQQGroupApi.getGroups(typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache);
         return OB11Constructor.groups(groupList);
     }
 }

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -24,15 +24,11 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
         const NTQQUserApi = this.CoreContext.apis.UserApi;
         const NTQQGroupApi = this.CoreContext.apis.GroupApi;
         const NTQQWebApi = this.CoreContext.apis.WebApi;
-        const isNocache = payload.no_cache == true || payload.no_cache === 'true';
+        const isNocache = typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache;
         const uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString());
-        if (!uid) {
+        if (!uid) throw (`Uin2Uid Error ${payload.user_id}不存在`);
-            throw (`Uin2Uid Error ${payload.user_id}不存在`);
-        }
         const member = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache);
-        if (!member) {
+        if (!member) throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
-            throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
-        }
         try {
             const info = (await NTQQUserApi.getUserDetailInfo(member.uid));
             this.CoreContext.context.logger.logDebug('群成员详细信息结果', info);
@@ -42,37 +38,24 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
         }
         const date = Math.round(Date.now() / 1000);
         const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
-        if (!this.CoreContext.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
+        const SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), this.CoreContext.selfInfo.uid, isNocache);
-            const SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), this.CoreContext.selfInfo.uid, isNocache);
+        let isPrivilege = false;
-            let isPrivilege = false;
+        if (SelfInfoInGroup) {
-            if (SelfInfoInGroup) {
+            isPrivilege = SelfInfoInGroup.role === 3 || SelfInfoInGroup.role === 4;
-                isPrivilege = SelfInfoInGroup.role === 3 || SelfInfoInGroup.role === 4;
-            }
-            if (isPrivilege) {
-                const webGroupMembers = await NTQQWebApi.getGroupMembers(payload.group_id.toString());
-                for (let i = 0, len = webGroupMembers.length; i < len; i++) {
-                    if (webGroupMembers[i]?.uin && webGroupMembers[i].uin === retMember.user_id) {
-                        retMember.join_time = webGroupMembers[i]?.join_time;
-                        retMember.last_sent_time = webGroupMembers[i]?.last_speak_time;
-                        retMember.qage = webGroupMembers[i]?.qage;
-                        retMember.level = webGroupMembers[i]?.lv.level.toString();
-                    }
-                }
-            } else {
-                const LastestMsgList = await NTQQGroupApi.getLatestMsg(payload.group_id.toString(), [payload.user_id.toString()]);
-                if (LastestMsgList?.msgList?.length && LastestMsgList?.msgList?.length > 0) {
-                    const last_send_time = LastestMsgList.msgList[0].msgTime;
-                    if (last_send_time && last_send_time != '0' && last_send_time != '') {
-                        retMember.last_sent_time = parseInt(last_send_time);
-                        retMember.join_time = Math.round(Date.now() / 1000);//兜底数据 防止群管乱杀
-                    }
-                }
-            }
-        } else {
-            // Mlikiowa V2.0.8 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());
         }
+        if (isPrivilege) {
+            const webGroupMembers = await NTQQWebApi.getGroupMembers(payload.group_id.toString());
+            for (let i = 0, len = webGroupMembers.length; i < len; i++) {
+                if (webGroupMembers[i]?.uin && webGroupMembers[i].uin === retMember.user_id) {
+                    retMember.join_time = webGroupMembers[i]?.join_time;
+                    retMember.last_sent_time = webGroupMembers[i]?.last_speak_time;
+                    retMember.qage = webGroupMembers[i]?.qage;
+                    retMember.level = webGroupMembers[i]?.lv.level.toString();
+                }
+            }
+        }
+        retMember.last_sent_time = parseInt((await this.CoreContext.apis.GroupApi.getGroupMember(payload.group_id.toString(), retMember.user_id))?.lastSpeakTime || date.toString());
+        retMember.join_time = parseInt((await this.CoreContext.apis.GroupApi.getGroupMember(payload.group_id.toString(), retMember.user_id))?.joinTime || date.toString());
         return retMember;
     }
 }

src/onebot/action/group/GetGroupMemberList.ts

@@ -22,23 +22,16 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
     async _handle(payload: Payload) {
         const NTQQGroupApi = this.CoreContext.apis.GroupApi;
         const NTQQWebApi = this.CoreContext.apis.WebApi;
-        const isNocache = payload.no_cache == true || payload.no_cache === 'true';
-        // const GroupList = await NTQQGroupApi.getGroups(isNocache);
-        // const group = GroupList.find(item => item.groupCode == payload.group_id);
-        // if (!group) {
-        //     throw (`群${payload.group_id}不存在`);
-        // }
         const groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString());
         const groupMembersArr = Array.from(groupMembers.values());
-        const groupMembersUids = groupMembersArr.map(e => e.uid);
+
         let _groupMembers = groupMembersArr.map(item => {
             return OB11Constructor.groupMember(payload.group_id.toString(), item);
         });
 
         const MemberMap: Map<number, OB11GroupMember> = new Map<number, OB11GroupMember>();
-        // 转为Map 方便索引
-        const GroupMemberUids: string[] = [];
         const date = Math.round(Date.now() / 1000);
+
         for (let i = 0, len = _groupMembers.length; i < len; i++) {
             // 保证基础数据有这个 同时避免群管插件过于依赖这个杀了
             _groupMembers[i].join_time = date;
@@ -46,59 +39,31 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
             MemberMap.set(_groupMembers[i].user_id, _groupMembers[i]);
         }
 
-        if (!this.CoreContext.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
+        const selfRole = groupMembers.get(this.CoreContext.selfInfo.uid)?.role;
-            const selfRole = groupMembers.get(this.CoreContext.selfInfo.uid)?.role;
+        const isPrivilege = selfRole === 3 || selfRole === 4;
-            const isPrivilege = selfRole === 3 || selfRole === 4;
 
-            if (isPrivilege) {
+        _groupMembers.forEach(item => {
-                const webGroupMembers = await NTQQWebApi.getGroupMembers(payload.group_id.toString());
+            item.last_sent_time = date;
-                for (let i = 0, len = webGroupMembers.length; i < len; i++) {
+            item.join_time = date;
-                    if (!webGroupMembers[i]?.uin) {
+        });
-                        continue;
+
-                    }
+        if (isPrivilege) {
-                    const MemberData = MemberMap.get(webGroupMembers[i]?.uin);
+            const webGroupMembers = await NTQQWebApi.getGroupMembers(payload.group_id.toString());
-                    if (MemberData) {
+            for (let i = 0, len = webGroupMembers.length; i < len; i++) {
-                        MemberData.join_time = webGroupMembers[i]?.join_time;
+                if (!webGroupMembers[i]?.uin) {
-                        MemberData.last_sent_time = webGroupMembers[i]?.last_speak_time;
+                    continue;
-                        MemberData.qage = webGroupMembers[i]?.qage;
-                        MemberData.level = webGroupMembers[i]?.lv.level.toString();
-                        MemberMap.set(webGroupMembers[i]?.uin, MemberData);
-                    }
                 }
-            } else {
+                const MemberData = MemberMap.get(webGroupMembers[i]?.uin);
-                if (isNocache) {
+                if (MemberData) {
-                    const DateMap = await NTQQGroupApi.getGroupMemberLatestSendTimeCache(payload.group_id.toString(), groupMembersUids);//开始从本地拉取
+                    MemberData.join_time = webGroupMembers[i]?.join_time;
-                    for (const DateUin of DateMap.keys()) {
+                    MemberData.last_sent_time = webGroupMembers[i]?.last_speak_time;
-                        const MemberData = MemberMap.get(parseInt(DateUin));
+                    MemberData.qage = webGroupMembers[i]?.qage;
-                        if (MemberData) {
+                    MemberData.level = webGroupMembers[i]?.lv.level.toString();
-                            MemberData.last_sent_time = parseInt(DateMap.get(DateUin)!);
+                    MemberMap.set(webGroupMembers[i]?.uin, MemberData);
-                            //join_time 有基础数据兜底
-                        }
-                    }
-                } else {
-                    _groupMembers.forEach(item => {
-                        item.last_sent_time = date;
-                        item.join_time = date;
-                    });
                 }
             }
-        } else {
-            // Mlikiowa V2.0.8 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());
-            // });
         }
-        // 还原索引到Array 一同返回
+        
-
-        // let retData: any[] = [];
-        // for (let retMem of MemberMap.values()) {
-        //   retMem.level = TypeConvert.toString(retMem.level) as any;
-        //   retData.push(retMem)
-        // }
-
-        // _groupMembers = Array.from(retData);
-
         _groupMembers = Array.from(MemberMap.values());
         return _groupMembers;
     }

src/onebot/action/group/GetGroupSystemMsg.ts

@@ -24,22 +24,22 @@ export class GetGroupSystemMsg extends BaseAction<void, any> {
             if (SSNotify.type == 1) {
                 retData.InvitedRequest.push({
                     request_id: SSNotify.seq,
-                    invitor_uin: await NTQQUserApi.getUinByUid(SSNotify.user1?.uid),
+                    invitor_uin: await NTQQUserApi.getUinByUidV2(SSNotify.user1?.uid),
                     invitor_nick: SSNotify.user1?.nickName,
                     group_id: SSNotify.group?.groupCode,
                     group_name: SSNotify.group?.groupName,
                     checked: SSNotify.status === 1 ? false : true,
-                    actor: await NTQQUserApi.getUinByUid(SSNotify.user2?.uid) || 0,
+                    actor: await NTQQUserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
                 });
             } else if (SSNotify.type == 7) {
                 retData.join_requests.push({
                     request_id: SSNotify.seq,
-                    requester_uin: await NTQQUserApi.getUinByUid(SSNotify.user1?.uid),
+                    requester_uin: await NTQQUserApi.getUinByUidV2(SSNotify.user1?.uid),
                     requester_nick: SSNotify.user1?.nickName,
                     group_id: SSNotify.group?.groupCode,
                     group_name: SSNotify.group?.groupName,
                     checked: SSNotify.status === 1 ? false : true,
-                    actor: await NTQQUserApi.getUinByUid(SSNotify.user2?.uid) || 0,
+                    actor: await NTQQUserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
                 });
             }
         }

src/onebot/action/group/SetGroupAdmin.ts

@@ -8,7 +8,7 @@ const SchemaData = {
     properties: {
         group_id: { type: ['number', 'string'] },
         user_id: { type: ['number', 'string'] },
-        enable: { type: 'boolean' },
+        enable: { type: ['boolean', 'string'] },
     },
     required: ['group_id', 'user_id'],
 } as const satisfies JSONSchema;
@@ -20,11 +20,12 @@ export default class SetGroupAdmin extends BaseAction<Payload, null> {
     PayloadSchema = SchemaData;
 
     async _handle(payload: Payload): Promise<null> {
+        const enable = typeof payload.enable === 'string' ? payload.enable === 'true' : !!payload.enable;
         const NTQQGroupApi = this.CoreContext.apis.GroupApi;
         const NTQQUserApi = this.CoreContext.apis.UserApi;
         const uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString());
         if (!uid) throw new Error('get Uid Error');
-        await NTQQGroupApi.setMemberRole(payload.group_id.toString(), uid, payload.enable ? GroupMemberRole.admin : GroupMemberRole.normal);
+        await NTQQGroupApi.setMemberRole(payload.group_id.toString(), uid, enable ? GroupMemberRole.admin : GroupMemberRole.normal);
         return null;
     }
 }

src/onebot/action/group/SetGroupLeave.ts

@@ -6,7 +6,7 @@ const SchemaData = {
     type: 'object',
     properties: {
         group_id: { type: ['number', 'string'] },
-        is_dismiss: { type: 'boolean' },
+        is_dismiss: { type: ['boolean', 'string'] },
     },
     required: ['group_id'],
 } as const satisfies JSONSchema;

src/onebot/action/guild/GetGuildProfile.ts

@@ -0,0 +1,10 @@
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+
+export default class GetGuildProfile extends BaseAction<null, null> {
+    actionName = ActionName.GetGuildProfile;
+
+    async _handle(payload: null): Promise<null> {
+        return null;
+    }
+}

src/onebot/action/index.ts

@@ -23,7 +23,7 @@ import GoCQHTTPGetStrangerInfo from './go-cqhttp/GetStrangerInfo';
 import SendLike from './user/SendLike';
 import SetGroupAddRequest from './group/SetGroupAddRequest';
 import SetGroupLeave from './group/SetGroupLeave';
-import GetGuildList from './group/GetGuildList';
+import GetGuildList from './guild/GetGuildList';
 import SetFriendAddRequest from './user/SetFriendAddRequest';
 import SetGroupWholeBan from './group/SetGroupWholeBan';
 import SetGroupName from './group/SetGroupName';
@@ -76,6 +76,8 @@ import { FetchEmojiLike } from './extends/FetchEmojiLike';
 import { NapCatCore } from '@/core';
 
 import { NapCatOneBot11Adapter } from '@/onebot';
+import GetGuildProfile from './guild/GetGuildProfile';
+import SetModelShow from './go-cqhttp/SetModelShow';
 
 export type ActionMap = Map<string, BaseAction<any, any>>;
 
@@ -161,6 +163,8 @@ export function createActionMap(onebotContext: NapCatOneBot11Adapter, coreContex
         new SetGroupHeader(onebotContext, coreContext),
         new FetchCustomFace(onebotContext, coreContext),
         new GoCQHTTPUploadPrivateFile(onebotContext, coreContext),
+        new GetGuildProfile(onebotContext, coreContext),
+        new SetModelShow(onebotContext, coreContext),
     ];
     const actionMap = new Map();
     for (const action of actionHandlers) {

src/onebot/action/msg/ForwardSingleMsg.ts

@@ -7,7 +7,7 @@ import { MessageUnique } from '@/common/utils/MessageUnique';
 const SchemaData = {
     type: 'object',
     properties: {
-        message_id: { type: 'number' },
+        message_id: { type: ['number', 'string'] },
         group_id: { type: ['number', 'string'] },
         user_id: { type: ['number', 'string'] },
     },
@@ -31,7 +31,7 @@ class ForwardSingleMsg extends BaseAction<Payload, null> {
 
     async _handle(payload: Payload): Promise<null> {
         const NTQQMsgApi = this.CoreContext.apis.MsgApi;
-        const msg = MessageUnique.getMsgIdAndPeerByShortId(payload.message_id);
+        const msg = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
         if (!msg) {
             throw new Error(`无法找到消息${payload.message_id}`);
         }

src/onebot/action/msg/GetMsg.ts

@@ -28,8 +28,8 @@ class GetMsg extends BaseAction<Payload, OB11Message> {
         if (!payload.message_id) {
             throw Error('参数message_id不能为空');
         }
-        const MsgShortId = await MessageUnique.getShortIdByMsgId(payload.message_id.toString());
+        const MsgShortId = MessageUnique.getShortIdByMsgId(payload.message_id.toString());
-        const msgIdWithPeer = await MessageUnique.getMsgIdAndPeerByShortId(MsgShortId || parseInt(payload.message_id.toString()));
+        const msgIdWithPeer = MessageUnique.getMsgIdAndPeerByShortId(MsgShortId || parseInt(payload.message_id.toString()));
         if (!msgIdWithPeer) {
             throw ('消息不存在');
         }
@@ -37,7 +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('消息为空');
         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,8 +56,8 @@ const _handlers: {
         if (atQQ === 'all') return SendMsgElementConstructor.at(coreContext, atQQ, atQQ, AtType.atAll, '全体成员');
 
         // then the qq is a group member
-        // Mlikiowa V2.0.8 Refactor Todo
+        // Mlikiowa V2.0.24 Refactor Todo
-        const uid = await coreContext.apis.UserApi.getUidByUinV2(atQQ);
+        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.8 Refactor Todo
+        // Mlikiowa V2.0.24 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';
@@ -152,7 +153,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
 
         const messages = normalize(
             payload.message,
-            payload.auto_escape === true || payload.auto_escape === 'true',
+            typeof payload.auto_escape === 'string' ? payload.auto_escape === 'true' : !!payload.auto_escape
         );
 
         if (getSpecialMsgNum(payload, OB11MessageDataType.node)) {

src/onebot/action/types.ts

@@ -104,5 +104,7 @@ export enum ActionName {
     FetchCustomFace = 'fetch_custom_face',
     GOCQHTTP_UploadPrivateFile = 'upload_private_file',
     TestApi01 = 'test_api_01',
-    FetchEmojiLike = 'fetch_emoji_like'
+    FetchEmojiLike = 'fetch_emoji_like',
+    GetGuildProfile = "get_guild_service_profile",
+    SetModelShow = "_set_model_show"
 }

src/onebot/action/user/GetCookies.ts

@@ -67,7 +67,7 @@ export class GetCookies extends BaseAction<Payload, Response> {
         const cookiesObject = await NTQQUserApi.getCookies(payload.domain);
         //把获取到的cookiesObject转换成 k=v; 格式字符串拼接在一起
         const cookies = Object.entries(cookiesObject).map(([key, value]) => `${key}=${value}`).join('; ');
-        const bkn = NTQQWebApi.getBknFromCookie(cookiesObject.p_skey);
+        const bkn = cookiesObject?.skey ? NTQQWebApi.getBknFromCookie(cookiesObject) : '';
         return { cookies, bkn };
     }
 }

src/onebot/action/user/GetFriendList.ts

@@ -20,6 +20,6 @@ export default class GetFriendList extends BaseAction<Payload, OB11User[]> {
     async _handle(payload: Payload) {
         //全新逻辑
         const NTQQFriendApi = this.CoreContext.apis.FriendApi;
-        return OB11Constructor.friendsV2(await NTQQFriendApi.getBuddyV2(payload?.no_cache === true || payload?.no_cache === 'true'));
+        return OB11Constructor.friendsV2(await NTQQFriendApi.getBuddyV2(typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache));
     }
 }

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/event/notice/OB11InputStatusEvent.ts

@@ -6,14 +6,14 @@ export class OB11InputStatusEvent extends OB11BaseNoticeEvent {
     notice_type = 'notify';
     sub_type = 'input_status';
     status_text = '对方正在输入...';
-    eventType = 1;
+    event_type = 1;
     user_id = 0;
     group_id = 0;
 
     constructor(core: NapCatCore, user_id: number, eventType: number, status_text: string) {
         super(core);
         this.user_id = user_id;
-        this.eventType = eventType;
+        this.event_type = eventType;
         this.status_text = status_text;
     }
 }

src/onebot/helper/data.ts

@@ -15,9 +15,9 @@ import {
     FaceIndex,
     Friend,
     FriendV2,
-    GrayTipElementSubType,
     Group,
     GroupMember,
+    NTGrayTipElementSubTypeV2,
     Peer,
     RawMessage,
     SelfInfo,
@@ -42,10 +42,18 @@ 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> {
+    static async message(
+        core: NapCatCore,
+        obcore: NapCatOneBot11Adapter,
+        msg: RawMessage,
+        messagePostFormat: string = obcore.configLoader.configData.messagePostFormat
+    ): Promise<OB11Message | undefined> {
+        if (msg.senderUin == "0" || msg.senderUin == "") return;
+        if (msg.peerUin == "0" || msg.peerUin == "") return;
+        //跳过空消息
         const NTQQGroupApi = core.apis.GroupApi;
         const NTQQUserApi = core.apis.UserApi;
         const NTQQFileApi = core.apis.FileApi;
@@ -75,8 +83,8 @@ export class OB11Constructor {
             resMsg.sub_type = 'normal'; // 这里go-cqhttp是group，而onebot11标准是normal, 蛋疼
             resMsg.group_id = parseInt(msg.peerUin);
             //直接去QQNative取
-            const memberList = await NTQQGroupApi.getGroupMembers(msg.peerUin);
+            let member = await NTQQGroupApi.getGroupMember(msg.peerUin, msg.senderUin);
-            const member = memberList.get(msg.senderUin!);
+            if (!member) member = await NTQQGroupApi.getGroupMember(msg.peerUin, msg.senderUin);
             if (member) {
                 resMsg.sender.role = OB11Constructor.groupMemberRole(member.role);
                 resMsg.sender.nickname = member.nick;
@@ -111,7 +119,7 @@ export class OB11Constructor {
                     const { atNtUid, content } = element.textElement;
                     let atQQ = element.textElement.atUid;
                     if (!atQQ || atQQ === '0') {
-                        atQQ = await NTQQUserApi.getUinByUid(atNtUid);
+                        atQQ = await NTQQUserApi.getUinByUidV2(atNtUid);
                     }
                     if (atQQ) {
                         qq = atQQ as `${number}`;
@@ -141,7 +149,7 @@ export class OB11Constructor {
                 message_data['type'] = OB11MessageDataType.reply;
                 //log("收到回复消息", element.replyElement);
                 try {
-                    const records = msg.records.find(msgRecord => msgRecord.msgId === element.replyElement.sourceMsgIdInRecords);
+                    const records = msg.records.find(msgRecord => msgRecord.msgId === element?.replyElement?.sourceMsgIdInRecords);
                     const peer = {
                         chatType: msg.chatType,
                         peerUid: msg.peerUid,
@@ -153,7 +161,7 @@ export class OB11Constructor {
                         peerUid: msg.peerUid,
                         guildId: '',
                         chatType: msg.chatType,
-                    }, element.replyElement.replayMsgSeq, 1, true, true)).msgList[0];
+                    }, element.replyElement.replayMsgSeq, 1, true, true)).msgList.find(msg => msg.msgRandom === records.msgRandom);
                     if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
                         replyMsg = (await NTQQMsgApi.getSingleMsg(peer, element.replyElement.replayMsgSeq)).msgList[0];
                     }
@@ -278,13 +286,13 @@ export class OB11Constructor {
                     chatType: msg.chatType,
                     guildId: '',
                 },
-                msg.msgId,
+                    msg.msgId,
-                msg.msgSeq,
+                    msg.msgSeq,
-                msg.senderUid,
+                    msg.senderUid,
-                element.elementId,
+                    element.elementId,
-                element.elementType.toString(),
+                    element.elementType.toString(),
-                element.pttElement.fileSize || '0',
+                    element.pttElement.fileSize || '0',
-                element.pttElement.fileUuid || '',
+                    element.pttElement.fileUuid || '',
                 );
                 //以uuid作为文件名
             } else if (element.arkElement) {
@@ -342,7 +350,8 @@ 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);
                 }
@@ -368,7 +377,7 @@ export class OB11Constructor {
         }
         for (const element of msg.elements) {
             if (element.grayTipElement) {
-                if (element.grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE) {
+                if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
                     const json = JSON.parse(element.grayTipElement.jsonGrayTipElement.jsonStr);
 
                     if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
@@ -389,7 +398,7 @@ export class OB11Constructor {
                     }
                     //下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE
                 }
-                if (element.grayTipElement.subElementType == GrayTipElementSubType.INVITE_NEW_MEMBER) {
+                if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
                     //好友添加成功事件
                     if (element.grayTipElement.xmlElement.templId === '10229' && msg.peerUin !== '') {
                         return new OB11FriendAddNoticeEvent(core, parseInt(msg.peerUin));
@@ -408,7 +417,7 @@ export class OB11Constructor {
             return;
         }
         //log("group msg", msg);
-        // Mlikiowa V2.0.8 Refactor Todo
+        // Mlikiowa V2.0.24 Refactor Todo
         // if (msg.senderUin && msg.senderUin !== '0') {
         //   const member = await getGroupMember(msg.peerUid, msg.senderUin);
         //   if (member && member.cardName !== msg.sendMemberName) {
@@ -527,12 +536,13 @@ export class OB11Constructor {
                             guildId: '',
                             peerUid: msg.peerUid,
                         }, msgSeq, 1, true, true)).msgList;
+                        console.log("表情回应消息长度检测", replyMsgList.length)
                         if (replyMsgList.length < 1) {
                             return;
                         }
 
-                        const replyMsg = replyMsgList[0];
+                        const replyMsg = replyMsgList.reverse()[0];//获取最顶层消息
-                        console.log('表情回应消息', msgSeq, ' 结算ID', replyMsg.msgId);
+                        //console.log('表情回应消息', msgSeq, ' 结算ID', replyMsg.msgId);
                         return new OB11GroupMsgEmojiLikeEvent(
                             core,
                             parseInt(msg.peerUid),
@@ -547,7 +557,7 @@ export class OB11Constructor {
                         logger.logError('解析表情回应消息失败', e.stack);
                     }
                 }
-                if (grayTipElement.subElementType == GrayTipElementSubType.INVITE_NEW_MEMBER) {
+                if (grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
                     logger.logDebug('收到新人被邀请进群消息', grayTipElement);
                     const xmlElement = grayTipElement.xmlElement;
                     if (xmlElement?.content) {
@@ -573,7 +583,7 @@ export class OB11Constructor {
                     }
                 }
                 //代码歧义 GrayTipElementSubType.MEMBER_NEW_TITLE
-                else if (grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE) {
+                else if (grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
                     const json = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr);
                     if (grayTipElement.jsonGrayTipElement.busiId == 1061) {
                         //判断业务类型

src/onebot/index.ts

@@ -8,6 +8,7 @@ import {
     MsgListener,
     NapCatCore,
     RawMessage,
+    SendStatusType,
 } from '@/core';
 import { OB11Config, OB11ConfigLoader } from '@/onebot/helper/config';
 import { OneBotApiContextType } from '@/onebot/types';
@@ -250,11 +251,12 @@ export class NapCatOneBot11Adapter {
                 .catch(e => this.context.logger.logError('处理消息失败', e));
 
             for (const msg of msgList.filter(e => e.senderUin == this.core.selfInfo.uin)) {
-                if (msg.sendStatus == 2 && !msgIdSend.get(msg.msgId)) {
+                if (msg.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS && !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;
                             ob11Msg.target_id = parseInt(msg.peerUin);
                             if (this.configLoader.configData.reportSelfMessage) {
                                 msg.id = MessageUnique.createMsg({
@@ -324,11 +326,6 @@ export class NapCatOneBot11Adapter {
                     const flag = notify.group.groupCode + '|' + notify.seq + '|' + notify.type;
                     this.context.logger.logDebug('收到群通知', notify);
 
-                    // let member2: GroupMember;
-                    // if (notify.user2.uid) {
-                    //     member2 = await getGroupMember(notify.group.groupCode, null, notify.user2.uid);
-                    // }
-
                     if ([
                         GroupNotifyTypes.ADMIN_SET,
                         GroupNotifyTypes.ADMIN_UNSET,
@@ -404,7 +401,7 @@ export class NapCatOneBot11Adapter {
                         const groupInviteEvent = new OB11GroupRequestEvent(
                             this.core,
                             parseInt(notify.group.groupCode),
-                            parseInt(notify.user1.uid),
+                            parseInt(await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid)),
                             'invite',
                             notify.postscript,
                             flag,
@@ -424,7 +421,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;
             this.context.logger.logDebug('转化为 OB11Message', ob11Msg);
             if (debug) {
                 ob11Msg.raw = message;
@@ -481,7 +479,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/onebot/network/active-http.ts

@@ -44,14 +44,16 @@ export class OB11ActiveHttpAdapter implements IOB11NetworkAdapter {
                 resJson = await res.json();
                 //logDebug('新消息事件HTTP上报返回快速操作: ', JSON.stringify(resJson));
             } catch (e) {
-                this.logger.logDebug('新消息事件HTTP上报没有返回快速操作，不需要处理');
+                this.logger.logDebug('[OneBot] [Http Client] 新消息事件HTTP上报没有返回快速操作，不需要处理');
                 return;
             }
             try {
                 handleQuickOperation(this.coreContext, this.obContext, event as QuickActionEvent, resJson).then().catch(this.logger.logError);
             } catch (e: any) {
-                this.logger.logError('新消息事件HTTP上报返回快速操作失败', e);
+                this.logger.logError('[OneBot] [Http Client] 新消息事件HTTP上报返回快速操作失败', e);
             }
+        }).catch((e) => {
+            this.logger.logError('[OneBot] [Http Client] 新消息事件HTTP上报失败', e);
         });
     }
 

src/onebot/network/active-websocket.ts

@@ -26,7 +26,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
     }
 
     onEvent<T extends OB11EmitEventContent>(event: T) {
-        if (this.connection) {
+        if (this.connection && this.connection.readyState === WebSocket.OPEN) {
             this.connection.send(JSON.stringify(event));
         }
     }
@@ -70,6 +70,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
             let isClosedByError = false;
 
             this.connection = new WebSocket(this.url, {
+                maxPayload: 1024 * 1024 * 1024,
                 headers: {
                     'X-Self-ID': this.coreContext.selfInfo.uin,
                     'Authorization': `Bearer ${this.token}`,
@@ -79,12 +80,12 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
 
             });
             this.connection.on('open', () => {
-                try{
+                try {
                     this.connectEvent(this.coreContext);
-                }catch(e){
+                } catch (e) {
                     this.logger.logError('[OneBot] [WebSocket Client] 发送连接生命周期失败', e);
                 }
-                
+
             });
             this.connection.on('message', (data) => {
                 this.handleMessage(data);
@@ -134,6 +135,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
             const packet = Object.assign({}, retdata);
             this.checkStateAndReply<any>(packet);
         } catch (e) {
+            this.logger.logError('[OneBot] [WebSocket Client] 发生错误', e);
             this.checkStateAndReply<any>(OB11Response.error('不支持的api ' + receiveData.action, 1404, echo));
         }
     }

src/onebot/network/passive-http.ts

@@ -4,6 +4,7 @@ import http from 'http';
 import { NapCatCore } from '@/core';
 import { OB11Response } from '../action/OB11Response';
 import { ActionMap } from '@/onebot/action';
+import cors from 'cors';
 
 export class OB11PassiveHttpAdapter implements IOB11NetworkAdapter {
     private app: Express | undefined;
@@ -43,13 +44,24 @@ export class OB11PassiveHttpAdapter implements IOB11NetworkAdapter {
         this.server?.close();
         this.app = undefined;
     }
-
     private initializeServer() {
         this.app = express();
         this.server = http.createServer(this.app);
 
-        this.app.use(express.json());
+        this.app.use(cors());
-        this.app.use(express.urlencoded({ extended: false }));
+        this.app.use(express.urlencoded({ extended: true, limit: '5000mb' }));
+        this.app.use((req, res, next) => {
+            // 兼容处理没有带content-type的请求
+            req.headers['content-type'] = 'application/json';
+            const originalJson = express.json({ limit: '5000mb' });
+            originalJson(req, res, (err) => {
+                if (err) {
+                    return res.status(400).send('Invalid JSON');
+                }
+                next();
+            });
+        });
+
         this.app.use((req, res, next) => this.authorize(this.token, req, res, next));
         this.app.use((req, res) => this.handleRequest(req, res));
 

src/onebot/network/passive-websocket.ts

@@ -36,8 +36,8 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
         this.logger = coreContext.context.logger;
 
         this.heartbeatInterval = heartbeatInterval;
-        this.wsServer = new WebSocketServer({ port: port, host: ip });
+        this.wsServer = new WebSocketServer({ port: port, host: ip, maxPayload: 1024 * 1024 * 1024, });
-        let core = coreContext;
+        const core = coreContext;
         this.wsServer.on('connection', async (wsClient, wsReq) => {
             if (!this.isOpen) {
                 wsClient.close();
@@ -63,7 +63,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
             });
         }).on('error', (err) => this.logger.log('[OneBot] [WebSocket Server] Server Error:', err.message));
     }
-    
+
     connectEvent(core: NapCatCore, wsClient: WebSocket) {
         try {
             this.checkStateAndReply<any>(new OB11LifeCycleEvent(core, LifeCycleSubType.CONNECT), wsClient);

src/shell/napcat.ts

@@ -168,20 +168,25 @@ export async function NCoreInitShell() {
             });
         });
 
-        if (quickLoginUin && historyLoginList.some(u => u.uin === quickLoginUin)) {
+        if (quickLoginUin) {
-            logger.log('正在快速登录 ', quickLoginUin);
+            if (historyLoginList.some(u => u.uin === quickLoginUin)) {
-            setTimeout(() => {
+                logger.log('正在快速登录 ', quickLoginUin);
-                loginService.quickLoginWithUin(quickLoginUin)
+                setTimeout(() => {
-                    .then(result => {
+                    loginService.quickLoginWithUin(quickLoginUin)
-                        if (result.loginErrorInfo.errMsg) {
+                        .then(result => {
-                            logger.logError('快速登录错误：', result.loginErrorInfo.errMsg);
+                            if (result.loginErrorInfo.errMsg) {
-                            loginService.getQRCodePicture();
+                                logger.logError('快速登录错误：', result.loginErrorInfo.errMsg);
-                        }
+                                loginService.getQRCodePicture();
-                    })
+                            }
-                    .catch();
+                        })
-            }, 1000);
+                        .catch();
+                }, 1000);
+            } else {
+                logger.logError('快速登录失败，未找到该 QQ 历史登录记录，将使用二维码登录方式');
+                loginService.getQRCodePicture();
+            }
         } else {
-            logger.log('没有 -q 指令指定快速登录，或未曾登录过这个 QQ，将使用二维码登录方式');
+            logger.log('没有 -q 指令指定快速登录，将使用二维码登录方式');
             if (historyLoginList.length > 0) {
                 logger.log(`可用于快速登录的 QQ：\n${
                     historyLoginList

src/webui/index.ts

@@ -19,7 +19,7 @@ export let webUiPathWrapper: NapCatPathWrapper;
 export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapper) {
     webUiPathWrapper = pathWrapper;
     WebUiConfig = new WebUiConfigWrapper();
-    let log = logger.log.bind(logger);
+    const log = logger.log.bind(logger);
     const config = await WebUiConfig.GetWebUIConfig();
     if (config.port == 0) {
         log('[NapCat] [WebUi] Current WebUi is not run.');

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.8', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.0.24', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([
@@ -180,12 +180,12 @@ async function onSettingWindowCreated(view: Element) {
                 'Telegram 群',
                 'https://t.me/+nLZEnpne-pQ1OWFl',
                 SettingButton('进去逛逛', 'open-telegram')
-              ),
+            ),
-              SettingItem(
+            SettingItem(
                 'QQ 群',
                 '518662028',
                 SettingButton('我要进去', 'open-qq-group')
-              ),
+            ),
             '</div>',
         ].join(''),
         'text/html',

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.8", "napcat-update-button", "secondary")
+          SettingButton("V2.0.24", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([