fix: 缓存

feat: eslint9

.eslintrc.cjs

@@ -1,64 +0,0 @@
-module.exports = {
-    'env': {
-        'browser': true,
-        'es2021': true,
-        'node': true
-    },
-    'ignorePatterns': ['src/core/proto/'],
-    'extends': [
-        'eslint:recommended',
-        'plugin:@typescript-eslint/recommended'
-    ],
-    'overrides': [
-        {
-            'env': {
-                'node': true
-            },
-            'files': [
-                '.eslintrc.{js,cjs}'
-            ],
-            'parserOptions': {
-                'sourceType': 'script'
-            }
-        }
-    ],
-    'parser': '@typescript-eslint/parser',
-    'parserOptions': {
-        'ecmaVersion': 'latest',
-        'sourceType': 'module'
-    },
-    'plugins': [
-        '@typescript-eslint',
-        'import'
-    ],
-    'settings': {
-        'import/parsers': {
-            '@typescript-eslint/parser': ['.ts']
-        },
-        'import/resolver': {
-            'typescript': {
-                'alwaysTryTypes': true
-            }
-        }
-    },
-    'rules': {
-        'indent': [
-            'error',
-            4
-        ],
-        'linebreak-style': [
-            'error',
-            'unix'
-        ],
-        'semi': [
-            'error',
-            'always'
-        ],
-        'no-unused-vars': 'off',
-        'no-async-promise-executor': 'off',
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/no-unused-vars': 'off',
-        '@typescript-eslint/no-var-requires': 'off',
-        'object-curly-spacing': ['error', 'always'],
-    }
-};

README.md

@@ -9,14 +9,12 @@
 NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现
 
 ## 猫猫技能
-- [x] **超高性能**：轻松数千群聊 独创消息队列
 - [x] **启动方式**：支持以无头、LiteLoader 插件、仅 QQ GUI 三种方式启动
 - [x] **覆盖平台**: 覆盖 Windows / Linux (可选 Docker) / Android Termux / MacOS
 - [x] **安装简单**: 支持一键脚本/程序自动部署/镜像部署等多种覆盖范围
 - [x] **超低占用**：无头模式占用资源极低，适合在服务器上运行
 - [x] **超多接口**：实现大部分 OneBot 和 go-cqhttp 接口，超多扩展 API
 - [x] **远程管理**：自带 WebUI 支持，远程管理更加便捷
-- [x] **扩展支持**：基于 MoeHoo 的Native 可实现发包与收包
 
 ## 使用猫猫
 

eslint.config.mjs

@@ -0,0 +1,70 @@
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import _import from "eslint-plugin-import";
+import { fixupPluginRules } from "@eslint/compat";
+import globals from "globals";
+import tsParser from "@typescript-eslint/parser";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const filename = fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
+const compat = new FlatCompat({
+    baseDirectory: dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [{
+    ignores: ["src/core/proto/"],
+}, ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"), {
+    plugins: {
+        "@typescript-eslint": typescriptEslint,
+        import: fixupPluginRules(_import),
+    },
+
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+            ...globals.node,
+        },
+
+        parser: tsParser,
+        ecmaVersion: "latest",
+        sourceType: "module",
+    },
+
+    settings: {
+        "import/parsers": {
+            "@typescript-eslint/parser": [".ts"],
+        },
+
+        "import/resolver": {
+            typescript: {
+                alwaysTryTypes: true,
+            },
+        },
+    },
+
+    rules: {
+        indent: ["error", 4],
+        semi: ["error", "always"],
+        "no-unused-vars": "off",
+        "no-async-promise-executor": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-var-requires": "off",
+        "object-curly-spacing": ["error", "always"],
+    },
+}, {
+    files: ["**/.eslintrc.{js,cjs}"],
+
+    languageOptions: {
+        globals: {
+            ...globals.node,
+        },
+        ecmaVersion: 5,
+        sourceType: "commonjs",
+    },
+}];

launcher/launcher-user.bat

@@ -0,0 +1,32 @@
+@echo off
+chcp 65001
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
+
+pause

launcher/launcher-win10-user.bat

@@ -0,0 +1,33 @@
+@echo off
+chcp 65001
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
+
+REM "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" 123456
+
+pause

launcher/qqnt.json

