Merge branch 'main' into 1999

.github/workflows/release.yml

@@ -150,15 +150,3 @@ jobs:
           NapCat.Shell.zip
           NapCat.Framework.Windows.Once.zip
         draft: true
-
-  build-docker:
-    needs: release-napcat
-    runs-on: ubuntu-latest
-    steps:
-      - name: Dispatch Docker Build
-        run: |
-          curl -X POST \
-          -H "Authorization: Bearer ${{ secrets.NAPCAT_BUILD }}" \
-          -H "Accept: application/vnd.github.v3+json" \
-          https://api.github.com/repos/NapNeko/NapCat-Docker/actions/workflows/docker-publish.yml/dispatches \
-          -d '{"ref": "main"}'

.gitignore

@@ -1,5 +1,6 @@
 # Develop
 node_modules/
+package-lock.json
 pnpm-lock.yaml
 out/
 dist/

README.md

@@ -1,9 +1,8 @@
-<img src="https://napneko.github.io/assets/newnewlogo.png" width = "305" height = "411" alt="NapCat" align=right />
 <div align="center">
 
 # NapCat
 
-
+![NapCatQQ](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Fnewlogo.png&name=1&owner=1&pattern=Diagonal+Stripes&stargazers=1&theme=Auto)
 
 _Modern protocol-side framework implemented based on NTQQ._
 
