Successfully built cache cleaning feature

Co-authored-by: sj817 <74231782+sj817@users.noreply.github.com>

launcher/launcher-user.bat

@@ -7,7 +7,7 @@ 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
+     set "RetString=%%~b"
     goto :napcat_boot
 )
 
@@ -16,7 +16,7 @@ for %%a in ("%RetString%") do (
     set "pathWithoutUninstall=%%~dpa"
 )
 
-SET QQPath=%pathWithoutUninstall%QQ.exe
+set "QQPath=%pathWithoutUninstall%QQ.exe"
 
 if not exist "%QQpath%" (
     echo provided QQ path is invalid

launcher/launcher-win10-user.bat

@@ -7,7 +7,7 @@ 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
+    set "RetString=%%~b"
     goto :napcat_boot
 )
 
@@ -16,7 +16,7 @@ for %%a in ("%RetString%") do (
     set "pathWithoutUninstall=%%~dpa"
 )
 
-SET QQPath=%pathWithoutUninstall%QQ.exe
+set "QQPath=%pathWithoutUninstall%QQ.exe"
 
 if not exist "%QQpath%" (
     echo provided QQ path is invalid

launcher/launcher-win10.bat

@@ -16,7 +16,7 @@ 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
+    set "RetString=%%~b"
     goto :napcat_boot
 )
 
@@ -25,7 +25,7 @@ for %%a in ("%RetString%") do (
     set "pathWithoutUninstall=%%~dpa"
 )
 
-SET QQPath=%pathWithoutUninstall%QQ.exe
+set "QQPath=%pathWithoutUninstall%QQ.exe"
 
 if not exist "%QQPath%" (
     echo provided QQ path is invalid

launcher/launcher.bat

@@ -16,7 +16,7 @@ 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
+    set "RetString=%%~b"
     goto :napcat_boot
 )
 
@@ -25,7 +25,7 @@ for %%a in ("%RetString%") do (
     set "pathWithoutUninstall=%%~dpa"
 )
 
-SET QQPath=%pathWithoutUninstall%QQ.exe
+set "QQPath=%pathWithoutUninstall%QQ.exe"
 
 if not exist "%QQPath%" (
     echo provided QQ path is invalid

manifest.json

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

napcat.webui/package-lock.json

@@ -93,6 +93,7 @@
         "@types/node": "^22.12.0",
         "@types/path-browserify": "^1.0.3",
         "@types/react": "^19.0.8",
+        "@types/react-color": "^3.0.13",
         "@types/react-dom": "^19.0.3",
         "@types/react-window": "^1.8.8",
         "@typescript-eslint/eslint-plugin": "^8.22.0",
@@ -8152,6 +8153,19 @@
         "csstype": "^3.0.2"
       }
     },
+    "node_modules/@types/react-color": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.13.tgz",
+      "integrity": "sha512-2c/9FZ4ixC5T3JzN0LP5Cke2Mf0MKOP2Eh0NPDPWmuVH3NjPyhEjqNMQpN1Phr5m74egAy+p2lYNAFrX1z9Yrg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/reactcss": "*"
+      },
+      "peerDependencies": {
+        "@types/react": "*"
+      }
+    },
     "node_modules/@types/react-dom": {
       "version": "19.1.6",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.1.6.tgz",
@@ -8172,6 +8186,16 @@
         "@types/react": "*"
       }
     },
+    "node_modules/@types/reactcss": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@types/reactcss/-/reactcss-1.2.13.tgz",
+      "integrity": "sha512-gi3S+aUi6kpkF5vdhUsnkwbiSEIU/BEJyD7kBy2SudWBUuKmJk8AQKE0OVcQQeEy40Azh0lV6uynxlikYIJuwg==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*"
+      }
+    },
     "node_modules/@types/unist": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",

napcat.webui/package.json

@@ -95,6 +95,7 @@
     "@types/node": "^22.12.0",
     "@types/path-browserify": "^1.0.3",
     "@types/react": "^19.0.8",