@@ -1,9 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.16-28788",
-  "verHash": "73b0c8f6",
-  "linuxVersion": "3.2.13-28788",
-  "linuxVerHash": "55fb6434",
+  "version": "9.9.16-29456",
+  "verHash": "dd395162",
+  "linuxVersion": "3.2.13-29456",
+  "linuxVerHash": "e379390a",
   "type": "module",
   "private": true,
   "description": "QQ",
@@ -18,7 +18,7 @@
     "qd": "externals/devtools/cli/index.js"
   },
   "main": "./loadNapCat.js",
-  "buildVersion": "28788",
+  "buildVersion": "29456",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "3.5.0",
+  "version": "3.6.7",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",
@@ -12,6 +12,9 @@
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.24.7",
+    "@eslint/compat": "^1.2.2",
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.14.0",
     "@log4js-node/log4js-api": "^1.0.2",
     "@napneko/nap-proto-core": "^0.0.2",
     "@protobuf-ts/runtime": "^2.9.4",
@@ -30,14 +33,16 @@
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "cors": "^2.8.5",
-    "eslint": "^8.57.0",
+    "eslint": "^9.14.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
     "fast-xml-parser": "^4.3.6",
     "file-type": "^19.0.0",
+    "globals": "^15.12.0",
     "image-size": "^1.1.1",
     "json-schema-to-ts": "^3.1.1",
     "typescript": "^5.3.3",
+    "typescript-eslint": "^8.13.0",
     "vite": "^5.2.6",
     "vite-plugin-cp": "^4.0.8",
     "vite-tsconfig-paths": "^5.1.0"

src/common/file.ts