@@ -41,20 +40,13 @@ _Modern protocol-side framework implemented based on NTQQ._
 | Docs | [![Cloudflare.Pages](https://img.shields.io/badge/docs%20on-Cloudflare.Pages-blue)](https://napneko.pages.dev/) | [![Server.Other](https://img.shields.io/badge/docs%20on-Server.Other-green)](https://napcat.cyou/) | [![NapCat.Wiki](https://img.shields.io/badge/docs%20on-NapCat.Wiki-red)](https://www.napcat.wiki) |
 |:-:|:-:|:-:|:-:|
 
-| QQ Group | [![QQ Group#4](https://img.shields.io/badge/QQ%20Group%234-Join-blue)](https://qm.qq.com/q/CMmPbGw0jA) | [![QQ Group#3](https://img.shields.io/badge/QQ%20Group%233-Join-blue)](https://qm.qq.com/q/8zJMLjqy2Y) | [![QQ Group#2](https://img.shields.io/badge/QQ%20Group%232-Join-blue)](https://qm.qq.com/q/HaRcfrHpUk) | [![QQ Group#1](https://img.shields.io/badge/QQ%20Group%231-Join-blue)](https://qm.qq.com/q/I6LU87a0Yq) |
-|:-:|:-:|:-:|:-:|:-:|
-
-| Telegram | [![Telegram](https://img.shields.io/badge/Telegram-MelodicMoonlight-blue)](https://t.me/MelodicMoonlight) |
-|:-:|:-:|
+| Contact | [![QQ Group#1](https://img.shields.io/badge/QQ%20Group%231-Join-blue)](https://qm.qq.com/q/I6LU87a0Yq) | [![QQ Group#2](https://img.shields.io/badge/QQ%20Group%232-Join-blue)](https://qm.qq.com/q/HaRcfrHpUk) | [![Telegram](https://img.shields.io/badge/Telegram-MelodicMoonlight-blue)](https://t.me/MelodicMoonlight) |
+|:-:|:-:|:-:|:-:|
 
 ## Thanks
 
 + [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
 
-+ [AstrBot](https://github.com/AstrBotDevs/AstrBot) 是完美适配本项目的LLM Bot框架 在此推荐一下
-
-+ [MaiBot](https://github.com/MaiM-with-u/MaiBot) 一只赛博群友 麦麦 Bot框架 在此推荐一下
-  
 + 不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---
@@ -66,3 +58,7 @@ _Modern protocol-side framework implemented based on NTQQ._
 2. 项目其余逻辑代码采用[本仓库开源许可](./LICENSE).
 
 **本仓库仅用于提高易用性，实现消息推送类功能，此外，禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**
+
+## Warnings
+
+[某框架抄袭部分分析](https://napneko.github.io/other/about-copy)

launcher/qqnt.json

@@ -1,9 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.19-34740",
-  "verHash": "f31348f2",
-  "linuxVersion": "3.2.17-34740",
-  "linuxVerHash": "5aa2d8d6",
+  "version": "9.9.18-32869",
+  "verHash": "e735296c",
+  "linuxVersion": "3.2.16-32869",
+  "linuxVerHash": "4c192ba9",
   "private": true,
   "description": "QQ",
   "productName": "QQ",
@@ -16,10 +16,27 @@
   "bin": {
     "qd": "externals/devtools/cli/index.js"
   },
+  "appid": {
+    "win32": "537258389",
+    "darwin": "537258412",
+    "linux": "537258424"
+  },
   "main": "./loadNapCat.js",
-  "buildVersion": "34740",
+  "peerDependenciesMeta": {
+    "*": {
+      "optional": true
+    }
+  },
+  "pnpm": {
+    "patchedDependencies": {
+      "@vue/runtime-dom@3.5.12": "patches/@vue__runtime-dom@3.5.12.patch",
+      "@swc/helpers@0.5.3": "patches/@swc__helpers@0.5.3.patch",
+      "vuex@4.1.0": "patches/vuex@4.1.0.patch"
+    }
+  },
+  "buildVersion": "32869",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",
   "eleArch": "x64"
-}
+}

manifest.json

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

napcat.webui/src/components/chat_input/components/music_insert.tsx

@@ -92,9 +92,7 @@ const MusicInsert = () => {
             className="w-96"
             fullWidth
             selectedKey={mode}
-            onSelectionChange={(key) => {
-              if (key !== null) setMode(key)
-            }}
+            onSelectionChange={setMode}
           >
             <Tab title="主流平台" key="default" className="flex flex-col gap-2">
               <Select

napcat.webui/src/components/onebot/display_card/render.tsx

@@ -26,7 +26,7 @@ const itemVariants = {
     opacity: 1,
     scale: 1,
     y: 0,
-    transition: { type: 'spring' as const, stiffness: 300, damping: 20 }
+    transition: { type: 'spring', stiffness: 300, damping: 20 }
   }
 }
 

napcat.webui/src/const/ob_api/group.ts

@@ -24,7 +24,9 @@ const oneBotHttpApiGroup = {
   },
   '/get_group_system_msg': {
     description: '获取群系统消息',
-    request: z.object({}),
+    request: z.object({
+      group_id: z.union([z.string(), z.number()]).describe('群号')
+    }),
     response: baseResponseSchema.extend({
       data: z.object({
         InvitedRequest: z
@@ -35,7 +37,6 @@ const oneBotHttpApiGroup = {
                 invitor_uin: z.string().describe('邀请人 QQ 号'),
                 invitor_nick: z.string().describe('邀请人昵称'),
                 group_id: z.string().describe('群号'),
-                message: z.string().describe('入群回答'),
                 group_name: z.string().describe('群名称'),
                 checked: z.boolean().describe('是否已处理'),
                 actor: z.string().describe('处理人 QQ 号')
@@ -49,7 +50,6 @@ const oneBotHttpApiGroup = {
             requester_uin: z.string().describe('请求人 QQ 号'),
             requester_nick: z.string().describe('请求人昵称'),
             group_id: z.string().describe('群号'),
-            message: z.string().describe('入群回答'),
             group_name: z.string().describe('群名称'),
             checked: z.boolean().describe('是否已处理'),
             actor: z.string().describe('处理人 QQ 号')
@@ -604,7 +604,7 @@ const oneBotHttpApiGroup = {
     response: baseResponseSchema.extend({
       data: z
         .object({
-          group_id: z.number().describe('群号'),
+          group_id: z.string().describe('群号'),
           current_talkative: z
             .object({
               user_id: z.number().describe('QQ 号'),

napcat.webui/src/pages/dashboard/terminal.tsx

@@ -56,9 +56,9 @@ export default function TerminalPage() {
 
       setTabs((prev) => [...prev, newTab])
       setSelectedTab(id)
-    } catch (error: unknown) {
+    } catch (error) {
       console.error('Failed to create terminal:', error)
-      toast.error((error as Error).message)
+      toast.error('创建终端失败')
     }
   }
 

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.8.93",
+  "version": "4.7.43",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
@@ -18,14 +18,14 @@
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.24.7",
-    "@eslint/compat": "^1.3.1",
+    "@eslint/compat": "^1.2.2",
     "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^9.31.0",
+    "@eslint/js": "^9.14.0",
     "@homebridge/node-pty-prebuilt-multiarch": "^0.12.0-beta.5",
     "@log4js-node/log4js-api": "^1.0.2",
     "@napneko/nap-proto-core": "^0.0.4",
     "@rollup/plugin-node-resolve": "^16.0.0",
-    "@rollup/plugin-typescript": "^12.1.4",
+    "@rollup/plugin-typescript": "^12.1.2",
     "@sinclair/typebox": "^0.34.9",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
@@ -41,27 +41,29 @@
     "ajv": "^8.13.0",
     "async-mutex": "^0.5.0",
     "commander": "^13.0.0",
+    "compressing": "^1.10.1",
     "cors": "^2.8.5",
-    "esbuild": "0.25.5",
+    "esbuild": "0.25.0",
     "eslint": "^9.14.0",
     "eslint-import-resolver-typescript": "^4.0.0",
     "eslint-plugin-import": "^2.29.1",
     "express-rate-limit": "^7.5.0",
     "fast-xml-parser": "^4.3.6",
-    "file-type": "^21.0.0",
+    "file-type": "^20.0.0",
     "globals": "^16.0.0",
+    "image-size": "^1.1.1",
     "json5": "^2.2.3",
-    "multer": "^2.0.1",
+    "multer": "^1.4.5-lts.1",
+    "napcat.protobuf": "^1.1.4",
     "typescript": "^5.3.3",
-    "typescript-eslint": "^8.35.1",
+    "typescript-eslint": "^8.13.0",
     "vite": "^6.0.1",
     "vite-plugin-cp": "^6.0.0",
     "vite-tsconfig-paths": "^5.1.0",
-    "napcat.protobuf": "^1.1.4",
-    "winston": "^3.17.0",
-    "compressing": "^1.10.1"
+    "winston": "^3.17.0"
   },
   "dependencies": {
+    "@napi-rs/canvas": "^0.1.69",
     "express": "^5.0.0",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"

src/common/download-ffmpeg.ts

@@ -8,16 +8,11 @@ import { pipeline } from 'stream/promises';
 import { fileURLToPath } from 'url';
 import { LogWrapper } from './log';
 
-const downloadOri = "https://github.com/NapNeko/ffmpeg-build/releases/download/v1.0.0/ffmpeg-7.1.1-win64.zip"
+const downloadOri = "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2025-04-16-12-54/ffmpeg-n7.1.1-6-g48c0f071d4-win64-lgpl-7.1.zip"
 const urls = [
-    "https://j.1win.ggff.net/" + downloadOri,
-    "https://git.yylx.win/" + downloadOri,
-    "https://ghfile.geekertao.top/" + downloadOri,
-    "https://gh-proxy.net/" + downloadOri,
-    "https://ghm.078465.xyz/" + downloadOri,
-    "https://gitproxy.127731.xyz/" + downloadOri,
-    "https://jiashu.1win.eu.org/" + downloadOri,
-    "https://github.tbedu.top/" + downloadOri,
+    "https://github.moeyy.xyz/" + downloadOri,
+    "https://ghp.ci/" + downloadOri,
+    "https://gh.api.99988866.xyz/" + downloadOri,
     downloadOri
 ];
 
@@ -341,16 +336,9 @@ export async function downloadFFmpegIfNotExists(log: LogWrapper) {
     const ffprobe_exist = fs.existsSync(path.join(currentPath, 'ffmpeg', 'ffprobe.exe'));
 
     if (!ffmpeg_exist || !ffprobe_exist) {
-        let url = await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
+        await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
             log.log(`[FFmpeg] [Download] ${percentage}% - ${message}`);
         });
-        if (!url) {
-            log.log('[FFmpeg] [Error] 下载FFmpeg失败');
-            return {
-                path: null,
-                reset: false
-            };
-        }
         return {
             path: path.join(currentPath, 'ffmpeg'),
             reset: true

src/common/ffmpeg.ts

@@ -4,10 +4,10 @@ import { execFile } from 'child_process';
 import { promisify } from 'util';
 import type { VideoInfo } from './video';
 import { fileTypeFromFile } from 'file-type';
+import imageSize from 'image-size';
 import { fileURLToPath } from 'node:url';
 import { platform } from 'node:os';
 import { LogWrapper } from './log';
-import { imageSizeFallBack } from '@/image-size';
 const currentPath = dirname(fileURLToPath(import.meta.url));
 const execFileAsync = promisify(execFile);
 const getFFmpegPath = (tool: string): string => {
@@ -157,7 +157,7 @@ export class FFmpegService {
         try {
             await this.extractThumbnail(videoPath, thumbnailPath);
             // 获取图片尺寸
-            const dimensions = await imageSizeFallBack(thumbnailPath);
+            const dimensions = imageSize(thumbnailPath);
 
             return {
                 format: fileType?.ext ?? 'mp4',

src/common/file.ts

@@ -145,8 +145,8 @@ export enum FileUriType {
 
 export async function checkUriType(Uri: string) {
     const LocalFileRet = await solveProblem((uri: string) => {
-        if (fs.existsSync(path.normalize(uri))) {
-            return { Uri: path.normalize(uri), Type: FileUriType.Local };
+        if (fs.existsSync(uri)) {
+            return { Uri: uri, Type: FileUriType.Local };
         }
         return undefined;
     }, Uri);

src/common/path.ts

@@ -13,15 +13,11 @@ export class NapCatPathWrapper {
     constructor(mainPath: string = dirname(fileURLToPath(import.meta.url))) {
         this.binaryPath = mainPath;
         let writePath: string;
-
-        if (process.env['NAPCAT_WORKDIR']) {
-            writePath = process.env['NAPCAT_WORKDIR'];
-        } else if (os.platform() === 'darwin') {
+        if (os.platform() === 'darwin') {
             writePath = path.join(os.homedir(), 'Library', 'Application Support', 'QQ', 'NapCat');
         } else {
             writePath = this.binaryPath;
         }
-
         this.logsPath = path.join(writePath, 'logs');
         this.configPath = path.join(writePath, 'config');
         this.cachePath = path.join(writePath, 'cache');

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.8.93';
+export const napCatVersion = '4.7.43';

src/core/apis/file.ts

@@ -17,6 +17,8 @@ import fs from 'fs';
 import fsPromises from 'fs/promises';
 import { InstanceContext, NapCatCore, SearchResultItem } from '@/core';
 import { fileTypeFromFile } from 'file-type';
+import imageSize from 'image-size';
+import { ISizeCalculationResult } from 'image-size/dist/types/interface';
 import { RkeyManager } from '@/core/helper/rkey';
 import { calculateFileMD5 } from '@/common/file';
 import pathLib from 'node:path';
@@ -26,9 +28,6 @@ import { SendMessageContext } from '@/onebot/api';
 import { getFileTypeForSendType } from '../helper/msg';
 import { FFmpegService } from '@/common/ffmpeg';
 import { rkeyDataType } from '../types/file';
-import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { FileId } from '../packet/transformer/proto/misc/fileid';
-import { imageSizeFallBack } from '@/image-size';
 
 export class NTQQFileApi {
     context: InstanceContext;
@@ -64,76 +63,6 @@ export class NTQQFileApi {
         }
     }
 
-    async getFileUrl(chatType: ChatType, peer: string, fileUUID?: string, file10MMd5?: string | undefined) {
-        if (this.core.apis.PacketApi.available) {
-            try {
-                if (chatType === ChatType.KCHATTYPEGROUP && fileUUID) {
-                    return this.core.apis.PacketApi.pkt.operation.GetGroupFileUrl(+peer, fileUUID);
-                } else if (file10MMd5 && fileUUID) {
-                    return this.core.apis.PacketApi.pkt.operation.GetPrivateFileUrl(peer, fileUUID, file10MMd5);
-                }
-            } catch (error) {
-                this.context.logger.logError('获取文件URL失败', (error as Error).message);
-            }
-        }
-        throw new Error('fileUUID or file10MMd5 is undefined');
-    }
-
-    async getPttUrl(peer: string, fileUUID?: string) {
-        if (this.core.apis.PacketApi.available && fileUUID) {
-            let appid = new NapProtoMsg(FileId).decode(Buffer.from(fileUUID.replaceAll('-', '+').replaceAll('_', '/'), 'base64')).appid;
-            try {
-                if (appid && appid === 1403) {
-                    return this.core.apis.PacketApi.pkt.operation.GetGroupPttUrl(+peer, {
-                        fileUuid: fileUUID,
-                        storeId: 1,
-                        uploadTime: 0,
-                        ttl: 0,
-                        subType: 0,
-                    });
-                } else if (fileUUID) {
-                    return this.core.apis.PacketApi.pkt.operation.GetPttUrl(peer, {
-                        fileUuid: fileUUID,
-                        storeId: 1,
-                        uploadTime: 0,
-                        ttl: 0,
-                        subType: 0,
-                    });
-                }
-            } catch (error) {
-                this.context.logger.logError('获取文件URL失败', (error as Error).message);
-            }
-        }
-        throw new Error('packet cant get ptt url');
-    }
-
-    async getVideoUrlPacket(peer: string, fileUUID?: string) {
-        if (this.core.apis.PacketApi.available && fileUUID) {
-            let appid = new NapProtoMsg(FileId).decode(Buffer.from(fileUUID.replaceAll('-', '+').replaceAll('_', '/'), 'base64')).appid;
-            try {
-                if (appid && appid === 1415) {
-                    return this.core.apis.PacketApi.pkt.operation.GetGroupVideoUrl(+peer, {
-                        fileUuid: fileUUID,
-                        storeId: 1,
-                        uploadTime: 0,
-                        ttl: 0,
-                        subType: 0,
-                    });
-                } else if (fileUUID) {
-                    return this.core.apis.PacketApi.pkt.operation.GetVideoUrl(peer, {
-                        fileUuid: fileUUID,
-                        storeId: 1,
-                        uploadTime: 0,
-                        ttl: 0,
-                        subType: 0,
-                    });
-                }
-            } catch (error) {
-                this.context.logger.logError('获取文件URL失败', (error as Error).message);
-            }
-        }
-        throw new Error('packet cant get video url');
-    }
 
     async copyFile(filePath: string, destPath: string) {
         await this.core.util.copyFile(filePath, destPath);
@@ -208,7 +137,7 @@ export class NTQQFileApi {
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');
         }
-        const imageSize = await imageSizeFallBack(picPath);
+        const imageSize = await this.core.apis.FileApi.getImageSize(picPath);
         context.deleteAfterSentFiles.push(path);
         return {
             elementType: ElementType.PIC,
@@ -396,7 +325,6 @@ export class NTQQFileApi {
                 }
             });
         });
-        return res.flat();
     }
 
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
@@ -436,6 +364,19 @@ export class NTQQFileApi {
         return completeRetData.filePath;
     }
 
+    async getImageSize(filePath: string): Promise<ISizeCalculationResult> {
+        return new Promise((resolve, reject) => {
+            imageSize(filePath, (err: Error | null, dimensions) => {
+                if (err) {
+                    reject(new Error(err.message));
+                } else if (!dimensions) {
+                    reject(new Error('获取图片尺寸失败'));
+                } else {
+                    resolve(dimensions);
+                }
+            });
+        });
+    }
 
     async searchForFile(keys: string[]): Promise<SearchResultItem | undefined> {
         const randomResultId = 100000 + Math.floor(Math.random() * 10000);

src/core/apis/group.ts

@@ -10,14 +10,11 @@ import {
     GroupNotify,
     GroupInfoSource,
     ShutUpGroupMember,
-    Peer,
-    ChatType,
 } from '@/core';
 import { isNumeric, solveAsyncProblem } from '@/common/helper';
 import { LimitedHashTable } from '@/common/message-unique';
 import { NTEventWrapper } from '@/common/event';
 import { CancelableTask, TaskExecutor } from '@/common/cancel-task';
-import { createGroupDetailInfoV2Param, createGroupExtFilter, createGroupExtInfo } from '../data';
 
 export class NTQQGroupApi {
     context: InstanceContext;
@@ -50,22 +47,6 @@ export class NTQQGroupApi {
         this.initCache().then().catch(e => this.context.logger.logError(e));
     }
 
-    async createGrayTip(groupCode: string, tip: string) {
-        return this.context.session.getMsgService().addLocalJsonGrayTipMsg(
-            {
-                chatType: ChatType.KCHATTYPEGROUP,
-                peerUid: groupCode,
-            } as Peer,
-            {
-                busiId: 2201,
-                jsonStr: JSON.stringify({ "align": "center", "items": [{ "txt": tip, "type": "nor" }] }),
-                recentAbstract: tip,
-                isServer: false
-            },
-            true,
-            true
-        )
-    }
     async initCache() {
         for (const group of await this.getGroups(true)) {
             this.refreshGroupMemberCache(group.groupCode, false).then().catch(e => this.context.logger.logError(e));
@@ -114,58 +95,6 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().setHeader(groupCode, filePath);
     }
 
-    // 0 0 无需管理员审核
-    // 0 2 需要管理员审核
-    // 1 2 禁止Bot入群( 最好只传一个1 ？)
-    async setGroupRobotAddOption(groupCode: string, robotMemberSwitch?: number, robotMemberExamine?: number) {
-        let extInfo = createGroupExtInfo(groupCode);
-        let groupExtFilter = createGroupExtFilter();
-        if (robotMemberSwitch !== undefined) {
-            extInfo.extInfo.inviteRobotMemberSwitch = robotMemberSwitch;
-            groupExtFilter.inviteRobotMemberSwitch = 1;
-        }
-        if (robotMemberExamine !== undefined) {
-            extInfo.extInfo.inviteRobotMemberExamine = robotMemberExamine;
-            groupExtFilter.inviteRobotMemberExamine = 1;
-        }
-        return this.context.session.getGroupService().modifyGroupExtInfoV2(extInfo, groupExtFilter);
-    }
-
-    async setGroupAddOption(groupCode: string, option: {
-        addOption: number;
-        groupQuestion?: string;
-        groupAnswer?: string;
-    }) {
-        let param = createGroupDetailInfoV2Param(groupCode);
-        // 设置要修改的目标
-        param.filter.addOption = 1;
-        if (option.addOption == 4 || option.addOption == 5) {
-            // 4 问题进入答案 5 问题管理员批准
-            param.filter.groupQuestion = 1;
-            param.filter.groupAnswer = option.addOption == 4 ? 1 : 0;
-            param.modifyInfo.groupQuestion = option.groupQuestion || '';
-            param.modifyInfo.groupAnswer = option.addOption == 4 ? option.groupAnswer || '' : '';
-        }
-        param.modifyInfo.addOption = option.addOption;
-        return this.context.session.getGroupService().modifyGroupDetailInfoV2(param, 0);
-    }
-
-    async setGroupSearch(groupCode: string, option: {
-        noCodeFingerOpenFlag?: number;
-        noFingerOpenFlag?: number;
-    }) {
-        let param = createGroupDetailInfoV2Param(groupCode);
-        if (option.noCodeFingerOpenFlag) {
-            param.filter.noCodeFingerOpenFlag = 1;
-            param.modifyInfo.noCodeFingerOpenFlag = option.noCodeFingerOpenFlag;
-        }
-        if (option.noFingerOpenFlag) {
-            param.filter.noFingerOpenFlag = 1;
-            param.modifyInfo.noFingerOpenFlag = option.noFingerOpenFlag;
-        }
-        return this.context.session.getGroupService().modifyGroupDetailInfoV2(param, 0);
-    }
-
     async getGroups(forced: boolean = false) {
         const [, , groupList] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelGroupService/getGroupList',

src/core/apis/msg.ts

@@ -71,7 +71,6 @@ export class NTQQMsgApi {
     async queryMsgsWithFilterExWithSeq(peer: Peer, msgSeq: string) {
         return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
             chatInfo: peer,
-            //searchFields: 3,
             filterMsgType: [],
             filterSendersUid: [],
             filterMsgToTime: '0',
@@ -85,7 +84,6 @@ export class NTQQMsgApi {
         return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
             chatInfo: peer,
             filterMsgType: [],
-            //searchFields: 3,
             filterSendersUid: SendersUid,
             filterMsgToTime: MsgTime,
             filterMsgFromTime: MsgTime,
@@ -102,7 +100,6 @@ export class NTQQMsgApi {
             filterMsgToTime: '0',
             filterMsgFromTime: '0',
             isReverseOrder: false,
-            //searchFields: 3,
             isIncludeCurrent: true,
             pageLimit: 1,
         });
@@ -113,7 +110,6 @@ export class NTQQMsgApi {
             filterMsgType: [],
             filterSendersUid: [],
             filterMsgToTime: '0',
-            //searchFields: 3,
             filterMsgFromTime: '0',
             isReverseOrder: true,
             isIncludeCurrent: true,
@@ -132,7 +128,6 @@ export class NTQQMsgApi {
             chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
             filterMsgType: [],
             filterSendersUid: [],
-            //searchFields: 3,
             filterMsgToTime: filterMsgToTime,
             filterMsgFromTime: filterMsgFromTime,
             isReverseOrder: false,
@@ -147,7 +142,6 @@ export class NTQQMsgApi {
             chatInfo: peer,
             filterMsgType: [],
             filterSendersUid: SendersUid,
-            //searchFields: 3,
             filterMsgToTime: '0',
             filterMsgFromTime: '0',
             isReverseOrder: true,

src/core/apis/webapi.ts

@@ -264,7 +264,7 @@ export class NTQQWebApi {
     async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
         let HonorInfo = {
-            group_id: Number(groupCode),
+            group_id: groupCode,
             current_talkative: {},
             talkative_list: [],
             performer_list: [],

src/core/data/group.ts

@@ -1,245 +0,0 @@
-import { GroupDetailInfoV2Param, GroupExtInfo, GroupExtFilter } from "../types";
-
-export function createGroupDetailInfoV2Param(group_code: string): GroupDetailInfoV2Param {
-    return {
-        groupCode: group_code,
-        filter:
-        {
-            noCodeFingerOpenFlag: 0,
-            noFingerOpenFlag: 0,
-            groupName: 0,
-            classExt: 0,
-            classText: 0,
-            fingerMemo: 0,
-            richFingerMemo: 0,
-            tagRecord: 0,
-            groupGeoInfo:
-            {
-                ownerUid: 0,
-                setTime: 0,
-                cityId: 0,
-                longitude: 0,
-                latitude: 0,
-                geoContent: 0,
-                poiId: 0
-            },
-            groupExtAdminNum: 0,
-            flag: 0,
-            groupMemo: 0,
-            groupAioSkinUrl: 0,
-            groupBoardSkinUrl: 0,
-            groupCoverSkinUrl: 0,
-            groupGrade: 0,
-            activeMemberNum: 0,
-            certificationType: 0,
-            certificationText: 0,
-            groupNewGuideLines:
-            {
-                enabled: 0,
-                content: 0
-            },
-            groupFace: 0,
-            addOption: 0,
-            shutUpTime: 0,
-            groupTypeFlag: 0,
-            appPrivilegeFlag: 0,
-            appPrivilegeMask: 0,
-            groupExtOnly:
-            {
-                tribeId: 0,
-                moneyForAddGroup: 0
-            }, groupSecLevel: 0,
-            groupSecLevelInfo: 0,
-            subscriptionUin: 0,
-            subscriptionUid: "",
-            allowMemberInvite: 0,
-            groupQuestion: 0,
-            groupAnswer: 0,
-            groupFlagExt3: 0,
-            groupFlagExt3Mask: 0,
-            groupOpenAppid: 0,
-            rootId: 0,
-            msgLimitFrequency: 0,
-            hlGuildAppid: 0,
-            hlGuildSubType: 0,
-            hlGuildOrgId: 0,
-            groupFlagExt4: 0,
-            groupFlagExt4Mask: 0,
-            groupSchoolInfo: {
-                location: 0,
-                grade: 0,
-                school: 0
-            },
-            groupCardPrefix:
-            {
-                introduction: 0,
-                rptPrefix: 0
-            }, allianceId: 0,
-            groupFlagPro1: 0,
-            groupFlagPro1Mask: 0
-        },
-        modifyInfo: {
-            noCodeFingerOpenFlag: 0,
-            noFingerOpenFlag: 0,
-            groupName: "",
-            classExt: 0,
-            classText: "",
-            fingerMemo: "",
-            richFingerMemo: "",
-            tagRecord: [],
-            groupGeoInfo: {
-                ownerUid: "",
-                SetTime: 0,
-                CityId: 0,
-                Longitude: "",
-                Latitude: "",
-                GeoContent: "",
-                poiId: ""
-            },
-            groupExtAdminNum: 0,
-            flag: 0,
-            groupMemo: "",
-            groupAioSkinUrl: "",
-            groupBoardSkinUrl: "",
-            groupCoverSkinUrl: "",
-            groupGrade: 0,
-            activeMemberNum: 0,
-            certificationType: 0,
-            certificationText: "",
-            groupNewGuideLines: {
-                enabled: false,
-                content: ""
-            }, groupFace: 0,
-            addOption: 0,
-            shutUpTime: 0,
-            groupTypeFlag: 0,
-            appPrivilegeFlag: 0,
-            appPrivilegeMask: 0,
-            groupExtOnly: {
-                tribeId: 0,
-                moneyForAddGroup: 0
-            },
-            groupSecLevel: 0,
-            groupSecLevelInfo: 0,
-            subscriptionUin: "",
-            subscriptionUid: "",
-            allowMemberInvite: 0,
-            groupQuestion: "",
-            groupAnswer: "",
-            groupFlagExt3: 0,
-            groupFlagExt3Mask: 0,
-            groupOpenAppid: 0,
-            rootId: "",
-            msgLimitFrequency: 0,
-            hlGuildAppid: 0,
-            hlGuildSubType: 0,
-            hlGuildOrgId: 0,
-            groupFlagExt4: 0,
-            groupFlagExt4Mask: 0,
-            groupSchoolInfo: {
-                location: "",
-                grade: 0,
-                school: ""
-            },
-            groupCardPrefix:
-            {
-                introduction: "",
-                rptPrefix: []
-            },
-            allianceId: "",
-            groupFlagPro1: 0,
-            groupFlagPro1Mask: 0
-        }
-    }
-}
-export function createGroupExtInfo(group_code: string): GroupExtInfo {
-    return {
-        groupCode: group_code,
-        resultCode: 0,
-        extInfo: {
-            groupInfoExtSeq: 0,
-            reserve: 0,
-            luckyWordId: '',
-            lightCharNum: 0,
-            luckyWord: '',
-            starId: 0,
-            essentialMsgSwitch: 0,
-            todoSeq: 0,
-            blacklistExpireTime: 0,
-            isLimitGroupRtc: 0,
-            companyId: 0,
-            hasGroupCustomPortrait: 0,
-            bindGuildId: '',
-            groupOwnerId: {
-                memberUin: '',
-                memberUid: '',
-                memberQid: '',
-            },
-            essentialMsgPrivilege: 0,
-            msgEventSeq: '',
-            inviteRobotSwitch: 0,
-            gangUpId: '',
-            qqMusicMedalSwitch: 0,
-            showPlayTogetherSwitch: 0,
-            groupFlagPro1: '',
-            groupBindGuildIds: {
-                guildIds: [],
-            },
-            viewedMsgDisappearTime: '',
-            groupExtFlameData: {
-                switchState: 0,
-                state: 0,
-                dayNums: [],
-                version: 0,
-                updateTime: '',
-                isDisplayDayNum: false,
-            },
-            groupBindGuildSwitch: 0,
-            groupAioBindGuildId: '',
-            groupExcludeGuildIds: {
-                guildIds: [],
-            },
-            fullGroupExpansionSwitch: 0,
-            fullGroupExpansionSeq: '',
-            inviteRobotMemberSwitch: 0,
-            inviteRobotMemberExamine: 0,
-            groupSquareSwitch: 0,
-        }
-    }
-}
-export function createGroupExtFilter(): GroupExtFilter {
-    return {
-        groupInfoExtSeq: 0,
-        reserve: 0,
-        luckyWordId: 0,
-        lightCharNum: 0,
-        luckyWord: 0,
-        starId: 0,
-        essentialMsgSwitch: 0,
-        todoSeq: 0,
-        blacklistExpireTime: 0,
-        isLimitGroupRtc: 0,
-        companyId: 0,
-        hasGroupCustomPortrait: 0,
-        bindGuildId: 0,
-        groupOwnerId: 0,
-        essentialMsgPrivilege: 0,
-        msgEventSeq: 0,
-        inviteRobotSwitch: 0,
-        gangUpId: 0,
-        qqMusicMedalSwitch: 0,
-        showPlayTogetherSwitch: 0,
-        groupFlagPro1: 0,
-        groupBindGuildIds: 0,
-        viewedMsgDisappearTime: 0,
-        groupExtFlameData: 0,
-        groupBindGuildSwitch: 0,
-        groupAioBindGuildId: 0,
-        groupExcludeGuildIds: 0,
-        fullGroupExpansionSwitch: 0,
-        fullGroupExpansionSeq: 0,
-        inviteRobotMemberSwitch: 0,
-        inviteRobotMemberExamine: 0,
-        groupSquareSwitch: 0,
-    }
-};

src/core/data/index.ts

@@ -1 +0,0 @@
-export * from "./group";

src/core/external/appid.json

@@ -274,69 +274,5 @@
     "9.9.19-34606": {
         "appid": 537282307,
         "qua": "V1_WIN_NQ_9.9.19_34606_GW_B"
-    },
-    "9.9.19-34740": {
-        "appid": 537290691,
-        "qua": "V1_WIN_NQ_9.9.19_34740_GW_B"
-    },
-    "3.2.17-34740": {
-        "appid": 537290727,
-        "qua": "V1_LNX_NQ_3.2.17_34740_GW_B"
-    },
-    "9.9.19-34958": {
-        "appid": 537290742,
-        "qua": "V1_WIN_NQ_9.9.19_34958_GW_B"
-    },
-    "3.2.17-35184": {
-        "appid": 537291084,
-        "qua": "V1_LNX_NQ_3.2.17_35184_GW_B"
-    },
-    "9.9.19-35184": {
-        "appid": 537291048,
-        "qua": "V1_WIN_NQ_9.9.19_35184_GW_B"
-    },
-    "3.2.17-35341": {
-        "appid": 537291383,
-        "qua": "V1_LNX_NQ_3.2.17_35341_GW_B"
-    },
-    "9.9.19-35341": {
-        "appid": 537291347,
-        "qua": "V1_WIN_NQ_9.9.19_35341_GW_B"
-    },
-    "9.9.19-35469": {
-        "appid": 537291398,
-        "qua": "V1_WIN_NQ_9.9.19_35469_GW_B"
-    },
-    "3.2.18-35951": {
-        "appid": 537296013,
-        "qua": "V1_LNX_NQ_3.2.18_35951_GW_B"
-    },
-    "9.9.20-35951": {
-        "appid": 537295977,
-        "qua": "V1_WIN_NQ_9.9.20_35951_GW_B"
-    },
-    "3.2.18-36580": {
-        "appid": 537298509,
-        "qua": "V1_LNX_NQ_3.2.18_36580_GW_B"
-    },
-    "9.9.20-36580": {
-        "appid": 537298473,
-        "qua": "V1_WIN_NQ_9.9.20_36580_GW_B"
-    },
-    "9.9.20-37012": {
-        "appid": 537304071,
-        "qua": "V1_WIN_NQ_9.9.20_37012_GW_B"
-    },
-    "3.2.18-37012": {
-        "appid": 537304107,
-        "qua": "V1_LNX_NQ_3.2.18_37012_GW_B"
-    },
-    "3.2.18-37051": {
-        "appid": 537304158,
-        "qua": "V1_LNX_NQ_3.2.18_37051_GW_B"
-    },
-    "9.9.20-37051": {
-        "appid": 537304122,
-        "qua": "V1_WIN_NQ_9.9.20_37051_GW_B"
     }
 }

src/core/external/offset.json

@@ -350,93 +350,5 @@
     "3.2.17-34606-arm64": {
         "send": "7711270",
         "recv": "7714BA0"
-    },
-    "9.9.19-34740-x64": {
-        "send": "3BDD8D0",
-        "recv": "3BE20D0"
-    },
-    "3.2.17-34740-x64": {
-        "send": "ADDF0A0",
-        "recv": "ADE2AC0"
-    },
-    "3.2.17-34740-arm64": {
-        "send": "7753BB8",
-        "recv": "77574E8"
-    },
-    "9.9.19-34958-x64": {
-        "send": "3BDD8D0",
-        "recv": "3BE20D0"
-    },
-    "3.2.17-35184-x64": {
-        "send": "AE0DDE0",
-        "recv": "AE11800"
-    },
-    "3.2.17-35184-arm64": {
-        "send": "7776028",
-        "recv": "7779958"
-    },
-    "9.9.19-35184-x64": {
-        "send": "3BE5A10",
-        "recv": "3BEA210"
-    },
-    "9.9.19-35341-x64": {
-        "send": "3BF1D50",
-        "recv": "3BF6550"
-    },
-    "9.9.19-35469-x64": {
-        "send": "3BF1D50",
-        "recv": "3BF6550"
-    },
-    "3.2.17-35341-x64": {
-        "send": "AE2F700",
-        "recv": "AE33120"
-    },
-    "3.2.17-35341-arm64": {
-        "send": "778D840",
-        "recv": "7791170"
-    },
-    "9.9.20-35951-x64": {
-        "send": "3034BAC",
-        "recv": "3038354"
-    },
-    "3.2.18-35951-x64": {
-        "send": "AFBBB00",
-        "recv": "AFBF520"
-    },
-    "9.9.20-36580-x64": {
-        "send": "30824B8",
-        "recv": "3085C5C"
-    },
-    "3.2.18-36580-x64": {
-        "send": "B0853E0",
-        "recv": "B088E60"
-    },
-    "3.2.18-36580-arm64": {
-        "send": "793DAC8",
-        "recv": "7941458"
-    },
-    "3.2.18-37012-x64": {
-        "send": "B20F960",
-        "recv": "B2133E0"
-    },
-    "3.2.18-37012-arm64": {
-        "send": "7A19E00",
-        "recv": "7A1D790"
-    },
-    "9.9.20-37012-x64": {
-        "send": "30CC958",
-        "recv": "30D00FC"
-    },
-    "3.2.18-37051-x64": {
-        "send": "B20F960",
-        "recv": "B2133E0"
-    },
-    "3.2.18-37051-arm64": {
-        "send": "7A19E00",
-        "recv": "7A1D790"
-    },
-    "9.9.20-37051-x64": {
-        "send": "30CC958",
-        "recv": "30D00FC"
     }
 }

src/core/listeners/NodeIKernelBuddyListener.ts

@@ -3,43 +3,43 @@ import { BuddyCategoryType, FriendRequestNotify } from '@/core/types';
 export type OnBuddyChangeParams = BuddyCategoryType[];
 
 export class NodeIKernelBuddyListener {
-    onBuddyListChangedV2(_arg: unknown): any {
+    onBuddyListChangedV2(arg: unknown): any {
     }
 
-    onAddBuddyNeedVerify(_arg: unknown): any {
+    onAddBuddyNeedVerify(arg: unknown): any {
     }
 
-    onAddMeSettingChanged(_arg: unknown): any {
+    onAddMeSettingChanged(arg: unknown): any {
     }
 
-    onAvatarUrlUpdated(_arg: unknown): any {
+    onAvatarUrlUpdated(arg: unknown): any {
     }
 
-    onBlockChanged(_arg: unknown): any {
+    onBlockChanged(arg: unknown): any {
     }
 
-    onBuddyDetailInfoChange(_arg: unknown): any {
+    onBuddyDetailInfoChange(arg: unknown): any {
     }
 
-    onBuddyInfoChange(_arg: unknown): any {
+    onBuddyInfoChange(arg: unknown): any {
     }
 
-    onBuddyListChange(_arg: OnBuddyChangeParams): any {
+    onBuddyListChange(arg: OnBuddyChangeParams): any {
     }
 
-    onBuddyRemarkUpdated(_arg: unknown): any {
+    onBuddyRemarkUpdated(arg: unknown): any {
     }
 
-    onBuddyReqChange(_arg: FriendRequestNotify): any {
+    onBuddyReqChange(arg: FriendRequestNotify): any {
     }
 
-    onBuddyReqUnreadCntChange(_arg: unknown): any {
+    onBuddyReqUnreadCntChange(arg: unknown): any {
     }
 
-    onCheckBuddySettingResult(_arg: unknown): any {
+    onCheckBuddySettingResult(arg: unknown): any {
     }
 
-    onDelBatchBuddyInfos(_arg: unknown): any {
+    onDelBatchBuddyInfos(arg: unknown): any {
         console.log('onDelBatchBuddyInfos not implemented', ...arguments);
     }
 
@@ -66,12 +66,12 @@ export class NodeIKernelBuddyListener {
     onDoubtBuddyReqUnreadNumChange(_num: number): void | Promise<void> {
     }
 
-    onNickUpdated(_arg: unknown): any {
+    onNickUpdated(arg: unknown): any {
     }
 
-    onSmartInfos(_arg: unknown): any {
+    onSmartInfos(arg: unknown): any {
     }
 
-    onSpacePermissionInfos(_arg: unknown): any {
+    onSpacePermissionInfos(arg: unknown): any {
     }
 }

src/core/packet/client/nativeClient.ts

@@ -40,8 +40,7 @@ export class NativePacketClient extends IPacketClient {
 
     async init(_pid: number, recv: string, send: string): Promise<void> {
         const platform = process.platform + '.' + process.arch;
-        const isNewQQ = this.napcore.basicInfo.requireMinNTQQBuild("36580");
-        const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + (isNewQQ ? '.new' : '') + '.node');
+        const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + '.node');
         process.dlopen(this.MoeHooExport, moehoo_path, constants.dlopen.RTLD_LAZY);
 
         this.MoeHooExport.exports.InitHook?.(send, recv, (type: number, _uin: string, cmd: string, seq: number, hex_data: string) => {

src/core/packet/context/napCoreContext.ts

@@ -1,7 +1,6 @@
 import { NapCatCore } from '@/core';
 
 export interface NapCoreCompatBasicInfo {
-    readonly requireMinNTQQBuild: (buildVer: string) => boolean;
     readonly uin: number;
     readonly uid: string;
     readonly uin2uid: (uin: number) => Promise<string>;
@@ -22,7 +21,6 @@ export class NapCoreContext {
 
     get basicInfo() {
         return {
-            requireMinNTQQBuild: (buildVer: string) => this.core.context.basicInfoWrapper.requireMinNTQQBuild(buildVer),
             uin: +this.core.selfInfo.uin,
             uid: this.core.selfInfo.uid,
             uin2uid: (uin: number) => this.core.apis.UserApi.getUidByUinV2(String(uin)).then(res => res ?? ''),

src/core/packet/context/operationContext.ts

@@ -6,14 +6,13 @@ import {
     PacketMsgFileElement,
     PacketMsgPicElement,
     PacketMsgPttElement,
-    PacketMsgReplyElement,
-    PacketMsgVideoElement,
+    PacketMsgVideoElement
 } from '@/core/packet/message/element';
 import { ChatType, MsgSourceType, NTMsgType, RawMessage } from '@/core';
 import { MiniAppRawData, MiniAppReqParams } from '@/core/packet/entities/miniApp';
 import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
 import { NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
-import { IndexNode, LongMsgResult, MsgInfo, PushMsgBody } from '@/core/packet/transformer/proto';
+import { IndexNode, LongMsgResult, MsgInfo } from '@/core/packet/transformer/proto';
 import { OidbPacket } from '@/core/packet/transformer/base';
 import { ImageOcrResult } from '@/core/packet/entities/ocrResult';
 import { gunzipSync } from 'zlib';
@@ -30,8 +29,13 @@ export class PacketOperationContext {
         return await this.context.client.sendOidbPacket(pkt, rsp);
     }
 
-    async SendPoke(is_group: boolean, peer: number, target?: number) {
-        const req = trans.SendPoke.build(is_group, peer, target ?? peer);
+    async GroupPoke(groupUin: number, uin: number) {
+        const req = trans.SendPoke.build(uin, groupUin);
+        await this.context.client.sendOidbPacket(req);
+    }
+
+    async FriendPoke(uin: number) {
+        const req = trans.SendPoke.build(uin);
         await this.context.client.sendOidbPacket(req);
     }
 
@@ -72,24 +76,22 @@ export class PacketOperationContext {
     async UploadResources(msg: PacketMsg[], groupUin: number = 0) {
         const chatType = groupUin ? ChatType.KCHATTYPEGROUP : ChatType.KCHATTYPEC2C;
         const peerUid = groupUin ? String(groupUin) : this.context.napcore.basicInfo.uid;
-        const reqList = msg.flatMap((m) =>
-            m.msg
-                .map((e) => {
-                    if (e instanceof PacketMsgPicElement) {
-                        return this.context.highway.uploadImage({ chatType, peerUid }, e);
-                    } else if (e instanceof PacketMsgVideoElement) {
-                        return this.context.highway.uploadVideo({ chatType, peerUid }, e);
-                    } else if (e instanceof PacketMsgPttElement) {
-                        return this.context.highway.uploadPtt({ chatType, peerUid }, e);
-                    } else if (e instanceof PacketMsgFileElement) {
-                        return this.context.highway.uploadFile({ chatType, peerUid }, e);
-                    }
-                    return null;
-                })
-                .filter(Boolean)
+        const reqList = msg.flatMap(m =>
+            m.msg.map(e => {
+                if (e instanceof PacketMsgPicElement) {
+                    return this.context.highway.uploadImage({ chatType, peerUid }, e);
+                } else if (e instanceof PacketMsgVideoElement) {
+                    return this.context.highway.uploadVideo({ chatType, peerUid }, e);
+                } else if (e instanceof PacketMsgPttElement) {
+                    return this.context.highway.uploadPtt({ chatType, peerUid }, e);
+                } else if (e instanceof PacketMsgFileElement) {
+                    return this.context.highway.uploadFile({ chatType, peerUid }, e);
+                }
+                return null;
+            }).filter(Boolean)
         );
         const res = await Promise.allSettled(reqList);
-        this.context.logger.info(`上传资源${res.length}个，失败${res.filter((r) => r.status === 'rejected').length}个`);
+        this.context.logger.info(`上传资源${res.length}个，失败${res.filter(r => r.status === 'rejected').length}个`);
         res.forEach((result, index) => {
             if (result.status === 'rejected') {
                 this.context.logger.error(`上传第${index + 1}个资源失败：${result.reason.stack}`);
@@ -98,13 +100,10 @@ export class PacketOperationContext {
     }
 
     async UploadImage(img: PacketMsgPicElement) {
-        await this.context.highway.uploadImage(
-            {
-                chatType: ChatType.KCHATTYPEC2C,
-                peerUid: this.context.napcore.basicInfo.uid,
-            },
-            img
-        );
+        await this.context.highway.uploadImage({
+            chatType: ChatType.KCHATTYPEC2C,
+            peerUid: this.context.napcore.basicInfo.uid
+        }, img);
         const index = img.msgInfo?.msgInfoBody?.at(0)?.index;
         if (!index) {
             throw new Error('img.msgInfo?.msgInfoBody![0].index! is undefined');
@@ -119,20 +118,6 @@ export class PacketOperationContext {
         return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
     }
 
-    async GetPttUrl(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadPtt.build(selfUid, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadPtt.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
-    async GetVideoUrl(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadVideo.build(selfUid, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadVideo.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
     async GetGroupImageUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
         const req = trans.DownloadGroupImage.build(groupUin, node);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -140,21 +125,6 @@ export class PacketOperationContext {
         return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
     }
 
-    async GetGroupPttUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadGroupPtt.build(groupUin, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadImage.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
-    async GetGroupVideoUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadGroupVideo.build(groupUin, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadImage.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
-
     async ImageOCR(imgUrl: string) {
         const req = trans.ImageOCR.build(imgUrl);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -167,66 +137,24 @@ export class PacketOperationContext {
                     coordinates: item.polygon.coordinates.map((c) => {
                         return {
                             x: c.x,
-                            y: c.y,
+                            y: c.y
                         };
                     }),
                 };
             }),
-            language: res.ocrRspBody.language,
+            language: res.ocrRspBody.language
         } as ImageOcrResult;
     }
 
-    private async SendPreprocess(msg: PacketMsg[], groupUin: number = 0) {
-        const ps = msg.map((m) => {
-            return m.msg.map(async (e) => {
-                if (e instanceof PacketMsgReplyElement && !e.targetElems) {
-                    this.context.logger.debug(`Cannot find reply element's targetElems, prepare to fetch it...`);
-                    if (!e.targetPeer?.peerUid) {
-                        this.context.logger.error(`targetPeer is undefined!`);
-                    }
-                    let targetMsg: NapProtoEncodeStructType<typeof PushMsgBody>[] | undefined;
-                    if (e.isGroupReply) {
-                        targetMsg = await this.FetchGroupMessage(+(e.targetPeer?.peerUid ?? 0), e.targetMessageSeq, e.targetMessageSeq);
-                    } else {
-                        targetMsg = await this.FetchC2CMessage(await this.context.napcore.basicInfo.uin2uid(e.targetUin), e.targetMessageSeq, e.targetMessageSeq);
-                    }
-                    e.targetElems = targetMsg.at(0)?.body?.richText?.elems;
-                    e.targetSourceMsg = targetMsg.at(0);
-                }
-            });
-        }).flat();
-        await Promise.all(ps)
-        await this.UploadResources(msg, groupUin);
-    }
-
-    async FetchGroupMessage(groupUin: number, startSeq: number, endSeq: number): Promise<NapProtoDecodeStructType<typeof PushMsgBody>[]> {
-        const req = trans.FetchGroupMessage.build(groupUin, startSeq, endSeq);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.FetchGroupMessage.parse(resp);
-        return res.body.messages
-    }
-
-    async FetchC2CMessage(targetUid: string, startSeq: number, endSeq: number): Promise<NapProtoDecodeStructType<typeof PushMsgBody>[]> {
-        const req = trans.FetchC2CMessage.build(targetUid, startSeq, endSeq);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.FetchC2CMessage.parse(resp);
-        return res.messages
-    }
-
     async UploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
-        await this.SendPreprocess(msg, groupUin);
+        await this.UploadResources(msg, groupUin);
         const req = trans.UploadForwardMsg.build(this.context.napcore.basicInfo.uid, msg, groupUin);
         const resp = await this.context.client.sendOidbPacket(req, true);
         const res = trans.UploadForwardMsg.parse(resp);
         return res.result.resId;
     }
 
-    async MoveGroupFile(
-        groupUin: number,
-        fileUUID: string,
-        currentParentDirectory: string,
-        targetParentDirectory: string
-    ) {
+    async MoveGroupFile(groupUin: number, fileUUID: string, currentParentDirectory: string, targetParentDirectory: string) {
         const req = trans.MoveGroupFile.build(groupUin, fileUUID, currentParentDirectory, targetParentDirectory);
         const resp = await this.context.client.sendOidbPacket(req, true);
         const res = trans.MoveGroupFile.parse(resp);
@@ -246,7 +174,6 @@ export class PacketOperationContext {
         const res = trans.DownloadGroupFile.parse(resp);
         return `https://${res.download.downloadDns}/ftn_handler/${Buffer.from(res.download.downloadUrl).toString('hex')}/?fname=`;
     }
-
     async GetPrivateFileUrl(self_id: string, fileUUID: string, md5: string) {
         const req = trans.DownloadPrivateFile.build(self_id, fileUUID, md5);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -254,6 +181,13 @@ export class PacketOperationContext {
         return `http://${res.body?.result?.server}:${res.body?.result?.port}${res.body?.result?.url?.slice(8)}&isthumb=0`;
     }
 
+    async GetGroupPttUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
+        const req = trans.DownloadGroupPtt.build(groupUin, node);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadGroupPtt.parse(resp);
+        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
+    }
+
     async GetMiniAppAdaptShareInfo(param: MiniAppReqParams) {
         const req = trans.GetMiniAppAdaptShareInfo.build(param);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -269,17 +203,12 @@ export class PacketOperationContext {
         return res.content.map((item) => {
             return {
                 category: item.category,
-                voices: item.voices,
+                voices: item.voices
             };
         });
     }
 
-    async GetAiVoice(
-        groupUin: number,
-        voiceId: string,
-        text: string,
-        chatType: AIVoiceChatType
-    ): Promise<NapProtoDecodeStructType<typeof MsgInfo>> {
+    async GetAiVoice(groupUin: number, voiceId: string, text: string, chatType: AIVoiceChatType): Promise<NapProtoDecodeStructType<typeof MsgInfo>> {
         let reqTime = 0;
         const reqMaxTime = 30;
         const sessionId = crypto.randomBytes(4).readUInt32BE(0);
@@ -307,7 +236,6 @@ export class PacketOperationContext {
         if (!main?.actionData.msgBody) {
             throw new Error('msgBody is empty');
         }
-        this.context.logger.debug('rawChains ', inflate.toString('hex'));
 
         const messagesPromises = main.actionData.msgBody.map(async (msg) => {
             if (!msg?.body?.richText?.elems) {
@@ -323,12 +251,12 @@ export class PacketOperationContext {
                             const groupUin = msg?.responseHead.grp?.groupUin ?? 0;
                             element.picElement = {
                                 ...element.picElement,
-                                originImageUrl: await this.GetGroupImageUrl(groupUin, index!),
+                                originImageUrl: await this.GetGroupImageUrl(groupUin, index!)
                             };
                         } else {
                             element.picElement = {
                                 ...element.picElement,
-                                originImageUrl: await this.GetImageUrl(this.context.napcore.basicInfo.uid, index!),
+                                originImageUrl: await this.GetImageUrl(this.context.napcore.basicInfo.uid, index!)
                             };
                         }
                         return element;
@@ -341,7 +269,7 @@ export class PacketOperationContext {
                 elements: elements,
                 guildId: '',
                 isOnlineMsg: false,
-                msgId: '7467703692092974645', // TODO: no necessary
+                msgId: '7467703692092974645',  // TODO: no necessary
                 msgRandom: '0',
                 msgSeq: String(msg.contentHead.sequence ?? 0),
                 msgTime: String(msg.contentHead.timeStamp ?? 0),

src/core/packet/message/builder.ts

@@ -24,15 +24,12 @@ export class PacketMsgBuilder {
             }
             return {
                 responseHead: {
-                    fromUin: node.senderUin,
-                    type: 0,
-                    sigMap: 0,
-                    toUin: 0,
                     fromUid: '',
+                    fromUin: node.senderUin,
+                    toUid: node.groupId ? undefined : selfUid,
                     forward: node.groupId ? undefined : {
                         friendName: node.senderName,
                     },
-                    toUid: node.groupId ? undefined : selfUid,
                     grp: node.groupId ? {
                         groupUin: node.groupId,
                         memberName: node.senderName,
@@ -43,13 +40,16 @@ export class PacketMsgBuilder {
                     type: node.groupId ? 82 : 9,
                     subType: node.groupId ? undefined : 4,
                     divSeq: node.groupId ? undefined : 4,
-                    autoReply: 0,
+                    msgId: crypto.randomBytes(4).readUInt32LE(0),
                     sequence: crypto.randomBytes(4).readUInt32LE(0),
                     timeStamp: +node.time.toString().substring(0, 10),
+                    field7: BigInt(1),
+                    field8: 0,
+                    field9: 0,
                     forward: {
                         field1: 0,
                         field2: 0,
-                        field3: node.groupId ? 1 : 2,
+                        field3: node.groupId ? 0 : 2,
                         unknownBase64: avatar,
                         avatar: avatar
                     }

src/core/packet/message/element.ts

@@ -10,7 +10,6 @@ import {
     MsgInfo,
     NotOnlineImage,
     OidbSvcTrpcTcp0XE37_800Response,
-    PushMsgBody,
     QBigFaceExtra,
     QSmallFaceExtra,
 } from '@/core/packet/transformer/proto';
@@ -30,8 +29,7 @@ import {
     SendReplyElement,
     SendMultiForwardMsgElement,
     SendTextElement,
-    SendVideoElement,
-    Peer
+    SendVideoElement
 } from '@/core';
 import {ForwardMsgBuilder} from '@/common/forward-msg-builder';
 import {PacketMsg, PacketSendMsgElement} from '@/core/packet/message/message';
@@ -148,40 +146,41 @@ export class PacketMsgAtElement extends PacketMsgTextElement {
 }
 
 export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
-    time: number;
-    targetMessageId: bigint;
-    targetMessageSeq: number;
-    targetMessageClientSeq: number;
+    messageId: bigint;
+    messageSeq: number;
+    messageClientSeq: number;
     targetUin: number;
     targetUid: string;
-    targetElems?: NapProtoEncodeStructType<typeof Elem>[];
-    targetSourceMsg?: NapProtoEncodeStructType<typeof PushMsgBody>;
-    targetPeer?: Peer;
+    time: number;
+    elems: PacketMsg[];
 
     constructor(element: SendReplyElement) {
         super(element);
-        this.time = +(element.replyElement.replyMsgTime ?? Math.floor(Date.now() / 1000));
-        this.targetMessageId = BigInt(element.replyElement.replayMsgId ?? 0);
-        this.targetMessageSeq = +(element.replyElement.replayMsgSeq ?? 0);
-        this.targetMessageClientSeq = +(element.replyElement.replyMsgClientSeq ?? 0);
+        this.messageId = BigInt(element.replyElement.replayMsgId ?? 0);
+        this.messageSeq = +(element.replyElement.replayMsgSeq ?? 0);
+        this.messageClientSeq = +(element.replyElement.replyMsgClientSeq ?? 0);
         this.targetUin = +(element.replyElement.senderUin ?? 0);
         this.targetUid = element.replyElement.senderUidStr ?? '';
-        this.targetPeer = element.replyElement._replyMsgPeer;
+        this.time = +(element.replyElement.replyMsgTime ?? 0);
+        this.elems = []; // TODO: in replyElement.sourceMsgTextElems
     }
 
     get isGroupReply(): boolean {
-        return this.targetMessageClientSeq === 0;
+        return this.messageClientSeq === 0;
     }
 
     override buildElement(): NapProtoEncodeStructType<typeof Elem>[] {
         return [{
             srcMsg: {
-                origSeqs: [this.isGroupReply ? this.targetMessageSeq : this.targetMessageClientSeq],
+                origSeqs: [this.isGroupReply ? this.messageClientSeq : this.messageSeq],
                 senderUin: BigInt(this.targetUin),
                 time: this.time,
-                elems: this.targetElems ?? [],
-                sourceMsg: new NapProtoMsg(PushMsgBody).encode(this.targetSourceMsg ?? {}),
-                toUin: BigInt(0),
+                elems: [], // TODO: in replyElement.sourceMsgTextElems
+                pbReserve: {
+                    messageId: this.messageId,
+                },
+                toUin: BigInt(this.targetUin),
+                type: 1,
             }
         }];
     }

src/core/packet/transformer/action/SendPoke.ts

@@ -8,13 +8,13 @@ class SendPoke extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase> {
         super();
     }
 
-    build(is_group: boolean, peer: number, target: number): OidbPacket {
-        const payload = {
-            uin: target,
-            ext: 0,
-            ...(is_group ? { groupUin: peer } : { friendUin: peer })
-        };
-        const data = new NapProtoMsg(proto.OidbSvcTrpcTcp0XED3_1).encode(payload);
+    build(peer: number, group?: number): OidbPacket {
+        const data = new NapProtoMsg(proto.OidbSvcTrpcTcp0XED3_1).encode({
+            uin: peer,
+            groupUin: group,
+            friendUin: group ?? peer,
+            ext: 0
+        });
         return OidbBase.build(0xED3, 1, data);
     }
 

src/core/packet/transformer/highway/DownloadGroupVideo.ts

@@ -1,50 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
-import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
-import { IndexNode } from '@/core/packet/transformer/proto';
-
-class DownloadGroupVideo extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
-    constructor() {
-        super();
-    }
-
-    build(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
-        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
-            reqHead: {
-                common: {
-                    requestId: 1,
-                    command: 200
-                },
-                scene: {
-                    requestType: 2,
-                    businessType: 2,
-                    sceneType: 2,
-                    group: {
-                        groupUin: groupUin
-                    }
-                },
-                client: {
-                    agentType: 2,
-                }
-            },
-            download: {
-                node: node,
-                download: {
-                    video: {
-                        busiType: 0,
-                        sceneType: 0
-                    }
-                }
-            }
-        });
-        return OidbBase.build(0x11EA, 200, body, true, false);
-    }
-
-    parse(data: Buffer) {
-        const oidbBody = OidbBase.parse(data).body;
-        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
-    }
-}
-
-export default new DownloadGroupVideo();

src/core/packet/transformer/highway/DownloadPtt.ts

@@ -1,51 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
-import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
-import { IndexNode } from '@/core/packet/transformer/proto';
-
-class DownloadPtt extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
-    constructor() {
-        super();
-    }
-
-    build(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
-        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
-            reqHead: {
-                common: {
-                    requestId: 1,
-                    command: 200
-                },
-                scene: {
-                    requestType: 1,
-                    businessType: 3,
-                    sceneType: 1,
-                    c2C: {
-                        accountType: 2,
-                        targetUid: selfUid
-                    },
-                },
-                client: {
-                    agentType: 2,
-                }
-            },
-            download: {
-                node: node,
-                download: {
-                    video: {
-                        busiType: 0,
-                        sceneType: 0
-                    }
-                }
-            }
-        });
-        return OidbBase.build(0x126D, 200, body, true, false);
-    }
-
-    parse(data: Buffer) {
-        const oidbBody = OidbBase.parse(data).body;
-        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
-    }
-}
-
-export default new DownloadPtt();

src/core/packet/transformer/highway/DownloadVideo.ts

@@ -1,51 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
-import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
-import { IndexNode } from '@/core/packet/transformer/proto';
-
-class DownloadVideo extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
-    constructor() {
-        super();
-    }
-
-    build(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
-        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
-            reqHead: {
-                common: {
-                    requestId: 1,
-                    command: 200
-                },
-                scene: {
-                    requestType: 2,
-                    businessType: 2,
-                    sceneType: 1,
-                    c2C: {
-                        accountType: 2,
-                        targetUid: selfUid
-                    },
-                },
-                client: {
-                    agentType: 2,
-                }
-            },
-            download: {
-                node: node,
-                download: {
-                    video: {
-                        busiType: 0,
-                        sceneType: 0
-                    }
-                }
-            }
-        });
-        return OidbBase.build(0x11E9, 200, body, true, false);
-    }
-
-    parse(data: Buffer) {
-        const oidbBody = OidbBase.parse(data).body;
-        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
-    }
-}
-
-export default new DownloadVideo();

src/core/packet/transformer/highway/index.ts

@@ -13,6 +13,3 @@ export { default as UploadPrivatePtt } from './UploadPrivatePtt';
 export { default as UploadPrivateVideo } from './UploadPrivateVideo';
 export { default as DownloadImage } from './DownloadImage';
 export { default as DownloadGroupImage } from './DownloadGroupImage';
-export { default as DownloadVideo } from './DownloadVideo';
-export { default as DownloadGroupVideo } from './DownloadGroupVideo';
-export { default as DownloadPtt } from './DownloadPtt';

src/core/packet/transformer/message/FetchC2CMessage.ts

@@ -1,27 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
-
-class FetchC2CMessage extends PacketTransformer<typeof proto.SsoGetC2cMsgResponse> {
-    constructor() {
-        super();
-    }
-
-    build(targetUid: string, startSeq: number, endSeq: number): OidbPacket {
-        const req = new NapProtoMsg(proto.SsoGetC2cMsg).encode({
-            friendUid: targetUid,
-            startSequence: startSeq,
-            endSequence: endSeq,
-        });
-        return {
-            cmd: 'trpc.msg.register_proxy.RegisterProxy.SsoGetC2cMsg',
-            data: PacketHexStrBuilder(req)
-        };
-    }
-
-    parse(data: Buffer) {
-        return new NapProtoMsg(proto.SsoGetC2cMsgResponse).decode(data);
-    }
-}
-
-export default new FetchC2CMessage();

src/core/packet/transformer/message/FetchGroupMessage.ts

@@ -1,30 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
-
-class FetchGroupMessage extends PacketTransformer<typeof proto.SsoGetGroupMsgResponse> {
-    constructor() {
-        super();
-    }
-
-    build(groupUin: number, startSeq: number, endSeq: number): OidbPacket {
-        const req = new NapProtoMsg(proto.SsoGetGroupMsg).encode({
-            info: {
-                groupUin: groupUin,
-                startSequence: startSeq,
-                endSequence: endSeq
-            },
-            direction: true
-        });
-        return {
-            cmd: 'trpc.msg.register_proxy.RegisterProxy.SsoGetGroupMsg',
-            data: PacketHexStrBuilder(req)
-        };
-    }
-
-    parse(data: Buffer) {
-        return new NapProtoMsg(proto.SsoGetGroupMsgResponse).decode(data);
-    }
-}
-
-export default new FetchGroupMessage();

src/core/packet/transformer/message/index.ts

@@ -1,4 +1,2 @@
 export { default as UploadForwardMsg } from './UploadForwardMsg';
-export { default as FetchGroupMessage } from './FetchGroupMessage';
-export { default as FetchC2CMessage } from './FetchC2CMessage';
-export { default as DownloadForwardMsg } from './DownloadForwardMsg';
+export { default as DownloadForwardMsg } from './DownloadForwardMsg';

src/core/packet/transformer/oidb/oidbBase.ts

@@ -7,7 +7,7 @@ class OidbBase extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase> {
         super();
     }
 
-    build(cmd: number, subCmd: number, body: Uint8Array, isUid: boolean = true, _isLafter: boolean = false): OidbPacket {
+    build(cmd: number, subCmd: number, body: Uint8Array, isUid: boolean = true, isLafter: boolean = false): OidbPacket {
         const data = new NapProtoMsg(proto.OidbSvcTrpcTcpBase).encode({
             command: cmd,
             subCommand: subCmd,

src/core/packet/transformer/proto/message/message.ts

@@ -13,15 +13,13 @@ import {
 export const ContentHead = {
     type: ProtoField(1, ScalarType.UINT32),
     subType: ProtoField(2, ScalarType.UINT32, true),
-    c2cCmd: ProtoField(3, ScalarType.UINT32, true),
-    ranDom: ProtoField(4, ScalarType.UINT32, true),
+    divSeq: ProtoField(3, ScalarType.UINT32, true),
+    msgId: ProtoField(4, ScalarType.UINT32, true),
     sequence: ProtoField(5, ScalarType.UINT32, true),
     timeStamp: ProtoField(6, ScalarType.UINT32, true),
-    pkgNum: ProtoField(7, ScalarType.UINT64, true),
-    pkgIndex: ProtoField(8, ScalarType.UINT32, true),
-    divSeq: ProtoField(9, ScalarType.UINT32, true),
-    autoReply: ProtoField(10, ScalarType.UINT32),
-    ntMsgSeq: ProtoField(10, ScalarType.UINT32, true),
+    field7: ProtoField(7, ScalarType.UINT64, true),
+    field8: ProtoField(8, ScalarType.UINT32, true),
+    field9: ProtoField(9, ScalarType.UINT32, true),
     newId: ProtoField(12, ScalarType.UINT64, true),
     forward: ProtoField(15, () => ForwardHead, true),
 };

src/core/packet/transformer/proto/misc/fileid.ts

@@ -1,6 +0,0 @@
-import { ProtoField, ScalarType } from '@napneko/nap-proto-core';
-
-export const FileId = {
-    appid: ProtoField(4, ScalarType.UINT32, true),
-    ttl: ProtoField(10, ScalarType.UINT32, true),
-};

src/core/services/NodeIKernelGroupService.ts

@@ -8,22 +8,10 @@ import {
     GroupNotifyMsgType,
     NTGroupRequestOperateTypes,
     KickMemberV2Req,
-    GroupDetailInfoV2Param,
-    GroupExtInfo,
-    GroupExtFilter,
 } from '@/core/types';
 import { GeneralCallResult } from '@/core/services/common';
 
 export interface NodeIKernelGroupService {
-
-    modifyGroupExtInfoV2(groupExtInfo: GroupExtInfo, groupExtFilter: GroupExtFilter): Promise<GeneralCallResult &
-    {
-        result: {
-            groupCode: string,
-            result: number
-        }
-    }>;
-
     // --->
     // 待启用 For Next Version 3.2.0
     // isTroopMember ? 0 : 111
@@ -181,9 +169,6 @@ export interface NodeIKernelGroupService {
 
     modifyGroupDetailInfo(groupCode: string, arg: unknown): void;
 
-    // 第二个参数在大多数情况为0 设置群成员权限 例如上传群文件权限和群成员付费/加入邀请加入时为8
-    modifyGroupDetailInfoV2(param: GroupDetailInfoV2Param, arg: number): Promise<GeneralCallResult>;
-
     setGroupMsgMask(groupCode: string, arg: unknown): void;
 
     changeGroupShieldSettingTemp(groupCode: string, arg: unknown): void;
@@ -264,7 +249,7 @@ export interface NodeIKernelGroupService {
 
     reqToJoinGroup(groupCode: string, arg: unknown): void;
 
-    setGroupShutUp(groupCode: string, shutUp: boolean): Promise<GeneralCallResult>;
+    setGroupShutUp(groupCode: string, shutUp: boolean): void;
 
     getGroupShutUpMemberList(groupCode: string): Promise<GeneralCallResult>;
 

src/core/services/NodeIKernelMsgService.ts

@@ -148,11 +148,10 @@ export interface NodeIKernelMsgService {
         msgList: RawMessage[]
     }>;
 
-    // getMsgService/getMsgs { chatType: 2, peerUid: '975206796', privilegeFlag: 336068800 } 0 20 true
-    getMsgs(peer: Peer & { privilegeFlag: number }, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
-        msgList: RawMessage[]
-    }>;
+    //@deprecated
+    getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>;
 
+    //@deprecated
     getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
         msgList: RawMessage[]
     }>;

src/core/types/element.ts

@@ -1,15 +1,4 @@
-import {
-    ElementType,
-    MessageElement,
-    NTGrayTipElementSubTypeV2,
-    PicSubType,
-    PicType,
-    TipAioOpGrayTipElement,
-    TipGroupElement,
-    NTVideoType,
-    FaceType,
-    Peer
-} from './msg';
+import { ElementType, MessageElement, NTGrayTipElementSubTypeV2, PicSubType, PicType, TipAioOpGrayTipElement, TipGroupElement, NTVideoType, FaceType } from './msg';
 
 type ElementFullBase = Omit<MessageElement, 'elementType' | 'elementId' | 'extBufForUI'>;
 
@@ -58,7 +47,6 @@ export interface GrayTipRovokeElement {
     operatorUid: string;
     operatorNick: string;
     operatorRemark: string;
-    isSelfOperate: boolean; // 是否是自己撤回的
     operatorMemRemark?: string;
     wording: string;  // 自定义的撤回提示语
 }
@@ -225,9 +213,6 @@ export interface ReplyElement {
     senderUidStr?: string;
     replyMsgTime?: string;
     replyMsgClientSeq?: string;
-    // HACK: Attributes that were not originally available,
-    // but were added due to NTQQ and NapCat's internal implementation, are used to supplement NapCat
-    _replyMsgPeer?: Peer;
 }
 
 export interface CalendarElement {

src/core/types/group.ts

@@ -1,97 +1,4 @@
 import { QQLevel, NTSex } from './user';
-export interface GroupExtInfo {
-    groupCode: string;
-    resultCode: number;
-    extInfo: EXTInfo;
-}
-export interface GroupExtFilter {
-    groupInfoExtSeq: number;
-    reserve: number;
-    luckyWordId: number;
-    lightCharNum: number;
-    luckyWord: number;
-    starId: number;
-    essentialMsgSwitch: number;
-    todoSeq: number;
-    blacklistExpireTime: number;
-    isLimitGroupRtc: number;
-    companyId: number;
-    hasGroupCustomPortrait: number;
-    bindGuildId: number;
-    groupOwnerId: number;
-    essentialMsgPrivilege: number;
-    msgEventSeq: number;
-    inviteRobotSwitch: number;
-    gangUpId: number;
-    qqMusicMedalSwitch: number;
-    showPlayTogetherSwitch: number;
-    groupFlagPro1: number;
-    groupBindGuildIds: number;
-    viewedMsgDisappearTime: number;
-    groupExtFlameData: number;
-    groupBindGuildSwitch: number;
-    groupAioBindGuildId: number;
-    groupExcludeGuildIds: number;
-    fullGroupExpansionSwitch: number;
-    fullGroupExpansionSeq: number;
-    inviteRobotMemberSwitch: number;
-    inviteRobotMemberExamine: number;
-    groupSquareSwitch: number;
-};
-
-export interface EXTInfo {
-    groupInfoExtSeq: number;
-    reserve: number;
-    luckyWordId: string;
-    lightCharNum: number;
-    luckyWord: string;
-    starId: number;
-    essentialMsgSwitch: number;
-    todoSeq: number;
-    blacklistExpireTime: number;
-    isLimitGroupRtc: number;
-    companyId: number;
-    hasGroupCustomPortrait: number;
-    bindGuildId: string;
-    groupOwnerId: GroupOwnerID;
-    essentialMsgPrivilege: number;
-    msgEventSeq: string;
-    inviteRobotSwitch: number;
-    gangUpId: string;
-    qqMusicMedalSwitch: number;
-    showPlayTogetherSwitch: number;
-    groupFlagPro1: string;
-    groupBindGuildIds: GroupGuildIDS;
-    viewedMsgDisappearTime: string;
-    groupExtFlameData: GroupEXTFlameData;
-    groupBindGuildSwitch: number;
-    groupAioBindGuildId: string;
-    groupExcludeGuildIds: GroupGuildIDS;
-    fullGroupExpansionSwitch: number;
-    fullGroupExpansionSeq: string;
-    inviteRobotMemberSwitch: number;
-    inviteRobotMemberExamine: number;
-    groupSquareSwitch: number;
-}
-
-export interface GroupGuildIDS {
-    guildIds: any[];
-}
-
-export interface GroupEXTFlameData {
-    switchState: number;
-    state: number;
-    dayNums: any[];
-    version: number;
-    updateTime: string;
-    isDisplayDayNum: boolean;
-}
-
-export interface GroupOwnerID {
-    memberUin: string;
-    memberUid: string;
-    memberQid: string;
-}
 
 export interface KickMemberInfo {
     optFlag: number;
@@ -100,185 +7,6 @@ export interface KickMemberInfo {
     optBytesMsg: string;
 }
 
-
-export interface GroupDetailInfoV2Param {
-    groupCode: string;
-    filter: Filter;
-    modifyInfo: ModifyInfo;
-}
-
-export interface Filter {
-    noCodeFingerOpenFlag: number;
-    noFingerOpenFlag: number;
-    groupName: number;
-    classExt: number;
-    classText: number;
-    fingerMemo: number;
-    richFingerMemo: number;
-    tagRecord: number;
-    groupGeoInfo: FilterGroupGeoInfo;
-    groupExtAdminNum: number;
-    flag: number;
-    groupMemo: number;
-    groupAioSkinUrl: number;
-    groupBoardSkinUrl: number;
-    groupCoverSkinUrl: number;
-    groupGrade: number;
-    activeMemberNum: number;
-    certificationType: number;
-    certificationText: number;
-    groupNewGuideLines: FilterGroupNewGuideLines;
-    groupFace: number;
-    addOption: number;
-    shutUpTime: number;
-    groupTypeFlag: number;
-    appPrivilegeFlag: number;
-    appPrivilegeMask: number;
-    groupExtOnly: GroupEXTOnly;
-    groupSecLevel: number;
-    groupSecLevelInfo: number;
-    subscriptionUin: number;
-    subscriptionUid: string;
-    allowMemberInvite: number;
-    groupQuestion: number;
-    groupAnswer: number;
-    groupFlagExt3: number;
-    groupFlagExt3Mask: number;
-    groupOpenAppid: number;
-    rootId: number;
-    msgLimitFrequency: number;
-    hlGuildAppid: number;
-    hlGuildSubType: number;
-    hlGuildOrgId: number;
-    groupFlagExt4: number;
-    groupFlagExt4Mask: number;
-    groupSchoolInfo: FilterGroupSchoolInfo;
-    groupCardPrefix: FilterGroupCardPrefix;
-    allianceId: number;
-    groupFlagPro1: number;
-    groupFlagPro1Mask: number;
-}
-
-export interface FilterGroupCardPrefix {
-    introduction: number;
-    rptPrefix: number;
-}
-
-export interface GroupEXTOnly {
-    tribeId: number;
-    moneyForAddGroup: number;
-}
-
-export interface FilterGroupGeoInfo {
-    ownerUid: number;
-    setTime: number;
-    cityId: number;
-    longitude: number;
-    latitude: number;
-    geoContent: number;
-    poiId: number;
-}
-
-export interface FilterGroupNewGuideLines {
-    enabled: number;
-    content: number;
-}
-
-export interface FilterGroupSchoolInfo {
-    location: number;
-    grade: number;
-    school: number;
-}
-
-export interface ModifyInfo {
-    noCodeFingerOpenFlag: number;
-    noFingerOpenFlag: number;
-    groupName: string;
-    classExt: number;
-    classText: string;
-    fingerMemo: string;
-    richFingerMemo: string;
-    tagRecord: any[];
-    groupGeoInfo: ModifyInfoGroupGeoInfo;
-    groupExtAdminNum: number;
-    flag: number;
-    groupMemo: string;
-    groupAioSkinUrl: string;
-    groupBoardSkinUrl: string;
-    groupCoverSkinUrl: string;
-    groupGrade: number;
-    activeMemberNum: number;
-    certificationType: number;
-    certificationText: string;
-    groupNewGuideLines: ModifyInfoGroupNewGuideLines;
-    groupFace: number;
-    addOption: number;// 0 空设置 1 任何人都可以进入 2 需要管理员批准 3 不允许任何人入群 4 问题进入答案 5 问题管理员批准
-    shutUpTime: number;
-    groupTypeFlag: number;
-    appPrivilegeFlag: number;
-    // 需要管理员审核
-    // 0000 0000 0000 0000 0000 0000 0000
-    // 无需审核入群
-    // 0000 0001 0000 0000 0000 0000 0000
-    // 成员数100内无审核
-    // 0100 0000 0000 0000 0000 0000 0000
-    // 禁用 群成员邀请好友
-    // 0100 0000 0000 0000 0000 0000 0000
-
-    appPrivilegeMask: number;
-    // 0110 0001 0000 0000 0000 0000 0000
-    // 101711872
-    groupExtOnly: GroupEXTOnly;
-    groupSecLevel: number;
-    groupSecLevelInfo: number;
-    subscriptionUin: string;
-    subscriptionUid: string;
-    allowMemberInvite: number;
-    groupQuestion: string;
-    groupAnswer: string;
-    groupFlagExt3: number;
-    groupFlagExt3Mask: number;
-    groupOpenAppid: number;
-    rootId: string;
-    msgLimitFrequency: number;
-    hlGuildAppid: number;
-    hlGuildSubType: number;
-    hlGuildOrgId: number;
-    groupFlagExt4: number;
-    groupFlagExt4Mask: number;
-    groupSchoolInfo: ModifyInfoGroupSchoolInfo;
-    groupCardPrefix: ModifyInfoGroupCardPrefix;
-    allianceId: string;
-    groupFlagPro1: number;
-    groupFlagPro1Mask: number;
-}
-
-export interface ModifyInfoGroupCardPrefix {
-    introduction: string;
-    rptPrefix: any[];
-}
-
-export interface ModifyInfoGroupGeoInfo {
-    ownerUid: string;
-    SetTime: number;
-    CityId: number;
-    Longitude: string;
-    Latitude: string;
-    GeoContent: string;
-    poiId: string;
-}
-
-export interface ModifyInfoGroupNewGuideLines {
-    enabled: boolean;
-    content: string;
-}
-
-export interface ModifyInfoGroupSchoolInfo {
-    location: string;
-    grade: number;
-    school: string;
-}
-
 // 获取群详细信息的来源类型
 export enum GroupInfoSource {
     KUNSPECIFIED,

src/core/types/msg.ts

@@ -403,7 +403,7 @@ export interface NTGroupGrayMember {
 }
 /**
  * 群灰色提示邀请者和被邀请者接口
- *
+ * 
  * */
 export interface NTGroupGrayInviterAndInvite {
     invited: NTGroupGrayMember;
@@ -501,15 +501,13 @@ export interface RawMessage {
     elements: MessageElement[];// 消息元素
     sourceType: MsgSourceType;// 消息来源类型
     isOnlineMsg: boolean;// 是否为在线消息
-    clientSeq?: string;
 }
 
 /**
  * 查询消息参数接口
  */
 export interface QueryMsgsParams {
-    chatInfo: Peer & { privilegeFlag?: number };
-    //searchFields: number;
+    chatInfo: Peer;
     filterMsgType: Array<{ type: NTMsgType, subType: Array<number> }>;
     filterSendersUid: string[];
     filterMsgFromTime: string;
@@ -567,4 +565,4 @@ export enum FaceType {
     AniSticke = 3,  // 动画贴纸
     Lottie = 4,// 新格式表情
     Poke = 5  // 可变Poke
-}
+}

src/core/types/notify.ts

@@ -132,26 +132,18 @@ export enum BuddyReqType {
     KMEINITIATORWAITPEERCONFIRM = 13
 }
 
-// 其中 ? 代表新版本参数
 export interface FriendRequest {
+    isBuddy?: boolean;
     isInitiator?: boolean;
     isDecide: boolean;
     friendUid: string;
     reqType: BuddyReqType,
     reqTime: string;  // 时间戳 秒
-    flag?: number;  // 0
-    preGroupingId?: number;  // 0
-    commFriendNum?: number;  // 共同好友数
     extWords: string;  // 申请人填写的验证消息
     isUnread: boolean;
-    isDoubt?: boolean;  // 是否是可疑的好友请求
-    nameMore?: string;
     friendNick: string;
     sourceId: number;
-    groupCode: string;
-    isBuddy?: boolean;
-    isAgreed?: boolean;
-    relation?: number;
+    groupCode: string
 }
 
 export interface FriendRequestNotify {

src/framework/napcat.ts

@@ -48,12 +48,6 @@ export async function NCoreInitFramework(
         });
     }
     //直到登录成功后，执行下一步
-    // const selfInfo = {
-    //     uid: 'u_FUSS0_x06S_9Tf4na_WpUg',
-    //     uin: '3684714082',
-    //     nick: '',
-    //     online: true
-    // }
     const selfInfo = await new Promise<SelfInfo>((resolveSelfInfo) => {
         const loginListener = new NodeIKernelLoginListener();
         loginListener.onQRCodeLoginSucceed = async (loginResult) => {

src/framework/nativeLoader.cjs

@@ -1,26 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-async function initializeNapCat(session, loginService, registerCallback) {
-    //const logFile = path.join(currentPath, 'napcat.log');
-
-    console.log('[NapCat] [Info] 开始初始化NapCat');
-
-    //fs.writeFileSync(logFile, '', { flag: 'w' });
-
-    //fs.writeFileSync(logFile, '[NapCat] [Info] NapCat 初始化成功\n', { flag: 'a' });
-
-    try {
-        const currentPath = path.dirname(__filename);
-        const { NCoreInitFramework } = await import('file://' + path.join(currentPath, './napcat.mjs'));
-        await NCoreInitFramework(session, loginService, (callback) => { registerCallback(callback) });
-
-    } catch (error) {
-        console.log('[NapCat] [Error] 初始化NapCat', error);
-        //fs.writeFileSync(logFile, `[NapCat] [Error] 初始化NapCat失败: ${error.message}\n`, { flag: 'a' });
-    }
-}
-
-module.exports = {
-    initializeNapCat: initializeNapCat
-};

src/image-size/index.ts

@@ -1,426 +0,0 @@
-import * as fs from 'fs';
-import { ReadStream } from 'fs';
-
-export interface ImageSize {
-    width: number;
-    height: number;
-}
-
-export enum ImageType {
-    JPEG = 'jpeg',
-    PNG = 'png',
-    BMP = 'bmp',
-    GIF = 'gif',
-    WEBP = 'webp',
-    UNKNOWN = 'unknown',
-}
-
-interface ImageParser {
-    readonly type: ImageType;
-    canParse(buffer: Buffer): boolean;
-    parseSize(stream: ReadStream): Promise<ImageSize | undefined>;
-}
-
-// 魔术匹配
-function matchMagic(buffer: Buffer, magic: number[], offset = 0): boolean {
-    if (buffer.length < offset + magic.length) {
-        return false;
-    }
-
-    for (let i = 0; i < magic.length; i++) {
-        if (buffer[offset + i] !== magic[i]) {
-            return false;
-        }
-    }
-    return true;
-}
-
-// PNG解析器
-class PngParser implements ImageParser {
-    readonly type = ImageType.PNG;
-    // PNG 魔术头：89 50 4E 47 0D 0A 1A 0A
-    private readonly PNG_SIGNATURE = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A];
-
-    canParse(buffer: Buffer): boolean {
-        return matchMagic(buffer, this.PNG_SIGNATURE);
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise((resolve, reject) => {
-            stream.once('error', reject);
-            stream.once('readable', () => {
-                const buf = stream.read(24) as Buffer;
-                if (!buf || buf.length < 24) {
-                    return resolve(undefined);
-                }
-                if (this.canParse(buf)) {
-                    const width = buf.readUInt32BE(16);
-                    const height = buf.readUInt32BE(20);
-                    resolve({ width, height });
-                } else {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-// JPEG解析器
-class JpegParser implements ImageParser {
-    readonly type = ImageType.JPEG;
-    // JPEG 魔术头：FF D8
-    private readonly JPEG_SIGNATURE = [0xFF, 0xD8];
-
-    // JPEG标记常量
-    private readonly SOF_MARKERS = {
-        SOF0: 0xC0, // 基线DCT
-        SOF1: 0xC1, // 扩展顺序DCT
-        SOF2: 0xC2, // 渐进式DCT
-        SOF3: 0xC3, // 无损
-    } as const;
-
-    // 非SOF标记
-    private readonly NON_SOF_MARKERS: number[] = [
-        0xC4, // DHT
-        0xC8, // JPEG扩展
-        0xCC, // DAC
-    ] as const;
-
-    canParse(buffer: Buffer): boolean {
-        return matchMagic(buffer, this.JPEG_SIGNATURE);
-    }
-
-    isSOFMarker(marker: number): boolean {
-        return (
-            marker === this.SOF_MARKERS.SOF0 ||
-            marker === this.SOF_MARKERS.SOF1 ||
-            marker === this.SOF_MARKERS.SOF2 ||
-            marker === this.SOF_MARKERS.SOF3
-        );
-    }
-
-    isNonSOFMarker(marker: number): boolean {
-        return this.NON_SOF_MARKERS.includes(marker);
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise<ImageSize | undefined>((resolve, reject) => {
-            const BUFFER_SIZE = 1024; // 读取块大小，可以根据需要调整
-            let buffer = Buffer.alloc(0);
-            let offset = 0;
-            let found = false;
-
-            // 处理错误
-            stream.on('error', (err) => {
-                stream.destroy();
-                reject(err);
-            });
-
-            // 处理数据块
-            stream.on('data', (chunk: Buffer | string) => {
-                // 追加新数据到缓冲区
-                const chunkBuffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-                buffer = Buffer.concat([buffer.subarray(offset), chunkBuffer]);
-                offset = 0;
-
-                // 保持缓冲区在合理大小内，只保留最后的部分用于跨块匹配
-                const bufferSize = buffer.length;
-                const MIN_REQUIRED_BYTES = 10; // SOF段最低字节数
-
-                // 从JPEG头部后开始扫描
-                while (offset < bufferSize - MIN_REQUIRED_BYTES) {
-                    // 寻找FF标记
-                    if (buffer[offset] === 0xFF && buffer[offset + 1]! >= 0xC0 && buffer[offset + 1]! <= 0xCF) {
-                        const marker = buffer[offset + 1];
-                        if (!marker) {
-                            break;
-                        }
-                        // 跳过非SOF标记
-                        if (this.isNonSOFMarker(marker)) {
-                            offset += 2;
-                            continue;
-                        }
-
-                        // 处理SOF标记 (包含尺寸信息)
-                        if (this.isSOFMarker(marker)) {
-                            // 确保缓冲区中有足够数据读取尺寸
-                            if (offset + 9 < bufferSize) {
-                                // 解析尺寸: FF XX YY YY PP HH HH WW WW ...
-                                // XX = 标记, YY YY = 段长度, PP = 精度, HH HH = 高, WW WW = 宽
-                                const height = buffer.readUInt16BE(offset + 5);
-                                const width = buffer.readUInt16BE(offset + 7);
-
-                                found = true;
-                                stream.destroy();
-                                resolve({ width, height });
-                                return;
-                            } else {
-                                // 如果缓冲区内数据不够，保留当前位置等待更多数据
-                                break;
-                            }
-                        }
-                    }
-
-                    offset++;
-                }
-
-                // 缓冲区管理: 如果处理了许多数据但没找到标记，
-                // 保留最后N字节用于跨块匹配，丢弃之前的数据
-                if (offset > BUFFER_SIZE) {
-                    const KEEP_BYTES = 20; // 保留足够数据以处理跨块边界的情况
-                    if (offset > KEEP_BYTES) {
-                        buffer = buffer.subarray(offset - KEEP_BYTES);
-                        offset = KEEP_BYTES;
-                    }
-                }
-            });
-
-            // 处理流结束
-            stream.on('end', () => {
-                if (!found) {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-// BMP解析器
-class BmpParser implements ImageParser {
-    readonly type = ImageType.BMP;
-    // BMP 魔术头：42 4D (BM)
-    private readonly BMP_SIGNATURE = [0x42, 0x4D];
-
-    canParse(buffer: Buffer): boolean {
-        return matchMagic(buffer, this.BMP_SIGNATURE);
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise((resolve, reject) => {
-            stream.once('error', reject);
-            stream.once('readable', () => {
-                const buf = stream.read(26) as Buffer;
-                if (!buf || buf.length < 26) {
-                    return resolve(undefined);
-                }
-                if (this.canParse(buf)) {
-                    const width = buf.readUInt32LE(18);
-                    const height = buf.readUInt32LE(22);
-                    resolve({ width, height });
-                } else {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-// GIF解析器
-class GifParser implements ImageParser {
-    readonly type = ImageType.GIF;
-    // GIF87a 魔术头：47 49 46 38 37 61
-    private readonly GIF87A_SIGNATURE = [0x47, 0x49, 0x46, 0x38, 0x37, 0x61];
-    // GIF89a 魔术头：47 49 46 38 39 61
-    private readonly GIF89A_SIGNATURE = [0x47, 0x49, 0x46, 0x38, 0x39, 0x61];
-
-    canParse(buffer: Buffer): boolean {
-        return (
-            matchMagic(buffer, this.GIF87A_SIGNATURE) ||
-            matchMagic(buffer, this.GIF89A_SIGNATURE)
-        );
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise((resolve, reject) => {
-            stream.once('error', reject);
-            stream.once('readable', () => {
-                const buf = stream.read(10) as Buffer;
-                if (!buf || buf.length < 10) {
-                    return resolve(undefined);
-                }
-                if (this.canParse(buf)) {
-                    const width = buf.readUInt16LE(6);
-                    const height = buf.readUInt16LE(8);
-                    resolve({ width, height });
-                } else {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-// WEBP解析器 - 完整支持VP8, VP8L, VP8X格式
-class WebpParser implements ImageParser {
-    readonly type = ImageType.WEBP;
-    // WEBP RIFF 头：52 49 46 46 (RIFF)
-    private readonly RIFF_SIGNATURE = [0x52, 0x49, 0x46, 0x46];
-    // WEBP 魔术头：57 45 42 50 (WEBP)
-    private readonly WEBP_SIGNATURE = [0x57, 0x45, 0x42, 0x50];
-
-    // WEBP 块头
-    private readonly CHUNK_VP8 = [0x56, 0x50, 0x38, 0x20];  // "VP8 "
-    private readonly CHUNK_VP8L = [0x56, 0x50, 0x38, 0x4C]; // "VP8L"
-    private readonly CHUNK_VP8X = [0x56, 0x50, 0x38, 0x58]; // "VP8X"
-
-    canParse(buffer: Buffer): boolean {
-        return (
-            buffer.length >= 12 &&
-            matchMagic(buffer, this.RIFF_SIGNATURE, 0) &&
-            matchMagic(buffer, this.WEBP_SIGNATURE, 8)
-        );
-    }
-
-    isChunkType(buffer: Buffer, offset: number, chunkType: number[]): boolean {
-        return buffer.length >= offset + 4 && matchMagic(buffer, chunkType, offset);
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise((resolve, reject) => {
-            // 需要读取足够的字节来检测所有三种格式
-            const MAX_HEADER_SIZE = 32;
-            let totalBytes = 0;
-            let buffer = Buffer.alloc(0);
-
-            stream.on('error', reject);
-
-            stream.on('data', (chunk: Buffer | string) => {
-                const chunkBuffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-                buffer = Buffer.concat([buffer, chunkBuffer]);
-                totalBytes += chunk.length;
-
-                // 检查是否有足够的字节进行格式检测
-                if (totalBytes >= MAX_HEADER_SIZE) {
-                    stream.destroy();
-
-                    // 检查基本的WEBP签名
-                    if (!this.canParse(buffer)) {
-                        return resolve(undefined);
-                    }
-
-                    // 检查chunk头部，位于字节12-15
-                    if (this.isChunkType(buffer, 12, this.CHUNK_VP8)) {
-                        // VP8格式 - 标准WebP
-                        // 宽度和高度在帧头中
-                        const width = buffer.readUInt16LE(26) & 0x3FFF;
-                        const height = buffer.readUInt16LE(28) & 0x3FFF;
-                        return resolve({ width, height });
-
-                    } else if (this.isChunkType(buffer, 12, this.CHUNK_VP8L)) {
-                        // VP8L格式 - 无损WebP
-                        // 1字节标记后是14位宽度和14位高度
-                        const bits = buffer.readUInt32LE(21);
-                        const width = 1 + (bits & 0x3FFF);
-                        const height = 1 + ((bits >> 14) & 0x3FFF);
-                        return resolve({ width, height });
-
-                    } else if (this.isChunkType(buffer, 12, this.CHUNK_VP8X)) {
-                        // VP8X格式 - 扩展WebP
-                        // 24位宽度和高度(减去1)
-                        if (!buffer[24] || !buffer[25] || !buffer[26] || !buffer[27] || !buffer[28] || !buffer[29]) {
-                            return resolve(undefined);
-                        }
-                        const width = 1 + ((buffer[24] | (buffer[25] << 8) | (buffer[26] << 16)) & 0xFFFFFF);
-                        const height = 1 + ((buffer[27] | (buffer[28] << 8) | (buffer[29] << 16)) & 0xFFFFFF);
-                        return resolve({ width, height });
-                    } else {
-                        // 未知的WebP子格式
-                        return resolve(undefined);
-                    }
-                }
-            });
-
-            stream.on('end', () => {
-                // 如果没有读到足够的字节
-                if (totalBytes < MAX_HEADER_SIZE) {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-const parsers: ReadonlyArray<ImageParser> = [
-    new PngParser(),
-    new JpegParser(),
-    new BmpParser(),
-    new GifParser(),
-    new WebpParser(),
-];
-
-export async function detectImageType(filePath: string): Promise<ImageType> {
-    return new Promise((resolve, reject) => {
-        const stream = fs.createReadStream(filePath, {
-            highWaterMark: 64, // 优化读取buffer大小
-            start: 0,
-            end: 63
-        });
-
-        let buffer: Buffer | null = null;
-
-        stream.once('error', (err) => {
-            stream.destroy();
-            reject(err);
-        });
-
-        stream.once('readable', () => {
-            buffer = stream.read(64) as Buffer;
-            stream.destroy();
-
-            if (!buffer) {
-                return resolve(ImageType.UNKNOWN);
-            }
-
-            for (const parser of parsers) {
-                if (parser.canParse(buffer)) {
-                    return resolve(parser.type);
-                }
-            }
-
-            resolve(ImageType.UNKNOWN);
-        });
-
-        stream.once('end', () => {
-            if (!buffer) {
-                resolve(ImageType.UNKNOWN);
-            }
-        });
-    });
-}
-
-export async function imageSizeFromFile(filePath: string): Promise<ImageSize | undefined> {
-    try {
-        // 先检测类型
-        const type = await detectImageType(filePath);
-        const parser = parsers.find(p => p.type === type);
-        if (!parser) {
-            return undefined;
-        }
-
-        // 用流式方式解析尺寸
-        const stream = fs.createReadStream(filePath);
-        try {
-            return await parser.parseSize(stream);
-        } catch (err) {
-            console.error(`解析图片尺寸出错: ${err}`);
-            return undefined;
-        } finally {
-            if (!stream.destroyed) {
-                stream.destroy();
-            }
-        }
-    } catch (err) {
-        console.error(`检测图片类型出错: ${err}`);
-        return undefined;
-    }
-}
-
-export async function imageSizeFallBack(
-    filePath: string,
-    fallback: ImageSize = {
-        width: 1024,
-        height: 1024,
-    }
-): Promise<ImageSize> {
-    return await imageSizeFromFile(filePath) ?? fallback;
-}

src/onebot/action/extends/SetGroupAddOption.ts

@@ -1,28 +0,0 @@
-import { OneBotAction } from '@/onebot/action/OneBotAction';
-import { ActionName } from '@/onebot/action/router';
-import { Static, Type } from '@sinclair/typebox';
-
-const SchemaData = Type.Object({
-    group_id: Type.String(),
-    add_type: Type.Number(),
-    group_question: Type.Optional(Type.String()),
-    group_answer: Type.Optional(Type.String()),
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export default class SetGroupAddOption extends OneBotAction<Payload, null> {
-    override actionName = ActionName.SetGroupAddOption;
-    override payloadSchema = SchemaData;
-    async _handle(payload: Payload): Promise<null> {
-        let ret = await this.core.apis.GroupApi.setGroupAddOption(payload.group_id, {
-            addOption: payload.add_type,
-            groupQuestion: payload.group_question,
-            groupAnswer: payload.group_answer,
-        });
-        if (ret.result != 0) {
-            throw new Error(`设置群添加选项失败, ${ret.result}:${ret.errMsg}`);
-        }
-        return null;
-    }
-}

src/onebot/action/extends/SetGroupKickMembers.ts

@@ -1,23 +0,0 @@
-import { OneBotAction } from '@/onebot/action/OneBotAction';
-import { ActionName } from '@/onebot/action/router';
-import { Static, Type } from '@sinclair/typebox';
-
-const SchemaData = Type.Object({
-    group_id: Type.String(),
-    user_id: Type.Array(Type.String()),
-    reject_add_request: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export default class SetGroupKickMembers extends OneBotAction<Payload, null> {
-    override actionName = ActionName.SetGroupKickMembers;
-    override payloadSchema = SchemaData;
-
-    async _handle(payload: Payload): Promise<null> {
-        const rejectReq = payload.reject_add_request?.toString() == 'true';
-        const uids: string[] = await Promise.all(payload.user_id.map(async uin => await this.core.apis.UserApi.getUidByUinV2(uin)));
-        await this.core.apis.GroupApi.kickMember(payload.group_id.toString(), uids.filter(uid => !!uid), rejectReq);
-        return null;
-    }
-}

src/onebot/action/extends/SetGroupRobotAddOption.ts

@@ -1,27 +0,0 @@
-import { OneBotAction } from '@/onebot/action/OneBotAction';
-import { ActionName } from '@/onebot/action/router';
-import { Static, Type } from '@sinclair/typebox';
-
-const SchemaData = Type.Object({
-    group_id: Type.String(),
-    robot_member_switch: Type.Optional(Type.Number()),
-    robot_member_examine: Type.Optional(Type.Number()),
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export default class SetGroupRobotAddOption extends OneBotAction<Payload, null> {
-    override actionName = ActionName.SetGroupRobotAddOption;
-    override payloadSchema = SchemaData;
-    async _handle(payload: Payload): Promise<null> {
-        let ret = await this.core.apis.GroupApi.setGroupRobotAddOption(
-            payload.group_id,
-            payload.robot_member_switch,
-            payload.robot_member_examine,
-        );
-        if (ret.result != 0) {
-            throw new Error(`设置群机器人添加选项失败, ${ret.result}:${ret.errMsg}`);
-        }
-        return null;
-    }
-}

src/onebot/action/extends/SetGroupSearch.ts

@@ -1,26 +0,0 @@
-import { OneBotAction } from '@/onebot/action/OneBotAction';
-import { ActionName } from '@/onebot/action/router';
-import { Static, Type } from '@sinclair/typebox';
-
-const SchemaData = Type.Object({
-    group_id: Type.String(),
-    no_code_finger_open: Type.Optional(Type.Number()),
-    no_finger_open: Type.Optional(Type.Number()),
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export default class SetGroupSearch extends OneBotAction<Payload, null> {
-    override actionName = ActionName.SetGroupSearch;
-    override payloadSchema = SchemaData;
-    async _handle(payload: Payload): Promise<null> {
-        let ret = await this.core.apis.GroupApi.setGroupSearch(payload.group_id, {
-            noCodeFingerOpenFlag: payload.no_code_finger_open,
-            noFingerOpenFlag: payload.no_finger_open,
-        });
-        if (ret.result != 0) {
-            throw new Error(`设置群搜索失败, ${ret.result}:${ret.errMsg}`);
-        }
-        return null;
-    }
-}

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

@@ -4,10 +4,7 @@ import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
     group_id: Type.Union([Type.Number(), Type.String()]),
-    // 兼容gocq 与name二选一
-    folder_name: Type.Optional(Type.String()),
-    // 兼容gocq 与folder_name二选一
-    name: Type.Optional(Type.String()),
+    folder_name: Type.String(),
 });
 
 type Payload = Static<typeof SchemaData>;
@@ -19,7 +16,6 @@ export class CreateGroupFileFolder extends  OneBotAction<Payload, ResponseType>
     override actionName = ActionName.GoCQHTTP_CreateGroupFileFolder;
     override payloadSchema = SchemaData;
     async _handle(payload: Payload) {
-        const folderName = payload.folder_name || payload.name;
-        return (await this.core.apis.GroupApi.creatGroupFileFolder(payload.group_id.toString(), folderName!)).resultWithGroupItem;
+        return (await this.core.apis.GroupApi.creatGroupFileFolder(payload.group_id.toString(), payload.folder_name)).resultWithGroupItem;
     }
 }

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

@@ -1,4 +1,4 @@
-import { ContextMode, normalize, ReturnDataType, SendMsgBase } from '@/onebot/action/msg/SendMsg';
+import { normalize, SendMsgBase } from '@/onebot/action/msg/SendMsg';
 import { OB11PostSendMsg } from '@/onebot/types';
 import { ActionName } from '@/onebot/action/router';
 
@@ -19,14 +19,8 @@ export class GoCQHTTPSendForwardMsg extends GoCQHTTPSendForwardMsgBase {
 }
 export class GoCQHTTPSendPrivateForwardMsg extends GoCQHTTPSendForwardMsgBase {
     override actionName = ActionName.GoCQHTTP_SendPrivateForwardMsg;
-    override async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
-        return this.base_handle(payload, ContextMode.Private);
-    }
 }
 
 export class GoCQHTTPSendGroupForwardMsg extends GoCQHTTPSendForwardMsgBase {
     override actionName = ActionName.GoCQHTTP_SendGroupForwardMsg;
-    override async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
-        return this.base_handle(payload, ContextMode.Group);
-    }
 }

src/onebot/action/group/GetGroupDetailInfo.ts

@@ -1,27 +0,0 @@
-import { OneBotAction } from '@/onebot/action/OneBotAction';
-import { ActionName } from '@/onebot/action/router';
-import { Static, Type } from '@sinclair/typebox';
-
-const SchemaData = Type.Object({
-    group_id: Type.Union([Type.Number(), Type.String()]),
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export class GetGroupDetailInfo extends OneBotAction<Payload, unknown> {
-    override actionName = ActionName.GetGroupDetailInfo;
-    override payloadSchema = SchemaData;
-
-    async _handle(payload: Payload) {
-        const data = await this.core.apis.GroupApi.fetchGroupDetail(payload.group_id.toString());
-        return {
-            ...data,
-            group_all_shut: data.shutUpAllTimestamp > 0 ? -1 : 0,
-            group_remark: '',
-            group_id: +payload.group_id,
-            group_name: data.groupName,
-            member_count: data.memberNum,
-            max_member_count: data.maxMemberNum,
-        };
-    }
-}

src/onebot/action/group/GetGroupIgnoredNotifies.ts

@@ -4,7 +4,6 @@ import { ActionName } from '@/onebot/action/router';
 import { Notify } from '@/onebot/types';
 
 interface RetData {
-    invited_requests: Notify[];
     InvitedRequest: Notify[];
     join_requests: Notify[];
 }
@@ -14,7 +13,7 @@ export class GetGroupIgnoredNotifies extends OneBotAction<void, RetData> {
 
     async _handle(): Promise<RetData> {
         const SingleScreenNotifies = await this.core.apis.GroupApi.getSingleScreenNotifies(false, 50);
-        const retData: RetData = { invited_requests: [], InvitedRequest: [], join_requests: [] };
+        const retData: RetData = { InvitedRequest: [], join_requests: [] };
 
         const notifyPromises = SingleScreenNotifies.map(async (SSNotify) => {
             const invitorUin = SSNotify.user1?.uid ? +await this.core.apis.UserApi.getUinByUidV2(SSNotify.user1.uid) : 0;
@@ -39,7 +38,7 @@ export class GetGroupIgnoredNotifies extends OneBotAction<void, RetData> {
         });
 
         await Promise.all(notifyPromises);
-        retData.invited_requests = retData.InvitedRequest;
+
         return retData;
     }
 }

src/onebot/action/group/GetGroupNotice.ts

@@ -8,16 +8,10 @@ interface GroupNotice {
     notice_id: string;
     message: {
         text: string
-        // 保持一段时间兼容性 防止以往版本出现问题 后续版本可考虑移除
         image: Array<{
             height: string
             width: string
             id: string
-        }>,
-        images: Array<{
-            height: string
-            width: string
-            id: string
         }>
     };
 }
@@ -46,18 +40,15 @@ export class GetGroupNotice extends OneBotAction<Payload, GroupNotice[]> {
                 continue;
             }
             const retApiNotice: WebApiGroupNoticeFeed = ret.feeds[key];
-            const image = retApiNotice.msg.pics?.map((pic) => {
-                return { id: pic.id, height: pic.h, width: pic.w };
-            }) || [];
-
             const retNotice: GroupNotice = {
                 notice_id: retApiNotice.fid,
                 sender_id: retApiNotice.u,
                 publish_time: retApiNotice.pubt,
                 message: {
                     text: retApiNotice.msg.text,
-                    image,
-                    images: image,
+                    image: retApiNotice.msg.pics?.map((pic) => {
+                        return { id: pic.id, height: pic.h, width: pic.w };
+                    }) || [],
                 },
             };
             retNotices.push(retNotice);

src/onebot/action/group/GroupPoke.ts

@@ -0,0 +1,19 @@
+import { ActionName } from '@/onebot/action/router';
+import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    group_id: Type.Union([Type.Number(), Type.String()]),
+    user_id: Type.Union([Type.Number(), Type.String()]),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class GroupPoke extends GetPacketStatusDepends<Payload, void> {
+    override actionName = ActionName.GroupPoke;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
+    }
+}

src/onebot/action/group/SendGroupMsg.ts

@@ -1,19 +1,17 @@
-import { ContextMode, ReturnDataType, SendMsgBase } from '@/onebot/action/msg/SendMsg';
+import { ContextMode, SendMsgBase } from '@/onebot/action/msg/SendMsg';
 import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 import { OB11PostSendMsg } from '@/onebot/types';
 
 // 未检测参数
 class SendGroupMsg extends SendMsgBase {
     override actionName = ActionName.SendGroupMsg;
+    override contextMode: ContextMode = ContextMode.Group;
 
     protected override async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
         delete payload.user_id;
         payload.message_type = 'group';
         return super.check(payload);
     }
-    override async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
-        return this.base_handle(payload, ContextMode.Group);
-    }
 }
 
 export default SendGroupMsg;

src/onebot/action/group/SetGroupWholeBan.ts

@@ -15,10 +15,7 @@ export default class SetGroupWholeBan extends OneBotAction<Payload, null> {
 
     async _handle(payload: Payload): Promise<null> {
         const enable = payload.enable?.toString() !== 'false';
-        let res = await this.core.apis.GroupApi.banGroup(payload.group_id.toString(), enable);
-        if (res.result !== 0) {
-            throw new Error(`SetGroupWholeBan failed: ${res.errMsg} ${res.result}`);
-        }
+        await this.core.apis.GroupApi.banGroup(payload.group_id.toString(), enable);
         return null;
     }
 }

src/onebot/action/index.ts

@@ -78,6 +78,7 @@ import { GetGroupFileSystemInfo } from '@/onebot/action/go-cqhttp/GetGroupFileSy
 import { GetGroupRootFiles } from '@/onebot/action/go-cqhttp/GetGroupRootFiles';
 import { GetGroupFilesByFolder } from '@/onebot/action/go-cqhttp/GetGroupFilesByFolder';
 import { GetGroupSystemMsg } from './system/GetSystemMsg';
+import { GroupPoke } from './group/GroupPoke';
 import { GetUserStatus } from './extends/GetUserStatus';
 import { GetRkey } from './extends/GetRkey';
 import { SetSpecialTitle } from './extends/SetSpecialTitle';
@@ -85,6 +86,7 @@ import { GetGroupShutList } from './group/GetGroupShutList';
 import { GetGroupMemberList } from './group/GetGroupMemberList';
 import { GetGroupFileUrl } from '@/onebot/action/file/GetGroupFileUrl';
 import { GetPacketStatus } from '@/onebot/action/packet/GetPacketStatus';
+import { FriendPoke } from '@/onebot/action/user/FriendPoke';
 import { GetCredentials } from './system/GetCredentials';
 import { SendGroupSign, SetGroupSign } from './extends/SetGroupSign';
 import { GoCQHTTPGetGroupAtAllRemain } from './go-cqhttp/GetGroupAtAllRemain';
@@ -100,7 +102,7 @@ import { GetGuildList } from './guild/GetGuildList';
 import { GetGuildProfile } from './guild/GetGuildProfile';
 import { GetClientkey } from './extends/GetClientkey';
 import { SendPacket } from './extends/SendPacket';
-import { FriendPoke, GroupPoke, SendPoke } from '@/onebot/action/packet/SendPoke';
+import { SendPoke } from '@/onebot/action/packet/SendPoke';
 import { SetDiyOnlineStatus } from './extends/SetDiyOnlineStatus';
 import { BotExit } from './extends/BotExit';
 import { ClickInlineKeyboardButton } from './extends/ClickInlineKeyboardButton';
@@ -116,22 +118,10 @@ import { CleanCache } from './system/CleanCache';
 import SetFriendRemark from './user/SetFriendRemark';
 import { SetDoubtFriendsAddRequest } from './new/SetDoubtFriendsAddRequest';
 import { GetDoubtFriendsAddRequest } from './new/GetDoubtFriendsAddRequest';
-import SetGroupAddOption from './extends/SetGroupAddOption';
-import SetGroupSearch from './extends/SetGroupSearch';
-import SetGroupRobotAddOption from './extends/SetGroupRobotAddOption';
-import SetGroupKickMembers from './extends/SetGroupKickMembers';
-import { GetGroupDetailInfo } from './group/GetGroupDetailInfo';
-import GetGroupAddRequest from './extends/GetGroupAddRequest';
-import { GetCollectionList } from './extends/GetCollectionList';
 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
     const actionHandlers = [
-        new GetGroupDetailInfo(obContext, core),
-        new SetGroupKickMembers(obContext, core),
-        new SetGroupAddOption(obContext, core),
-        new SetGroupRobotAddOption(obContext, core),
-        new SetGroupSearch(obContext, core),
         new SetDoubtFriendsAddRequest(obContext, core),
         new GetDoubtFriendsAddRequest(obContext, core),
         new SetFriendRemark(obContext, core),
@@ -259,8 +249,6 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new GetPrivateFileUrl(obContext, core),
         new GetUnidirectionalFriendList(obContext, core),
         new CleanCache(obContext, core),
-        new GetGroupAddRequest(obContext, core),
-        new GetCollectionList(obContext, core),
     ];
 
     type HandlerUnion = typeof actionHandlers[number];

src/onebot/action/msg/SendMsg.ts

@@ -19,7 +19,6 @@ import { rawMsgWithSendMsg } from '@/core/packet/message/converter';
 export interface ReturnDataType {
     message_id: number;
     res_id?: string;
-    forward_id?: string;
 }
 
 export enum ContextMode {
@@ -105,6 +104,8 @@ function getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType
 }
 
 export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
+    contextMode = ContextMode.Normal;
+
     protected override async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
         const messages = normalize(payload.message);
         const nodeElementLength = getSpecialMsgNum(payload, OB11MessageDataType.node);
@@ -116,13 +117,12 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         }
         return { valid: true };
     }
+
     async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
-        return this.base_handle(payload);
-    }
-    async base_handle(payload: OB11PostSendMsg, contextMode: ContextMode = ContextMode.Normal): Promise<ReturnDataType> {
-        if (payload.message_type === 'group') contextMode = ContextMode.Group;
-        if (payload.message_type === 'private') contextMode = ContextMode.Private;
-        const peer = await createContext(this.core, payload, contextMode);
+        this.contextMode = ContextMode.Normal;
+        if (payload.message_type === 'group') this.contextMode = ContextMode.Group;
+        if (payload.message_type === 'private') this.contextMode = ContextMode.Private;
+        const peer = await createContext(this.core, payload, this.contextMode);
 
         const messages = normalize(
             payload.message,
@@ -148,10 +148,7 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                     peerUid: peer.peerUid,
                     chatType: peer.chatType,
                 }, (returnMsgAndResId.message).msgId);
-
-                // 对gocq的forward_id进行兼容
-                const resId = returnMsgAndResId.res_id!;
-                return { message_id: msgShortId!, res_id: resId, forward_id: resId };
+                return { message_id: msgShortId!, res_id: returnMsgAndResId.res_id! };
             } else if (returnMsgAndResId.res_id && !returnMsgAndResId.message) {
                 throw Error(`发送转发消息（res_id：${returnMsgAndResId.res_id} 失败`);
             }
@@ -177,11 +174,9 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         nickname: string,
     }, dp: number = 0): Promise<{
         finallySendElements: SendArkElement,
-        res_id?: string,
-        deleteAfterSentFiles: string[],
+        res_id?: string
     } | null> {
         const packetMsg: PacketMsg[] = [];
-        let delFiles: string[] = [];
         for (const node of messageNodes) {
             if (dp >= 3) {
                 this.core.context.logger.logWarn('转发消息深度超过3层，将停止解析！');
@@ -197,11 +192,9 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                         nickname: (node.data.nickname || node.data.name) ?? parentMeta?.nickname ?? 'QQ用户',
                     }, dp + 1);
                     sendElements = uploadReturnData?.finallySendElements ? [uploadReturnData.finallySendElements] : [];
-                    delFiles.push(...(uploadReturnData?.deleteAfterSentFiles || []));
                 } else {
                     const sendElementsCreateReturn = await this.obContext.apis.MsgApi.createSendElements(OB11Data, msgPeer);
                     sendElements = sendElementsCreateReturn.sendElements;
-                    delFiles.push(...sendElementsCreateReturn.deleteAfterSentFiles);
                 }
 
                 const packetMsgElements: rawMsgWithSendMsg = {
@@ -225,8 +218,7 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                 const msg = (await this.core.apis.MsgApi.getMsgsByMsgId(nodeMsg.Peer, [nodeMsg.MsgId])).msgList[0];
                 this.core.context.logger.logDebug(`handleForwardedNodesPacket[PureRaw] 开始转换 ${stringifyWithBigInt(msg)}`);
                 if (msg) {
-                    let msgCache = await this.core.apis.FileApi.downloadRawMsgMedia([msg]);
-                    delFiles.push(...msgCache);
+                    await this.core.apis.FileApi.downloadRawMsgMedia([msg]);
                     const transformedMsg = this.core.apis.PacketApi.pkt.msgConverter.rawMsgToPacketMsg(msg, msgPeer);
                     this.core.context.logger.logDebug(`handleForwardedNodesPacket[PureRaw] 转换为 ${stringifyWithBigInt(transformedMsg)}`);
                     packetMsg.push(transformedMsg);
@@ -242,7 +234,6 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         const resid = await this.core.apis.PacketApi.pkt.operation.UploadForwardMsg(packetMsg, msgPeer.chatType === ChatType.KCHATTYPEGROUP ? +msgPeer.peerUid : 0);
         const forwardJson = ForwardMsgBuilder.fromPacketMsg(resid, packetMsg, source, news, summary, prompt);
         return {
-            deleteAfterSentFiles: delFiles,
             finallySendElements: {
                 elementType: ElementType.ARK,
                 elementId: '',
@@ -264,7 +255,7 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         const res_id = uploadReturnData?.res_id;
         const finallySendElements = uploadReturnData?.finallySendElements;
         if (!finallySendElements) throw Error('转发消息失败，生成节点为空');
-        const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], uploadReturnData.deleteAfterSentFiles || []).catch(() => undefined);
+        const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], []).catch(() => undefined);
         return { message: returnMsg ?? null, res_id: res_id! };
     }
 

src/onebot/action/msg/SendPrivateMsg.ts

@@ -1,18 +1,16 @@
-import { ContextMode, ReturnDataType, SendMsgBase } from './SendMsg';
+import { ContextMode, SendMsgBase } from './SendMsg';
 import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 import { OB11PostSendMsg } from '@/onebot/types';
 
 // 未检测参数
 class SendPrivateMsg extends SendMsgBase {
     override actionName = ActionName.SendPrivateMsg;
+    override contextMode: ContextMode = ContextMode.Private;
 
     protected override async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
         payload.message_type = 'private';
         return super.check(payload);
     }
-    override async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
-        return this.base_handle(payload, ContextMode.Private);
-    }
 }
 
 export default SendPrivateMsg;

src/onebot/action/packet/SendPoke.ts

@@ -3,36 +3,21 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.Optional(Type.String()),
-    user_id: Type.Optional(Type.String()),
-    target_id: Type.Optional(Type.String()),
+    group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
+    user_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;
-export class SendPokeBase extends GetPacketStatusDepends<Payload, void> {
+
+export class SendPoke extends GetPacketStatusDepends<Payload, void> {
+    override actionName = ActionName.SendPoke;
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        // 这里的 !! 可以传入空字符串 忽略这些数据有利用接口统一接口
-        const target_id = !!payload.target_id ? payload.target_id : payload.user_id;
-        const peer_id = !!payload.group_id ? payload.group_id : payload.user_id;
-
-        const is_group = !!payload.group_id;
-        if (!target_id || !peer_id) {
-            throw new Error('请检查参数，缺少 user_id 或 group_id');
+        if (payload.group_id) {
+            await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
+        } else {
+            await this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id);
         }
-
-        await this.core.apis.PacketApi.pkt.operation.SendPoke(is_group, +peer_id, +target_id);
     }
 }
-
-
-export class SendPoke extends SendPokeBase {
-    override actionName = ActionName.SendPoke;
-}
-export class GroupPoke extends SendPokeBase {
-    override actionName = ActionName.GroupPoke;
-}
-export class FriendPoke extends SendPokeBase {
-    override actionName = ActionName.FriendPoke;
-}

src/onebot/action/router.ts

@@ -10,10 +10,6 @@ export interface InvalidCheckResult {
 }
 
 export const ActionName = {
-    SetGroupKickMembers: 'set_group_kick_members',
-    SetGroupRobotAddOption: 'set_group_robot_add_option',
-    SetGroupAddOption: 'set_group_add_option',
-    SetGroupSearch: 'set_group_search',
     // new extends 完全差异OneBot类别
     GetDoubtFriendsAddRequest: 'get_doubt_friends_add_request',
     SetDoubtFriendsAddRequest: 'set_doubt_friends_add_request',
@@ -63,7 +59,7 @@ export const ActionName = {
     GetStatus: 'get_status',
     GetVersionInfo: 'get_version_info',
     // Reboot : 'set_restart',
-    CleanCache: 'clean_cache',
+    CleanCache : 'clean_cache',
     Exit: 'bot_exit',
     // go-cqhttp
     SetQQProfile: 'set_qq_profile',
@@ -132,7 +128,6 @@ export const ActionName = {
     FetchEmojiLike: 'fetch_emoji_like',
     SetInputStatus: 'set_input_status',
     GetGroupInfoEx: 'get_group_info_ex',
-    GetGroupDetailInfo: 'get_group_detail_info',
     GetGroupIgnoreAddRequest: 'get_group_ignore_add_request',
     DelGroupNotice: '_del_group_notice',
     FriendPoke: 'friend_poke',

src/onebot/action/system/GetSystemMsg.ts

@@ -2,27 +2,18 @@ import { GroupNotifyMsgStatus } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { Notify } from '@/onebot/types';
-import { Static, Type } from '@sinclair/typebox';
 
 interface RetData {
-    invited_requests: Notify[];
     InvitedRequest: Notify[];
     join_requests: Notify[];
 }
 
-const SchemaData = Type.Object({
-    count: Type.Union([Type.Number(), Type.String()], { default: 50 }),
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export class GetGroupSystemMsg extends OneBotAction<Payload, RetData> {
+export class GetGroupSystemMsg extends OneBotAction<void, RetData> {
     override actionName = ActionName.GetGroupSystemMsg;
-    override payloadSchema = SchemaData;
 
-    async _handle(params: Payload): Promise<RetData> {
-        const SingleScreenNotifies = await this.core.apis.GroupApi.getSingleScreenNotifies(false, +params.count);
-        const retData: RetData = { invited_requests: [], InvitedRequest: [], join_requests: [] };
+    async _handle(): Promise<RetData> {
+        const SingleScreenNotifies = await this.core.apis.GroupApi.getSingleScreenNotifies(false, 50);
+        const retData: RetData = { InvitedRequest: [], join_requests: [] };
 
         const notifyPromises = SingleScreenNotifies.map(async (SSNotify) => {
             const invitorUin = SSNotify.user1?.uid ? +await this.core.apis.UserApi.getUinByUidV2(SSNotify.user1.uid) : 0;
@@ -48,7 +39,6 @@ export class GetGroupSystemMsg extends OneBotAction<Payload, RetData> {
 
         await Promise.all(notifyPromises);
 
-        retData.invited_requests = retData.InvitedRequest;
         return retData;
     }
-}
+}

src/onebot/action/user/FriendPoke.ts

@@ -0,0 +1,18 @@
+import { ActionName } from '@/onebot/action/router';
+import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    user_id: Type.Union([Type.Number(), Type.String()])
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class FriendPoke extends GetPacketStatusDepends<Payload, void> {
+    override actionName = ActionName.FriendPoke;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        await this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id);
+    }
+}

src/onebot/api/msg.ts

@@ -85,6 +85,9 @@ export class OneBotMsgApi {
         textElement: async element => {
             if (element.atType === NTMsgAtType.ATTYPEUNKNOWN) {
                 let text = element.content;
+                if (!text.trim()) {
+                    return null;
+                }
                 // 兼容 9.7.x 换行符
                 if (text.indexOf('\n') === -1 && text.indexOf('\r\n') === -1) {
                     text = text.replace(/\r/g, '\n');
@@ -97,7 +100,7 @@ export class OneBotMsgApi {
                 let qq: string = 'all';
                 if (element.atType !== NTMsgAtType.ATTYPEALL) {
                     const { atNtUid, atUid } = element;
-                    qq = !atUid || atUid === '0' ? await this.core.apis.UserApi.getUinByUidV2(atNtUid) : String(Number(atUid) >>> 0);
+                    qq = !atUid || atUid === '0' ? await this.core.apis.UserApi.getUinByUidV2(atNtUid) : atUid;
                 }
                 return {
                     type: OB11MessageDataType.at,
@@ -147,31 +150,12 @@ export class OneBotMsgApi {
             };
             FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileUuid);
             FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileName);
-            if (this.core.apis.PacketApi.available) {
-                let url;
-                try {
-                    url = await this.core.apis.FileApi.getFileUrl(msg.chatType, msg.peerUid, element.fileUuid, element.file10MMd5)
-                } catch (error) {
-                    url = '';
-                }
-                if (url) {
-                    return {
-                        type: OB11MessageDataType.file,
-                        data: {
-                            file: element.fileName,
-                            file_id: element.fileUuid,
-                            file_size: element.fileSize,
-                            url: url,
-                        },
-                    }
-                }
-            }
             return {
                 type: OB11MessageDataType.file,
                 data: {
                     file: element.fileName,
                     file_id: element.fileUuid,
-                    file_size: element.fileSize
+                    file_size: element.fileSize,
                 },
             };
         },
@@ -241,13 +225,17 @@ export class OneBotMsgApi {
         },
 
         replyElement: async (element, msg) => {
+            const records = msg.records.find(msgRecord => msgRecord.msgId === element?.sourceMsgIdInRecords);
             const peer = {
                 chatType: msg.chatType,
                 peerUid: msg.peerUid,
                 guildId: '',
             };
+            if (!records || !element.replyMsgTime || !element.senderUidStr) {
+                this.core.context.logger.logError('似乎是旧版客户端,获取不到引用的消息', element.replayMsgSeq);
+                return null;
+            }
 
-            // 创建回复数据的通用方法
             const createReplyData = (msgId: string): OB11MessageData => ({
                 type: OB11MessageDataType.reply,
                 data: {
@@ -255,96 +243,48 @@ export class OneBotMsgApi {
                 },
             });
 
-            // 查找记录
-            const records = msg.records.find(msgRecord => msgRecord.msgId === element?.sourceMsgIdInRecords);
-
-            // 特定账号的特殊处理
-            if (records && (records.peerUin === '284840486' || records.peerUin === '1094950020')) {
+            if (records.peerUin === '284840486' || records.peerUin === '1094950020') {
                 return createReplyData(records.msgId);
             }
+            let replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV2(peer, element.replayMsgSeq, records.msgTime, [element.senderUidStr])).msgList;
+            let replyMsg = replyMsgList.find(msg => msg.msgRandom === records.msgRandom);
 
-            // 获取消息的通用方法组
-            const tryFetchMethods = async (msgSeq: string, senderUid?: string, msgTime?: string, msgRandom?: string): Promise<RawMessage | undefined> => {
-                try {
-                    // 方法1：通过序号和时间筛选
-                    if (senderUid && msgTime) {
-                        const replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV2(
-                            peer, msgSeq, msgTime, [senderUid]
-                        )).msgList;
-
-                        const replyMsg = msgRandom
-                            ? replyMsgList.find(msg => msg.msgRandom === msgRandom)
-                            : replyMsgList.find(msg => msg.msgSeq === msgSeq);
-
-                        if (replyMsg) return replyMsg;
-
-                        this.core.context.logger.logWarn(`方法1查询失败，序号: ${msgSeq}, 消息数: ${replyMsgList.length}`);
-                    }
-
-                    // 方法2：直接通过序号获取
-                    const replyMsgList = (await this.core.apis.MsgApi.getMsgsBySeqAndCount(
-                        peer, msgSeq, 1, true, true
-                    )).msgList;
-
-                    const replyMsg = msgRandom
-                        ? replyMsgList.find(msg => msg.msgRandom === msgRandom)
-                        : replyMsgList.find(msg => msg.msgSeq === msgSeq);
-
-                    if (replyMsg) return replyMsg;
-
-                    this.core.context.logger.logWarn(`方法2查询失败，序号: ${msgSeq}, 消息数: ${replyMsgList.length}`);
-
-                    // 方法3：另一种筛选方式
-                    if (senderUid) {
-                        const replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV3(
-                            peer, msgSeq, [senderUid]
-                        )).msgList;
-
-                        const replyMsg = msgRandom
-                            ? replyMsgList.find(msg => msg.msgRandom === msgRandom)
-                            : replyMsgList.find(msg => msg.msgSeq === msgSeq);
-
-                        if (replyMsg) return replyMsg;
-
-                        this.core.context.logger.logWarn(`方法3查询失败，序号: ${msgSeq}, 消息数: ${replyMsgList.length}`);
-                    }
-
-                    return undefined;
-                } catch (error) {
-                    this.core.context.logger.logError('查询回复消息出错', error);
-                    return undefined;
-                }
-            };
-
-            // 有记录情况下，使用完整信息查询
-            if (records && element.replyMsgTime && element.senderUidStr) {
-                const replyMsg = await tryFetchMethods(
+            if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
+                this.core.context.logger.logError(
+                    '筛选结果,筛选消息失败,将使用Fallback-1 Seq: ',
                     element.replayMsgSeq,
-                    element.senderUidStr,
-                    records.msgTime,
-                    records.msgRandom
+                    ',消息长度:',
+                    replyMsgList.length
                 );
-
-                if (replyMsg) {
-                    return createReplyData(replyMsg.msgId);
-                }
-
-                this.core.context.logger.logError('所有查找方法均失败，获取不到带记录的引用消息', element.replayMsgSeq);
-            } else {
-                // 旧版客户端或不完整记录的情况，也尝试使用相同流程
-                this.core.context.logger.logWarn('似乎是旧版客户端，尝试仅通过序号获取引用消息', element.replayMsgSeq);
-
-                const replyMsg = await tryFetchMethods(element.replayMsgSeq);
-
-                if (replyMsg) {
-                    return createReplyData(replyMsg.msgId);
-                }
-
-                this.core.context.logger.logError('所有查找方法均失败，获取不到旧客户端的引用消息', element.replayMsgSeq);
+                replyMsgList = (await this.core.apis.MsgApi.getMsgsBySeqAndCount(peer, element.replayMsgSeq, 1, true, true)).msgList;
+                replyMsg = replyMsgList.find(msg => msg.msgRandom === records.msgRandom);
             }
 
-            return null;
+            if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
+                this.core.context.logger.logWarn(
+                    '筛选消息失败,将使用Fallback-2 Seq:',
+                    element.replayMsgSeq,
+                    ',消息长度:',
+                    replyMsgList.length
+                );
+                replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV3(peer, element.replayMsgSeq, [element.senderUidStr])).msgList;
+                replyMsg = replyMsgList.find(msg => msg.msgRandom === records.msgRandom);
+            }
+
+
+            // 丢弃该消息段
+            if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
+                this.core.context.logger.logError(
+                    '最终筛选结果,筛选消息失败,获取不到引用的消息 Seq: ',
+                    element.replayMsgSeq,
+                    ',消息长度:',
+                    replyMsgList.length
+                );
+                return null;
+            }
+            return createReplyData(replyMsg.msgId);
         },
+
         videoElement: async (element, msg, elementWrapper) => {
             const peer = {
                 chatType: msg.chatType,
@@ -391,17 +331,7 @@ export class OneBotMsgApi {
 
             //开始兜底
             if (!videoDownUrl) {
-                if (this.core.apis.PacketApi.available) {
-                    try {
-                        videoDownUrl = await this.core.apis.FileApi.getVideoUrlPacket(msg.peerUid, element.fileUuid);
-                    } catch (e) {
-                        this.core.context.logger.logError('获取视频url失败', (e as Error).stack);
-                        videoDownUrl = element.filePath;
-                    }
-                } else {
-                    videoDownUrl = element.filePath;
-                }
-
+                videoDownUrl = element.filePath;
             }
             const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileName);
             return {
@@ -421,28 +351,6 @@ export class OneBotMsgApi {
                 guildId: '',
             };
             const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, '', element.fileName);
-            let pttUrl = '';
-            if (this.core.apis.PacketApi.available) {
-                try {
-                    pttUrl = await this.core.apis.FileApi.getPttUrl(msg.peerUid, element.fileUuid);
-                } catch (e) {
-                    this.core.context.logger.logError('获取语音url失败', (e as Error).stack);
-                    pttUrl = element.filePath;
-                }
-            } else {
-                pttUrl = element.filePath;
-            }
-            if (pttUrl) {
-                return {
-                    type: OB11MessageDataType.voice,
-                    data: {
-                        file: fileCode,
-                        path: element.filePath,
-                        url: pttUrl,
-                        file_size: element.fileSize,
-                    },
-                }
-            }
             return {
                 type: OB11MessageDataType.voice,
                 data: {
@@ -559,8 +467,6 @@ export class OneBotMsgApi {
                         replayMsgId: replyMsg.msgId,  // raw.msgId
                         senderUin: replyMsg.senderUin,
                         senderUinStr: replyMsg.senderUin,
-                        replyMsgClientSeq: replyMsg.clientSeq,
-                        _replyMsgPeer: replyMsgM.Peer
                     },
                 } :
                 undefined;
@@ -1209,6 +1115,7 @@ export class OneBotMsgApi {
     async waitGroupNotify(groupUin: string, memberUid?: string, operatorUid?: string) {
         const groupRole = this.core.apis.GroupApi.groupMemberCache.get(groupUin)?.get(this.core.selfInfo.uid.toString())?.role;
         const isAdminOrOwner = groupRole === 3 || groupRole === 4;
+
         if (isAdminOrOwner && !operatorUid) {
             let dataNotify: GroupNotify | undefined;
             await this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onGroupNotifiesUpdated',
@@ -1238,7 +1145,7 @@ export class OneBotMsgApi {
             const operatorUid = await this.waitGroupNotify(
                 groupChange.groupUin.toString(),
                 groupChange.memberUid,
-                groupChange.operatorInfo ? new TextDecoder('utf-8').decode(groupChange.operatorInfo) : undefined
+                groupChange.operatorInfo ? Buffer.from(groupChange.operatorInfo).toString() : ''
             );
             return new OB11GroupIncreaseEvent(
                 this.core,
@@ -1250,42 +1157,13 @@ export class OneBotMsgApi {
 
         } else if (SysMessage.contentHead.type == 34 && SysMessage.body?.msgContent) {
             const groupChange = new NapProtoMsg(GroupChange).decode(SysMessage.body.msgContent);
-
-            let operator_uid_parse: string | undefined = undefined;
-            if (groupChange.operatorInfo) {
-                // 先判断是否可能是protobuf（自身被踢出或以0a开头）
-                if (groupChange.decreaseType === 3 || Buffer.from(groupChange.operatorInfo).toString('hex').startsWith('0a')) {
-                    // 可能是protobuf，尝试解析
-                    try {
-                        operator_uid_parse = new NapProtoMsg(GroupChangeInfo).decode(groupChange.operatorInfo).operator?.operatorUid;
-                    } catch (error) {
-                        // protobuf解析失败，fallback到字符串解析
-                        try {
-                            const decoded = new TextDecoder('utf-8').decode(groupChange.operatorInfo);
-                            // 检查是否包含非ASCII字符，如果包含则丢弃
-                            const isAsciiOnly = [...decoded].every(char => char.charCodeAt(0) >= 32 && char.charCodeAt(0) <= 126);
-                            operator_uid_parse = isAsciiOnly ? decoded : '';
-                        } catch (e2) {
-                            operator_uid_parse = '';
-                        }
-                    }
-                } else {
-                    // 直接进行字符串解析
-                    try {
-                        const decoded = new TextDecoder('utf-8').decode(groupChange.operatorInfo);
-                        // 检查是否包含非ASCII字符，如果包含则丢弃
-                        const isAsciiOnly = [...decoded].every(char => char.charCodeAt(0) >= 32 && char.charCodeAt(0) <= 126);
-                        operator_uid_parse = isAsciiOnly ? decoded : '';
-                    } catch (e) {
-                        operator_uid_parse = '';
-                    }
-                }
-            }
-
+            // 自身被踢出时operatorInfo会是一个protobuf 否则大多数情况为一个string
             const operatorUid = await this.waitGroupNotify(
                 groupChange.groupUin.toString(),
                 groupChange.memberUid,
-                operator_uid_parse
+                groupChange.decreaseType === 3 && groupChange.operatorInfo ?
+                    new NapProtoMsg(GroupChangeInfo).decode(groupChange.operatorInfo).operator?.operatorUid :
+                    groupChange.operatorInfo?.toString()
             );
             if (groupChange.memberUid === this.core.selfInfo.uid) {
                 setTimeout(() => {

src/onebot/event/notice/OB11BaseNoticeEvent.ts

@@ -2,5 +2,4 @@ import { EventType, OneBotEvent } from '@/onebot/event/OneBotEvent';
 
 export abstract class OB11BaseNoticeEvent extends OneBotEvent {
     post_type = EventType.NOTICE;
-    abstract notice_type: string;
-}
+}

src/onebot/event/request/OB11BaseRequestEvent.ts

@@ -1,6 +0,0 @@
-import { EventType, OneBotEvent } from '@/onebot/event/OneBotEvent';
-
-export abstract class OB11BaseRequestEvent extends OneBotEvent {
-    readonly post_type = EventType.REQUEST;
-    abstract request_type: string;
-}

src/onebot/event/request/OB11FriendRequest.ts

@@ -1,8 +1,10 @@
+import { OB11BaseNoticeEvent } from '@/onebot/event/notice/OB11BaseNoticeEvent';
+import { EventType } from '@/onebot/event/OneBotEvent';
 import { NapCatCore } from '@/core';
-import { OB11BaseRequestEvent } from './OB11BaseRequestEvent';
 
-export class OB11FriendRequestEvent extends OB11BaseRequestEvent {
-    override request_type = 'friend';
+export class OB11FriendRequestEvent extends OB11BaseNoticeEvent {
+    override post_type = EventType.REQUEST;
+    request_type = 'friend';
 
     user_id: number;
     comment: string;

src/onebot/event/request/OB11GroupRequest.ts

@@ -1,18 +1,18 @@
+import { OB11GroupNoticeEvent } from '@/onebot/event/notice/OB11GroupNoticeEvent';
+import { EventType } from '@/onebot/event/OneBotEvent';
 import { NapCatCore } from '@/core';
-import { OB11BaseRequestEvent } from './OB11BaseRequestEvent';
 
-export class OB11GroupRequestEvent extends OB11BaseRequestEvent {
-    override readonly request_type = 'group' as const;
+export class OB11GroupRequestEvent extends OB11GroupNoticeEvent {
+    override post_type = EventType.REQUEST;
+    request_type = 'group';
 
-    group_id: number;
-    user_id: number;
+    override user_id: number;
     comment: string;
     flag: string;
     sub_type: string;
 
     constructor(core: NapCatCore, groupId: number, userId: number, sub_type: string, comment: string, flag: string) {
-        super(core);
-        this.group_id = groupId;
+        super(core, groupId, userId);
         this.user_id = userId;
         this.sub_type = sub_type;
         this.comment = comment;

src/onebot/index.ts

@@ -50,6 +50,7 @@ import {
 import { OB11Message } from './types';
 import { IOB11NetworkAdapter } from '@/onebot/network/adapter';
 import { OB11HttpSSEServerAdapter } from './network/http-server-sse';
+import { OB11PluginAdapter } from './network/plugin';
 
 //OneBot实现类
 export class NapCatOneBot11Adapter {
@@ -113,9 +114,9 @@ export class NapCatOneBot11Adapter {
         //创建NetWork服务
 
         // 注册Plugin 如果需要基于NapCat进行快速开发
-        // this.networkManager.registerAdapter(
-        //     new OB11PluginAdapter('myPlugin', this.core, this,this.actions)
-        // );
+        this.networkManager.registerAdapter(
+            new OB11PluginAdapter('myPlugin', this.core, this,this.actions)
+        );
         for (const key of ob11Config.network.httpServers) {
             if (key.enable) {
                 this.networkManager.registerAdapter(
@@ -270,6 +271,7 @@ export class NapCatOneBot11Adapter {
                 );
             }
         };
+
         msgListener.onAddSendMsg = async (msg) => {
             try {
                 if (msg.sendStatus == SendStatusType.KSEND_STATUS_SENDING) {
@@ -281,8 +283,7 @@ export class NapCatOneBot11Adapter {
                     }, 1, 10 * 60 * 1000);
                     // 10分钟 超时
                     const updatemsg = updatemsgs.find((e) => e.msgId === msg.msgId);
-                    // updatemsg?.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS_NOSEQ NOSEQ一般是服务器未下发SEQ 这意味着这条消息不应该推送network
-                    if (updatemsg?.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS) {
+                    if (updatemsg?.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS || updatemsg?.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS_NOSEQ) {
                         updatemsg.id = MessageUnique.createUniqueMsgId(
                             {
                                 chatType: updatemsg.chatType,
@@ -304,18 +305,8 @@ export class NapCatOneBot11Adapter {
                 peerUid: uid,
                 guildId: ''
             };
-            let msg = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeq(peer, msgSeq)).msgList.find(e => e.msgType == NTMsgType.KMSGTYPEGRAYTIPS);
+            const msg = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeq(peer, msgSeq)).msgList.find(e => e.msgType == NTMsgType.KMSGTYPEGRAYTIPS);
             const element = msg?.elements.find(e => !!e.grayTipElement?.revokeElement);
-            if (element?.grayTipElement?.revokeElement.isSelfOperate && msg) {
-                await this.core.eventWrapper.registerListen('NodeIKernelMsgListener/onMsgRecall',
-                    (chatType: ChatType, uid: string, msgSeq: string) => {
-                        return chatType === msg?.chatType && uid === msg?.peerUid && msgSeq === msg?.msgSeq;
-                    }
-                ).catch(() => {
-                    msg = undefined;
-                    this.context.logger.logDebug('自操作消息撤回事件');
-                });
-            }
             if (msg && element) {
                 const recallEvent = await this.emitRecallMsg(msg, element);
                 try {
@@ -326,7 +317,6 @@ export class NapCatOneBot11Adapter {
                     this.context.logger.logError('处理消息撤回失败', e);
                 }
             }
-
         };
         msgListener.onKickedOffLine = async (kick) => {
             const event = new BotOfflineEvent(this.core, kick.tipsTitle, kick.tipsDesc);
@@ -345,7 +335,7 @@ export class NapCatOneBot11Adapter {
             for (let i = 0; i < reqs.unreadNums; i++) {
                 const req = reqs.buddyReqs[i];
                 if (!req) continue;
-                if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM) || !req.isUnread) {
+                if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM)) {
                     continue;
                 }
                 try {
@@ -363,6 +353,7 @@ export class NapCatOneBot11Adapter {
                 }
             }
         };
+
         this.context.session
             .getBuddyService()
             .addKernelBuddyListener(proxiedListenerOf(buddyListener, this.context.logger));

src/onebot/network/http-server.ts

@@ -87,8 +87,8 @@ export class OB11HttpServerAdapter extends IOB11NetworkAdapter<HttpServerConfig>
         this.app.use(async (req, res) => {
             await this.handleRequest(req, res);
         });
-        this.server.listen(this.config.port, this.config.host, () => {
-            this.core.context.logger.log(`[OneBot] [HTTP Server Adapter] Start On ${this.config.host}:${this.config.port}`);
+        this.server.listen(this.config.port, () => {
+            this.core.context.logger.log(`[OneBot] [HTTP Server Adapter] Start On Port ${this.config.port}`);
         });
     }
 

src/onebot/network/plugin.ts

@@ -22,7 +22,7 @@ export class OB11PluginAdapter extends IOB11NetworkAdapter<PluginConfig> {
 
     onEvent<T extends OB11EmitEventContent>(event: T) {
         if (event.post_type === 'message') {
-            plugin_onmessage(this.config.name, this.core, this.obContext, event as OB11Message, this.actions, this).then().catch();
+            plugin_onmessage(this.config.name, this.core, this.obContext, event as OB11Message, this.actions, this).then().catch(console.log);
         }
     }
 

src/onebot/network/websocket-server.ts

@@ -39,11 +39,8 @@ export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter<WebsocketSer
                 wsClient.close();
                 return;
             }
-            // 鉴权 close 不会立刻销毁 当前返回可避免挂载message事件 close 并未立刻关闭 而是存在timer操作后关闭
-            // 引发高危漏洞
-            if (!this.authorize(this.config.token, wsClient, wsReq)) {
-                return;
-            }
+            //鉴权
+            this.authorize(this.config.token, wsClient, wsReq);
             const paramUrl = wsReq.url?.indexOf('?') !== -1 ? wsReq.url?.substring(0, wsReq.url?.indexOf('?')) : wsReq.url;
             const isApiConnect = paramUrl === '/api' || paramUrl === '/api/';
             if (!isApiConnect) {
@@ -148,16 +145,15 @@ export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter<WebsocketSer
     }
 
     private authorize(token: string | undefined, wsClient: WebSocket, wsReq: IncomingMessage) {
-        if (!token || token.length == 0) return true;//客户端未设置密钥
+        if (!token || token.length == 0) return;//客户端未设置密钥
         const QueryClientToken = urlParse.parse(wsReq?.url || '', true).query['access_token'];
         const HeaderClientToken = wsReq.headers.authorization?.split('Bearer ').pop() || '';
         const ClientToken = typeof (QueryClientToken) === 'string' && QueryClientToken !== '' ? QueryClientToken : HeaderClientToken;
         if (ClientToken === token) {
-            return true;
+            return;
         }
         wsClient.send(JSON.stringify(OB11Response.res(null, 'failed', 1403, 'token验证失败')));
         wsClient.close();
-        return false;
     }
 
     private checkStateAndReply<T>(data: T, wsClient: WebSocket) {

src/plugin/TapAccountManager.ts

@@ -0,0 +1,203 @@
+/**
+ * TapTap账号管理类
+ */
+import * as fs from 'fs';
+import * as path from 'path';
+
+export class TapAccountManager {
+    private userBindTapMap = new Map<string, {
+        default: string;
+        list: Array<{
+            id: string;
+            name: string;
+        }>;
+    }>();
+    private dataFilePath: string;
+
+    constructor(dataDir: string = './data') {
+        // 确保数据目录存在
+        if (!fs.existsSync(dataDir)) {
+            fs.mkdirSync(dataDir, { recursive: true });
+        }
+        this.dataFilePath = path.join(dataDir, 'tap_accounts.json');
+        this.loadData();
+    }
+
+    saveData() {
+        try {
+            // 将 Map 转换为可序列化的对象
+            const dataObj: Record<string, any> = {};
+            this.userBindTapMap.forEach((value, key) => {
+                dataObj[key] = value;
+            });
+
+            fs.writeFileSync(
+                this.dataFilePath,
+                JSON.stringify(dataObj, null, 2),
+                'utf-8'
+            );
+        } catch (error) {
+            console.error('保存 TapTap 账号数据失败:', error);
+        }
+    }
+
+    loadData() {
+        try {
+            if (fs.existsSync(this.dataFilePath)) {
+                const fileContent = fs.readFileSync(this.dataFilePath, 'utf-8');
+                const dataObj = JSON.parse(fileContent);
+
+                // 清空当前数据并加载新数据
+                this.userBindTapMap.clear();
+                for (const [key, value] of Object.entries(dataObj)) {
+                    this.userBindTapMap.set(key, value as any);
+                }
+
+                console.log('TapTap 账号数据已加载');
+            } else {
+                console.log('未找到 TapTap 账号数据文件，将创建新的数据存储');
+            }
+        } catch (error) {
+            console.error('加载 TapTap 账号数据失败:', error);
+        }
+    }
+
+    /**
+     * 绑定TapTap ID
+     */
+    async bindAccount(userId: string, tapId: string, characterName: string): Promise<boolean> {
+        // 用户首次绑定账号
+        if (!this.userBindTapMap.has(userId)) {
+            this.userBindTapMap.set(userId, {
+                default: tapId,
+                list: [{
+                    id: tapId,
+                    name: characterName
+                }]
+            });
+            await this.saveData();
+            return true;
+        }
+
+        // 用户已有账号，追加新账号
+        const userData = this.userBindTapMap.get(userId)!;
+        // 检查是否已经绑定过该ID
+        if (!userData.list.some(item => item.id === tapId)) {
+            userData.list.push({
+                id: tapId,
+                name: characterName
+            });
+            userData.default = tapId; // 新绑定的账号自动设为默认
+            await this.saveData();
+            return true;
+        }
+
+        // 账号已存在
+        return false;
+    }
+
+    /**
+     * 切换默认TapTap ID
+     */
+    async switchAccount(userId: string, tapId: string): Promise<boolean> {
+        const userData = this.userBindTapMap.get(userId);
+        if (!userData) return false;
+
+        const accountItem = userData.list.find(item => item.id === tapId);
+        if (!accountItem) return false;
+
+        userData.default = tapId;
+        await this.saveData();
+        return true;
+    }
+
+    /**
+     * 删除绑定的TapTap ID
+     * @returns 删除结果、剩余默认账号信息（如果有）
+     */
+    async deleteAccount(userId: string, tapId: string): Promise<{
+        success: boolean;
+        deletedAccount?: { id: string; name: string; };
+        defaultAccount?: { id: string; name: string; };
+        isEmpty: boolean;
+    }> {
+        const userData = this.userBindTapMap.get(userId);
+        if (!userData) {
+            return { success: false, isEmpty: true };
+        }
+
+        const index = userData.list.findIndex(item => item.id === tapId);
+        if (index === -1) {
+            return { success: false, isEmpty: false };
+        }
+
+        const deletedAccount = userData.list[index];
+        userData.list.splice(index, 1);
+
+        // 如果删除的是当前默认账号，则需要重新设置默认账号
+        if (userData.default === tapId) {
+            userData.default = userData.list.length > 0 ? userData.list[0]?.id ?? '' : '';
+        }
+
+        // 如果没有绑定账号了，则删除该用户的记录
+        let result;
+        if (userData.list.length === 0) {
+            this.userBindTapMap.delete(userId);
+            result = {
+                success: true,
+                deletedAccount,
+                isEmpty: true
+            };
+        } else {
+            const defaultAccount = userData.list.find(item => item.id === userData.default);
+            result = {
+                success: true,
+                deletedAccount,
+                defaultAccount,
+                isEmpty: false
+            };
+        }
+
+        await this.saveData();
+        return result;
+    }
+
+    /**
+     * 获取用户账号列表
+     */
+    getAccountList(userId: string): {
+        hasAccounts: boolean;
+        accounts?: Array<{
+            id: string;
+            name: string;
+            isDefault: boolean;
+        }>;
+    } {
+        const userData = this.userBindTapMap.get(userId);
+        if (!userData || userData.list.length === 0) {
+            return { hasAccounts: false };
+        }
+
+        const accounts = userData.list.map(item => ({
+            id: item.id,
+            name: item.name,
+            isDefault: item.id === userData.default
+        }));
+
+        return { hasAccounts: true, accounts };
+    }
+
+    /**
+     * 获取用户当前默认账号ID
+     */
+    getDefaultAccount(userId: string): {
+        hasDefault: boolean;
+        tapId?: string;
+    } {
+        const userData = this.userBindTapMap.get(userId);
+        if (!userData || !userData.default) {
+            return { hasDefault: false };
+        }
+        return { hasDefault: true, tapId: userData.default };
+    }
+}

src/plugin/api.ts

@@ -0,0 +1,255 @@
+export interface GameUserDetail {
+    data: Data;
+    now: number;
+    success: boolean;
+    [property: string]: any;
+}
+
+export interface Data {
+    config: Config;
+    external_url: string;
+    is_bind: boolean;
+    list: DataList[];
+    next_page: string;
+    prev_page: string;
+    role_id: string;
+    sharing: Sharing;
+    show_bind_button: boolean;
+    [property: string]: any;
+}
+
+export interface Config {
+    app_icon: AppIcon;
+    banner: Banner;
+    font_class: string;
+    font_color: string;
+    label: Label;
+    show_bind_expired_alert: boolean;
+    tint: number;
+    title: string;
+    [property: string]: any;
+}
+
+export interface AppIcon {
+    color: string;
+    height: number;
+    medium_url: string;
+    original_format: string;
+    original_size: number;
+    original_url: string;
+    small_url: string;
+    url: string;
+    width: number;
+    [property: string]: any;
+}
+
+export interface Banner {
+    color: string;
+    height: number;
+    medium_url: string;
+    original_format: string;
+    original_size: number;
+    original_url: string;
+    small_url: string;
+    url: string;
+    width: number;
+    [property: string]: any;
+}
+
+export interface Label {
+    color: string;
+    medium_url: string;
+    original_format: string;
+    original_url: string;
+    small_url: string;
+    url: string;
+    [property: string]: any;
+}
+
+export interface DataList {
+    basic_module?: BasicModule;
+    character_module?: CharacterModule;
+    episode_module?: EpisodeModule;
+    is_sharing: boolean;
+    item_progress?: ItemProgress;
+    module_type: number;
+    weapon_module?: WeaponModule;
+    [property: string]: any;
+}
+
+export interface BasicModule {
+    avatar: BasicModuleAvatar;
+    custom_items: BasicModuleCustomItem[];
+    custom_title: string;
+    info: Info[];
+    name: string;
+    role_id: string;
+    subtitle: string;
+    [property: string]: any;
+}
+
+export interface BasicModuleAvatar {
+    color: string;
+    medium_url: string;
+    original_format: string;
+    original_url: string;
+    small_url: string;
+    url: string;
+    [property: string]: any;
+}
+
+export interface BasicModuleCustomItem {
+    is_main: boolean;
+    key: string;
+    value: string;
+    [property: string]: any;
+}
+
+export interface Info {
+    main_value: string;
+    name: string;
+    sub_value: string;
+    value: string;
+    [property: string]: any;
+}
+
+export interface CharacterModule {
+    custom_title: string;
+    list: CharacterModuleList[];
+    total: number;
+    [property: string]: any;
+}
+
+export interface CharacterModuleList {
+    grade: string;
+    image: PurpleImage;
+    level: number;
+    name: string;
+    talent_level: number;
+    [property: string]: any;
+}
+
+export interface PurpleImage {
+    color: string;
+    medium_url: string;
+    original_format: string;
+    original_url: string;
+    small_url: string;
+    url: string;
+    [property: string]: any;
+}
+
+export interface EpisodeModule {
+    custom_items: EpisodeModuleCustomItem[];
+    custom_title: string;
+    [property: string]: any;
+}
+
+export interface EpisodeModuleCustomItem {
+    is_main: boolean;
+    key: string;
+    value: string;
+    [property: string]: any;
+}
+
+export interface ItemProgress {
+    custom_title: string;
+    list: ItemProgressList[];
+    table_tabs: string[];
+    total: number;
+    [property: string]: any;
+}
+
+export interface ItemProgressList {
+    avatar: ListAvatar;
+    name: string;
+    progress: Progress;
+    sort: Sort;
+    [property: string]: any;
+}
+
+export interface ListAvatar {
+    color: string;
+    medium_url: string;
+    original_format: string;
+    original_url: string;
+    small_url: string;
+    url: string;
+    [property: string]: any;
+}
+
+export interface Progress {
+    current: number;
+    max: number;
+    [property: string]: any;
+}
+
+export interface Sort {
+    icon: Icon;
+    value: string;
+    [property: string]: any;
+}
+
+export interface Icon {
+    color: string;
+    medium_url: string;
+    original_format: string;
+    original_url: string;
+    small_url: string;
+    url: string;
+    [property: string]: any;
+}
+
+export interface WeaponModule {
+    custom_title: string;
+    list: WeaponModuleList[];
+    total: number;
+    [property: string]: any;
+}
+
+export interface WeaponModuleList {
+    grade: string;
+    image: FluffyImage;
+    level: number;
+    name: string;
+    props: string[];
+    rarity: Rarity;
+    [property: string]: any;
+}
+
+export interface FluffyImage {
+    color: string;
+    medium_url: string;
+    original_format: string;
+    original_url: string;
+    small_url: string;
+    url: string;
+    [property: string]: any;
+}
+
+export interface Rarity {
+    color: string;
+    medium_url: string;
+    original_format: string;
+    original_url: string;
+    small_url: string;
+    url: string;
+    [property: string]: any;
+}
+
+export interface Sharing {
+    description: string;
+    image: null;
+    moment_params: MomentParams;
+    qr_code: string;
+    title: string;
+    url: string;
+    [property: string]: any;
+}
+
+export interface MomentParams {
+    app_id: number;
+    group_label_id: number;
+    hashtag_ids: number[];
+    [property: string]: any;
+}

src/plugin/canvas.ts

@@ -0,0 +1,195 @@
+import { createCanvas, loadImage, GlobalFonts } from '@napi-rs/canvas';
+
+interface MenuCommand {
+    command: string;
+    description: string;
+    highlight?: boolean;
+}
+
+/**
+ * 生成REVERSE.1999帮助菜单图片 (自适应美化版)
+ * @returns 生成的图片的base64编码
+ */
+export async function generate1999HelpMenu(): Promise<string> {
+    try {
+        // 字体注册
+        const fontsToTry = [
+            { path: 'C:\\Windows\\Fonts\\msyh.ttc', name: 'Microsoft YaHei' },
+            { path: 'C:\\Windows\\Fonts\\msyhbd.ttc', name: 'Microsoft YaHei Bold' },
+            { path: 'C:\\Windows\\Fonts\\simhei.ttf', name: 'SimHei' }
+        ];
+        let fontFamily = 'sans-serif';
+        let fontFamilyBold = 'sans-serif';
+        for (const font of fontsToTry) {
+            try {
+                if (!GlobalFonts.has(font.name)) {
+                    GlobalFonts.registerFromPath(font.path, font.name);
+                }
+                if (font.name.includes('Bold')) {
+                    fontFamilyBold = font.name;
+                } else if (fontFamily === 'sans-serif') {
+                    fontFamily = font.name;
+                }
+            } catch { }
+        }
+        if (fontFamilyBold === 'sans-serif') fontFamilyBold = fontFamily;
+
+        // 画布设置
+        const width = 2560;
+        const height = 1440;
+        const canvas = createCanvas(width, height);
+        const ctx = canvas.getContext('2d');
+
+        // 背景处理
+        const backgroundPath = "E:\\NewDevelop\\NapCatQQ\\src\\canvas\\image\\normal\\01.jpg";
+        try {
+            const backgroundImage = await loadImage(backgroundPath);
+            const scale = Math.max(width / backgroundImage.width, height / backgroundImage.height);
+            const scaledWidth = backgroundImage.width * scale;
+            const scaledHeight = backgroundImage.height * scale;
+            const x = (width - scaledWidth) / 2;
+            const y = (height - scaledHeight) / 2;
+            ctx.drawImage(backgroundImage, x, y, scaledWidth, scaledHeight);
+            ctx.save();
+            ctx.filter = 'blur(20px) brightness(0.75)';
+            ctx.drawImage(backgroundImage, x, y, scaledWidth, scaledHeight);
+            ctx.restore();
+        } catch {
+            const gradient = ctx.createLinearGradient(0, 0, width, height);
+            gradient.addColorStop(0, '#2a2a40');
+            gradient.addColorStop(1, '#4a3a60');
+            ctx.fillStyle = gradient;
+            ctx.fillRect(0, 0, width, height);
+        }
+        // 半透明叠加层
+        ctx.fillStyle = 'rgba(15, 15, 25, 0.65)';
+        ctx.fillRect(0, 0, width, height);
+
+        // 命令列表
+        const commands: MenuCommand[] = [
+            { command: '#1999 绑定 <TapTap ID>', description: '将您的 TapTap ID 与机器人绑定', highlight: true },
+            { command: '#1999 切换 <TapTap ID>', description: '切换当前操作的 TapTap ID' },
+            { command: '#1999 删除 <TapTap ID>', description: '解除指定的 TapTap ID 绑定' },
+            { command: '#1999 账号', description: '查看所有已绑定的 TapTap 账号', highlight: true },
+            { command: '#1999 信息', description: '查询当前选中账号的游戏信息', highlight: true },
+            { command: '#1999 心相', description: '浏览当前账号拥有的心相详情' },
+            { command: '#1999 角色', description: '浏览当前账号拥有的角色详情' },
+            { command: '#1999 帮助', description: '显示此帮助菜单' }
+        ];
+
+        // 动态计算卡片宽度
+        ctx.font = `bold 40px ${fontFamilyBold}`;
+        let maxCommandWidth = 0;
+        let maxDescWidth = 0;
+        for (const cmd of commands) {
+            maxCommandWidth = Math.max(maxCommandWidth, ctx.measureText(cmd.command).width);
+            ctx.font = `32px ${fontFamily}`;
+            maxDescWidth = Math.max(maxDescWidth, ctx.measureText(cmd.description).width);
+            ctx.font = `bold 40px ${fontFamilyBold}`;
+        }
+        const baseCardWidth = Math.max(maxCommandWidth, maxDescWidth) + 120;
+        const minCardWidth = 420;
+        const maxCardWidth = Math.min(baseCardWidth, width * 0.38);
+        const cardWidth = Math.max(minCardWidth, Math.min(maxCardWidth, baseCardWidth));
+
+        // 卡片参数
+        const cardHeight = Math.floor(height * 0.07) + 44;
+        const cardBorderRadius = 24;
+        const cardShadow = 'rgba(60, 40, 120, 0.18)';
+        const textPaddingLeft = 38;
+        // 自适应间距，最大不超过指定值
+        const maxColGap = 44;
+        const maxRowGap = 32;
+        const minColGap = 24;
+        const minRowGap = 18;
+
+        // 动态计算列数，保证整体不空旷且不挤
+        let cols = Math.min(commands.length, Math.floor((width - 160) / (cardWidth + minColGap)));
+        cols = Math.max(1, cols);
+        let colGap = Math.floor((width - cols * cardWidth) / (cols + 1));
+        colGap = Math.max(minColGap, Math.min(colGap, maxColGap));
+        const rows = Math.ceil(commands.length / cols);
+        let rowGap = Math.floor((height - rows * cardHeight - 120) / (rows + 1));
+        rowGap = Math.max(minRowGap, Math.min(rowGap, maxRowGap));
+
+        // 计算整体卡片区尺寸，实现居中
+        const cardsAreaWidth = cols * cardWidth + (cols - 1) * colGap;
+        const cardsAreaHeight = rows * cardHeight + (rows - 1) * rowGap;
+        const cardsStartX = Math.floor((width - cardsAreaWidth) / 2);
+        const cardsStartY = Math.floor((height - cardsAreaHeight) / 2);
+
+        // 绘制命令卡片
+        ctx.textAlign = 'left';
+        ctx.textBaseline = 'middle';
+
+        for (let i = 0; i < commands.length; i++) {
+            const cmd = commands[i];
+            if (!cmd) continue;
+            const col = i % cols;
+            const row = Math.floor(i / cols);
+            const x = cardsStartX + col * (cardWidth + colGap);
+            const y = cardsStartY + row * (cardHeight + rowGap);
+
+            // 卡片阴影
+            ctx.save();
+            ctx.shadowColor = cardShadow;
+            ctx.shadowBlur = 16;
+            ctx.shadowOffsetY = 6;
+
+            // 卡片背景
+            ctx.beginPath();
+            ctx.roundRect(x, y, cardWidth, cardHeight, cardBorderRadius);
+            ctx.closePath();
+            if (cmd.highlight) {
+                const cardGradient = ctx.createLinearGradient(x, y, x + cardWidth, y);
+                cardGradient.addColorStop(0, 'rgba(110, 80, 250, 0.60)');
+                cardGradient.addColorStop(1, 'rgba(150, 110, 255, 0.72)');
+                ctx.fillStyle = cardGradient;
+            } else {
+                ctx.fillStyle = 'rgba(45, 45, 65, 0.89)';
+            }
+            ctx.fill();
+            ctx.restore();
+
+            // 左侧高亮条
+            if (cmd.highlight) {
+                ctx.save();
+                ctx.beginPath();
+                ctx.roundRect(x, y, cardWidth, cardHeight, cardBorderRadius);
+                ctx.clip();
+                ctx.fillStyle = '#c5a8ff';
+                ctx.fillRect(x, y, 12, cardHeight);
+                ctx.restore();
+            }
+
+            // 文本
+            const commandTextX = x + textPaddingLeft;
+            const commandTextY = y + cardHeight * 0.38;
+            const descriptionTextY = y + cardHeight * 0.74;
+
+            ctx.fillStyle = cmd.highlight ? '#f0e8ff' : '#c0d4ff';
+            ctx.font = `bold 40px ${fontFamilyBold}`;
+            ctx.fillText(cmd.command, commandTextX, commandTextY);
+
+            ctx.fillStyle = cmd.highlight ? 'rgba(255,255,255,1)' : 'rgba(225,230,245,0.92)';
+            ctx.font = `32px ${fontFamily}`;
+            ctx.fillText(cmd.description, commandTextX, descriptionTextY);
+        }
+
+        // 底部 NapCat & Plugin
+        const bottomTextY = height - 36;
+        ctx.font = `23px ${fontFamily}`;
+        ctx.fillStyle = 'rgba(255,255,255,0.62)';
+        ctx.textAlign = 'center';
+        ctx.textBaseline = 'bottom';
+        ctx.fillText('NapCat & Plugin', width / 2, bottomTextY);
+
+        // 转换为base64
+        const buffer = canvas.toBuffer('image/png');
+        const base64Image = `base64://${buffer.toString('base64')}`;
+        return base64Image;
+    } catch (error) {
+        console.error('生成菜单时发生错误:', error);
+        throw error;
+    }
+}

src/plugin/get_user.ts

@@ -0,0 +1,25 @@
+import { RequestUtil } from '@/common/request';
+import { GameUserDetail } from './api';
+
+/**
+ * 获取用户游戏记录信息
+ * @param tap_id TapTap用户ID
+ * @returns 用户游戏记录信息
+ */
+
+export async function get_user(tap_id: string): Promise<GameUserDetail> {
+    try {
+        const params = new URLSearchParams({
+            'app_id': '221062',
+            'user_id': tap_id,
+            'X-UA': 'V=1&PN=WebApp&LANG=zh_CN&VN_CODE=102&VN=0.1.0&LOC=CN&PLT=Android&DS=Android&UID=00e000ee-00e0-0e0e-ee00-f0c95d8ca115&VID=444444444&OS=Android&OSV=14.0.1'
+        });
+
+        const url = `https://www.taptap.cn/webapiv2/game-record/v1/detail-by-user?${params.toString()}`;
+        return await RequestUtil.HttpGetJson(url, 'GET');
+    } catch (error) {
+        console.error('获取用户游戏记录失败:', error);
+        throw error;
+    }
+}
+

src/plugin/index.ts

@@ -1,11 +1,219 @@
-import { NapCatOneBot11Adapter, OB11Message } from '@/onebot';
+import { NapCatOneBot11Adapter, OB11Message, OB11MessageDataType } from '@/onebot';
 import { NapCatCore } from '@/core';
 import { ActionMap } from '@/onebot/action';
 import { OB11PluginAdapter } from '@/onebot/network/plugin';
+import { TapAccountManager } from './TapAccountManager';
+import { sendMessage } from './sendMessage';
+import { get_user } from './get_user';
+import { generate1999HelpMenu } from './canvas';
+import { generate1999AccountListImage, generate1999BindImage, generate1999CharacterImage, generate1999InfoImage, generate1999SwitchImage, generate1999WeaponImage } from './new';
 
-export const plugin_onmessage = async (adapter: string, _core: NapCatCore, _obCtx: NapCatOneBot11Adapter, message: OB11Message, action: ActionMap, instance: OB11PluginAdapter) => {
-    if (message.raw_message === 'ping') {
-        const ret = await action.get('send_group_msg')?.handle({ group_id: String(message.group_id), message: 'pong' }, adapter, instance.config);
-        console.log(ret);
+const tapAccountManager = new TapAccountManager();
+
+export const plugin_onmessage = async (
+    _adapter: string,
+    _core: NapCatCore,
+    _obCtx: NapCatOneBot11Adapter,
+    message: OB11Message,
+    action: ActionMap,
+    _instance: OB11PluginAdapter
+) => {
+    if (message.raw_message.startsWith('#1999 绑定')) {
+        const tap_id = message.raw_message.slice(8).trim();
+        const userId = message.user_id.toString();
+
+        if (tap_id.length === 0) {
+            await sendMessage(message, action, '请输入正确的 TapTap ID');
+            return;
+        }
+
+        try {
+            // 验证账号有效性并获取角色名称
+            const userInfo = await get_user(tap_id);
+            const characterName = userInfo.data.list[0]?.basic_module?.name;
+            if (!characterName) {
+                await sendMessage(message, action, '获取角色名称失败，请检查账号是否有效');
+                return;
+            }
+            // 使用账号管理器绑定账号
+            tapAccountManager.bindAccount(userId, tap_id, characterName);
+            await sendMessage(message, action, [{
+                type: OB11MessageDataType.image,
+                data: {
+                    file: await generate1999BindImage(tap_id, characterName),
+                    summary: '绑定成功'
+                }
+            }]);
+        } catch (error) {
+            await sendMessage(message, action, `绑定失败，可能是TapTap ID无效或未关联游戏账号`);
+            console.error(`绑定TapTap ID失败:`, error);
+        }
     }
-};
+    else if (message.raw_message.startsWith('#1999 切换')) {
+        const tap_id = message.raw_message.slice(8).trim();
+        const userId = message.user_id.toString();
+
+        if (tap_id.length === 0) {
+            await sendMessage(message, action, '请输入要切换的 TapTap ID');
+            return;
+        }
+
+        // 使用账号管理器切换账号
+        const result = tapAccountManager.switchAccount(userId, tap_id);
+        if (!result) {
+            const accountList = tapAccountManager.getAccountList(userId);
+            if (!accountList.hasAccounts) {
+                await sendMessage(message, action, '您尚未绑定任何账号，请先使用"#1999 绑定"命令');
+            } else {
+                await sendMessage(message, action, `未找到ID为 ${tap_id} 的绑定记录，请先绑定该账号`);
+            }
+            return;
+        }
+
+        const accountInfo = tapAccountManager.getAccountList(userId);
+        const account = accountInfo.accounts?.find(a => a.id === tap_id);
+        await sendMessage(message, action, [{
+            type: OB11MessageDataType.image,
+            data: {
+                file: await generate1999SwitchImage(tap_id, account?.name ?? ''),
+                summary: '切换成功'
+            }
+        }]);
+    }
+    else if (message.raw_message.startsWith('#1999 删除')) {
+        const tap_id = message.raw_message.slice(8).trim();
+        const userId = message.user_id.toString();
+
+        if (tap_id.length === 0) {
+            await sendMessage(message, action, '请输入要删除的 TapTap ID');
+            return;
+        }
+
+        // 使用账号管理器删除账号
+        const result = await tapAccountManager.deleteAccount(userId, tap_id);
+
+        if (!result.success) {
+            if (result.isEmpty) {
+                await sendMessage(message, action, '您尚未绑定任何账号');
+            } else {
+                await sendMessage(message, action, `未找到ID为 ${tap_id} 的绑定记录`);
+            }
+            return;
+        }
+
+        if (result.isEmpty) {
+            await sendMessage(message, action, `已删除账号 ${tap_id}(${result.deletedAccount?.name})，您当前没有绑定任何账号`);
+        } else {
+            await sendMessage(message, action, `已删除账号 ${tap_id}(${result.deletedAccount?.name})，当前默认账号为 ${result.defaultAccount?.id}(${result.defaultAccount?.name})`);
+        }
+    }
+    else if (message.raw_message.startsWith('#1999 账号')) {
+        const userId = message.user_id.toString();
+        const accountList = tapAccountManager.getAccountList(userId);
+
+        if (!accountList.hasAccounts) {
+            await sendMessage(message, action, '您尚未绑定任何账号');
+            return;
+        }
+
+        await sendMessage(message, action, [{
+            type: OB11MessageDataType.image,
+            data: {
+                file: await generate1999AccountListImage(accountList.accounts!),
+                summary: '账号列表'
+            }
+        }]);
+    }
+    else if (message.raw_message.startsWith('#1999 信息')) {
+        const userId = message.user_id.toString();
+        const defaultAccount = tapAccountManager.getDefaultAccount(userId);
+
+        if (!defaultAccount.hasDefault) {
+            await sendMessage(message, action, '请先绑定 TapTap ID');
+            return;
+        }
+
+        const tap_id = defaultAccount.tapId!;
+
+        try {
+            const userInfo = await get_user(tap_id);
+            const user_1999_name = userInfo.data.list[0]?.basic_module?.name;
+            if (!user_1999_name) {
+                await sendMessage(message, action, '获取账号信息失败，请检查账号是否有效');
+                return;
+            }
+            await sendMessage(message, action, [{
+                type: OB11MessageDataType.image,
+                data: {
+                    file: await generate1999InfoImage(userInfo),
+                    summary: '账号信息'
+                }
+            }]);
+        } catch (error) {
+            await sendMessage(message, action, '获取账号信息失败，请检查账号是否有效');
+            console.error('获取用户信息失败:', error);
+        }
+    }
+    else if (message.raw_message.startsWith('#1999 心相')) {
+        const userId = message.user_id.toString();
+        const defaultAccount = tapAccountManager.getDefaultAccount(userId);
+
+        if (!defaultAccount.hasDefault) {
+            await sendMessage(message, action, '请先绑定 TapTap ID');
+            return;
+        }
+
+        const tap_id = defaultAccount.tapId!;
+        try {
+            const userInfo = await get_user(tap_id);
+            await sendMessage(message, action, [
+                {
+                    type: OB11MessageDataType.image,
+                    data: {
+                        file: await generate1999WeaponImage(userInfo),
+                        summary: '心相信息'
+                    }
+                }
+            ]);
+        } catch (error) {
+            await sendMessage(message, action, '获取心相信息失败，请检查账号是否有效');
+            console.error('获取心相信息失败:', error);
+        }
+    }
+    else if (message.raw_message.startsWith('#1999 角色')) {
+        const userId = message.user_id.toString();
+        const defaultAccount = tapAccountManager.getDefaultAccount(userId);
+
+        if (!defaultAccount.hasDefault) {
+            await sendMessage(message, action, '请先绑定 TapTap ID');
+            return;
+        }
+
+        const tap_id = defaultAccount.tapId!;
+        try {
+            const userInfo = await get_user(tap_id);
+            const user_1999_name = userInfo.data.list[0]?.basic_module?.name;
+            if (!user_1999_name) {
+                await sendMessage(message, action, '获取角色信息失败，请检查账号是否有效');
+                return;
+            }
+            await sendMessage(message, action, [
+                {
+                    type: OB11MessageDataType.image,
+                    data: {
+                        file: await generate1999CharacterImage(userInfo),
+                        summary: '角色信息'
+                    }
+                }
+            ]);
+        } catch (error) {
+            await sendMessage(message, action, '获取角色信息失败，请检查账号是否有效');
+            console.error('获取角色信息失败:', error);
+        }
+    }
+    else if (message.raw_message.startsWith('#1999 帮助') || message.raw_message.startsWith('#1999 菜单')) {
+        await sendMessage(message, action, [
+            { type: OB11MessageDataType.image, data: { file: await generate1999HelpMenu() } }
+        ]);
+    }
+};

src/plugin/new.ts

@@ -0,0 +1,387 @@
+import { createCanvas, loadImage, GlobalFonts } from '@napi-rs/canvas';
+import { GameUserDetail } from './api';
+
+// 字体注册工具
+function getFontFamily() {
+    const fontsToTry = [
+        { path: 'C:\\Windows\\Fonts\\msyh.ttc', name: 'Microsoft YaHei' },
+        { path: 'C:\\Windows\\Fonts\\msyhbd.ttc', name: 'Microsoft YaHei Bold' },
+        { path: 'C:\\Windows\\Fonts\\simhei.ttf', name: 'SimHei' }
+    ];
+    let fontFamily = 'sans-serif';
+    let fontFamilyBold = 'sans-serif';
+    for (const font of fontsToTry) {
+        try {
+            if (!GlobalFonts.has(font.name)) {
+                GlobalFonts.registerFromPath(font.path, font.name);
+            }
+            if (font.name.includes('Bold')) {
+                fontFamilyBold = font.name;
+            } else if (fontFamily === 'sans-serif') {
+                fontFamily = font.name;
+            }
+        } catch { }
+    }
+    if (fontFamilyBold === 'sans-serif') fontFamilyBold = fontFamily;
+    return { fontFamily, fontFamilyBold };
+}
+
+// 背景绘制工具
+async function drawBackground(ctx: any, width: number, height: number) {
+    const backgroundPath = "E:\\NewDevelop\\NapCatQQ\\src\\canvas\\image\\normal\\01.jpg";
+    try {
+        const backgroundImage = await loadImage(backgroundPath);
+        const scale = Math.max(width / backgroundImage.width, height / backgroundImage.height);
+        const scaledWidth = backgroundImage.width * scale;
+        const scaledHeight = backgroundImage.height * scale;
+        const x = (width - scaledWidth) / 2;
+        const y = (height - scaledHeight) / 2;
+        ctx.drawImage(backgroundImage, x, y, scaledWidth, scaledHeight);
+        ctx.save();
+        ctx.filter = 'blur(20px) brightness(0.75)';
+        ctx.drawImage(backgroundImage, x, y, scaledWidth, scaledHeight);
+        ctx.restore();
+    } catch {
+        const gradient = ctx.createLinearGradient(0, 0, width, height);
+        gradient.addColorStop(0, '#2a2a40');
+        gradient.addColorStop(1, '#4a3a60');
+        ctx.fillStyle = gradient;
+        ctx.fillRect(0, 0, width, height);
+    }
+    ctx.fillStyle = 'rgba(15, 15, 25, 0.65)';
+    ctx.fillRect(0, 0, width, height);
+}
+
+// 标题美化工具
+function drawTitle(ctx: any, text: string, width: number, y: number, fontFamilyBold: string) {
+    // 小标题条
+    ctx.save();
+    ctx.globalAlpha = 0.32;
+    ctx.fillStyle = '#c5a8ff';
+    ctx.fillRect(width / 2 - 220, y - 38, 440, 54);
+    ctx.restore();
+    // 标题
+    ctx.font = `bold 44px ${fontFamilyBold}`;
+    ctx.fillStyle = '#f0e8ff';
+    ctx.textAlign = 'center';
+    ctx.fillText(text, width / 2, y);
+    // 下划线
+    ctx.save();
+    ctx.strokeStyle = '#c5a8ff';
+    ctx.lineWidth = 3;
+    ctx.beginPath();
+    ctx.moveTo(width / 2 - 80, y + 18);
+    ctx.lineTo(width / 2 + 80, y + 18);
+    ctx.stroke();
+    ctx.restore();
+}
+
+// 信息行绘制
+function drawInfoLine(ctx: any, text: string, x: number, y: number, font: string, color: string | CanvasGradient | CanvasPattern) {
+    ctx.font = font;
+    // 兼容 CanvasGradient/CanvasPattern 和 string
+    if (typeof color === 'string' || color instanceof CanvasGradient || color instanceof CanvasPattern) {
+        ctx.fillStyle = color;
+    } else {
+        ctx.fillStyle = '#c5a8ff';
+    }
+    ctx.textAlign = 'left';
+    ctx.fillText(text, x, y);
+}
+
+// 卡片小块绘制
+function drawMiniCard(ctx: any, x: number, y: number, w: number, h: number, radius: number, shadow = true, color?: string, shadowColor?: string) {
+    ctx.save();
+    if (shadow) {
+        ctx.shadowColor = shadowColor ?? 'rgba(60, 40, 120, 0.13)';
+        ctx.shadowBlur = 12;
+    }
+    ctx.beginPath();
+    ctx.roundRect(x, y, w, h, radius);
+    ctx.closePath();
+    ctx.fillStyle = color ?? 'rgba(45, 45, 65, 0.89)';
+    ctx.fill();
+    ctx.restore();
+}
+
+// 底部标识
+function drawFooter(ctx: any, width: number, height: number, fontFamily: string) {
+    ctx.font = `22px ${fontFamily}`;
+    ctx.fillStyle = 'rgba(255,255,255,0.62)';
+    ctx.textAlign = 'center';
+    ctx.textBaseline = 'bottom';
+    ctx.fillText('NapCat & Plugin', width / 2, height - 24);
+}
+
+/**
+ * 生成REVERSE.1999 信息图片
+ */
+export async function generate1999InfoImage(userInfo: any): Promise<string> {
+    const { fontFamily, fontFamilyBold } = getFontFamily();
+    const width = 2560, height = 1440;
+    const canvas = createCanvas(width, height);
+    const ctx = canvas.getContext('2d');
+    await drawBackground(ctx, width, height);
+
+    // 标题
+    drawTitle(ctx, '账号信息', width, 120, fontFamilyBold);
+
+    // 信息内容
+    const startX = width / 2 - 350, startY = 220, lineH = 62;
+    const infoList = [
+        `昵称: ${userInfo.data.list[0]?.basic_module?.name ?? '-'}`,
+        `角色ID: ${userInfo.data.list[0]?.basic_module?.role_id ?? '-'}`,
+        `角色数量: ${userInfo.data.list[0]?.basic_module?.custom_items[0]?.value ?? '-'}`,
+        `登录天数: ${userInfo.data.list[0]?.basic_module?.custom_items[1]?.value ?? '-'}`,
+        `雨滴数量: ${userInfo.data.list[0]?.basic_module?.custom_items[2]?.value ?? '-'}`,
+        `你何时睁眼看这个世界: ${userInfo.data.list[1]?.episode_module?.custom_items[0]?.value ?? '-'}`,
+        `你在哪一幕: ${userInfo.data.list[1]?.episode_module?.custom_items[1]?.value ?? '-'}`,
+        `人工梦游: ${userInfo.data.list[1]?.episode_module?.custom_items[2]?.value ?? '-'}`,
+    ];
+    ctx.font = `bold 36px ${fontFamilyBold}`;
+    ctx.fillStyle = '#c5a8ff';
+    infoList.forEach((txt, i) => {
+        drawInfoLine(ctx, txt, startX, startY + i * lineH, ctx.font, ctx.fillStyle);
+    });
+
+    drawFooter(ctx, width, height, fontFamily);
+    const buffer = canvas.toBuffer('image/png');
+    return `base64://${buffer.toString('base64')}`;
+}
+
+/**
+ * 生成REVERSE.1999 心相图片
+ */
+export async function generate1999WeaponImage(userInfo: GameUserDetail): Promise<string> {
+    const { fontFamily, fontFamilyBold } = getFontFamily();
+    const width = 2560, height = 1440;
+    const canvas = createCanvas(width, height);
+    const ctx = canvas.getContext('2d');
+    await drawBackground(ctx, width, height);
+
+    drawTitle(ctx, '心相', width, 120, fontFamilyBold);
+
+    ctx.font = `bold 34px ${fontFamilyBold}`;
+    ctx.fillStyle = '#c5a8ff';
+    drawInfoLine(ctx, `昵称: ${userInfo.data.list[0]?.basic_module?.name ?? '-'}`, width / 2 - 350, 180, ctx.font, ctx.fillStyle);
+    drawInfoLine(ctx, `角色ID: ${userInfo.data.list[0]?.basic_module?.role_id ?? '-'}`, width / 2 - 350, 230, ctx.font, ctx.fillStyle);
+
+    const weaponList = userInfo.data.list[3]?.weapon_module?.list ?? [];
+    const cardW = 420, cardH = 110, gapX = 38, gapY = 32;
+    const imgSize = 90;
+    const textLeft = 36 + imgSize + 18; // 缩略图+间隔
+    const cols = Math.min(5, Math.floor((width - 2 * gapX) / (cardW + gapX)));
+    const areaW = cols * cardW + (cols - 1) * gapX;
+    const startX = (width - areaW) / 2;
+    let y = 280;
+    ctx.font = `bold 32px ${fontFamilyBold}`;
+    for (let idx = 0; idx < weaponList.length; idx++) {
+        const item = weaponList[idx];
+        const col = idx % cols, row = Math.floor(idx / cols);
+        const x = startX + col * (cardW + gapX);
+        const cy = y + row * (cardH + gapY);
+        drawMiniCard(ctx, x, cy, cardW, cardH, 22);
+
+        if (!item) continue; // 跳过空值
+        // 绘制缩略图
+        if (item.image?.small_url) {
+            try {
+                const img = await loadImage(item.image.small_url);
+                const imgX = x + 18;
+                const imgY = cy + (cardH - imgSize) / 2;
+                ctx.save();
+                ctx.beginPath();
+                ctx.arc(imgX + imgSize / 2, imgY + imgSize / 2, imgSize / 2, 0, Math.PI * 2);
+                ctx.closePath();
+                ctx.clip();
+                ctx.drawImage(img, imgX, imgY, imgSize, imgSize);
+                ctx.restore();
+            } catch { }
+        }
+
+        ctx.fillStyle = '#f0e8ff';
+        ctx.font = `bold 32px ${fontFamilyBold}`;
+        ctx.fillText(item.name ?? '-', x + textLeft, cy + cardH / 2 - 12);
+        ctx.font = `28px ${fontFamily}`;
+        ctx.fillStyle = '#c5a8ff';
+        ctx.fillText(`LV.${item.level ?? '-'}`, x + textLeft, cy + cardH / 2 + 32);
+    }
+
+    drawFooter(ctx, width, height, fontFamily);
+    const buffer = canvas.toBuffer('image/png');
+    return `base64://${buffer.toString('base64')}`;
+}
+
+/**
+ * 生成REVERSE.1999 角色图片
+ */
+export async function generate1999CharacterImage(userInfo: GameUserDetail): Promise<string> {
+    const { fontFamily, fontFamilyBold } = getFontFamily();
+    const width = 2560, height = 1440;
+    const canvas = createCanvas(width, height);
+    const ctx = canvas.getContext('2d');
+    await drawBackground(ctx, width, height);
+
+    drawTitle(ctx, '角色', width, 120, fontFamilyBold);
+
+    ctx.font = `bold 34px ${fontFamilyBold}`;
+    ctx.fillStyle = '#c5a8ff';
+    drawInfoLine(ctx, `昵称: ${userInfo.data.list[0]?.basic_module?.name ?? '-'}`, width / 2 - 350, 180, ctx.font, ctx.fillStyle);
+    drawInfoLine(ctx, `角色ID: ${userInfo.data.list[0]?.basic_module?.role_id ?? '-'}`, width / 2 - 350, 230, ctx.font, ctx.fillStyle);
+
+    const charList = userInfo.data.list[2]?.character_module?.list ?? [];
+    const cardW = 420, cardH = 110, gapX = 38, gapY = 32;
+    const imgSize = 90;
+    const textLeft = 36 + imgSize + 18;
+    const cols = Math.min(5, Math.floor((width - 2 * gapX) / (cardW + gapX)));
+    const areaW = cols * cardW + (cols - 1) * gapX;
+    const startX = (width - areaW) / 2;
+    let y = 280;
+    ctx.font = `bold 32px ${fontFamilyBold}`;
+    for (let idx = 0; idx < charList.length; idx++) {
+        const item = charList[idx];
+        const col = idx % cols, row = Math.floor(idx / cols);
+        const x = startX + col * (cardW + gapX);
+        const cy = y + row * (cardH + gapY);
+        drawMiniCard(ctx, x, cy, cardW, cardH, 22);
+
+        // 绘制缩略图
+        if (!item) continue; // 跳过空值
+        if (item.image?.small_url) {
+            try {
+                const img = await loadImage(item.image.small_url);
+                const imgX = x + 18;
+                const imgY = cy + (cardH - imgSize) / 2;
+                ctx.save();
+                ctx.beginPath();
+                ctx.arc(imgX + imgSize / 2, imgY + imgSize / 2, imgSize / 2, 0, Math.PI * 2);
+                ctx.closePath();
+                ctx.clip();
+                ctx.drawImage(img, imgX, imgY, imgSize, imgSize);
+                ctx.restore();
+            } catch { }
+        }
+
+        ctx.fillStyle = '#f0e8ff';
+        ctx.font = `bold 32px ${fontFamilyBold}`;
+        ctx.fillText(item.name ?? '-', x + textLeft, cy + cardH / 2 - 12);
+        ctx.font = `28px ${fontFamily}`;
+        ctx.fillStyle = '#c5a8ff';
+        ctx.fillText(`LV.${item.level ?? '-'}`, x + textLeft, cy + cardH / 2 + 32);
+    }
+
+    drawFooter(ctx, width, height, fontFamily);
+    const buffer = canvas.toBuffer('image/png');
+    return `base64://${buffer.toString('base64')}`;
+}
+
+/**
+ * 生成REVERSE.1999 绑定/切换结果图片
+ */
+async function generateSimpleResultImage(title: string, tapId: string, characterName: string): Promise<string> {
+    const { fontFamily, fontFamilyBold } = getFontFamily();
+    const width = 900, height = 340;
+    const canvas = createCanvas(width, height);
+    const ctx = canvas.getContext('2d');
+    await drawBackground(ctx, width, height);
+
+    // 标题
+    drawTitle(ctx, title, width, 80, fontFamilyBold);
+
+    // 内容卡片
+    const cardW = 700, cardH = 120, cardX = (width - cardW) / 2, cardY = 120;
+    drawMiniCard(
+        ctx,
+        cardX,
+        cardY,
+        cardW,
+        cardH,
+        20,
+        true,
+        'rgba(197,168,255,0.18)',
+        'rgba(197,168,255,0.13)'
+    );
+
+    // TapTap ID
+    ctx.font = `bold 28px ${fontFamilyBold}`;
+    ctx.fillStyle = '#c5a8ff';
+    ctx.textAlign = 'left';
+    ctx.fillText(`TapTap ID:`, cardX + 36, cardY + 48);
+    ctx.font = `bold 28px ${fontFamilyBold}`;
+    ctx.fillStyle = '#fffbe6';
+    ctx.fillText(tapId, cardX + 180, cardY + 48);
+
+    // 角色名称
+    ctx.font = `bold 28px ${fontFamilyBold}`;
+    ctx.fillStyle = '#c5a8ff';
+    ctx.fillText(`角色名称:`, cardX + 36, cardY + 88);
+    ctx.font = `bold 28px ${fontFamilyBold}`;
+    ctx.fillStyle = '#ffe066';
+    ctx.fillText(characterName, cardX + 180, cardY + 88);
+
+    drawFooter(ctx, width, height, fontFamily);
+    const buffer = canvas.toBuffer('image/png');
+    return `base64://${buffer.toString('base64')}`;
+}
+
+export async function generate1999BindImage(tapId: string, characterName: string): Promise<string> {
+    return generateSimpleResultImage('绑定成功', tapId, characterName);
+}
+
+export async function generate1999SwitchImage(tapId: string, characterName: string): Promise<string> {
+    return generateSimpleResultImage('切换成功', tapId, characterName);
+}
+
+/**
+ * 生成REVERSE.1999 账号列表图片
+ */
+export async function generate1999AccountListImage(accountList: { id: string, name: string, isDefault?: boolean }[]): Promise<string> {
+    const { fontFamily, fontFamilyBold } = getFontFamily();
+    const width = 900;
+    const cardW = 700, cardH = 56, gapY = 18;
+    const listH = accountList.length * cardH + (accountList.length - 1) * gapY;
+    const height = Math.max(340, 120 + listH + 60);
+    const canvas = createCanvas(width, height);
+    const ctx = canvas.getContext('2d');
+    await drawBackground(ctx, width, height);
+
+    // 标题
+    drawTitle(ctx, '已绑定账号列表', width, 80, fontFamilyBold);
+
+    // 列表区域起始Y，垂直居中
+    const startY = Math.max(140, (height - listH) / 2);
+
+    for (let i = 0; i < accountList.length; i++) {
+        const item = accountList[i];
+        if (!item) continue; // 跳过空值
+        const x = (width - cardW) / 2;
+        const y = startY + i * (cardH + gapY);
+
+        // 卡片颜色
+        const cardColor = item.isDefault ? 'rgba(255, 224, 102, 0.22)' : 'rgba(197, 168, 255, 0.18)';
+        const shadowColor = item.isDefault ? 'rgba(255, 224, 102, 0.18)' : 'rgba(197, 168, 255, 0.13)';
+        drawMiniCard(ctx, x, y, cardW, cardH, 16, true, cardColor, shadowColor);
+
+        // 账号ID（小号，灰色）
+        ctx.font = `22px ${fontFamily}`;
+        ctx.fillStyle = '#b0b0c8';
+        ctx.textAlign = 'left';
+        ctx.fillText(`ID: ${item.id}`, x + 28, y + 26);
+
+        // 账号名（大号，主色）
+        ctx.font = `bold 26px ${fontFamilyBold}`;
+        ctx.fillStyle = item.isDefault ? '#ffe066' : '#c5a8ff';
+        ctx.fillText(item.name, x + 28, y + 48);
+
+        // 当前使用标识
+        if (item.isDefault) {
+            ctx.font = `bold 18px ${fontFamilyBold}`;
+            ctx.fillStyle = '#fffbe6';
+            ctx.fillText('（当前使用）', x + 28 + ctx.measureText(item.name).width + 12, y + 48);
+        }
+    }
+
+    drawFooter(ctx, width, height, fontFamily);
+    const buffer = canvas.toBuffer('image/png');
+    return `base64://${buffer.toString('base64')}`;
+}

src/plugin/sendMessage.ts

@@ -0,0 +1,23 @@
+import { OB11Message, OB11MessageData } from '@/onebot';
+import { ActionMap } from '@/onebot/action';
+
+/**
+ * 发送消息工具函数
+ */
+export   async function sendMessage<T extends OB11MessageData[] | string>(
+    message: OB11Message,
+    action: ActionMap,
+    content: T
+) {
+    if (message.message_type === 'private') {
+        await action.get('send_msg')?._handle({
+            user_id: message.user_id.toString(),
+            message: content,
+        });
+    } else {
+        await action.get('send_msg')?._handle({
+            group_id: message.group_id?.toString(),
+            message: content,
+        });
+    }
+};

src/shell/pipe.ts

@@ -1,7 +1,6 @@
 import { LogWrapper } from '@/common/log';
 import * as net from 'net';
 import * as process from 'process';
-import { Writable } from 'stream';
 
 /**
  * 连接到命名管道并重定向stdout
@@ -12,6 +11,7 @@ import { Writable } from 'stream';
 export function connectToNamedPipe(logger: LogWrapper, timeoutMs: number = 5000): Promise<{ disconnect: () => void }> {
     return new Promise((resolve, reject) => {
         if (process.platform !== 'win32') {
+            logger.log('只有Windows平台支持命名管道');
             // 非Windows平台不reject，而是返回一个空的disconnect函数
             return resolve({ disconnect: () => { } });
         }
@@ -25,50 +25,12 @@ export function connectToNamedPipe(logger: LogWrapper, timeoutMs: number = 5000)
         }, timeoutMs);
 
         try {
-            const originalStdoutWrite = process.stdout.write.bind(process.stdout);
+            let originalStdoutWrite = process.stdout.write.bind(process.stdout);
             const pipeSocket = net.connect(pipePath, () => {
                 // 清除超时
                 clearTimeout(timeoutId);
 
-                // 优化网络性能设置
-                pipeSocket.setNoDelay(true); // 减少延迟
-
-                // 设置更高的高水位线，允许更多数据缓冲
-
                 logger.log(`[StdOut] 已重定向到命名管道: ${pipePath}`);
-
-                // 创建拥有更优雅背压处理的 Writable 流
-                const pipeWritable = new Writable({
-                    highWaterMark: 1024 * 64, // 64KB 高水位线
-                    write(chunk, encoding, callback) {
-                        if (!pipeSocket.writable) {
-                            // 如果管道不可写，退回到原始stdout
-                            logger.log('[StdOut] 管道不可写，回退到控制台输出');
-                            return originalStdoutWrite(chunk, encoding, callback);
-                        }
-
-                        // 尝试写入数据到管道
-                        const canContinue = pipeSocket.write(chunk, encoding, () => {
-                            // 数据已被发送或放入内部缓冲区
-                        });
-
-                        if (canContinue) {
-                            // 如果返回true，表示可以继续写入更多数据
-                            // 立即通知写入流可以继续
-                            process.nextTick(callback);
-                        } else {
-                            // 如果返回false，表示内部缓冲区已满
-                            // 等待drain事件再恢复写入
-                            pipeSocket.once('drain', () => {
-                                callback();
-                            });
-                        }
-                        // 明确返回true，表示写入已处理
-                        return true;
-                    }
-                });
-
-                // 重定向stdout
                 process.stdout.write = (
                     chunk: any,
                     encoding?: BufferEncoding | (() => void),
@@ -78,11 +40,8 @@ export function connectToNamedPipe(logger: LogWrapper, timeoutMs: number = 5000)
                         cb = encoding;
                         encoding = undefined;
                     }
-
-                    // 使用优化的writable流处理写入
-                    return pipeWritable.write(chunk, encoding as BufferEncoding, cb as () => void);
+                    return pipeSocket.write(chunk, encoding as BufferEncoding, cb);
                 };
-
                 // 提供断开连接的方法
                 const disconnect = () => {
                     process.stdout.write = originalStdoutWrite;
@@ -94,7 +53,6 @@ export function connectToNamedPipe(logger: LogWrapper, timeoutMs: number = 5000)
                 resolve({ disconnect });
             });
 
-            // 管道错误处理
             pipeSocket.on('error', (err) => {
                 clearTimeout(timeoutId);
                 process.stdout.write = originalStdoutWrite;
@@ -102,18 +60,11 @@ export function connectToNamedPipe(logger: LogWrapper, timeoutMs: number = 5000)
                 reject(err);
             });
 
-            // 管道关闭处理
             pipeSocket.on('end', () => {
                 process.stdout.write = originalStdoutWrite;
                 logger.log('命名管道连接已关闭');
             });
 
-            // 确保在连接意外关闭时恢复stdout
-            pipeSocket.on('close', () => {
-                process.stdout.write = originalStdoutWrite;
-                logger.log('命名管道连接已关闭');
-            });
-
         } catch (error) {
             clearTimeout(timeoutId);
             logger.log(`尝试连接命名管道 ${pipePath} 时发生异常:`, error);

src/webui/index.ts

@@ -122,9 +122,7 @@ export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapp
 
     // ------------挂载路由------------
     // 挂载静态路由（前端），路径为 /webui
-    app.use('/webui', express.static(pathWrapper.staticPath, {
-        maxAge: '1d'
-    }));
+    app.use('/webui', express.static(pathWrapper.staticPath));
     // 初始化WebSocket服务器
     const sslCerts = await checkCertificates(logger);
     const isHttps = !!sslCerts;

src/webui/src/api/Log.ts

@@ -47,9 +47,6 @@ export const CreateTerminalHandler: RequestHandler = async (req, res) => {
     if (isMacOS) {
         return sendError(res, 'MacOS不支持终端');
     }
-    if ((await WebUiConfig.GetWebUIConfig()).token === 'napcat') {
-        return sendError(res, '默认密码禁止创建终端');
-    }
     try {
         const { cols, rows } = req.body;
         const { id } = terminalManager.createTerminal(cols, rows);

src/webui/src/terminal/init-dynamic-dirname.ts

@@ -9,7 +9,7 @@ Object.defineProperty(global, '__dirname', {
         // 注意：堆栈格式可能不同，请根据实际环境调整索引及正则表达式
         for (const line of stack) {
             const match = line.match(/\((.*):\d+:\d+\)/);
-            if (match?.[1]) {
+            if (match) {
                 callerFile = match[1];
                 if (!callerFile.includes('init-dynamic-dirname.ts')) {
                     break;

src/webui/src/uploader/webui_font.ts

@@ -1,13 +1,13 @@
 import multer from 'multer';
+import { WebUiConfigWrapper } from '../helper/config';
 import path from 'path';
 import fs from 'fs';
 import type { Request, Response } from 'express';
-import { WebUiConfig } from '@/webui';
 
 export const webUIFontStorage = multer.diskStorage({
     destination: (_, __, cb) => {
         try {
-            const fontsPath = path.dirname(WebUiConfig.GetWebUIFontPath());
+            const fontsPath = path.dirname(WebUiConfigWrapper.GetWebUIFontPath());
             // 确保字体目录存在
             fs.mkdirSync(fontsPath, { recursive: true });
             cb(null, fontsPath);