+    "@types/react-color": "^3.0.13",
     "@types/react-dom": "^19.0.3",
     "@types/react-window": "^1.8.8",
     "@typescript-eslint/eslint-plugin": "^8.22.0",

napcat.webui/src/components/file_manage/file_table.tsx

@@ -82,6 +82,7 @@ export default function FileTable({
     setPreviewImages([])
     setPreviewIndex(0)
     setShowImage(false)
+    setPage(1)
   }, [currentPath])
 
   const onPreviewImage = (name: string, images: PreviewImage[]) => {

napcat.webui/src/components/network_edit/generic_form.tsx

@@ -171,7 +171,8 @@ const GenericForm = <T extends keyof NetworkConfigType>({
 
 export default GenericForm
 export function random_token(length: number) {
-  const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789@#$%^&*()-_=+[]{}|;:,.<>?'
+  const chars =
+    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789@#$%^&*()-_=+[]{}|;:,.<>?'
   let result = ''
   for (let i = 0; i < length; i++) {
     result += chars.charAt(Math.floor(Math.random() * chars.length))

napcat.webui/src/controllers/webui_manager.ts

@@ -1,9 +1,10 @@
+import CryptoJS from 'crypto-js'
 import { EventSourcePolyfill } from 'event-source-polyfill'
 
 import { LogLevel } from '@/const/enum'
 
 import { serverRequest } from '@/utils/request'
-import CryptoJS from "crypto-js";
+
 export interface Log {
   level: LogLevel
   message: string
@@ -17,7 +18,7 @@ export default class WebUIManager {
   }
 
   public static async loginWithToken(token: string) {
-    const sha256 = CryptoJS.SHA256(token + '.napcat').toString();
+    const sha256 = CryptoJS.SHA256(token + '.napcat').toString()
     const { data } = await serverRequest.post<ServerResponse<AuthResponse>>(
       '/auth/login',
       { hash: sha256 }
@@ -196,4 +197,13 @@ export default class WebUIManager {
     )
     return data.data
   }
+
+  // 清理缓存
+  public static async cleanCache() {
+    const { data } =
+      await serverRequest.post<
+        ServerResponse<{ result: boolean; message: string }>
+      >('/base/CleanCache')
+    return data.data
+  }
 }

napcat.webui/src/pages/dashboard/config/server.tsx

@@ -1,16 +1,22 @@
+import { Button } from '@heroui/button'
 import { Input } from '@heroui/input'
 import { Switch } from '@heroui/switch'
 import { useRequest } from 'ahooks'
-import { useEffect } from 'react'
+import { useEffect, useState } from 'react'
 import { Controller, useForm } from 'react-hook-form'
 import toast from 'react-hot-toast'
+import { MdDeleteSweep } from 'react-icons/md'
 
 import SaveButtons from '@/components/button/save_buttons'
 import PageLoading from '@/components/page_loading'
 
+import useDialog from '@/hooks/use-dialog'
+
 import WebUIManager from '@/controllers/webui_manager'
 
 const ServerConfigCard = () => {
+  const dialog = useDialog()
+  const [isCleaningCache, setIsCleaningCache] = useState(false)
   const {
     data: configData,
     loading: configLoading,
@@ -69,6 +75,42 @@ const ServerConfigCard = () => {
     }
   }
 
+  const handleCleanCache = () => {
+    dialog.confirm({
+      title: '清理缓存',
+      content: (
+        <div className="space-y-2">
+          <p>确定要清理缓存吗？此操作将清理以下内容：</p>
+          <ul className="list-disc list-inside text-sm text-default-600">
+            <li>临时文件夹中的所有文件</li>
+            <li>图片缓存 (Pic)</li>
+            <li>语音缓存 (Ptt)</li>
+            <li>视频缓存 (Video)</li>
+            <li>文件缓存 (File)</li>
+            <li>日志文件 (log)</li>
+          </ul>
+          <p className="text-warning text-sm">此操作不可撤销，请谨慎操作。</p>
+        </div>
+      ),
+      onConfirm: async () => {
+        setIsCleaningCache(true)
+        try {
+          const result = await WebUIManager.cleanCache()
+          if (result.result) {
+            toast.success(result.message || '缓存清理成功')
+          } else {
+            toast.error(result.message || '缓存清理失败')
+          }
+        } catch (error) {
+          const msg = (error as Error).message
+          toast.error(`清理缓存失败: ${msg}`)
+        } finally {
+          setIsCleaningCache(false)
+        }
+      }
+    })
+  }
+
   useEffect(() => {
     reset()
   }, [configData])
@@ -131,6 +173,30 @@ const ServerConfigCard = () => {
           />
         </div>
 
+        <div className="flex flex-col gap-2">
+          <div className="flex-shrink-0 w-full">维护操作</div>
+          <div className="flex flex-col gap-2 p-4 rounded-lg bg-default-50">
+            <div className="flex items-start justify-between gap-2">
+              <div className="flex-1">
+                <div className="font-medium">清理缓存</div>
+                <div className="text-sm text-default-500">
+                  清理临时文件、图片、语音、视频、文件缓存和日志文件
+                </div>
+              </div>
+              <Button
+                color="danger"
+                variant="flat"
+                startContent={<MdDeleteSweep size={20} />}
+                onPress={handleCleanCache}
+                isLoading={isCleaningCache}
+                isDisabled={!!configError}
+              >
+                清理缓存
+              </Button>
+            </div>
+          </div>
+        </div>
+
         <div className="flex flex-col gap-2">
           <div className="flex-shrink-0 w-full">安全配置</div>
           <Controller
@@ -182,4 +248,4 @@ const ServerConfigCard = () => {
   )
 }
 
-export default ServerConfigCard
+export default ServerConfigCard

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "napcat",
-  "version": "4.8.98",
+  "version": "4.8.119",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "napcat",
-      "version": "4.8.98",
+      "version": "4.8.119",
       "dependencies": {
         "express": "^5.0.0",
         "silk-wasm": "^3.6.1",

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.8.116",
+  "version": "4.8.119",
   "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",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.8.116';
+export const napCatVersion = '4.8.119';

src/core/external/appid.json

@@ -386,5 +386,9 @@
     "9.9.21-39038": {
         "appid": 537313906,
         "qua": "V1_WIN_NQ_9.9.21_39038_GW_B"
+    },
+    "9.9.22-40362": {
+        "appid": 537314212,
+        "qua": "V1_WIN_NQ_9.9.22_40362_GW_B"
     }
 }

src/core/external/offset.json

@@ -507,8 +507,12 @@
         "send": "7B025C8",
         "recv": "7B05F58"
     },
-     "9.9.21-39038-x64": {
+    "9.9.21-39038-x64": {
         "send": "313FB58",
         "recv": "31432FC"
+    },
+    "9.9.22-40362-x64": {
+        "send": "31C0EB8",
+        "recv": "31C465C"
     }
 }

src/onebot/action/extends/MoveGroupFile.ts

@@ -22,9 +22,8 @@ export class MoveGroupFile extends GetPacketStatusDepends<Payload, MoveGroupFile
 
     async _handle(payload: Payload) {
         const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file_id) || FileNapCatOneBotUUID.decodeModelId(payload.file_id);
-        const fileUUID = contextMsgFile?.fileUUID || contextMsgFile?.fileId;
-        if (fileUUID) {
-            await this.core.apis.PacketApi.pkt.operation.MoveGroupFile(+payload.group_id, fileUUID, payload.current_parent_directory, payload.target_parent_directory);
+        if (contextMsgFile?.fileUUID) {
+            await this.core.apis.PacketApi.pkt.operation.MoveGroupFile(+payload.group_id, contextMsgFile.fileUUID, payload.current_parent_directory, payload.target_parent_directory);
             return {
                 ok: true,
             };

src/onebot/action/extends/RenameGroupFile.ts

@@ -22,9 +22,8 @@ export class RenameGroupFile extends GetPacketStatusDepends<Payload, RenameGroup
 
     async _handle(payload: Payload) {
         const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file_id) || FileNapCatOneBotUUID.decodeModelId(payload.file_id);
-        const fileUUID = contextMsgFile?.fileUUID || contextMsgFile?.fileId;
-        if (fileUUID) {
-            await this.core.apis.PacketApi.pkt.operation.RenameGroupFile(+payload.group_id, fileUUID, payload.current_parent_directory, payload.new_name);
+        if (contextMsgFile?.fileUUID) {
+            await this.core.apis.PacketApi.pkt.operation.RenameGroupFile(+payload.group_id, contextMsgFile.fileUUID, payload.current_parent_directory, payload.new_name);
             return {
                 ok: true,
             };

src/onebot/action/extends/TransGroupFile.ts

@@ -20,9 +20,8 @@ export class TransGroupFile extends GetPacketStatusDepends<Payload, TransGroupFi
 
     async _handle(payload: Payload) {
         const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file_id) || FileNapCatOneBotUUID.decodeModelId(payload.file_id);
-        const fileUUID = contextMsgFile?.fileUUID || contextMsgFile?.fileId;
-        if (fileUUID) {
-            const result = await this.core.apis.GroupApi.transGroupFile(payload.group_id.toString(), fileUUID);
+        if (contextMsgFile?.fileUUID) {
+            const result = await this.core.apis.GroupApi.transGroupFile(payload.group_id.toString(), contextMsgFile.fileUUID);
             if (result.transGroupFileResult.result.retCode === 0) {
                 return {
                     ok: true

src/onebot/action/file/GetGroupFileUrl.ts

@@ -20,10 +20,9 @@ export class GetGroupFileUrl extends GetPacketStatusDepends<Payload, GetGroupFil
 
     async _handle(payload: Payload) {
         const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file_id) || FileNapCatOneBotUUID.decodeModelId(payload.file_id);
-        const fileUUID = contextMsgFile?.fileUUID || contextMsgFile?.fileId;
-        if (fileUUID) {
+        if (contextMsgFile?.fileUUID) {
             return {
-                url: await this.core.apis.PacketApi.pkt.operation.GetGroupFileUrl(+payload.group_id, fileUUID)
+                url: await this.core.apis.PacketApi.pkt.operation.GetGroupFileUrl(+payload.group_id, contextMsgFile.fileUUID)
             };
         }
         throw new Error('real fileUUID not found!');

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

@@ -16,7 +16,7 @@ export class DeleteGroupFile extends OneBotAction<Payload, Awaited<ReturnType<NT
     override actionName = ActionName.GOCQHTTP_DeleteGroupFile;
     override payloadSchema = SchemaData;
     async _handle(payload: Payload) {
-        const data = FileNapCatOneBotUUID.decode(payload.file_id) || FileNapCatOneBotUUID.decodeModelId(payload.file_id);
+        const data = FileNapCatOneBotUUID.decodeModelId(payload.file_id);
         if (!data || !data.fileId) throw new Error('Invalid file_id');
         return await this.core.apis.GroupApi.delGroupFile(payload.group_id.toString(), [data.fileId]);
     }

src/onebot/api/msg.ts

@@ -578,7 +578,7 @@ export class OneBotMsgApi {
                 };
             }
 
-            if (!context.peer || context.peer.chatType == ChatType.KCHATTYPEC2C) return undefined;
+            if (!context.peer || !atQQ || context.peer.chatType == ChatType.KCHATTYPEC2C) return undefined; // 过滤掉空atQQ
             if (atQQ === 'all') return at(atQQ, atQQ, NTMsgAtType.ATTYPEALL, '全体成员');
             const atMember = await this.core.apis.GroupApi.getGroupMember(context.peer.peerUid, atQQ);
             if (atMember) {

src/onebot/index.ts

@@ -217,6 +217,15 @@ export class NapCatOneBot11Adapter {
             //this.context.logger.log(`OneBot11 配置更改：${JSON.stringify(prev)} -> ${JSON.stringify(newConfig)}`);
             await this.reloadNetwork(prev, newConfig);
         });
+        WebUiDataRuntime.setCleanCacheCall(async () => {
+            try {
+                await this.actions.get('clean_cache')?.handle({});
+                return { result: true, message: '缓存清理成功' };
+            } catch (error) {
+                this.context.logger.logError('清理缓存失败:', error);
+                return { result: false, message: `清理缓存失败: ${(error as Error).message}` };
+            }
+        });
     }
 
 

src/webui/src/api/BaseInfo.ts

@@ -24,3 +24,8 @@ export const SetThemeConfigHandler: RequestHandler = async (req, res) => {
     await WebUiConfig.UpdateTheme(theme);
     sendSuccess(res, { message: '更新成功' });
 };
+
+export const CleanCacheHandler: RequestHandler = async (_, res) => {
+    const result = await WebUiDataRuntime.requestCleanCache();
+    sendSuccess(res, result);
+};

src/webui/src/helper/Data.ts

@@ -27,6 +27,9 @@ const LoginRuntime: LoginRuntimeType = {
         onQuickLoginRequested: async () => {
             return { result: false, message: '' };
         },
+        onCleanCacheRequested: async () => {
+            return { result: false, message: '' };
+        },
         QQLoginList: [],
         NewQQLoginList: [],
     },
@@ -130,6 +133,14 @@ export const WebUiDataRuntime = {
         return LoginRuntime.NapCatHelper.onOB11ConfigChanged(ob11);
     } as LoginRuntimeType['NapCatHelper']['onOB11ConfigChanged'],
 
+    setCleanCacheCall(func: LoginRuntimeType['NapCatHelper']['onCleanCacheRequested']): void {
+        LoginRuntime.NapCatHelper.onCleanCacheRequested = func;
+    },
+
+    requestCleanCache: function () {
+        return LoginRuntime.NapCatHelper.onCleanCacheRequested();
+    } as LoginRuntimeType['NapCatHelper']['onCleanCacheRequested'],
+
     getPackageJson() {
         return LoginRuntime.packageJson;
     },

src/webui/src/router/Base.ts

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import { GetThemeConfigHandler, PackageInfoHandler, QQVersionHandler, SetThemeConfigHandler } from '../api/BaseInfo';
+import { CleanCacheHandler, GetThemeConfigHandler, PackageInfoHandler, QQVersionHandler, SetThemeConfigHandler } from '../api/BaseInfo';
 import { StatusRealTimeHandler } from '@webapi/api/Status';
 import { GetProxyHandler } from '../api/Proxy';
 
@@ -11,5 +11,6 @@ router.get('/GetSysStatusRealTime', StatusRealTimeHandler);
 router.get('/proxy', GetProxyHandler);
 router.get('/Theme', GetThemeConfigHandler);
 router.post('/SetTheme', SetThemeConfigHandler);
+router.post('/CleanCache', CleanCacheHandler);
 
 export { router as BaseRouter };

src/webui/src/types/data.d.ts

@@ -15,6 +15,7 @@ interface LoginRuntimeType {
     NapCatHelper: {
         onQuickLoginRequested: (uin: string) => Promise<{ result: boolean; message: string }>;
         onOB11ConfigChanged: (ob11: OneBotConfig) => Promise<void>;
+        onCleanCacheRequested: () => Promise<{ result: boolean; message: string }>;
         QQLoginList: string[];
         NewQQLoginList: LoginListItem[];
     };