@@ -215,7 +215,7 @@ export async function checkUriType(Uri: string) {
         }
         if (uri.startsWith('file://')) {
             let filePath: string;
-            const pathname = decodeURIComponent(new URL(uri).pathname);
+            const pathname = decodeURIComponent(new URL(uri).pathname + new URL(uri).hash);
             if (process.platform === 'win32') {
                 filePath = pathname.slice(1);
             } else {

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '3.5.0';
+export const napCatVersion = '3.6.7';

src/core/apis/file.ts

@@ -175,14 +175,18 @@ export class NTQQFileApi {
             const thumbPath = pathLib.join(thumb, thumbFileName);
             ffmpeg(filePath)
                 .on('error', (err) => {
-                    logger.logDebug('获取视频封面失败，使用默认封面', err);
-                    if (diyThumbPath) {
-                        fsPromises.copyFile(diyThumbPath, thumbPath).then(() => {
+                    try {
+                        logger.logDebug('获取视频封面失败，使用默认封面', err);
+                        if (diyThumbPath) {
+                            fsPromises.copyFile(diyThumbPath, thumbPath).then(() => {
+                                resolve(thumbPath);
+                            }).catch(reject);
+                        } else {
+                            fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
                             resolve(thumbPath);
-                        }).catch(reject);
-                    } else {
-                        fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
-                        resolve(thumbPath);
+                        }
+                    } catch (error) {
+                        logger.logError.bind(logger)('获取视频封面失败，使用默认封面失败', error);
                     }
                 })
                 .screenshots({

src/core/apis/group.ts

@@ -375,8 +375,10 @@ export class NTQQGroupApi {
         };
     }
 
-    async getGroupMembersV2(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
-        //console.log('getGroupMembers -->', groupQQ);
+    async getGroupMembersV2(groupQQ: string, num = 3000, no_cache: boolean = false): Promise<Map<string, GroupMember>> {
+        if (no_cache) {
+            return (await this.getGroupMemberAll(groupQQ, true)).result.infos;
+        }
         let res = await this.GetGroupMembersV3(groupQQ, num);
         let ret = res.infos;
         if (res.infos.size === 0 && !res.listenerMode) {
@@ -386,14 +388,13 @@ export class NTQQGroupApi {
         if (res.infos.size === 0) {
             ret = (await this.getGroupMemberAll(groupQQ)).result.infos;
         }
-        //console.log("<---------------")
         return ret;
     }
 
     async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
         const groupService = this.context.session.getGroupService();
         const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
-        const result = await groupService.getNextMemberList(sceneId!, undefined, num);
+        const result = await groupService.getNextMemberList(sceneId, undefined, num);
         if (result.errCode !== 0) {
             throw new Error('获取群成员列表出错,' + result.errMsg);
         }
@@ -401,8 +402,8 @@ export class NTQQGroupApi {
         return result.result.infos;
     }
 
-    async getGroupFileCount(Gids: Array<string>) {
-        return this.context.session.getRichMediaService().batchGetGroupFileCount(Gids);
+    async getGroupFileCount(group_ids: Array<string>) {
+        return this.context.session.getRichMediaService().batchGetGroupFileCount(group_ids);
     }
 
     async getArkJsonGroupShare(GroupCode: string) {

src/core/apis/packet.ts

@@ -25,6 +25,7 @@ import { OidbSvcTrpcTcp0X929B_0Resp, OidbSvcTrpcTcp0X929D_0Resp } from "@/core/p
 import { IndexNode, MsgInfo } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq";
 import { NTV2RichMediaResp } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp";
 import { RecvPacketData } from "@/core/packet/client/client";
+import { napCatVersion } from "@/common/version";
 
 
 interface OffsetType {
@@ -61,11 +62,12 @@ export class NTQQPacketApi {
         this.qqVersion = qqversion;
         const table = typedOffset[qqversion + '-' + os.arch()];
         if (!table) {
-            this.logger.logError('[Core] [Packet] PacketServer Offset table not found for QQVersion: ', qqversion + '-' + os.arch());
+            this.logger.logError(`[Core] [Packet] PacketBackend 不支持当前QQ版本架构：${qqversion}-${os.arch()}，
+            请参照 https://github.com/NapNeko/NapCatQQ/releases/tag/v${napCatVersion} 配置正确的QQ版本！`);
             return false;
         }
         if (this.core.configLoader.configData.packetBackend === 'disable') {
-            this.logger.logWarn('[Core] [Packet] 已禁用Packet后端，NapCat.Packet将不会加载！');
+            this.logger.logWarn('[Core] [Packet] 已禁用PacketBackend，NapCat.Packet将不会加载！');
             return false;
         }
         this.packetSession = new PacketSession(this.core);

src/core/apis/webapi.ts

@@ -283,7 +283,7 @@ export class NTQQWebApi {
                 this.context.logger.logError.bind(this.context.logger)('获取群聊之火失败');
             }
         }
-        if (getType === WebHonorType.PERFORMER || getType === WebHonorType.ALL) {
+        if (getType === WebHonorType.LEGEND || getType === WebHonorType.ALL) {
             const RetInternal = await getDataInternal(groupCode, 3);
             if (RetInternal) {
                 HonorInfo.legend_list = [];

src/core/external/appid.json

@@ -74,5 +74,17 @@
     "6.9.59-29271": {
         "appid": 537249863,
         "qua": "V1_MAC_NQ_6.9.59_29271_GW_B"
+    },
+    "9.9.16-29456": {
+        "appid": 537249875,
+        "qua": "V1_WIN_NQ_9.9.16_29456_GW_B"
+    },
+    "3.2.13-29456": {
+        "appid": 537249996,
+        "qua": "V1_LNX_NQ_3.2.13_29456_GW_B"
+    },
+    "6.9.59-29456": {
+        "appid": 537249961,
+        "qua": "V1_MAC_NQ_6.9.59_29456_GW_B"
     }
-}
+}

src/core/external/offset.json

@@ -54,5 +54,17 @@
     "3.2.13-29271-arm64": {
         "send": "6ECA098",
         "recv": "6ECD8D0"
+    },
+    "9.9.16-29456-x64": {
+        "send": "3835CD0",
+        "recv": "383A104"
+    },
+    "3.2.13-29456-x64": {
+        "send": "A11E820",
+        "recv": "A122120"
+    },
+    "3.2.13-29456-arm64": {
+        "send": "6ECA130",
+        "recv": "6ECD968"
     }
-}
+}

src/core/packet/session.ts

@@ -45,7 +45,7 @@ export class PacketSession {
             client = this.judgeClient(core);
             break;
         default:
-            this.logger.logError(`[Core] [Packet] 未知的Packet后端类型 ${prefer}，请检查配置文件！`);
+            this.logger.logError(`[Core] [Packet] 未知的PacketBackend ${prefer}，请检查配置文件！`);
             client = null;
         }
         if (!(client && client.check(core))) {

src/onebot/action/extends/SetGroupSign.ts

@@ -5,7 +5,7 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 const SchemaData = {
     type: 'object',
     properties: {
-        group_id: { type: 'string' },
+        group_id: { type: ['string', 'number'] },
     },
     required: ['group_id'],
 } as const satisfies JSONSchema;
@@ -17,6 +17,9 @@ export class SetGroupSign extends BaseAction<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        return await this.core.apis.PacketApi.sendGroupSignPacket(payload.group_id);
+        return await this.core.apis.PacketApi.sendGroupSignPacket(payload.group_id.toString());
     }
 }
+export class SendGroupSign extends SetGroupSign {
+    actionName = ActionName.SendGroupSign;
+}

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

@@ -6,10 +6,15 @@ const SchemaData = {
     type: 'object',
     properties: {
         friend_id: { type: ['string', 'number'] },
+        user_id: { type: ['string', 'number'] },
         temp_block: { type: 'boolean' },
         temp_both_del: { type: 'boolean' },
     },
-    required: ['friend_id'],
+    oneOf: [
+        { required: ['friend_id'] },
+        { required: ['user_id'] },
+    ],
+
 } as const satisfies JSONSchema;
 type Payload = FromSchema<typeof SchemaData>;
 
@@ -18,7 +23,8 @@ export class GoCQHTTPDeleteFriend extends BaseAction<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const uid = await this.core.apis.UserApi.getUidByUinV2(payload.friend_id.toString());
+        const uin = payload.friend_id ?? payload.user_id ?? '';
+        const uid = await this.core.apis.UserApi.getUidByUinV2(uin.toString());
 
         if (!uid) {
             return {

src/onebot/action/group/GetAiRecord.ts

@@ -2,8 +2,6 @@ import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus";
 import { AIVoiceChatType } from "@/core/packet/entities/aiChat";
-import { NapProtoEncodeStructType } from "@/core/packet/proto/NapProto";
-import { IndexNode } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq";
 
 const SchemaData = {
     type: 'object',

src/onebot/action/group/GetGroupMemberList.ts

@@ -24,12 +24,11 @@ export class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
         const noCache = payload.no_cache ? this.stringToBoolean(payload.no_cache) : false;
         const memberCache = this.core.apis.GroupApi.groupMemberCache;
         let groupMembers;
-        if (noCache) {
-            groupMembers = await this.core.apis.GroupApi.getGroupMembersV2(groupIdStr);
-        } else {
+        try {
+            groupMembers = await this.core.apis.GroupApi.getGroupMembersV2(groupIdStr, 3000, noCache);
+        } catch (error) {
             groupMembers = memberCache.get(groupIdStr) ?? await this.core.apis.GroupApi.getGroupMembersV2(groupIdStr);
         }
-
         const memberPromises = Array.from(groupMembers.values()).map(item =>
             OB11Entities.groupMember(groupIdStr, item)
         );

src/onebot/action/index.ts

@@ -92,7 +92,7 @@ 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 { SetGroupSign } from './extends/SetGroupSign';
+import { SendGroupSign, SetGroupSign } from './extends/SetGroupSign';
 import { GoCQHTTPGetGroupAtAllRemain } from './go-cqhttp/GetGroupAtAllRemain';
 import { GoCQHTTPCheckUrlSafely } from './go-cqhttp/GoCQHTTPCheckUrlSafely';
 import { GoCQHTTPGetModelShow } from './go-cqhttp/GoCQHTTPGetModelShow';
@@ -125,6 +125,7 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new TranslateEnWordToZn(obContext, core),
         new GetGroupRootFiles(obContext, core),
         new SetGroupSign(obContext, core),
+        new SendGroupSign(obContext, core),
         // onebot11
         new SendLike(obContext, core),
         new GetMsg(obContext, core),

src/onebot/action/types.ts

@@ -136,6 +136,8 @@ export enum ActionName {
     GetGroupIgnoredNotifies = 'get_group_ignored_notifies',
 
     SetGroupSign = "set_group_sign",
+    SendGroupSign = "send_group_sign",
+    
     GetMiniAppArk = "get_mini_app_ark",
     // UploadForwardMsg = "upload_forward_msg",
     GetAiRecord = "get_ai_record",

static/assets/renderer.js

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

static/config.html

@@ -10,6 +10,20 @@
     <link rel="stylesheet" href="./assets/webcomponents.css" />
     <link rel="stylesheet" href="./assets/style.css" />
     <link rel="stylesheet" href="./assets/color.css" />
+    <style>
+        body > div {
+            padding: 12px;
+
+            @media screen and (min-width: 900px) {
+                width: 900px;
+                margin: 0 auto;
+            }
+        }
+
+        ob-setting-select {
+            width: 210px;
+        }
+    </style>
     <!-- 脚手架 -->
     <!-- 渲染脚本 -->
     <script>