fix

Bumps [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) from 9.28.0 to 9.30.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/commits/v9.30.1/packages/js)

---
updated-dependencies:
- dependency-name: "@eslint/js"
  dependency-version: 9.30.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/release.yml

@@ -150,3 +150,15 @@ 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,6 +1,5 @@
 # Develop
 node_modules/
-package-lock.json
 pnpm-lock.yaml
 out/
 dist/

.vscode/launch.json

@@ -0,0 +1,115 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:shell",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:shell"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:shell",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:shell"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:universal",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:universal"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:framework",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:framework"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:webui",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:webui"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:universal",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:universal"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:framework",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:framework"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:webui",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:webui"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "lint",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "lint"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "depend",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "depend"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:depend",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:depend"
+            ]
+        }
+    ]
+}

.vscode/settings.json

@@ -6,5 +6,7 @@
         "tsconfig.json": "tsconfig.*.json, env.d.ts, vite.config.ts",
         "package.json": "package-lock.json, eslint*, .prettier*, .editorconfig, manifest.json, logo.png, .gitignore, LICENSE"
     },
-    "css.customData": [".vscode/tailwindcss.json"],
+    "css.customData": [
+        ".vscode/tailwindcss.json"
+    ],
 }

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+nanaeonn@outlook.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

README.md

@@ -1,67 +1,68 @@
+<img src="https://napneko.github.io/assets/newnewlogo.png" width = "305" height = "411" alt="NapCat" align=right />
 <div align="center">
-  
-![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)
-  
+
+# NapCat
+
+
+
+_Modern protocol-side framework implemented based on NTQQ._
+
+> 云起兮风生，心向远方兮路未曾至.
+
 </div>
 
 ---
-## 欢迎回家
-NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
-## 特性介绍
-- [x] **安装简单**：就算是笨蛋也能使用
-- [x] **性能友好**：就算是低内存也能使用
-- [x] **接口丰富**：就算是没有也能使用
-- [x] **稳定好用**：就算是被捉也能使用
+## Welcome
++ NapCatQQ is a modern implementation of the Bot protocol based on NTQQ.
+  - NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
-## 使用框架
+## Feature
+
++ **Easy to Use**
+  - 作为初学者能够轻松使用.
++ **Quick and Efficient**
+  - 在低内存操作系统长时运行.
++ **Rich API Interface**
+  - 完整实现了大部分标准接口.
++ **Stable and Reliable**
+  - 持续稳定的开发与维护.
+## Quick Start
 
 可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
 
 **首次使用**请务必查看如下文档看使用教程
 
-### 文档地址
+## Link
 
-[Cloudflare.Worker](https://doc.napneko.icu/)
+| Docs | [![Github.IO](https://img.shields.io/badge/docs%20on-Github.IO-orange)](https://napneko.github.io/) | [![Cloudflare.Worker](https://img.shields.io/badge/docs%20on-Cloudflare.Worker-black)](https://doc.napneko.icu/) | [![Cloudflare.HKServer](https://img.shields.io/badge/docs%20on-Cloudflare.HKServer-informational)](https://napcat.napneko.icu/) |
+|:-:|:-:|:-:|:-:|
 
-[Cloudflare.HKServer](https://napcat.napneko.icu/)
+| 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) |
+|:-:|:-:|:-:|:-:|
 
-[Github.IO](https://napneko.github.io/)
+| 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) |
+|:-:|:-:|:-:|:-:|:-:|
 
-[Cloudflare.Pages](https://napneko.pages.dev/)
+| Telegram | [![Telegram](https://img.shields.io/badge/Telegram-MelodicMoonlight-blue)](https://t.me/MelodicMoonlight) |
+|:-:|:-:|
 
-[Server.Other](https://docs.napcat.cyou/)
+## Thanks
 
-[NapCat.Wiki](https://www.napcat.wiki)
++ [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
 
-## 回家旅途
-[QQ Group#1](https://qm.qq.com/q/I6LU87a0Yq)
++ [AstrBot](https://github.com/AstrBotDevs/AstrBot) 是完美适配本项目的LLM Bot框架 在此推荐一下
 
-[QQ Group#2](https://qm.qq.com/q/HaRcfrHpUk)
-
-[Telegram](https://t.me/MelodicMoonlight)
-
-> QQ Group#2 准许Bot / Telegram与QQ Group#2 为新建Group
-
-## 性能设计/协议标准
-NapCat 已实现90％+的 OneBot / GoCQ 标准接口，并提供兼容性保留接口，其设计理念遵守 无数据库/异步优先/后台刷新 的性能思想。
-
-由此设计带来一系列好处，在开发中，获取群员列表通常小于50Ms，单条文本消息发送在320Ms以内，在1k+的群聊流畅运行，同时带来一些副作用，消息Id无法持久，无法上报撤回消息原始内容。
-
-NapCat 在设计理念下遵守 OneBot 规范大多数要求并且积极改进，任何合理的标准化 Issue 与 Pr 将被接收。
-
-## 感谢他们
-感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
-
-感谢 React 强力驱动 NapCat.WebUi
-
-不过最最重要的 还是需要感谢屏幕前的你哦~
++ [MaiBot](https://github.com/MaiM-with-u/MaiBot) 一只赛博群友 麦麦 Bot框架 在此推荐一下
+  
++ 不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---
 
-## 特殊感谢
-[LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目
+## License
+本项目采用 混合协议 开源，因此使用本项目时，你需要注意以下几点：
+1. 第三方库代码或修改部分遵循其原始开源许可.
+2. 本项目获取部分项目授权而不受部分约束
+2. 项目其余逻辑代码采用[本仓库开源许可](./LICENSE).
 
-## 开源附加
-
-任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**本仓库仅用于提高IM易用性，实现类似Hook推送，此外，禁止任何项目未经仓库主作者授权二次分发或基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**
+**本仓库仅用于提高易用性，实现消息推送类功能，此外，禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| > 4.0   | :white_check_mark: |
+| < 4.0   | :x:                |
+
+## Reporting a Vulnerability
+you should open an issue

launcher/launcher-user.bat

@@ -19,7 +19,7 @@ for %%a in ("%RetString%") do (
 SET QQPath=%pathWithoutUninstall%QQ.exe
 
 if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
+    echo provided QQ path is invalid
     pause
     exit /b
 )

launcher/launcher-win10-user.bat

@@ -19,7 +19,7 @@ for %%a in ("%RetString%") do (
 SET QQPath=%pathWithoutUninstall%QQ.exe
 
 if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
+    echo provided QQ path is invalid
     pause
     exit /b
 )

launcher/launcher-win10.bat

@@ -27,8 +27,8 @@ for %%a in ("%RetString%") do (
 
 SET QQPath=%pathWithoutUninstall%QQ.exe
 
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
+if not exist "%QQPath%" (
+    echo provided QQ path is invalid
     pause
     exit /b
 )

launcher/launcher.bat

@@ -27,8 +27,8 @@ for %%a in ("%RetString%") do (
 
 SET QQPath=%pathWithoutUninstall%QQ.exe
 
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
+if not exist "%QQPath%" (
+    echo provided QQ path is invalid
     pause
     exit /b
 )

launcher/qqnt.json

@@ -1,10 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.17-30899",
-  "verHash": "ececf273",
-  "linuxVersion": "3.2.15-30899",
-  "linuxVerHash": "63c751e8",
-  "type": "module",
+  "version": "9.9.19-34740",
+  "verHash": "f31348f2",
+  "linuxVersion": "3.2.17-34740",
+  "linuxVerHash": "5aa2d8d6",
   "private": true,
   "description": "QQ",
   "productName": "QQ",
@@ -18,9 +17,9 @@
     "qd": "externals/devtools/cli/index.js"
   },
   "main": "./loadNapCat.js",
-  "buildVersion": "30899",
+  "buildVersion": "34740",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",
   "eleArch": "x64"
-}
+}

manifest.json

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

napcat.webui/package.json

@@ -13,6 +13,7 @@
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
+    "@heroui/accordion": "^2.2.8",
     "@heroui/avatar": "2.2.7",
     "@heroui/breadcrumbs": "2.2.7",
     "@heroui/button": "2.2.10",
@@ -54,6 +55,7 @@
     "ahooks": "^3.8.4",
     "axios": "^1.7.9",
     "clsx": "^2.1.1",
+    "crypto-js": "^4.2.0",
     "echarts": "^5.5.1",
     "event-source-polyfill": "^1.0.31",
     "framer-motion": "^12.0.6",
@@ -64,6 +66,7 @@
     "qrcode.react": "^4.2.0",
     "quill": "^2.0.3",
     "react": "^19.0.0",
+    "react-color": "^2.19.3",
     "react-dom": "^19.0.0",
     "react-dropzone": "^14.3.5",
     "react-error-boundary": "^5.0.0",
@@ -86,6 +89,7 @@
     "@eslint/js": "^9.19.0",
     "@react-types/shared": "^3.26.0",
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
+    "@types/crypto-js": "^4.2.2",
     "@types/event-source-polyfill": "^1.0.5",
     "@types/fabric": "^5.3.9",
     "@types/node": "^22.12.0",

napcat.webui/src/components/ColorPicker.tsx

@@ -0,0 +1,36 @@
+import { Popover, PopoverContent, PopoverTrigger } from '@heroui/popover'
+import React from 'react'
+import { ColorResult, SketchPicker } from 'react-color'
+
+// 假定 heroui 提供的 Popover组件
+
+interface ColorPickerProps {
+  color: string
+  onChange: (color: ColorResult) => void
+}
+
+const ColorPicker: React.FC<ColorPickerProps> = ({ color, onChange }) => {
+  const handleChange = (colorResult: ColorResult) => {
+    onChange(colorResult)
+  }
+
+  return (
+    <Popover triggerScaleOnOpen={false}>
+      <PopoverTrigger>
+        <div
+          className="w-36 h-8 rounded-md cursor-pointer border border-content4"
+          style={{ background: color }}
+        />
+      </PopoverTrigger>
+      <PopoverContent>
+        <SketchPicker
+          color={color}
+          onChange={handleChange}
+          className="!bg-transparent !shadow-none"
+        />
+      </PopoverContent>
+    </Popover>
+  )
+}
+
+export default ColorPicker

napcat.webui/src/components/button/save_buttons.tsx

@@ -1,4 +1,5 @@
 import { Button } from '@heroui/button'
+import clsx from 'clsx'
 import toast from 'react-hot-toast'
 import { IoMdRefresh } from 'react-icons/io'
 
@@ -7,15 +8,22 @@ export interface SaveButtonsProps {
   reset: () => void
   refresh?: () => void
   isSubmitting: boolean
+  className?: string
 }
 
 const SaveButtons: React.FC<SaveButtonsProps> = ({
   onSubmit,
   reset,
   isSubmitting,
-  refresh
+  refresh,
+  className
 }) => (
-  <div className="max-w-full mx-3 w-96 flex flex-col justify-center gap-3">
+  <div
+    className={clsx(
+      'max-w-full mx-3 w-96 flex flex-col justify-center gap-3',
+      className
+    )}
+  >
     <div className="flex items-center justify-center gap-2 mt-5">
       <Button
         color="default"

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

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

napcat.webui/src/components/onebot/api/debug.tsx

@@ -136,7 +136,7 @@ const OneBotApiDebug: React.FC<OneBotApiDebugProps> = (props) => {
       </div>
       <Card
         shadow="sm"
-        className="my-4 bg-opacity-50 backdrop-blur-md overflow-visible z-20"
+        className="my-4 bg-opacity-50 backdrop-blur-md overflow-visible"
       >
         <CardHeader className="font-bold text-lg gap-1 pb-0">
           <span className="mr-2">请求体</span>

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

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

napcat.webui/src/components/sidebar/menus.tsx

@@ -58,14 +58,13 @@ const renderItems = (items: MenuItem[], children = false) => {
           color="primary"
           endContent={
             canOpen ? (
-              // div实现箭头V效果
               <div
                 className={clsx(
                   'ml-auto relative w-3 h-3 transition-transform',
                   open && 'transform rotate-180',
                   isActive
                     ? 'text-primary-500'
-                    : 'text-red-300 dark:text-white',
+                    : 'text-primary-200 dark:text-white',
                   'before:rounded-full',
                   'before:content-[""]',
                   'before:block',
@@ -98,7 +97,7 @@ const renderItems = (items: MenuItem[], children = false) => {
                   'w-3 h-1.5 rounded-full ml-auto shadow-lg',
                   isActive
                     ? 'bg-primary-500 animate-spinner-ease-spin'
-                    : 'bg-red-300 dark:bg-white'
+                    : 'bg-primary-200 dark:bg-white'
                 )}
               />
             )

napcat.webui/src/components/system_info.tsx

@@ -34,7 +34,7 @@ const SystemInfoItem: React.FC<SystemInfoItemProps> = ({
   endContent
 }) => {
   return (
-    <div className="flex text-sm gap-1 p-2 items-center shadow-sm shadow-primary-50 dark:shadow-primary-100 rounded text-primary-400">
+    <div className="flex text-sm gap-1 p-2 items-center shadow-sm shadow-primary-100 dark:shadow-primary-100 rounded text-primary-400">
       {icon}
       <div className="w-24">{title}</div>
       <div className="text-primary-200">{value}</div>
@@ -234,7 +234,7 @@ const SystemInfo: React.FC<SystemInfoProps> = (props) => {
     error: qqVersionError
   } = useRequest(WebUIManager.getQQVersion)
   return (
-    <Card className="bg-opacity-60 shadow-sm shadow-primary-50 dark:shadow-primary-100 overflow-visible flex-1">
+    <Card className="bg-opacity-60 shadow-sm shadow-primary-100 dark:shadow-primary-100 overflow-visible flex-1">
       <CardHeader className="pb-0 items-center gap-1 text-primary-500 font-extrabold">
         <FaCircleInfo className="text-lg" />
         <span>系统信息</span>

napcat.webui/src/components/system_status_display.tsx

@@ -24,7 +24,7 @@ const SystemStatusItem: React.FC<SystemStatusItemProps> = ({
   return (
     <div
       className={clsx(
-        'shadow-sm p-2 rounded-md text-sm bg-content1 bg-opacity-30',
+        'shadow-sm shadow-primary-100 p-2 rounded-md text-sm bg-content1 bg-opacity-30',
         size === 'lg' ? 'col-span-2' : 'col-span-1 flex justify-between'
       )}
     >
@@ -55,7 +55,7 @@ const SystemStatusDisplay: React.FC<SystemStatusDisplayProps> = ({ data }) => {
   }
 
   return (
-    <Card className="bg-opacity-60 shadow-sm shadow-primary-50 dark:shadow-primary-100 col-span-1 lg:col-span-2 relative overflow-hidden">
+    <Card className="bg-opacity-60 shadow-sm shadow-primary-100 col-span-1 lg:col-span-2 relative overflow-hidden">
       <div className="absolute h-full right-0 top-0">
         <Image
           src={bkg}

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

@@ -24,9 +24,7 @@ const oneBotHttpApiGroup = {
   },
   '/get_group_system_msg': {
     description: '获取群系统消息',
-    request: z.object({
-      group_id: z.union([z.string(), z.number()]).describe('群号')
-    }),
+    request: z.object({}),
     response: baseResponseSchema.extend({
       data: z.object({
         InvitedRequest: z
@@ -37,6 +35,7 @@ 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 号')
@@ -50,6 +49,7 @@ 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.string().describe('群号'),
+          group_id: z.number().describe('群号'),
           current_talkative: z
             .object({
               user_id: z.number().describe('QQ 号'),

napcat.webui/src/const/themes.ts

@@ -0,0 +1,6 @@
+import heroui from './themes/heroui'
+import nc_pink from './themes/nc_pink'
+
+const themes: ThemeInfo[] = [nc_pink, heroui]
+
+export default themes

napcat.webui/src/const/themes/heroui.ts

@@ -0,0 +1,256 @@
+const theme: ThemeConfig = {
+  dark: {
+    '--heroui-background': '0 0% 0%',
+    '--heroui-foreground-50': '240 5.88% 10%',
+    '--heroui-foreground-100': '240 3.7% 15.88%',
+    '--heroui-foreground-200': '240 5.26% 26.08%',
+    '--heroui-foreground-300': '240 5.2% 33.92%',
+    '--heroui-foreground-400': '240 3.83% 46.08%',
+    '--heroui-foreground-500': '240 5.03% 64.9%',
+    '--heroui-foreground-600': '240 4.88% 83.92%',
+    '--heroui-foreground-700': '240 5.88% 90%',
+    '--heroui-foreground-800': '240 4.76% 95.88%',
+    '--heroui-foreground-900': '0 0% 98.04%',
+    '--heroui-foreground': '210 5.56% 92.94%',
+    '--heroui-focus': '212.01999999999998 100% 46.67%',
+    '--heroui-overlay': '0 0% 0%',
+    '--heroui-divider': '0 0% 100%',
+    '--heroui-divider-opacity': '0.15',
+    '--heroui-content1': '240 5.88% 10%',
+    '--heroui-content1-foreground': '0 0% 98.04%',
+    '--heroui-content2': '240 3.7% 15.88%',
+    '--heroui-content2-foreground': '240 4.76% 95.88%',
+    '--heroui-content3': '240 5.26% 26.08%',
+    '--heroui-content3-foreground': '240 5.88% 90%',
+    '--heroui-content4': '240 5.2% 33.92%',
+    '--heroui-content4-foreground': '240 4.88% 83.92%',
+    '--heroui-default-50': '240 5.88% 10%',
+    '--heroui-default-100': '240 3.7% 15.88%',
+    '--heroui-default-200': '240 5.26% 26.08%',
+    '--heroui-default-300': '240 5.2% 33.92%',
+    '--heroui-default-400': '240 3.83% 46.08%',
+    '--heroui-default-500': '240 5.03% 64.9%',
+    '--heroui-default-600': '240 4.88% 83.92%',
+    '--heroui-default-700': '240 5.88% 90%',
+    '--heroui-default-800': '240 4.76% 95.88%',
+    '--heroui-default-900': '0 0% 98.04%',
+    '--heroui-default-foreground': '0 0% 100%',
+    '--heroui-default': '240 5.26% 26.08%',
+    '--heroui-danger-50': '340 84.91% 10.39%',
+    '--heroui-danger-100': '339.33 86.54% 20.39%',
+    '--heroui-danger-200': '339.11 85.99% 30.78%',
+    '--heroui-danger-300': '339 86.54% 40.78%',
+    '--heroui-danger-400': '339.2 90.36% 51.18%',
+    '--heroui-danger-500': '339 90% 60.78%',
+    '--heroui-danger-600': '339.11 90.6% 70.78%',
+    '--heroui-danger-700': '339.33 90% 80.39%',
+    '--heroui-danger-800': '340 91.84% 90.39%',
+    '--heroui-danger-900': '339.13 92% 95.1%',
+    '--heroui-danger-foreground': '0 0% 100%',
+    '--heroui-danger': '339.2 90.36% 51.18%',
+    '--heroui-primary-50': '211.84 100% 9.61%',
+    '--heroui-primary-100': '211.84 100% 19.22%',
+    '--heroui-primary-200': '212.24 100% 28.82%',
+    '--heroui-primary-300': '212.14 100% 38.43%',
+    '--heroui-primary-400': '212.02 100% 46.67%',
+    '--heroui-primary-500': '212.14 92.45% 58.43%',
+    '--heroui-primary-600': '212.24 92.45% 68.82%',
+    '--heroui-primary-700': '211.84 92.45% 79.22%',
+    '--heroui-primary-800': '211.84 92.45% 89.61%',
+    '--heroui-primary-900': '212.5 92.31% 94.9%',
+    '--heroui-primary-foreground': '0 0% 100%',
+    '--heroui-primary': '212.02 100% 46.67%',
+    '--heroui-secondary-50': '270 66.67% 9.41%',
+    '--heroui-secondary-100': '270 66.67% 18.82%',
+    '--heroui-secondary-200': '270 66.67% 28.24%',
+    '--heroui-secondary-300': '270 66.67% 37.65%',
+    '--heroui-secondary-400': '270 66.67% 47.06%',
+    '--heroui-secondary-500': '270 59.26% 57.65%',
+    '--heroui-secondary-600': '270 59.26% 68.24%',
+    '--heroui-secondary-700': '270 59.26% 78.82%',
+    '--heroui-secondary-800': '270 59.26% 89.41%',
+    '--heroui-secondary-900': '270 61.54% 94.9%',
+    '--heroui-secondary-foreground': '0 0% 100%',
+    '--heroui-secondary': '270 59.26% 57.65%',
+    '--heroui-success-50': '145.71 77.78% 8.82%',
+    '--heroui-success-100': '146.2 79.78% 17.45%',
+    '--heroui-success-200': '145.79 79.26% 26.47%',
+    '--heroui-success-300': '146.01 79.89% 35.1%',
+    '--heroui-success-400': '145.96 79.46% 43.92%',
+    '--heroui-success-500': '146.01 62.45% 55.1%',
+    '--heroui-success-600': '145.79 62.57% 66.47%',
+    '--heroui-success-700': '146.2 61.74% 77.45%',
+    '--heroui-success-800': '145.71 61.4% 88.82%',
+    '--heroui-success-900': '146.67 64.29% 94.51%',
+    '--heroui-success-foreground': '0 0% 0%',
+    '--heroui-success': '145.96 79.46% 43.92%',
+    '--heroui-warning-50': '37.14 75% 10.98%',
+    '--heroui-warning-100': '37.14 75% 21.96%',
+    '--heroui-warning-200': '36.96 73.96% 33.14%',
+    '--heroui-warning-300': '37.01 74.22% 44.12%',
+    '--heroui-warning-400': '37.03 91.27% 55.1%',
+    '--heroui-warning-500': '37.01 91.26% 64.12%',
+    '--heroui-warning-600': '36.96 91.24% 73.14%',
+    '--heroui-warning-700': '37.14 91.3% 81.96%',
+    '--heroui-warning-800': '37.14 91.3% 90.98%',
+    '--heroui-warning-900': '54.55 91.67% 95.29%',
+    '--heroui-warning-foreground': '0 0% 0%',
+    '--heroui-warning': '37.03 91.27% 55.1%',
+    '--heroui-code-background': '240 5.56% 7.06%',
+    '--heroui-strong': '190.14 94.67% 44.12%',
+    '--heroui-code-mdx': '190.14 94.67% 44.12%',
+    '--heroui-divider-weight': '1px',
+    '--heroui-disabled-opacity': '.5',
+    '--heroui-font-size-tiny': '0.75rem',
+    '--heroui-font-size-small': '0.875rem',
+    '--heroui-font-size-medium': '1rem',
+    '--heroui-font-size-large': '1.125rem',
+    '--heroui-line-height-tiny': '1rem',
+    '--heroui-line-height-small': '1.25rem',
+    '--heroui-line-height-medium': '1.5rem',
+    '--heroui-line-height-large': '1.75rem',
+    '--heroui-radius-small': '8px',
+    '--heroui-radius-medium': '12px',
+    '--heroui-radius-large': '14px',
+    '--heroui-border-width-small': '1px',
+    '--heroui-border-width-medium': '2px',
+    '--heroui-border-width-large': '3px',
+    '--heroui-box-shadow-small':
+      '0px 0px 5px 0px rgba(0, 0, 0, .05), 0px 2px 10px 0px rgba(0, 0, 0, .2), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-box-shadow-medium':
+      '0px 0px 15px 0px rgba(0, 0, 0, .06), 0px 2px 30px 0px rgba(0, 0, 0, .22), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-box-shadow-large':
+      '0px 0px 30px 0px rgba(0, 0, 0, .07), 0px 30px 60px 0px rgba(0, 0, 0, .26), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-hover-opacity': '.9'
+  },
+  light: {
+    '--heroui-background': '0 0% 100%',
+    '--heroui-foreground-50': '240 5.88% 95%',
+    '--heroui-foreground-100': '240 3.7% 90%',
+    '--heroui-foreground-200': '240 5.26% 80%',
+    '--heroui-foreground-300': '240 5.2% 70%',
+    '--heroui-foreground-400': '240 3.83% 60%',
+    '--heroui-foreground-500': '240 5.03% 50%',
+    '--heroui-foreground-600': '240 4.88% 40%',
+    '--heroui-foreground-700': '240 5.88% 30%',
+    '--heroui-foreground-800': '240 4.76% 20%',
+    '--heroui-foreground-900': '0 0% 10%',
+    '--heroui-foreground': '210 5.56% 7.06%',
+    '--heroui-focus': '212.01999999999998 100% 53.33%',
+    '--heroui-overlay': '0 0% 100%',
+    '--heroui-divider': '0 0% 0%',
+    '--heroui-divider-opacity': '0.85',
+    '--heroui-content1': '240 5.88% 95%',
+    '--heroui-content1-foreground': '0 0% 10%',
+    '--heroui-content2': '240 3.7% 90%',
+    '--heroui-content2-foreground': '240 4.76% 20%',
+    '--heroui-content3': '240 5.26% 80%',
+    '--heroui-content3-foreground': '240 5.88% 30%',
+    '--heroui-content4': '240 5.2% 70%',
+    '--heroui-content4-foreground': '240 4.88% 40%',
+    '--heroui-default-50': '240 5.88% 95%',
+    '--heroui-default-100': '240 3.7% 90%',
+    '--heroui-default-200': '240 5.26% 80%',
+    '--heroui-default-300': '240 5.2% 70%',
+    '--heroui-default-400': '240 3.83% 60%',
+    '--heroui-default-500': '240 5.03% 50%',
+    '--heroui-default-600': '240 4.88% 40%',
+    '--heroui-default-700': '240 5.88% 30%',
+    '--heroui-default-800': '240 4.76% 20%',
+    '--heroui-default-900': '0 0% 10%',
+    '--heroui-default-foreground': '0 0% 0%',
+    '--heroui-default': '240 5.26% 80%',
+    '--heroui-danger-50': '339.13 92% 95.1%',
+    '--heroui-danger-100': '340 91.84% 90.39%',
+    '--heroui-danger-200': '339.33 90% 80.39%',
+    '--heroui-danger-300': '339.11 90.6% 70.78%',
+    '--heroui-danger-400': '339 90% 60.78%',
+    '--heroui-danger-500': '339.2 90.36% 51.18%',
+    '--heroui-danger-600': '339 86.54% 40.78%',
+    '--heroui-danger-700': '339.11 85.99% 30.78%',
+    '--heroui-danger-800': '339.33 86.54% 20.39%',
+    '--heroui-danger-900': '340 84.91% 10.39%',
+    '--heroui-danger-foreground': '0 0% 100%',
+    '--heroui-danger': '339.2 90.36% 51.18%',
+    '--heroui-primary-50': '212.5 92.31% 94.9%',
+    '--heroui-primary-100': '211.84 92.45% 89.61%',
+    '--heroui-primary-200': '211.84 92.45% 79.22%',
+    '--heroui-primary-300': '212.24 92.45% 68.82%',
+    '--heroui-primary-400': '212.14 92.45% 58.43%',
+    '--heroui-primary-500': '212.02 100% 46.67%',
+    '--heroui-primary-600': '212.14 100% 38.43%',
+    '--heroui-primary-700': '212.24 100% 28.82%',
+    '--heroui-primary-800': '211.84 100% 19.22%',
+    '--heroui-primary-900': '211.84 100% 9.61%',
+    '--heroui-primary-foreground': '0 0% 100%',
+    '--heroui-primary': '212.02 100% 46.67%',
+    '--heroui-secondary-50': '270 61.54% 94.9%',
+    '--heroui-secondary-100': '270 59.26% 89.41%',
+    '--heroui-secondary-200': '270 59.26% 78.82%',
+    '--heroui-secondary-300': '270 59.26% 68.24%',
+    '--heroui-secondary-400': '270 59.26% 57.65%',
+    '--heroui-secondary-500': '270 66.67% 47.06%',
+    '--heroui-secondary-600': '270 66.67% 37.65%',
+    '--heroui-secondary-700': '270 66.67% 28.24%',
+    '--heroui-secondary-800': '270 66.67% 18.82%',
+    '--heroui-secondary-900': '270 66.67% 9.41%',
+    '--heroui-secondary-foreground': '0 0% 100%',
+    '--heroui-secondary': '270 66.67% 47.06%',
+    '--heroui-success-50': '146.67 64.29% 94.51%',
+    '--heroui-success-100': '145.71 61.4% 88.82%',
+    '--heroui-success-200': '146.2 61.74% 77.45%',
+    '--heroui-success-300': '145.79 62.57% 66.47%',
+    '--heroui-success-400': '146.01 62.45% 55.1%',
+    '--heroui-success-500': '145.96 79.46% 43.92%',
+    '--heroui-success-600': '146.01 79.89% 35.1%',
+    '--heroui-success-700': '145.79 79.26% 26.47%',
+    '--heroui-success-800': '146.2 79.78% 17.45%',
+    '--heroui-success-900': '145.71 77.78% 8.82%',
+    '--heroui-success-foreground': '0 0% 0%',
+    '--heroui-success': '145.96 79.46% 43.92%',
+    '--heroui-warning-50': '54.55 91.67% 95.29%',
+    '--heroui-warning-100': '37.14 91.3% 90.98%',
+    '--heroui-warning-200': '37.14 91.3% 81.96%',
+    '--heroui-warning-300': '36.96 91.24% 73.14%',
+    '--heroui-warning-400': '37.01 91.26% 64.12%',
+    '--heroui-warning-500': '37.03 91.27% 55.1%',
+    '--heroui-warning-600': '37.01 74.22% 44.12%',
+    '--heroui-warning-700': '36.96 73.96% 33.14%',
+    '--heroui-warning-800': '37.14 75% 21.96%',
+    '--heroui-warning-900': '37.14 75% 10.98%',
+    '--heroui-warning-foreground': '0 0% 0%',
+    '--heroui-warning': '37.03 91.27% 55.1%',
+    '--heroui-code-background': '221.25 17.39% 18.04%',
+    '--heroui-strong': '316.95 100% 65.29%',
+    '--heroui-code-mdx': '316.95 100% 65.29%',
+    '--heroui-divider-weight': '1px',
+    '--heroui-disabled-opacity': '.5',
+    '--heroui-font-size-tiny': '0.75rem',
+    '--heroui-font-size-small': '0.875rem',
+    '--heroui-font-size-medium': '1rem',
+    '--heroui-font-size-large': '1.125rem',
+    '--heroui-line-height-tiny': '1rem',
+    '--heroui-line-height-small': '1.25rem',
+    '--heroui-line-height-medium': '1.5rem',
+    '--heroui-line-height-large': '1.75rem',
+    '--heroui-radius-small': '8px',
+    '--heroui-radius-medium': '12px',
+    '--heroui-radius-large': '14px',
+    '--heroui-border-width-small': '1px',
+    '--heroui-border-width-medium': '2px',
+    '--heroui-border-width-large': '3px',
+    '--heroui-box-shadow-small':
+      '0px 0px 5px 0px rgba(0, 0, 0, .02), 0px 2px 10px 0px rgba(0, 0, 0, .06), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-box-shadow-medium':
+      '0px 0px 15px 0px rgba(0, 0, 0, .03), 0px 2px 30px 0px rgba(0, 0, 0, .08), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-box-shadow-large':
+      '0px 0px 30px 0px rgba(0, 0, 0, .04), 0px 30px 60px 0px rgba(0, 0, 0, .12), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-hover-opacity': '.8'
+  }
+}
+export default {
+  theme,
+  author: 'HeroUI',
+  name: 'heroui',
+  description: 'HeroUI Default Theme'
+} satisfies ThemeInfo

napcat.webui/src/const/themes/nc_pink.ts

@@ -0,0 +1,256 @@
+const theme: ThemeConfig = {
+  dark: {
+    '--heroui-background': '0 0% 0%',
+    '--heroui-foreground-50': '240 5.88% 10%',
+    '--heroui-foreground-100': '240 3.7% 15.88%',
+    '--heroui-foreground-200': '240 5.26% 26.08%',
+    '--heroui-foreground-300': '240 5.2% 33.92%',
+    '--heroui-foreground-400': '240 3.83% 46.08%',
+    '--heroui-foreground-500': '240 5.03% 64.9%',
+    '--heroui-foreground-600': '240 4.88% 83.92%',
+    '--heroui-foreground-700': '240 5.88% 90%',
+    '--heroui-foreground-800': '240 4.76% 95.88%',
+    '--heroui-foreground-900': '0 0% 98.04%',
+    '--heroui-foreground': '210 5.56% 92.94%',
+    '--heroui-focus': '212.01999999999998 100% 46.67%',
+    '--heroui-overlay': '0 0% 0%',
+    '--heroui-divider': '0 0% 100%',
+    '--heroui-divider-opacity': '0.15',
+    '--heroui-content1': '240 5.88% 10%',
+    '--heroui-content1-foreground': '0 0% 98.04%',
+    '--heroui-content2': '240 3.7% 15.88%',
+    '--heroui-content2-foreground': '240 4.76% 95.88%',
+    '--heroui-content3': '240 5.26% 26.08%',
+    '--heroui-content3-foreground': '240 5.88% 90%',
+    '--heroui-content4': '240 5.2% 33.92%',
+    '--heroui-content4-foreground': '240 4.88% 83.92%',
+    '--heroui-default-50': '240 5.88% 10%',
+    '--heroui-default-100': '240 3.7% 15.88%',
+    '--heroui-default-200': '240 5.26% 26.08%',
+    '--heroui-default-300': '240 5.2% 33.92%',
+    '--heroui-default-400': '240 3.83% 46.08%',
+    '--heroui-default-500': '240 5.03% 64.9%',
+    '--heroui-default-600': '240 4.88% 83.92%',
+    '--heroui-default-700': '240 5.88% 90%',
+    '--heroui-default-800': '240 4.76% 95.88%',
+    '--heroui-default-900': '0 0% 98.04%',
+    '--heroui-default-foreground': '0 0% 100%',
+    '--heroui-default': '240 5.26% 26.08%',
+    '--heroui-danger-50': '301.89 82.61% 22.55%',
+    '--heroui-danger-100': '308.18 76.39% 28.24%',
+    '--heroui-danger-200': '313.85 70.65% 36.08%',
+    '--heroui-danger-300': '319.73 65.64% 44.51%',
+    '--heroui-danger-400': '325.82 69.62% 53.53%',
+    '--heroui-danger-500': '331.82 75% 65.49%',
+    '--heroui-danger-600': '337.84 83.46% 73.92%',
+    '--heroui-danger-700': '343.42 90.48% 83.53%',
+    '--heroui-danger-800': '350.53 90.48% 91.76%',
+    '--heroui-danger-900': '324 90.91% 95.69%',
+    '--heroui-danger-foreground': '0 0% 100%',
+    '--heroui-danger': '325.82 69.62% 53.53%',
+    '--heroui-primary-50': '340 84.91% 10.39%',
+    '--heroui-primary-100': '339.33 86.54% 20.39%',
+    '--heroui-primary-200': '339.11 85.99% 30.78%',
+    '--heroui-primary-300': '339 86.54% 40.78%',
+    '--heroui-primary-400': '339.2 90.36% 51.18%',
+    '--heroui-primary-500': '339 90% 60.78%',
+    '--heroui-primary-600': '339.11 90.6% 70.78%',
+    '--heroui-primary-700': '339.33 90% 80.39%',
+    '--heroui-primary-800': '340 91.84% 90.39%',
+    '--heroui-primary-900': '339.13 92% 95.1%',
+    '--heroui-primary-foreground': '0 0% 100%',
+    '--heroui-primary': '339.2 90.36% 51.18%',
+    '--heroui-secondary-50': '270 66.67% 9.41%',
+    '--heroui-secondary-100': '270 66.67% 18.82%',
+    '--heroui-secondary-200': '270 66.67% 28.24%',
+    '--heroui-secondary-300': '270 66.67% 37.65%',
+    '--heroui-secondary-400': '270 66.67% 47.06%',
+    '--heroui-secondary-500': '270 59.26% 57.65%',
+    '--heroui-secondary-600': '270 59.26% 68.24%',
+    '--heroui-secondary-700': '270 59.26% 78.82%',
+    '--heroui-secondary-800': '270 59.26% 89.41%',
+    '--heroui-secondary-900': '270 61.54% 94.9%',
+    '--heroui-secondary-foreground': '0 0% 100%',
+    '--heroui-secondary': '270 59.26% 57.65%',
+    '--heroui-success-50': '145.71 77.78% 8.82%',
+    '--heroui-success-100': '146.2 79.78% 17.45%',
+    '--heroui-success-200': '145.79 79.26% 26.47%',
+    '--heroui-success-300': '146.01 79.89% 35.1%',
+    '--heroui-success-400': '145.96 79.46% 43.92%',
+    '--heroui-success-500': '146.01 62.45% 55.1%',
+    '--heroui-success-600': '145.79 62.57% 66.47%',
+    '--heroui-success-700': '146.2 61.74% 77.45%',
+    '--heroui-success-800': '145.71 61.4% 88.82%',
+    '--heroui-success-900': '146.67 64.29% 94.51%',
+    '--heroui-success-foreground': '0 0% 0%',
+    '--heroui-success': '145.96 79.46% 43.92%',
+    '--heroui-warning-50': '37.14 75% 10.98%',
+    '--heroui-warning-100': '37.14 75% 21.96%',
+    '--heroui-warning-200': '36.96 73.96% 33.14%',
+    '--heroui-warning-300': '37.01 74.22% 44.12%',
+    '--heroui-warning-400': '37.03 91.27% 55.1%',
+    '--heroui-warning-500': '37.01 91.26% 64.12%',
+    '--heroui-warning-600': '36.96 91.24% 73.14%',
+    '--heroui-warning-700': '37.14 91.3% 81.96%',
+    '--heroui-warning-800': '37.14 91.3% 90.98%',
+    '--heroui-warning-900': '54.55 91.67% 95.29%',
+    '--heroui-warning-foreground': '0 0% 0%',
+    '--heroui-warning': '37.03 91.27% 55.1%',
+    '--heroui-code-background': '240 5.56% 7.06%',
+    '--heroui-strong': '190.14 94.67% 44.12%',
+    '--heroui-code-mdx': '190.14 94.67% 44.12%',
+    '--heroui-divider-weight': '1px',
+    '--heroui-disabled-opacity': '.5',
+    '--heroui-font-size-tiny': '0.75rem',
+    '--heroui-font-size-small': '0.875rem',
+    '--heroui-font-size-medium': '1rem',
+    '--heroui-font-size-large': '1.125rem',
+    '--heroui-line-height-tiny': '1rem',
+    '--heroui-line-height-small': '1.25rem',
+    '--heroui-line-height-medium': '1.5rem',
+    '--heroui-line-height-large': '1.75rem',
+    '--heroui-radius-small': '8px',
+    '--heroui-radius-medium': '12px',
+    '--heroui-radius-large': '14px',
+    '--heroui-border-width-small': '1px',
+    '--heroui-border-width-medium': '2px',
+    '--heroui-border-width-large': '3px',
+    '--heroui-box-shadow-small':
+      '0px 0px 5px 0px rgba(0, 0, 0, .05), 0px 2px 10px 0px rgba(0, 0, 0, .2), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-box-shadow-medium':
+      '0px 0px 15px 0px rgba(0, 0, 0, .06), 0px 2px 30px 0px rgba(0, 0, 0, .22), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-box-shadow-large':
+      '0px 0px 30px 0px rgba(0, 0, 0, .07), 0px 30px 60px 0px rgba(0, 0, 0, .26), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-hover-opacity': '.9'
+  },
+  light: {
+    '--heroui-background': '0 0% 100%',
+    '--heroui-foreground-50': '240 5.88% 95%',
+    '--heroui-foreground-100': '240 3.7% 90%',
+    '--heroui-foreground-200': '240 5.26% 80%',
+    '--heroui-foreground-300': '240 5.2% 70%',
+    '--heroui-foreground-400': '240 3.83% 60%',
+    '--heroui-foreground-500': '240 5.03% 50%',
+    '--heroui-foreground-600': '240 4.88% 40%',
+    '--heroui-foreground-700': '240 5.88% 30%',
+    '--heroui-foreground-800': '240 4.76% 20%',
+    '--heroui-foreground-900': '0 0% 10%',
+    '--heroui-foreground': '210 5.56% 7.06%',
+    '--heroui-focus': '212.01999999999998 100% 53.33%',
+    '--heroui-overlay': '0 0% 100%',
+    '--heroui-divider': '0 0% 0%',
+    '--heroui-divider-opacity': '0.85',
+    '--heroui-content1': '240 5.88% 95%',
+    '--heroui-content1-foreground': '0 0% 10%',
+    '--heroui-content2': '240 3.7% 90%',
+    '--heroui-content2-foreground': '240 4.76% 20%',
+    '--heroui-content3': '240 5.26% 80%',
+    '--heroui-content3-foreground': '240 5.88% 30%',
+    '--heroui-content4': '240 5.2% 70%',
+    '--heroui-content4-foreground': '240 4.88% 40%',
+    '--heroui-default-50': '240 5.88% 95%',
+    '--heroui-default-100': '240 3.7% 90%',
+    '--heroui-default-200': '240 5.26% 80%',
+    '--heroui-default-300': '240 5.2% 70%',
+    '--heroui-default-400': '240 3.83% 60%',
+    '--heroui-default-500': '240 5.03% 50%',
+    '--heroui-default-600': '240 4.88% 40%',
+    '--heroui-default-700': '240 5.88% 30%',
+    '--heroui-default-800': '240 4.76% 20%',
+    '--heroui-default-900': '0 0% 10%',
+    '--heroui-default-foreground': '0 0% 0%',
+    '--heroui-default': '240 5.26% 80%',
+    '--heroui-danger-50': '324 90.91% 95.69%',
+    '--heroui-danger-100': '350.53 90.48% 91.76%',
+    '--heroui-danger-200': '343.42 90.48% 83.53%',
+    '--heroui-danger-300': '337.84 83.46% 73.92%',
+    '--heroui-danger-400': '331.82 75% 65.49%',
+    '--heroui-danger-500': '325.82 69.62% 53.53%',
+    '--heroui-danger-600': '319.73 65.64% 44.51%',
+    '--heroui-danger-700': '313.85 70.65% 36.08%',
+    '--heroui-danger-800': '308.18 76.39% 28.24%',
+    '--heroui-danger-900': '301.89 82.61% 22.55%',
+    '--heroui-danger-foreground': '0 0% 100%',
+    '--heroui-danger': '325.82 69.62% 53.53%',
+    '--heroui-primary-50': '339.13 92% 95.1%',
+    '--heroui-primary-100': '340 91.84% 90.39%',
+    '--heroui-primary-200': '339.33 90% 80.39%',
+    '--heroui-primary-300': '339.11 90.6% 70.78%',
+    '--heroui-primary-400': '339 90% 60.78%',
+    '--heroui-primary-500': '339.2 90.36% 51.18%',
+    '--heroui-primary-600': '339 86.54% 40.78%',
+    '--heroui-primary-700': '339.11 85.99% 30.78%',
+    '--heroui-primary-800': '339.33 86.54% 20.39%',
+    '--heroui-primary-900': '340 84.91% 10.39%',
+    '--heroui-primary-foreground': '0 0% 100%',
+    '--heroui-primary': '339.2 90.36% 51.18%',
+    '--heroui-secondary-50': '270 61.54% 94.9%',
+    '--heroui-secondary-100': '270 59.26% 89.41%',
+    '--heroui-secondary-200': '270 59.26% 78.82%',
+    '--heroui-secondary-300': '270 59.26% 68.24%',
+    '--heroui-secondary-400': '270 59.26% 57.65%',
+    '--heroui-secondary-500': '270 66.67% 47.06%',
+    '--heroui-secondary-600': '270 66.67% 37.65%',
+    '--heroui-secondary-700': '270 66.67% 28.24%',
+    '--heroui-secondary-800': '270 66.67% 18.82%',
+    '--heroui-secondary-900': '270 66.67% 9.41%',
+    '--heroui-secondary-foreground': '0 0% 100%',
+    '--heroui-secondary': '270 66.67% 47.06%',
+    '--heroui-success-50': '146.67 64.29% 94.51%',
+    '--heroui-success-100': '145.71 61.4% 88.82%',
+    '--heroui-success-200': '146.2 61.74% 77.45%',
+    '--heroui-success-300': '145.79 62.57% 66.47%',
+    '--heroui-success-400': '146.01 62.45% 55.1%',
+    '--heroui-success-500': '145.96 79.46% 43.92%',
+    '--heroui-success-600': '146.01 79.89% 35.1%',
+    '--heroui-success-700': '145.79 79.26% 26.47%',
+    '--heroui-success-800': '146.2 79.78% 17.45%',
+    '--heroui-success-900': '145.71 77.78% 8.82%',
+    '--heroui-success-foreground': '0 0% 0%',
+    '--heroui-success': '145.96 79.46% 43.92%',
+    '--heroui-warning-50': '54.55 91.67% 95.29%',
+    '--heroui-warning-100': '37.14 91.3% 90.98%',
+    '--heroui-warning-200': '37.14 91.3% 81.96%',
+    '--heroui-warning-300': '36.96 91.24% 73.14%',
+    '--heroui-warning-400': '37.01 91.26% 64.12%',
+    '--heroui-warning-500': '37.03 91.27% 55.1%',
+    '--heroui-warning-600': '37.01 74.22% 44.12%',
+    '--heroui-warning-700': '36.96 73.96% 33.14%',
+    '--heroui-warning-800': '37.14 75% 21.96%',
+    '--heroui-warning-900': '37.14 75% 10.98%',
+    '--heroui-warning-foreground': '0 0% 0%',
+    '--heroui-warning': '37.03 91.27% 55.1%',
+    '--heroui-code-background': '221.25 17.39% 18.04%',
+    '--heroui-strong': '316.95 100% 65.29%',
+    '--heroui-code-mdx': '316.95 100% 65.29%',
+    '--heroui-divider-weight': '1px',
+    '--heroui-disabled-opacity': '.5',
+    '--heroui-font-size-tiny': '0.75rem',
+    '--heroui-font-size-small': '0.875rem',
+    '--heroui-font-size-medium': '1rem',
+    '--heroui-font-size-large': '1.125rem',
+    '--heroui-line-height-tiny': '1rem',
+    '--heroui-line-height-small': '1.25rem',
+    '--heroui-line-height-medium': '1.5rem',
+    '--heroui-line-height-large': '1.75rem',
+    '--heroui-radius-small': '8px',
+    '--heroui-radius-medium': '12px',
+    '--heroui-radius-large': '14px',
+    '--heroui-border-width-small': '1px',
+    '--heroui-border-width-medium': '2px',
+    '--heroui-border-width-large': '3px',
+    '--heroui-box-shadow-small':
+      '0px 0px 5px 0px rgba(0, 0, 0, .02), 0px 2px 10px 0px rgba(0, 0, 0, .06), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-box-shadow-medium':
+      '0px 0px 15px 0px rgba(0, 0, 0, .03), 0px 2px 30px 0px rgba(0, 0, 0, .08), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-box-shadow-large':
+      '0px 0px 30px 0px rgba(0, 0, 0, .04), 0px 30px 60px 0px rgba(0, 0, 0, .12), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-hover-opacity': '.8'
+  }
+}
+export default {
+  theme,
+  author: 'NapCat',
+  name: 'nc_pink',
+  description: 'NapCat Pink Theme'
+} satisfies ThemeInfo

napcat.webui/src/controllers/qq_manager.ts

@@ -73,4 +73,17 @@ export default class QQManager {
     )
     return data.data.data
   }
+
+  public static async getQuickLoginQQ() {
+    const { data } = await serverRequest.post<ServerResponse<string>>(
+      '/QQLogin/GetQuickLoginQQ'
+    )
+    return data.data
+  }
+
+  public static async setQuickLoginQQ(uin: string) {
+    await serverRequest.post<ServerResponse<null>>('/QQLogin/SetQuickLoginQQ', {
+      uin
+    })
+  }
 }

napcat.webui/src/controllers/webui_manager.ts

@@ -3,20 +3,12 @@ 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
 }
 
-export interface TerminalSession {
-  id: string
-}
-
-export interface TerminalInfo {
-  id: string
-}
-
 export default class WebUIManager {
   public static async checkWebUiLogined() {
     const { data } =
@@ -25,9 +17,10 @@ export default class WebUIManager {
   }
 
   public static async loginWithToken(token: string) {
+    const sha256 = CryptoJS.SHA256(token + '.napcat').toString();
     const { data } = await serverRequest.post<ServerResponse<AuthResponse>>(
       '/auth/login',
-      { token }
+      { hash: sha256 }
     )
     return data.data.Credential
   }
@@ -40,6 +33,13 @@ export default class WebUIManager {
     return data.data
   }
 
+  public static async checkUsingDefaultToken() {
+    const { data } = await serverRequest.get<ServerResponse<boolean>>(
+      '/auth/check_using_default_token'
+    )
+    return data.data
+  }
+
   public static async proxy<T>(url = '') {
     const data = await serverRequest.get<ServerResponse<string>>(
       '/base/proxy?url=' + encodeURIComponent(url)
@@ -60,6 +60,20 @@ export default class WebUIManager {
     return data.data
   }
 
+  public static async getThemeConfig() {
+    const { data } =
+      await serverRequest.get<ServerResponse<ThemeConfig>>('/base/Theme')
+    return data.data
+  }
+
+  public static async setThemeConfig(theme: ThemeConfig) {
+    const { data } = await serverRequest.post<ServerResponse<boolean>>(
+      '/base/SetTheme',
+      { theme }
+    )
+    return data.data
+  }
+
   public static async getLogList() {
     const { data } =
       await serverRequest.get<ServerResponse<string[]>>('/Log/GetLogList')

napcat.webui/src/main.tsx

@@ -8,6 +8,7 @@ import '@/styles/globals.css'
 
 import key from './const/key'
 import WebUIManager from './controllers/webui_manager'
+import { loadTheme } from './utils/theme'
 
 WebUIManager.checkWebUiLogined()
 
@@ -22,6 +23,8 @@ if (theme && !theme.startsWith('"')) {
   localStorage.setItem(key.theme, JSON.stringify(theme))
 }
 
+loadTheme()
+
 ReactDOM.createRoot(document.getElementById('root')!).render(
   // <React.StrictMode>
   <BrowserRouter basename="/webui/">

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

@@ -1,20 +1,36 @@
 import { Card, CardBody } from '@heroui/card'
 import { Tab, Tabs } from '@heroui/tabs'
+import clsx from 'clsx'
 import { useMediaQuery } from 'react-responsive'
+import { useNavigate, useSearchParams } from 'react-router-dom'
 
 import ChangePasswordCard from './change_password'
+import LoginConfigCard from './login'
 import OneBotConfigCard from './onebot'
+import ThemeConfigCard from './theme'
 import WebUIConfigCard from './webui'
 
 export interface ConfigPageProps {
   children?: React.ReactNode
+  size?: 'sm' | 'md' | 'lg'
 }
 
-const ConfingPageItem: React.FC<ConfigPageProps> = ({ children }) => {
+const ConfingPageItem: React.FC<ConfigPageProps> = ({
+  children,
+  size = 'md'
+}) => {
   return (
     <Card className="bg-opacity-50 backdrop-blur-sm">
       <CardBody className="items-center py-5">
-        <div className="w-96 max-w-full flex flex-col gap-2">{children}</div>
+        <div
+          className={clsx('max-w-full flex flex-col gap-2', {
+            'w-72': size === 'sm',
+            'w-96': size === 'md',
+            'w-[32rem]': size === 'lg'
+          })}
+        >
+          {children}
+        </div>
       </CardBody>
     </Card>
   )
@@ -22,6 +38,11 @@ const ConfingPageItem: React.FC<ConfigPageProps> = ({ children }) => {
 
 export default function ConfigPage() {
   const isMediumUp = useMediaQuery({ minWidth: 768 })
+  const navigate = useNavigate()
+  const search = useSearchParams({
+    tab: 'onebot'
+  })[0]
+  const tab = search.get('tab') ?? 'onebot'
 
   return (
     <section className="w-[1000px] max-w-full md:mx-auto gap-4 py-8 px-2 md:py-10">
@@ -30,6 +51,10 @@ export default function ConfigPage() {
         fullWidth
         className="w-full"
         isVertical={isMediumUp}
+        selectedKey={tab}
+        onSelectionChange={(key) => {
+          navigate(`/config?tab=${key}`)
+        }}
         classNames={{
           tabList: 'sticky flex top-14 bg-opacity-50 backdrop-blur-sm',
           panel: 'w-full relative',
@@ -47,12 +72,22 @@ export default function ConfigPage() {
             <WebUIConfigCard />
           </ConfingPageItem>
         </Tab>
-
+        <Tab title="登录配置" key="login">
+          <ConfingPageItem>
+            <LoginConfigCard />
+          </ConfingPageItem>
+        </Tab>
         <Tab title="修改密码" key="token">
           <ConfingPageItem>
             <ChangePasswordCard />
           </ConfingPageItem>
         </Tab>
+
+        <Tab title="主题配置" key="theme">
+          <ConfingPageItem size="lg">
+            <ThemeConfigCard />
+          </ConfingPageItem>
+        </Tab>
       </Tabs>
     </section>
   )

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

@@ -0,0 +1,89 @@
+import { Input } from '@heroui/input'
+import { useRequest } from 'ahooks'
+import { useEffect } from 'react'
+import { Controller, useForm } from 'react-hook-form'
+import toast from 'react-hot-toast'
+
+import SaveButtons from '@/components/button/save_buttons'
+import PageLoading from '@/components/page_loading'
+
+import QQManager from '@/controllers/qq_manager'
+
+const LoginConfigCard = () => {
+  const {
+    data: quickLoginData,
+    loading: quickLoginLoading,
+    error: quickLoginError,
+    refreshAsync: refreshQuickLogin
+  } = useRequest(QQManager.getQuickLoginQQ)
+  const {
+    control,
+    handleSubmit: handleOnebotSubmit,
+    formState: { isSubmitting },
+    setValue: setOnebotValue
+  } = useForm<{
+    quickLoginQQ: string
+  }>({
+    defaultValues: {
+      quickLoginQQ: ''
+    }
+  })
+
+  const reset = () => {
+    setOnebotValue('quickLoginQQ', quickLoginData ?? '')
+  }
+
+  const onSubmit = handleOnebotSubmit(async (data) => {
+    try {
+      await QQManager.setQuickLoginQQ(data.quickLoginQQ)
+      toast.success('保存成功')
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`保存失败: ${msg}`)
+    }
+  })
+
+  const onRefresh = async () => {
+    try {
+      await refreshQuickLogin()
+      toast.success('刷新成功')
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`刷新失败: ${msg}`)
+    }
+  }
+
+  useEffect(() => {
+    reset()
+  }, [quickLoginData])
+
+  if (quickLoginLoading) return <PageLoading loading={true} />
+
+  return (
+    <>
+      <title>OneBot配置 - NapCat WebUI</title>
+      <div className="flex-shrink-0 w-full">快速登录QQ</div>
+      <Controller
+        control={control}
+        name="quickLoginQQ"
+        render={({ field }) => (
+          <Input
+            {...field}
+            label="快速登录QQ"
+            placeholder="请输入QQ号"
+            isDisabled={!!quickLoginError}
+            errorMessage={quickLoginError ? '获取快速登录QQ失败' : undefined}
+          />
+        )}
+      />
+      <SaveButtons
+        onSubmit={onSubmit}
+        reset={reset}
+        isSubmitting={isSubmitting || quickLoginLoading}
+        refresh={onRefresh}
+      />
+    </>
+  )
+}
+
+export default LoginConfigCard

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

@@ -30,9 +30,9 @@ const OneBotConfigCard = () => {
     setOnebotValue('parseMultMsg', config.parseMultMsg)
   }
 
-  const onSubmit = handleOnebotSubmit((data) => {
+  const onSubmit = handleOnebotSubmit(async (data) => {
     try {
-      saveConfigWithoutNetwork(data)
+      await saveConfigWithoutNetwork(data)
       toast.success('保存成功')
     } catch (error) {
       const msg = (error as Error).message

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

@@ -0,0 +1,279 @@
+import { Accordion, AccordionItem } from '@heroui/accordion'
+import { Card, CardBody, CardHeader } from '@heroui/card'
+import { useRequest } from 'ahooks'
+import clsx from 'clsx'
+import { useEffect, useRef } from 'react'
+import { Controller, useForm, useWatch } from 'react-hook-form'
+import toast from 'react-hot-toast'
+import { FaUserAstronaut } from 'react-icons/fa'
+import { FaPaintbrush } from 'react-icons/fa6'
+import { IoIosColorPalette } from 'react-icons/io'
+import { MdDarkMode, MdLightMode } from 'react-icons/md'
+
+import themes from '@/const/themes'
+
+import ColorPicker from '@/components/ColorPicker'
+import SaveButtons from '@/components/button/save_buttons'
+import PageLoading from '@/components/page_loading'
+
+import { colorKeys, generateTheme, loadTheme } from '@/utils/theme'
+
+import WebUIManager from '@/controllers/webui_manager'
+
+export type PreviewThemeCardProps = {
+  theme: ThemeInfo
+  onPreview: () => void
+}
+
+const values = [
+  '',
+  '-50',
+  '-100',
+  '-200',
+  '-300',
+  '-400',
+  '-500',
+  '-600',
+  '-700',
+  '-800',
+  '-900'
+]
+const colors = [
+  'primary',
+  'secondary',
+  'success',
+  'danger',
+  'warning',
+  'default'
+]
+
+function PreviewThemeCard({ theme, onPreview }: PreviewThemeCardProps) {
+  const style = document.createElement('style')
+  style.innerHTML = generateTheme(theme.theme, theme.name)
+  const cardRef = useRef<HTMLDivElement>(null)
+  useEffect(() => {
+    document.head.appendChild(style)
+    return () => {
+      document.head.removeChild(style)
+    }
+  }, [])
+  return (
+    <Card
+      ref={cardRef}
+      shadow="sm"
+      radius="sm"
+      isPressable
+      onPress={onPreview}
+      className={clsx('text-primary bg-primary-50', theme.name)}
+    >
+      <CardHeader className="pb-0 flex flex-col items-start gap-1">
+        <div className="px-1 rounded-md bg-primary text-primary-foreground">
+          {theme.name}
+        </div>
+        <div className="text-xs flex items-center gap-1 text-primary-300">
+          <FaUserAstronaut />
+          {theme.author ?? '未知'}
+        </div>
+        <div className="text-xs text-primary-200">{theme.description}</div>
+      </CardHeader>
+      <CardBody>
+        <div className="flex flex-col gap-1">
+          {colors.map((color) => (
+            <div className="flex gap-1 items-center flex-wrap" key={color}>
+              <div className="text-xs w-4 text-right">
+                {color[0].toUpperCase()}
+              </div>
+              {values.map((value) => (
+                <div
+                  key={value}
+                  className={clsx(
+                    'w-2 h-2 rounded-full shadow-small',
+                    `bg-${color}${value}`
+                  )}
+                ></div>
+              ))}
+            </div>
+          ))}
+        </div>
+      </CardBody>
+    </Card>
+  )
+}
+
+const ThemeConfigCard = () => {
+  const { data, loading, error, refreshAsync } = useRequest(
+    WebUIManager.getThemeConfig
+  )
+  const {
+    control,
+    handleSubmit: handleOnebotSubmit,
+    formState: { isSubmitting },
+    setValue: setOnebotValue
+  } = useForm<{
+    theme: ThemeConfig
+  }>({
+    defaultValues: {
+      theme: {
+        dark: {},
+        light: {}
+      }
+    }
+  })
+
+  // 使用 useRef 存储 style 标签引用
+  const styleTagRef = useRef<HTMLStyleElement | null>(null)
+
+  // 在组件挂载时创建 style 标签，并在卸载时清理
+  useEffect(() => {
+    const styleTag = document.createElement('style')
+    document.head.appendChild(styleTag)
+    styleTagRef.current = styleTag
+    return () => {
+      if (styleTagRef.current) {
+        document.head.removeChild(styleTagRef.current)
+      }
+    }
+  }, [])
+
+  const theme = useWatch({ control, name: 'theme' })
+
+  const reset = () => {
+    if (data) setOnebotValue('theme', data)
+  }
+
+  const onSubmit = handleOnebotSubmit(async (data) => {
+    try {
+      await WebUIManager.setThemeConfig(data.theme)
+      toast.success('保存成功')
+      loadTheme()
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`保存失败: ${msg}`)
+    }
+  })
+
+  const onRefresh = async () => {
+    try {
+      await refreshAsync()
+      toast.success('刷新成功')
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`刷新失败: ${msg}`)
+    }
+  }
+
+  useEffect(() => {
+    reset()
+  }, [data])
+
+  useEffect(() => {
+    if (theme && styleTagRef.current) {
+      const css = generateTheme(theme)
+      styleTagRef.current.innerHTML = css
+    }
+  }, [theme])
+
+  if (loading) return <PageLoading loading={true} />
+
+  if (error)
+    return (
+      <div className="py-24 text-danger-500 text-center">{error.message}</div>
+    )
+
+  return (
+    <>
+      <title>主题配置 - NapCat WebUI</title>
+
+      <SaveButtons
+        onSubmit={onSubmit}
+        reset={reset}
+        isSubmitting={isSubmitting}
+        refresh={onRefresh}
+        className="items-end w-full p-4"
+      />
+      <div className="px-4 text-sm text-default-600">实时预览，记得保存！</div>
+      <Accordion variant="splitted" defaultExpandedKeys={['select']}>
+        <AccordionItem
+          key="select"
+          aria-label="Pick Color"
+          title="选择主题"
+          subtitle="可以切换夜间/白昼模式查看对应颜色"
+          className="shadow-small"
+          startContent={<IoIosColorPalette />}
+        >
+          <div className="flex flex-wrap gap-2">
+            {themes.map((theme) => (
+              <PreviewThemeCard
+                key={theme.name}
+                theme={theme}
+                onPreview={() => {
+                  setOnebotValue('theme', theme.theme)
+                }}
+              />
+            ))}
+          </div>
+        </AccordionItem>
+
+        <AccordionItem
+          key="pick"
+          aria-label="Pick Color"
+          title="自定义配色"
+          className="shadow-small"
+          startContent={<FaPaintbrush />}
+        >
+          <div className="space-y-2">
+            {(['dark', 'light'] as const).map((mode) => (
+              <div
+                key={mode}
+                className={clsx(
+                  'p-2 rounded-md',
+                  mode === 'dark' ? 'text-white' : 'text-black',
+                  mode === 'dark'
+                    ? 'bg-content1-foreground dark:bg-content1'
+                    : 'bg-content1 dark:bg-content1-foreground'
+                )}
+              >
+                <h3 className="text-center p-2 rounded-md bg-content2 mb-2 text-default-800 flex items-center justify-center">
+                  {mode === 'dark' ? (
+                    <MdDarkMode size={24} />
+                  ) : (
+                    <MdLightMode size={24} />
+                  )}
+                  {mode === 'dark' ? '夜间模式主题' : '白昼模式主题'}
+                </h3>
+                {colorKeys.map((key) => (
+                  <div
+                    key={key}
+                    className="grid grid-cols-2 items-center mb-2 gap-2"
+                  >
+                    <label className="text-right">{key}</label>
+                    <Controller
+                      control={control}
+                      name={`theme.${mode}.${key}`}
+                      render={({ field: { value, onChange } }) => {
+                        const hslArray = value?.split(' ') ?? [0, 0, 0]
+                        const color = `hsl(${hslArray[0]}, ${hslArray[1]}, ${hslArray[2]})`
+                        return (
+                          <ColorPicker
+                            color={color}
+                            onChange={(result) => {
+                              onChange(
+                                `${result.hsl.h} ${result.hsl.s * 100}% ${result.hsl.l * 100}%`
+                              )
+                            }}
+                          />
+                        )
+                      }}
+                    />
+                  </div>
+                ))}
+              </div>
+            ))}
+          </div>
+        </AccordionItem>
+      </Accordion>
+    </>
+  )
+}
+
+export default ThemeConfigCard

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

@@ -81,6 +81,10 @@ const WebUIConfigCard = () => {
             onDelete={async () => {
               try {
                 await FileManager.deleteWebUIFont()
+                toast.success('删除成功')
+                setTimeout(() => {
+                  window.location.reload()
+                }, 1000)
               } catch (error) {
                 toast.error('删除失败: ' + (error as Error).message)
               }

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

@@ -105,7 +105,7 @@ const DashboardIndexPage: React.FC = () => {
           <SystemStatusCard setArchInfo={setArchInfo} />
         </div>
         <Networks />
-        <Card className="bg-opacity-60 shadow-sm shadow-primary-50">
+        <Card className="bg-opacity-60 shadow-sm shadow-primary-100">
           <CardBody>
             <Hitokoto />
           </CardBody>

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

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

napcat.webui/src/pages/index.tsx

@@ -1,14 +1,46 @@
 import { Spinner } from '@heroui/spinner'
 import { AnimatePresence, motion } from 'motion/react'
-import { Suspense } from 'react'
-import { Outlet, useLocation } from 'react-router-dom'
+import { Suspense, useEffect } from 'react'
+import { Outlet, useLocation, useNavigate } from 'react-router-dom'
 
+import useAuth from '@/hooks/auth'
+import useDialog from '@/hooks/use-dialog'
+
+import WebUIManager from '@/controllers/webui_manager'
 import DefaultLayout from '@/layouts/default'
 
+const CheckDefaultPassword = () => {
+  const { isAuth } = useAuth()
+  const dialog = useDialog()
+  const navigate = useNavigate()
+  const checkDefaultPassword = async () => {
+    const data = await WebUIManager.checkUsingDefaultToken()
+    if (data) {
+      dialog.confirm({
+        title: '修改默认密码',
+        content: '检测到当前密码为默认密码，请尽快修改密码。',
+        confirmText: '前往修改',
+        onConfirm: () => {
+          navigate('/config?tab=token')
+        }
+      })
+    }
+  }
+
+  useEffect(() => {
+    if (isAuth) {
+      checkDefaultPassword()
+    }
+  }, [isAuth])
+  return null
+}
+
 export default function IndexPage() {
   const location = useLocation()
+
   return (
     <DefaultLayout>
+      <CheckDefaultPassword />
       <Suspense
         fallback={
           <div className="flex justify-center px-10">

napcat.webui/src/pages/web_login.tsx

@@ -47,6 +47,22 @@ export default function WebLoginPage() {
     }
   }
 
+  // 处理全局键盘事件
+  const handleKeyDown = (e: KeyboardEvent) => {
+    if (e.key === 'Enter' && !isLoading) {
+      onSubmit()
+    }
+  }
+
+  useEffect(() => {
+    document.addEventListener('keydown', handleKeyDown)
+
+    // 清理函数
+    return () => {
+      document.removeEventListener('keydown', handleKeyDown)
+    }
+  }, [tokenValue, isLoading]) // 依赖项包含用于登录的状态
+
   useEffect(() => {
     if (token) {
       onSubmit()
@@ -79,6 +95,7 @@ export default function WebLoginPage() {
             <CardBody className="flex gap-5 py-5 px-5 md:px-10">
               <Input
                 isClearable
+                type="password"
                 classNames={{
                   label: 'text-black/50 dark:text-white/90',
                   input: [

napcat.webui/src/styles/text.css

@@ -1,6 +1,6 @@
 @layer base {
   .shiny-text {
-    @apply text-pink-400 text-opacity-60;
+    @apply text-primary-400 text-opacity-60;
     background-size: 200% 100%;
     -webkit-background-clip: text;
     background-clip: text;
@@ -10,7 +10,7 @@
     background-image: linear-gradient(
       120deg,
       rgba(255, 50, 50, 0) 40%,
-      rgba(255, 76, 76, 0.8) 50%,
+      hsl(var(--heroui-primary-400) / 0.8) 50%,
       rgba(255, 50, 50, 0) 60%
     );
   }
@@ -18,11 +18,10 @@
     background-image: linear-gradient(
       120deg,
       rgba(255, 255, 255, 0) 40%,
-      rgba(206, 21, 21, 0.8) 50%,
+      hsl(var(--heroui-primary-600) / 0.8) 50%,
       rgba(255, 255, 255, 0) 60%
     );
   }
-
   @keyframes shine {
     0% {
       background-position: 100%;

napcat.webui/src/types/server.d.ts

@@ -48,3 +48,136 @@ interface SystemStatus {
   }
   arch: string
 }
+
+interface ThemeConfigItem {
+  '--heroui-background': string
+  '--heroui-foreground-50': string
+  '--heroui-foreground-100': string
+  '--heroui-foreground-200': string
+  '--heroui-foreground-300': string
+  '--heroui-foreground-400': string
+  '--heroui-foreground-500': string
+  '--heroui-foreground-600': string
+  '--heroui-foreground-700': string
+  '--heroui-foreground-800': string
+  '--heroui-foreground-900': string
+  '--heroui-foreground': string
+  '--heroui-focus': string
+  '--heroui-overlay': string
+  '--heroui-divider': string
+  '--heroui-divider-opacity': string
+  '--heroui-content1': string
+  '--heroui-content1-foreground': string
+  '--heroui-content2': string
+  '--heroui-content2-foreground': string
+  '--heroui-content3': string
+  '--heroui-content3-foreground': string
+  '--heroui-content4': string
+  '--heroui-content4-foreground': string
+  '--heroui-default-50': string
+  '--heroui-default-100': string
+  '--heroui-default-200': string
+  '--heroui-default-300': string
+  '--heroui-default-400': string
+  '--heroui-default-500': string
+  '--heroui-default-600': string
+  '--heroui-default-700': string
+  '--heroui-default-800': string
+  '--heroui-default-900': string
+  '--heroui-default-foreground': string
+  '--heroui-default': string
+  // 新增 danger
+  '--heroui-danger-50': string
+  '--heroui-danger-100': string
+  '--heroui-danger-200': string
+  '--heroui-danger-300': string
+  '--heroui-danger-400': string
+  '--heroui-danger-500': string
+  '--heroui-danger-600': string
+  '--heroui-danger-700': string
+  '--heroui-danger-800': string
+  '--heroui-danger-900': string
+  '--heroui-danger-foreground': string
+  '--heroui-danger': string
+  // 新增 primary
+  '--heroui-primary-50': string
+  '--heroui-primary-100': string
+  '--heroui-primary-200': string
+  '--heroui-primary-300': string
+  '--heroui-primary-400': string
+  '--heroui-primary-500': string
+  '--heroui-primary-600': string
+  '--heroui-primary-700': string
+  '--heroui-primary-800': string
+  '--heroui-primary-900': string
+  '--heroui-primary-foreground': string
+  '--heroui-primary': string
+  // 新增 secondary
+  '--heroui-secondary-50': string
+  '--heroui-secondary-100': string
+  '--heroui-secondary-200': string
+  '--heroui-secondary-300': string
+  '--heroui-secondary-400': string
+  '--heroui-secondary-500': string
+  '--heroui-secondary-600': string
+  '--heroui-secondary-700': string
+  '--heroui-secondary-800': string
+  '--heroui-secondary-900': string
+  '--heroui-secondary-foreground': string
+  '--heroui-secondary': string
+  // 新增 success
+  '--heroui-success-50': string
+  '--heroui-success-100': string
+  '--heroui-success-200': string
+  '--heroui-success-300': string
+  '--heroui-success-400': string
+  '--heroui-success-500': string
+  '--heroui-success-600': string
+  '--heroui-success-700': string
+  '--heroui-success-800': string
+  '--heroui-success-900': string
+  '--heroui-success-foreground': string
+  '--heroui-success': string
+  // 新增 warning
+  '--heroui-warning-50': string
+  '--heroui-warning-100': string
+  '--heroui-warning-200': string
+  '--heroui-warning-300': string
+  '--heroui-warning-400': string
+  '--heroui-warning-500': string
+  '--heroui-warning-600': string
+  '--heroui-warning-700': string
+  '--heroui-warning-800': string
+  '--heroui-warning-900': string
+  '--heroui-warning-foreground': string
+  '--heroui-warning': string
+  // 其它配置
+  '--heroui-code-background': string
+  '--heroui-strong': string
+  '--heroui-code-mdx': string
+  '--heroui-divider-weight': string
+  '--heroui-disabled-opacity': string
+  '--heroui-font-size-tiny': string
+  '--heroui-font-size-small': string
+  '--heroui-font-size-medium': string
+  '--heroui-font-size-large': string
+  '--heroui-line-height-tiny': string
+  '--heroui-line-height-small': string
+  '--heroui-line-height-medium': string
+  '--heroui-line-height-large': string
+  '--heroui-radius-small': string
+  '--heroui-radius-medium': string
+  '--heroui-radius-large': string
+  '--heroui-border-width-small': string
+  '--heroui-border-width-medium': string
+  '--heroui-border-width-large': string
+  '--heroui-box-shadow-small': string
+  '--heroui-box-shadow-medium': string
+  '--heroui-box-shadow-large': string
+  '--heroui-hover-opacity': string
+}
+
+interface ThemeConfig {
+  dark: ThemeConfigItem
+  light: ThemeConfigItem
+}

napcat.webui/src/types/theme.d.ts

@@ -0,0 +1,6 @@
+interface ThemeInfo {
+  theme: ThemeConfig
+  name: string
+  description?: string
+  author?: string
+}

napcat.webui/src/utils/music.ts

@@ -1,19 +1,21 @@
 import { PlayMode } from '@/const/enum'
 
+import WebUIManager from '@/controllers/webui_manager'
 import type {
   FinalMusic,
   Music163ListResponse,
   Music163URLResponse
 } from '@/types/music'
 
-import WebUIManager from '@/controllers/webui_manager'
 /**
  * 获取网易云音乐歌单
  * @param id 歌单id
  * @returns 歌单信息
  */
 export const get163MusicList = async (id: string) => {
-  let res = await WebUIManager.proxy<Music163ListResponse>('https://wavesgame.top/playlist/track/all?id=' + id);
+  let res = await WebUIManager.proxy<Music163ListResponse>(
+    'https://wavesgame.top/playlist/track/all?id=' + id
+  )
   // const res = await request.get<Music163ListResponse>(
   //   `https://wavesgame.top/playlist/track/all?id=${id}`
   // )
@@ -71,7 +73,7 @@ export const get163MusicListSongs = async (id: string) => {
     if (songURL) {
       finalMusic.push({
         id: song.id,
-        url: songURL,
+        url: songURL.replace(/http:\/\//, '//').replace(/https:\/\//, '//'),
         title: song.name,
         artist: song.ar.map((p) => p.name).join('/'),
         cover: song.al.picUrl

napcat.webui/src/utils/theme.ts

@@ -0,0 +1,141 @@
+import { request } from './request'
+
+const style = document.createElement('style')
+document.head.appendChild(style)
+
+export function loadTheme() {
+  request('/files/theme.css?_t=' + Date.now())
+    .then((res) => res.data)
+    .then((css) => {
+      style.innerHTML = css
+    })
+    .catch(() => {
+      console.error('Failed to load theme.css')
+    })
+}
+
+export const colorKeys = [
+  '--heroui-background',
+
+  '--heroui-foreground-50',
+  '--heroui-foreground-100',
+  '--heroui-foreground-200',
+  '--heroui-foreground-300',
+  '--heroui-foreground-400',
+  '--heroui-foreground-500',
+  '--heroui-foreground-600',
+  '--heroui-foreground-700',
+  '--heroui-foreground-800',
+  '--heroui-foreground-900',
+  '--heroui-foreground',
+
+  '--heroui-content1',
+  '--heroui-content1-foreground',
+  '--heroui-content2',
+  '--heroui-content2-foreground',
+  '--heroui-content3',
+  '--heroui-content3-foreground',
+  '--heroui-content4',
+  '--heroui-content4-foreground',
+
+  '--heroui-default-50',
+  '--heroui-default-100',
+  '--heroui-default-200',
+  '--heroui-default-300',
+  '--heroui-default-400',
+  '--heroui-default-500',
+  '--heroui-default-600',
+  '--heroui-default-700',
+  '--heroui-default-800',
+  '--heroui-default-900',
+  '--heroui-default-foreground',
+  '--heroui-default',
+
+  '--heroui-danger-50',
+  '--heroui-danger-100',
+  '--heroui-danger-200',
+  '--heroui-danger-300',
+  '--heroui-danger-400',
+  '--heroui-danger-500',
+  '--heroui-danger-600',
+  '--heroui-danger-700',
+  '--heroui-danger-800',
+  '--heroui-danger-900',
+  '--heroui-danger-foreground',
+  '--heroui-danger',
+
+  '--heroui-primary-50',
+  '--heroui-primary-100',
+  '--heroui-primary-200',
+  '--heroui-primary-300',
+  '--heroui-primary-400',
+  '--heroui-primary-500',
+  '--heroui-primary-600',
+  '--heroui-primary-700',
+  '--heroui-primary-800',
+  '--heroui-primary-900',
+  '--heroui-primary-foreground',
+  '--heroui-primary',
+
+  '--heroui-secondary-50',
+  '--heroui-secondary-100',
+  '--heroui-secondary-200',
+  '--heroui-secondary-300',
+  '--heroui-secondary-400',
+  '--heroui-secondary-500',
+  '--heroui-secondary-600',
+  '--heroui-secondary-700',
+  '--heroui-secondary-800',
+  '--heroui-secondary-900',
+  '--heroui-secondary-foreground',
+  '--heroui-secondary',
+
+  '--heroui-success-50',
+  '--heroui-success-100',
+  '--heroui-success-200',
+  '--heroui-success-300',
+  '--heroui-success-400',
+  '--heroui-success-500',
+  '--heroui-success-600',
+  '--heroui-success-700',
+  '--heroui-success-800',
+  '--heroui-success-900',
+  '--heroui-success-foreground',
+  '--heroui-success',
+
+  '--heroui-warning-50',
+  '--heroui-warning-100',
+  '--heroui-warning-200',
+  '--heroui-warning-300',
+  '--heroui-warning-400',
+  '--heroui-warning-500',
+  '--heroui-warning-600',
+  '--heroui-warning-700',
+  '--heroui-warning-800',
+  '--heroui-warning-900',
+  '--heroui-warning-foreground',
+  '--heroui-warning',
+
+  '--heroui-focus',
+  '--heroui-overlay',
+  '--heroui-divider',
+  '--heroui-code-background',
+  '--heroui-strong',
+  '--heroui-code-mdx'
+] as const
+
+export const generateTheme = (theme: ThemeConfig, validField?: string) => {
+  let css = `:root ${validField ? `.${validField}` : ''}, .light ${validField ? `.${validField}` : ''}, [data-theme="light"] ${validField ? `.${validField}` : ''} {`
+  for (const key in theme.light) {
+    const _key = key as keyof ThemeConfigItem
+    css += `${_key}: ${theme.light[_key]};`
+  }
+  css += `}`
+  css += `.dark ${validField ? `.${validField}` : ''}, [data-theme="dark"] ${validField ? `.${validField}` : ''} {`
+  for (const key in theme.dark) {
+    const _key = key as keyof ThemeConfigItem
+    css += `${_key}: ${theme.dark[_key]};`
+  }
+  css += `}`
+  return css
+}

napcat.webui/tailwind.config.js

@@ -9,6 +9,12 @@ export default {
     './src/components/**/*.{js,ts,jsx,tsx,mdx}',
     './node_modules/@heroui/theme/dist/**/*.{js,ts,jsx,tsx}'
   ],
+  safelist: [
+    {
+      pattern:
+        /bg-(primary|secondary|success|danger|warning|default)-(50|100|200|300|400|500|600|700|800|900)/
+    }
+  ],
   theme: {
     extend: {}
   },

napcat.webui/vite.config.ts

@@ -34,7 +34,8 @@ export default defineConfig(({ mode }) => {
           ws: true,
           changeOrigin: true
         },
-        '/api': backendDebugUrl
+        '/api': backendDebugUrl,
+        '/files': backendDebugUrl
       }
     },
     build: {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.5.11",
+  "version": "4.8.93",
   "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,21 +18,23 @@
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.24.7",
-    "@eslint/compat": "^1.2.2",
+    "@eslint/compat": "^1.3.1",
     "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^9.14.0",
-    "@ffmpeg.wasm/main": "^0.13.1",
+    "@eslint/js": "^9.30.1",
     "@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.2",
+    "@rollup/plugin-typescript": "^12.1.4",
     "@sinclair/typebox": "^0.34.9",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
     "@types/multer": "^1.4.12",
     "@types/node": "^22.0.1",
+    "@types/on-finished": "^2.3.4",
     "@types/qrcode-terminal": "^0.12.2",
+    "@types/react-color": "^3.0.13",
+    "@types/type-is": "^1.6.7",
     "@types/ws": "^8.5.12",
     "@typescript-eslint/eslint-plugin": "^8.3.0",
     "@typescript-eslint/parser": "^8.3.0",
@@ -40,29 +42,27 @@
     "async-mutex": "^0.5.0",
     "commander": "^13.0.0",
     "cors": "^2.8.5",
-    "esbuild": "0.24.0",
+    "esbuild": "0.25.5",
     "eslint": "^9.14.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
+    "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": "^20.0.0",
-    "globals": "^15.12.0",
-    "image-size": "^1.1.1",
+    "file-type": "^21.0.0",
+    "globals": "^16.0.0",
     "json5": "^2.2.3",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^2.0.1",
     "typescript": "^5.3.3",
-    "typescript-eslint": "^8.13.0",
+    "typescript-eslint": "^8.35.1",
     "vite": "^6.0.1",
-    "vite-plugin-cp": "^4.0.8",
+    "vite-plugin-cp": "^6.0.0",
     "vite-tsconfig-paths": "^5.1.0",
-    "winston": "^3.17.0"
+    "napcat.protobuf": "^1.1.4",
+    "winston": "^3.17.0",
+    "compressing": "^1.10.1"
   },
   "dependencies": {
-    "@ffmpeg.wasm/core-mt": "^0.13.2",
-    "compressing": "^1.10.1",
     "express": "^5.0.0",
-    "piscina": "^4.7.0",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   }

src/common/audio-worker.ts

@@ -1,9 +1,20 @@
 import { encode } from 'silk-wasm';
+import { parentPort } from 'worker_threads';
 
 export interface EncodeArgs {
     input: ArrayBufferView | ArrayBuffer
     sampleRate: number
 }
-export default async ({ input, sampleRate }: EncodeArgs) => {
+export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
+    parentPort?.on('message', async (taskData: T) => {
+        try {
+            let ret = await cb(taskData);
+            parentPort?.postMessage(ret);
+        } catch (error: unknown) {
+            parentPort?.postMessage({ error: (error as Error).message });
+        }
+    });
+}
+recvTask<EncodeArgs>(async ({ input, sampleRate }) => {
     return await encode(input, sampleRate);
-};
+});

src/common/audio.ts

@@ -1,4 +1,3 @@
-import Piscina from 'piscina';
 import fsPromise from 'fs/promises';
 import path from 'node:path';
 import { randomUUID } from 'crypto';
@@ -6,16 +5,16 @@ import { EncodeResult, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-w
 import { LogWrapper } from '@/common/log';
 import { EncodeArgs } from '@/common/audio-worker';
 import { FFmpegService } from '@/common/ffmpeg';
+import { runTask } from './worker';
+import { fileURLToPath } from 'node:url';
 
 const ALLOW_SAMPLE_RATE = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
 
-async function getWorkerPath() {
-    return new URL(/* @vite-ignore */ './audio-worker.mjs', import.meta.url).href;
+function getWorkerPath() {
+    //return new URL(/* @vite-ignore */ './audio-worker.mjs', import.meta.url).href;
+    return path.join(path.dirname(fileURLToPath(import.meta.url)), 'audio-worker.mjs');
 }
 
-const piscina = new Piscina<EncodeArgs, EncodeResult>({
-    filename: await getWorkerPath(),
-});
 
 async function guessDuration(pttPath: string, logger: LogWrapper) {
     const pttFileInfo = await fsPromise.stat(pttPath);
@@ -46,7 +45,7 @@ export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: Log
             const { input, sampleRate } = isWav(file)
                 ? await handleWavFile(file, filePath, pcmPath)
                 : { input: await FFmpegService.convert(filePath, pcmPath), sampleRate: 24000 };
-            const silk = await piscina.run({ input: input, sampleRate: sampleRate });
+            const silk = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { input: input, sampleRate: sampleRate });
             fsPromise.unlink(pcmPath).catch((e) => logger.logError('删除临时文件失败', pcmPath, e));
             await fsPromise.writeFile(pttPath, Buffer.from(silk.data));
             logger.log(`语音文件${filePath}转换成功!`, pttPath, '时长:', silk.duration);

src/common/clean-task.ts

@@ -0,0 +1,229 @@
+import fs from 'fs';
+// generate Claude 3.7 Sonet Thinking
+
+interface FileRecord {
+    filePath: string;
+    addedTime: number;
+    retries: number;
+}
+
+interface CleanupTask {
+    fileRecord: FileRecord;
+    timer: NodeJS.Timeout;
+}
+
+class CleanupQueue {
+    private tasks: Map<string, CleanupTask> = new Map();
+    private readonly MAX_RETRIES = 3;
+    private isProcessing: boolean = false;
+    private pendingOperations: Array<() => void> = [];
+
+    /**
+     * 执行队列中的待处理操作，确保异步安全
+     */
+    private executeNextOperation(): void {
+        if (this.pendingOperations.length === 0) {
+            this.isProcessing = false;
+            return;
+        }
+
+        this.isProcessing = true;
+        const operation = this.pendingOperations.shift();
+        operation?.();
+
+        // 使用 setImmediate 允许事件循环继续，防止阻塞
+        setImmediate(() => this.executeNextOperation());
+    }
+
+    /**
+     * 安全执行操作，防止竞态条件
+     * @param operation 要执行的操作
+     */
+    private safeExecute(operation: () => void): void {
+        this.pendingOperations.push(operation);
+        if (!this.isProcessing) {
+            this.executeNextOperation();
+        }
+    }
+
+    /**
+     * 检查文件是否存在
+     * @param filePath 文件路径
+     * @returns 文件是否存在
+     */
+    private fileExists(filePath: string): boolean {
+        try {
+            return fs.existsSync(filePath);
+        } catch (error) {
+            //console.log(`检查文件存在出错: ${filePath}`, error);
+            return false;
+        }
+    }
+
+    /**
+     * 添加文件到清理队列
+     * @param filePath 文件路径
+     * @param cleanupDelay 清理延迟时间(毫秒)
+     */
+    addFile(filePath: string, cleanupDelay: number): void {
+        this.safeExecute(() => {
+            // 如果文件已在队列中，取消原来的计时器
+            if (this.tasks.has(filePath)) {
+                this.cancelCleanup(filePath);
+            }
+
+            // 创建新的文件记录
+            const fileRecord: FileRecord = {
+                filePath,
+                addedTime: Date.now(),
+                retries: 0
+            };
+
+            // 设置计时器
+            const timer = setTimeout(() => {
+                this.cleanupFile(fileRecord, cleanupDelay);
+            }, cleanupDelay);
+
+            // 添加到任务队列
+            this.tasks.set(filePath, { fileRecord, timer });
+        });
+    }
+
+    /**
+     * 批量添加文件到清理队列
+     * @param filePaths 文件路径数组
+     * @param cleanupDelay 清理延迟时间(毫秒)
+     */
+    addFiles(filePaths: string[], cleanupDelay: number): void {
+        this.safeExecute(() => {
+            for (const filePath of filePaths) {
+                // 内部直接处理，不通过 safeExecute 以保证批量操作的原子性
+                if (this.tasks.has(filePath)) {
+                    // 取消已有的计时器，但不使用 cancelCleanup 方法以避免重复的安全检查
+                    const existingTask = this.tasks.get(filePath);
+                    if (existingTask) {
+                        clearTimeout(existingTask.timer);
+                    }
+                }
+
+                const fileRecord: FileRecord = {
+                    filePath,
+                    addedTime: Date.now(),
+                    retries: 0
+                };
+
+                const timer = setTimeout(() => {
+                    this.cleanupFile(fileRecord, cleanupDelay);
+                }, cleanupDelay);
+
+                this.tasks.set(filePath, { fileRecord, timer });
+            }
+        });
+    }
+
+    /**
+     * 清理文件
+     * @param record 文件记录
+     * @param delay 延迟时间，用于重试
+     */
+    private cleanupFile(record: FileRecord, delay: number): void {
+        this.safeExecute(() => {
+            // 首先检查文件是否存在，不存在则视为清理成功
+            if (!this.fileExists(record.filePath)) {
+                //console.log(`文件已不存在，跳过清理: ${record.filePath}`);
+                this.tasks.delete(record.filePath);
+                return;
+            }
+
+            try {
+                // 尝试删除文件
+                fs.unlinkSync(record.filePath);
+                // 删除成功，从队列中移除任务
+                this.tasks.delete(record.filePath);
+            } catch (error) {
+                const err = error as NodeJS.ErrnoException;
+
+                // 明确处理文件不存在的情况
+                if (err.code === 'ENOENT') {
+                    //console.log(`文件在删除时不存在，视为清理成功: ${record.filePath}`);
+                    this.tasks.delete(record.filePath);
+                    return;
+                }
+
+                // 文件没有访问权限等情况
+                if (err.code === 'EACCES' || err.code === 'EPERM') {
+                    //console.error(`没有权限删除文件: ${record.filePath}`, err);
+                }
+
+                // 其他删除失败情况，考虑重试
+                if (record.retries < this.MAX_RETRIES - 1) {
+                    // 还有重试机会，增加重试次数
+                    record.retries++;
+                    //console.log(`清理文件失败，将重试(${record.retries}/${this.MAX_RETRIES}): ${record.filePath}`);
+
+                    // 设置相同的延迟时间再次尝试
+                    const timer = setTimeout(() => {
+                        this.cleanupFile(record, delay);
+                    }, delay);
+
+                    // 更新任务
+                    this.tasks.set(record.filePath, { fileRecord: record, timer });
+                } else {
+                    // 已达到最大重试次数，从队列中移除任务
+                    this.tasks.delete(record.filePath);
+                    //console.error(`清理文件失败，已达最大重试次数(${this.MAX_RETRIES}): ${record.filePath}`, error);
+                }
+            }
+        });
+    }
+
+    /**
+     * 取消文件的清理任务
+     * @param filePath 文件路径
+     * @returns 是否成功取消
+     */
+    cancelCleanup(filePath: string): boolean {
+        let cancelled = false;
+        this.safeExecute(() => {
+            const task = this.tasks.get(filePath);
+            if (task) {
+                clearTimeout(task.timer);
+                this.tasks.delete(filePath);
+                cancelled = true;
+            }
+        });
+        return cancelled;
+    }
+
+    /**
+     * 获取队列中的文件数量
+     * @returns 文件数量
+     */
+    getQueueSize(): number {
+        return this.tasks.size;
+    }
+
+    /**
+     * 获取所有待清理的文件
+     * @returns 文件路径数组
+     */
+    getPendingFiles(): string[] {
+        return Array.from(this.tasks.keys());
+    }
+
+    /**
+     * 清空所有清理任务
+     */
+    clearAll(): void {
+        this.safeExecute(() => {
+            // 取消所有定时器
+            for (const task of this.tasks.values()) {
+                clearTimeout(task.timer);
+            }
+            this.tasks.clear();
+            //console.log('已清空所有清理任务');
+        });
+    }
+}
+
+export const cleanTaskQueue = new CleanupQueue();

src/common/download-ffmpeg.ts

@@ -0,0 +1,364 @@
+// 更正导入语句
+import * as fs from 'fs';
+import * as path from 'path';
+import * as https from 'https';
+import * as os from 'os';
+import * as compressing from 'compressing';  // 修正导入方式
+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 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,
+    downloadOri
+];
+
+/**
+ * 测试URL是否可用
+ * @param url 待测试的URL
+ * @returns 如果URL可访问返回true，否则返回false
+ */
+async function testUrl(url: string): Promise<boolean> {
+    return new Promise<boolean>((resolve) => {
+        const req = https.get(url, { timeout: 5000 }, (res) => {
+            // 检查状态码是否表示成功
+            const statusCode = res.statusCode || 0;
+            if (statusCode >= 200 && statusCode < 300) {
+                // 终止请求并返回true
+                req.destroy();
+                resolve(true);
+            } else {
+                req.destroy();
+                resolve(false);
+            }
+        });
+
+        req.on('error', () => {
+            resolve(false);
+        });
+
+        req.on('timeout', () => {
+            req.destroy();
+            resolve(false);
+        });
+    });
+}
+
+/**
+ * 查找第一个可用的URL
+ * @returns 返回第一个可用的URL，如果都不可用则返回null
+ */
+async function findAvailableUrl(): Promise<string | null> {
+    for (const url of urls) {
+        try {
+            const available = await testUrl(url);
+            if (available) {
+                return url;
+            }
+        } catch (error) {
+            // 忽略错误
+        }
+    }
+
+    return null;
+}
+/**
+ * 下载文件
+ * @param url 下载URL
+ * @param destPath 目标保存路径
+ * @returns 成功返回true，失败返回false
+ */
+async function downloadFile(url: string, destPath: string, progressCallback?: (percent: number) => void): Promise<boolean> {
+    return new Promise<boolean>((resolve) => {
+        const file = fs.createWriteStream(destPath);
+
+        const req = https.get(url, (res) => {
+            const statusCode = res.statusCode || 0;
+
+            if (statusCode >= 200 && statusCode < 300) {
+                // 获取文件总大小
+                const totalSize = parseInt(res.headers['content-length'] || '0', 10);
+                let downloadedSize = 0;
+                let lastReportedPercent = -1; // 上次报告的百分比
+                let lastReportTime = 0; // 上次报告的时间戳
+
+                // 如果有内容长度和进度回调，则添加数据监听
+                if (totalSize > 0 && progressCallback) {
+                    // 初始报告 0%
+                    progressCallback(0);
+                    lastReportTime = Date.now();
+
+                    res.on('data', (chunk) => {
+                        downloadedSize += chunk.length;
+                        const currentPercent = Math.floor((downloadedSize / totalSize) * 100);
+                        const now = Date.now();
+
+                        // 只在以下条件触发回调：
+                        // 1. 百分比变化至少为1%
+                        // 2. 距离上次报告至少500毫秒
+                        // 3. 确保报告100%完成
+                        if ((currentPercent !== lastReportedPercent &&
+                            (currentPercent - lastReportedPercent >= 1 || currentPercent === 100)) &&
+                            (now - lastReportTime >= 1000 || currentPercent === 100)) {
+
+                            progressCallback(currentPercent);
+                            lastReportedPercent = currentPercent;
+                            lastReportTime = now;
+                        }
+                    });
+                }
+
+                pipeline(res, file)
+                    .then(() => {
+                        // 确保最后报告100%
+                        if (progressCallback && lastReportedPercent !== 100) {
+                            progressCallback(100);
+                        }
+                        resolve(true);
+                    })
+                    .catch(() => resolve(false));
+            } else {
+                file.close();
+                fs.unlink(destPath, () => { });
+                resolve(false);
+            }
+        });
+
+        req.on('error', () => {
+            file.close();
+            fs.unlink(destPath, () => { });
+            resolve(false);
+        });
+    });
+}
+
+/**
+ * 解压缩zip文件中的特定内容
+ * 只解压bin目录中的文件到目标目录
+ * @param zipPath 压缩文件路径
+ * @param extractDir 解压目标路径
+ */
+async function extractBinDirectory(zipPath: string, extractDir: string): Promise<void> {
+    try {
+        // 确保目标目录存在
+        if (!fs.existsSync(extractDir)) {
+            fs.mkdirSync(extractDir, { recursive: true });
+        }
+
+        // 解压文件
+        const zipStream = new compressing.zip.UncompressStream({ source: zipPath });
+
+        return new Promise<void>((resolve, reject) => {
+            // 监听条目事件
+            zipStream.on('entry', (header, stream, next) => {
+                // 获取文件路径
+                const filePath = header.name;
+
+                // 匹配内层bin目录中的文件
+                // 例如：ffmpeg-n7.1.1-6-g48c0f071d4-win64-lgpl-7.1/bin/ffmpeg.exe
+                if (filePath.includes('/bin/') && filePath.endsWith('.exe')) {
+                    // 提取文件名
+                    const fileName = path.basename(filePath);
+                    const targetPath = path.join(extractDir, fileName);
+
+                    // 创建写入流
+                    const writeStream = fs.createWriteStream(targetPath);
+
+                    // 将流管道连接到文件
+                    stream.pipe(writeStream);
+
+                    // 监听写入完成事件
+                    writeStream.on('finish', () => {
+                        next();
+                    });
+
+                    writeStream.on('error', () => {
+                        next();
+                    });
+                } else {
+                    // 跳过不需要的文件
+                    stream.resume();
+                    next();
+                }
+            });
+
+            zipStream.on('error', (err) => {
+                reject(err);
+            });
+
+            zipStream.on('finish', () => {
+                resolve();
+            });
+        });
+    } catch (err) {
+        throw err;
+    }
+}
+
+/**
+ * 下载并设置FFmpeg
+ * @param destDir 目标安装目录，默认为用户临时目录下的ffmpeg文件夹
+ * @param tempDir 临时文件目录，默认为系统临时目录
+ * @returns 返回ffmpeg可执行文件的路径，如果失败则返回null
+ */
+export async function downloadFFmpeg(
+    destDir?: string,
+    tempDir?: string,
+    progressCallback?: (percent: number, stage: string) => void
+): Promise<string | null> {
+    // 仅限Windows
+    if (os.platform() !== 'win32') {
+        return null;
+    }
+
+    const destinationDir = destDir || path.join(os.tmpdir(), 'ffmpeg');
+    const tempDirectory = tempDir || os.tmpdir();
+    const zipFilePath = path.join(tempDirectory, 'ffmpeg.zip'); // 临时下载到指定临时目录
+    const ffmpegExePath = path.join(destinationDir, 'ffmpeg.exe');
+
+    // 确保目录存在
+    if (!fs.existsSync(destinationDir)) {
+        fs.mkdirSync(destinationDir, { recursive: true });
+    }
+
+    // 确保临时目录存在
+    if (!fs.existsSync(tempDirectory)) {
+        fs.mkdirSync(tempDirectory, { recursive: true });
+    }
+
+    // 如果ffmpeg已经存在，直接返回路径
+    if (fs.existsSync(ffmpegExePath)) {
+        if (progressCallback) progressCallback(100, '已找到FFmpeg');
+        return ffmpegExePath;
+    }
+
+    // 查找可用URL
+    if (progressCallback) progressCallback(0, '查找可用下载源');
+    const availableUrl = await findAvailableUrl();
+    if (!availableUrl) {
+        return null;
+    }
+
+    // 下载文件
+    if (progressCallback) progressCallback(5, '开始下载FFmpeg');
+    const downloaded = await downloadFile(
+        availableUrl,
+        zipFilePath,
+        (percent) => {
+            // 下载占总进度的70%
+            if (progressCallback) progressCallback(5 + Math.floor(percent * 0.7), '下载FFmpeg');
+        }
+    );
+
+    if (!downloaded) {
+        return null;
+    }
+
+    try {
+        // 直接解压bin目录文件到目标目录
+        if (progressCallback) progressCallback(75, '解压FFmpeg');
+        await extractBinDirectory(zipFilePath, destinationDir);
+
+        // 清理下载文件
+        if (progressCallback) progressCallback(95, '清理临时文件');
+        try {
+            fs.unlinkSync(zipFilePath);
+        } catch (err) {
+            // 忽略清理临时文件失败的错误
+        }
+
+        // 检查ffmpeg.exe是否成功解压
+        if (fs.existsSync(ffmpegExePath)) {
+            if (progressCallback) progressCallback(100, 'FFmpeg安装完成');
+            return ffmpegExePath;
+        } else {
+            return null;
+        }
+    } catch (err) {
+        return null;
+    }
+}
+
+/**
+ * 检查系统PATH环境变量中是否存在指定可执行文件
+ * @param executable 可执行文件名
+ * @returns 如果找到返回完整路径，否则返回null
+ */
+function findExecutableInPath(executable: string): string | null {
+    // 仅适用于Windows系统
+    if (os.platform() !== 'win32') return null;
+
+    // 获取PATH环境变量
+    const pathEnv = process.env['PATH'] || '';
+    const pathDirs = pathEnv.split(';');
+
+    // 检查每个目录
+    for (const dir of pathDirs) {
+        if (!dir) continue;
+        try {
+            const filePath = path.join(dir, executable);
+            if (fs.existsSync(filePath)) {
+                return filePath;
+            }
+        } catch (error) {
+            continue;
+        }
+    }
+
+    return null;
+}
+
+export async function downloadFFmpegIfNotExists(log: LogWrapper) {
+    // 仅限Windows
+    if (os.platform() !== 'win32') {
+        return {
+            path: null,
+            reset: false
+        };
+    }
+    const ffmpegInPath = findExecutableInPath('ffmpeg.exe');
+    const ffprobeInPath = findExecutableInPath('ffprobe.exe');
+
+    if (ffmpegInPath && ffprobeInPath) {
+        const ffmpegDir = path.dirname(ffmpegInPath);
+        return {
+            path: ffmpegDir,
+            reset: true
+        };
+    }
+
+    // 如果环境变量中没有，检查项目目录中是否存在
+    const currentPath = path.dirname(fileURLToPath(import.meta.url));
+    const ffmpeg_exist = fs.existsSync(path.join(currentPath, 'ffmpeg', 'ffmpeg.exe'));
+    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) => {
+            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
+        }
+    }
+
+    return {
+        path: path.join(currentPath, 'ffmpeg'),
+        reset: true
+    }
+}

src/common/ffmpeg-worker.ts

@@ -1,151 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { FFmpeg } from '@ffmpeg.wasm/main';
-import { randomUUID } from 'crypto';
-import { readFileSync, statSync, writeFileSync } from 'fs';
-import type { VideoInfo } from './video';
-import { fileTypeFromFile } from 'file-type';
-import imageSize from 'image-size';
-class FFmpegService {
-    public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
-        const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
-        const videoFileName = `${randomUUID()}.mp4`;
-        const outputFileName = `${randomUUID()}.jpg`;
-        try {
-            ffmpegInstance.fs.writeFile(videoFileName, readFileSync(videoPath));
-            const code = await ffmpegInstance.run('-i', videoFileName, '-ss', '00:00:01.000', '-vframes', '1', outputFileName);
-            if (code !== 0) {
-                throw new Error('Error extracting thumbnail: FFmpeg process exited with code ' + code);
-            }
-            const thumbnail = ffmpegInstance.fs.readFile(outputFileName);
-            writeFileSync(thumbnailPath, thumbnail);
-        } catch (error) {
-            console.error('Error extracting thumbnail:', error);
-            throw error;
-        } finally {
-            try {
-                ffmpegInstance.fs.unlink(outputFileName);
-            } catch (unlinkError) {
-                console.error('Error unlinking output file:', unlinkError);
-            }
-            try {
-                ffmpegInstance.fs.unlink(videoFileName);
-            } catch (unlinkError) {
-                console.error('Error unlinking video file:', unlinkError);
-            }
-        }
-    }
-
-    public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
-        const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
-        const inputFileName = `${randomUUID()}.pcm`;
-        const outputFileName = `${randomUUID()}.${format}`;
-        try {
-            ffmpegInstance.fs.writeFile(inputFileName, readFileSync(inputFile));
-            const params = format === 'amr'
-                ? ['-f', 's16le', '-ar', '24000', '-ac', '1', '-i', inputFileName, '-ar', '8000', '-b:a', '12.2k', outputFileName]
-                : ['-f', 's16le', '-ar', '24000', '-ac', '1', '-i', inputFileName, outputFileName];
-            const code = await ffmpegInstance.run(...params);
-            if (code !== 0) {
-                throw new Error('Error extracting thumbnail: FFmpeg process exited with code ' + code);
-            }
-            const outputData = ffmpegInstance.fs.readFile(outputFileName);
-            writeFileSync(outputFile, outputData);
-        } catch (error) {
-            console.error('Error converting file:', error);
-            throw error;
-        } finally {
-            try {
-                ffmpegInstance.fs.unlink(outputFileName);
-            } catch (unlinkError) {
-                console.error('Error unlinking output file:', unlinkError);
-            }
-            try {
-                ffmpegInstance.fs.unlink(inputFileName);
-            } catch (unlinkError) {
-                console.error('Error unlinking input file:', unlinkError);
-            }
-        }
-    }
-
-    public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
-        const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
-        const inputFileName = `${randomUUID()}.input`;
-        const outputFileName = `${randomUUID()}.pcm`;
-        try {
-            ffmpegInstance.fs.writeFile(inputFileName, readFileSync(filePath));
-            const params = ['-y', '-i', inputFileName, '-ar', '24000', '-ac', '1', '-f', 's16le', outputFileName];
-            const code = await ffmpegInstance.run(...params);
-            if (code !== 0) {
-                throw new Error('FFmpeg process exited with code ' + code);
-            }
-            const outputData = ffmpegInstance.fs.readFile(outputFileName);
-            writeFileSync(pcmPath, outputData);
-            return Buffer.from(outputData);
-        } catch (error: any) {
-            throw new Error('FFmpeg处理转换出错: ' + error.message);
-        } finally {
-            try {
-                ffmpegInstance.fs.unlink(outputFileName);
-            } catch (unlinkError) {
-                console.error('Error unlinking output file:', unlinkError);
-            }
-            try {
-                ffmpegInstance.fs.unlink(inputFileName);
-            } catch (unlinkError) {
-                console.error('Error unlinking output file:', unlinkError);
-            }
-        }
-    }
-
-    public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
-        await FFmpegService.extractThumbnail(videoPath, thumbnailPath);
-        const fileType = (await fileTypeFromFile(videoPath))?.ext ?? 'mp4';
-        const inputFileName = `${randomUUID()}.${fileType}`;
-        const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
-        ffmpegInstance.fs.writeFile(inputFileName, readFileSync(videoPath));
-        ffmpegInstance.setLogging(true);
-        let duration = 60;
-        ffmpegInstance.setLogger((_level, ...msg) => {
-            const message = msg.join(' ');
-            const durationMatch = message.match(/Duration: (\d+):(\d+):(\d+\.\d+)/);
-            if (durationMatch) {
-                const hours = parseInt(durationMatch[1] ?? '0', 10);
-                const minutes = parseInt(durationMatch[2] ?? '0', 10);
-                const seconds = parseFloat(durationMatch[3] ?? '0');
-                duration = hours * 3600 + minutes * 60 + seconds;
-            }
-        });
-        await ffmpegInstance.run('-i', inputFileName);
-        const image = imageSize(thumbnailPath);
-        ffmpegInstance.fs.unlink(inputFileName);
-        const fileSize = statSync(videoPath).size;
-        return {
-            width: image.width ?? 100,
-            height: image.height ?? 100,
-            time: duration,
-            format: fileType,
-            size: fileSize,
-            filePath: videoPath
-        };
-    }
-}
-type FFmpegMethod = 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
-
-interface FFmpegTask {
-    method: FFmpegMethod;
-    args: any[];
-}
-export default async function handleFFmpegTask({ method, args }: FFmpegTask): Promise<any> {
-    switch (method) {
-    case 'extractThumbnail':
-        return await FFmpegService.extractThumbnail(...args as [string, string]);
-    case 'convertFile':
-        return await FFmpegService.convertFile(...args as [string, string, string]);
-    case 'convert':
-        return await FFmpegService.convert(...args as [string, string]);
-    case 'getVideoInfo':
-        return await FFmpegService.getVideoInfo(...args as [string, string]);
-    default:
-        throw new Error(`Unknown method: ${method}`);
-    }
-}

src/common/ffmpeg.ts

@@ -1,50 +1,195 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import Piscina from 'piscina';
-import { VideoInfo } from './video';
-
-type EncodeArgs = {
-    method: 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
-    args: any[];
+import { readFileSync, statSync, existsSync, mkdirSync } from 'fs';
+import path, { dirname } from 'path';
+import { execFile } from 'child_process';
+import { promisify } from 'util';
+import type { VideoInfo } from './video';
+import { fileTypeFromFile } from 'file-type';
+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 => {
+    if (process.platform === 'win32') {
+        const exeName = `${tool}.exe`;
+        const isLocalExeExists = existsSync(path.join(currentPath, 'ffmpeg', exeName));
+        return isLocalExeExists ? path.join(currentPath, 'ffmpeg', exeName) : exeName;
+    }
+    return tool;
 };
-
-type EncodeResult = any;
-
-async function getWorkerPath() {
-    return new URL(/* @vite-ignore */ './ffmpeg-worker.mjs', import.meta.url).href;
-}
-
+export let FFMPEG_CMD = getFFmpegPath('ffmpeg');
+export let FFPROBE_CMD = getFFmpegPath('ffprobe');
 export class FFmpegService {
+    // 确保目标目录存在
+    public static setFfmpegPath(ffmpegPath: string,logger:LogWrapper): void {
+        if (platform() === 'win32') {
+            FFMPEG_CMD = path.join(ffmpegPath, 'ffmpeg.exe');
+            FFPROBE_CMD = path.join(ffmpegPath, 'ffprobe.exe');
+            logger.log('[Check] ffmpeg:', FFMPEG_CMD);
+            logger.log('[Check] ffprobe:', FFPROBE_CMD);
+        }
+    }
+    private static ensureDirExists(filePath: string): void {
+        const dir = dirname(filePath);
+        if (!existsSync(dir)) {
+            mkdirSync(dir, { recursive: true });
+        }
+    }
+
     public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        await piscina.run({ method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
-        await piscina.destroy();
+        try {
+            this.ensureDirExists(thumbnailPath);
+
+            const { stderr } = await execFileAsync(FFMPEG_CMD, [
+                '-i', videoPath,
+                '-ss', '00:00:01.000',
+                '-vframes', '1',
+                '-y', // 覆盖输出文件
+                thumbnailPath
+            ]);
+
+            if (!existsSync(thumbnailPath)) {
+                throw new Error(`提取缩略图失败，输出文件不存在: ${stderr}`);
+            }
+        } catch (error) {
+            console.error('Error extracting thumbnail:', error);
+            throw new Error(`提取缩略图失败: ${(error as Error).message}`);
+        }
     }
 
     public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        await piscina.run({ method: 'convertFile', args: [inputFile, outputFile, format] });
-        await piscina.destroy();
+        try {
+            this.ensureDirExists(outputFile);
+
+            const params = format === 'amr'
+                ? [
+                    '-f', 's16le',
+                    '-ar', '24000',
+                    '-ac', '1',
+                    '-i', inputFile,
+                    '-ar', '8000',
+                    '-b:a', '12.2k',
+                    '-y',
+                    outputFile
+                ]
+                : [
+                    '-f', 's16le',
+                    '-ar', '24000',
+                    '-ac', '1',
+                    '-i', inputFile,
+                    '-y',
+                    outputFile
+                ];
+
+            await execFileAsync(FFMPEG_CMD, params);
+
+            if (!existsSync(outputFile)) {
+                throw new Error('转换失败，输出文件不存在');
+            }
+        } catch (error) {
+            console.error('Error converting file:', error);
+            throw new Error(`文件转换失败: ${(error as Error).message}`);
+        }
     }
 
     public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        const result = await piscina.run({ method: 'convert', args: [filePath, pcmPath] });
-        await piscina.destroy();
-        return result;
+        try {
+            this.ensureDirExists(pcmPath);
+
+            await execFileAsync(FFMPEG_CMD, [
+                '-y',
+                '-i', filePath,
+                '-ar', '24000',
+                '-ac', '1',
+                '-f', 's16le',
+                pcmPath
+            ]);
+
+            if (!existsSync(pcmPath)) {
+                throw new Error('转换PCM失败，输出文件不存在');
+            }
+
+            return readFileSync(pcmPath);
+        } catch (error: any) {
+            throw new Error(`FFmpeg处理转换出错: ${error.message}`);
+        }
     }
 
     public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        const result = await piscina.run({ method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
-        await piscina.destroy();
-        return result;
+        try {
+            // 并行执行获取文件信息和提取缩略图
+            const [fileInfo, duration] = await Promise.all([
+                this.getFileInfo(videoPath, thumbnailPath),
+                this.getVideoDuration(videoPath)
+            ]);
+
+            const result: VideoInfo = {
+                width: fileInfo.width,
+                height: fileInfo.height,
+                time: duration,
+                format: fileInfo.format,
+                size: fileInfo.size,
+                filePath: videoPath
+            };
+            return result;
+        } catch (error) {
+            throw error;
+        }
     }
-}
+
+    private static async getFileInfo(videoPath: string, thumbnailPath: string): Promise<{
+        format: string,
+        size: number,
+        width: number,
+        height: number
+    }> {
+
+        // 获取文件大小和类型
+        const [fileType, fileSize] = await Promise.all([
+            fileTypeFromFile(videoPath).catch(() => {
+                return null;
+            }),
+            Promise.resolve(statSync(videoPath).size)
+        ]);
+
+
+        try {
+            await this.extractThumbnail(videoPath, thumbnailPath);
+            // 获取图片尺寸
+            const dimensions = await imageSizeFallBack(thumbnailPath);
+
+            return {
+                format: fileType?.ext ?? 'mp4',
+                size: fileSize,
+                width: dimensions.width ?? 100,
+                height: dimensions.height ?? 100
+            };
+        } catch (error) {
+            return {
+                format: fileType?.ext ?? 'mp4',
+                size: fileSize,
+                width: 100,
+                height: 100
+            };
+        }
+    }
+
+    private static async getVideoDuration(videoPath: string): Promise<number> {
+        try {
+            // 使用FFprobe获取时长
+            const { stdout } = await execFileAsync(FFPROBE_CMD, [
+                '-v', 'error',
+                '-show_entries', 'format=duration',
+                '-of', 'default=noprint_wrappers=1:nokey=1',
+                videoPath
+            ]);
+
+            const duration = parseFloat(stdout.trim());
+
+            return isNaN(duration) ? 60 : duration;
+        } catch (error) {
+            return 60; // 默认时长
+        }
+    }
+}

src/common/file.ts

@@ -76,7 +76,7 @@ export function calculateFileMD5(filePath: string): Promise<string> {
         const stream = fs.createReadStream(filePath);
         const hash = crypto.createHash('md5');
 
-        stream.on('data', (data: Buffer) => {
+        stream.on('data', (data) => {
             // 当读取到数据时，更新哈希对象的状态
             hash.update(data);
         });
@@ -115,7 +115,7 @@ async function tryDownload(options: string | HttpDownloadOptions, useReferer: bo
     if (useReferer && !headers['Referer']) {
         headers['Referer'] = url;
     }
-    const fetchRes = await fetch(url, { headers }).catch((err) => {
+    const fetchRes = await fetch(url, { headers, redirect: 'follow' }).catch((err) => {
         if (err.cause) {
             throw err.cause;
         }
@@ -145,8 +145,8 @@ export enum FileUriType {
 
 export async function checkUriType(Uri: string) {
     const LocalFileRet = await solveProblem((uri: string) => {
-        if (fs.existsSync(uri)) {
-            return { Uri: uri, Type: FileUriType.Local };
+        if (fs.existsSync(path.normalize(uri))) {
+            return { Uri: path.normalize(uri), Type: FileUriType.Local };
         }
         return undefined;
     }, Uri);
@@ -182,28 +182,28 @@ export async function uriToLocalFile(dir: string, uri: string, filename: string
     const filePath = path.join(dir, filename);
 
     switch (UriType) {
-    case FileUriType.Local: {
-        const fileExt = path.extname(HandledUri);
-        const localFileName = path.basename(HandledUri, fileExt) + fileExt;
-        const tempFilePath = path.join(dir, filename + fileExt);
-        fs.copyFileSync(HandledUri, tempFilePath);
-        return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
-    }
+        case FileUriType.Local: {
+            const fileExt = path.extname(HandledUri);
+            const localFileName = path.basename(HandledUri, fileExt) + fileExt;
+            const tempFilePath = path.join(dir, filename + fileExt);
+            fs.copyFileSync(HandledUri, tempFilePath);
+            return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
+        }
 
-    case FileUriType.Remote: {
-        const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
-        fs.writeFileSync(filePath, buffer);
-        return { success: true, errMsg: '', fileName: filename, path: filePath };
-    }
+        case FileUriType.Remote: {
+            const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
+            fs.writeFileSync(filePath, buffer);
+            return { success: true, errMsg: '', fileName: filename, path: filePath };
+        }
 
-    case FileUriType.Base64: {
-        const base64 = HandledUri.replace(/^base64:\/\//, '');
-        const base64Buffer = Buffer.from(base64, 'base64');
-        fs.writeFileSync(filePath, base64Buffer);
-        return { success: true, errMsg: '', fileName: filename, path: filePath };
-    }
+        case FileUriType.Base64: {
+            const base64 = HandledUri.replace(/^base64:\/\//, '');
+            const base64Buffer = Buffer.from(base64, 'base64');
+            fs.writeFileSync(filePath, base64Buffer);
+            return { success: true, errMsg: '', fileName: filename, path: filePath };
+        }
 
-    default:
-        return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
+        default:
+            return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
     }
 }

src/common/forward-msg-builder.ts

@@ -54,7 +54,7 @@ export class ForwardMsgBuilder {
         const id = crypto.randomUUID();
         const isGroupMsg = msg.some(m => m.isGroupMsg);
         if (!source) {
-            source = isGroupMsg ? '群聊的聊天记录' : msg.map(m => m.senderName).filter((v, i, a) => a.indexOf(v) === i).slice(0, 4).join('和') + '的聊天记录';
+            source = msg.length === 0 ? '聊天记录' : (isGroupMsg ? '群聊的聊天记录' : msg.map(m => m.senderName).filter((v, i, a) => a.indexOf(v) === i).slice(0, 4).join('和') + '的聊天记录');
         }
         if (!news) {
             news = msg.length === 0 ? [{

src/common/log.ts

@@ -232,7 +232,7 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
             tokens.push(`群聊 [${msg.peerName}(${msg.peerUin})]`);
         }
         if (msg.senderUin !== '0') {
-            tokens.push(`[${msg.sendMemberName ?? msg.sendRemarkName ?? msg.sendNickName}(${msg.senderUin})]`);
+            tokens.push(`[${msg.sendMemberName || msg.sendRemarkName || msg.sendNickName}(${msg.senderUin})]`);
         }
     } else if (msg.chatType == ChatType.KCHATTYPEDATALINE) {
         tokens.push('移动设备');

src/common/path.ts

@@ -13,11 +13,15 @@ export class NapCatPathWrapper {
     constructor(mainPath: string = dirname(fileURLToPath(import.meta.url))) {
         this.binaryPath = mainPath;
         let writePath: string;
-        if (os.platform() === 'darwin') {
+
+        if (process.env['NAPCAT_WORKDIR']) {
+            writePath = process.env['NAPCAT_WORKDIR'];
+        } else 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/store.ts

@@ -163,7 +163,7 @@ class Store {
         const current = this.get<StoreValueType>(key);
 
         if (current === null) {
-            this.set(key, 1);
+            this.set(key, 1, 60);
             return 1;
         }
 
@@ -180,7 +180,7 @@ class Store {
         }
 
         const newValue = numericValue + 1;
-        this.set(key, newValue);
+        this.set(key, newValue, 60);
         return newValue;
     }
 }

src/common/version.ts

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

src/common/worker.ts

@@ -0,0 +1,35 @@
+import { Worker } from 'worker_threads';
+
+export async function runTask<T, R>(workerScript: string, taskData: T): Promise<R> {
+    let worker = new Worker(workerScript);
+    try {
+        return await new Promise<R>((resolve, reject) => {
+            worker.on('message', (result: R) => {
+                if ((result as any)?.log) {
+                    console.error('Worker Log--->:', (result as { log: string }).log);
+                }
+                if ((result as any)?.error) {
+                    reject(new Error("Worker error: " + (result as { error: string }).error));
+                }
+                resolve(result);
+            });
+
+            worker.on('error', (error) => {
+                reject(new Error(`Worker error: ${error.message}`));
+            });
+
+            worker.on('exit', (code) => {
+                if (code !== 0) {
+                    reject(new Error(`Worker stopped with exit code ${code}`));
+                }
+            });
+            worker.postMessage(taskData);
+        });
+    } catch (error: unknown) {
+        throw new Error(`Failed to run task: ${(error as Error).message}`);
+    } finally {
+        // Ensure the worker is terminated after the promise is settled
+        worker.terminate();
+    }
+}
+

src/core/apis/file.ts

@@ -17,8 +17,6 @@ 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';
@@ -28,6 +26,9 @@ 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;
@@ -41,9 +42,10 @@ export class NTQQFileApi {
         this.context = context;
         this.core = core;
         this.rkeyManager = new RkeyManager([
-            'https://rkey.napneko.icu/rkeys'
+            'https://secret-service.bietiaop.com/rkeys',
+            'http://ss.xingzhige.com/music_card/rkey',
         ],
-        this.context.logger
+            this.context.logger
         );
     }
 
@@ -62,6 +64,76 @@ 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);
@@ -136,7 +208,7 @@ export class NTQQFileApi {
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');
         }
-        const imageSize = await this.core.apis.FileApi.getImageSize(picPath);
+        const imageSize = await imageSizeFallBack(picPath);
         context.deleteAfterSentFiles.push(path);
         return {
             elementType: ElementType.PIC,
@@ -181,23 +253,30 @@ export class NTQQFileApi {
         filePath = newFilePath;
 
         const { fileName: _fileName, path, fileSize, md5 } = await this.core.apis.FileApi.uploadFile(filePath, ElementType.VIDEO);
+        context.deleteAfterSentFiles.push(path);
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');
         }
         const thumbDir = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`);
         fs.mkdirSync(pathLib.dirname(thumbDir), { recursive: true });
         const thumbPath = pathLib.join(pathLib.dirname(thumbDir), `${md5}_0.png`);
-        try {
-            videoInfo = await FFmpegService.getVideoInfo(filePath, thumbPath);
-        } catch {
-            fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
-        }
         if (_diyThumbPath) {
             try {
                 await this.copyFile(_diyThumbPath, thumbPath);
             } catch (e) {
                 this.context.logger.logError('复制自定义缩略图失败', e);
             }
+        } else {
+            try {
+                videoInfo = await FFmpegService.getVideoInfo(filePath, thumbPath);
+                if (!fs.existsSync(thumbPath)) {
+                    this.context.logger.logError('获取视频缩略图失败', new Error('缩略图不存在'));
+                    throw new Error('获取视频缩略图失败');
+                }
+            } catch (e) {
+                this.context.logger.logError('获取视频信息失败', e);
+                fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
+            }
         }
         context.deleteAfterSentFiles.push(thumbPath);
         const thumbSize = (await fsPromises.stat(thumbPath)).size;
@@ -223,7 +302,7 @@ export class NTQQFileApi {
             },
         };
     }
-    async createValidSendPttElement(pttPath: string): Promise<SendPttElement> {
+    async createValidSendPttElement(_context: SendMessageContext, pttPath: string): Promise<SendPttElement> {
 
         const { converted, path: silkPath, duration } = await encodeSilk(pttPath, this.core.NapCatTempPath, this.core.context.logger);
         if (!silkPath) {
@@ -300,23 +379,24 @@ export class NTQQFileApi {
                     element.elementType === ElementType.FILE
                 ) {
                     switch (element.elementType) {
-                    case ElementType.PIC:
+                        case ElementType.PIC:
                             element.picElement!.sourcePath = elementResults?.[elementIndex] ?? '';
-                        break;
-                    case ElementType.VIDEO:
+                            break;
+                        case ElementType.VIDEO:
                             element.videoElement!.filePath = elementResults?.[elementIndex] ?? '';
-                        break;
-                    case ElementType.PTT:
+                            break;
+                        case ElementType.PTT:
                             element.pttElement!.filePath = elementResults?.[elementIndex] ?? '';
-                        break;
-                    case ElementType.FILE:
+                            break;
+                        case ElementType.FILE:
                             element.fileElement!.filePath = elementResults?.[elementIndex] ?? '';
-                        break;
+                            break;
                     }
                     elementIndex++;
                 }
             });
         });
+        return res.flat();
     }
 
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
@@ -337,6 +417,7 @@ export class NTQQFileApi {
             'NodeIKernelMsgListener/onRichMediaDownloadComplete',
             [{
                 fileModelId: '0',
+                downSourceType: 0,
                 downloadSourceType: 0,
                 triggerType: 1,
                 msgId: msgId,
@@ -355,19 +436,6 @@ 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);
@@ -434,9 +502,9 @@ export class NTQQFileApi {
         };
 
         try {
-            if (this.core.apis.PacketApi.available && this.packetRkey?.[0] && this.packetRkey?.[1]) {
-                const rkey_expired_private = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
-                const rkey_expired_group = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
+            if (this.core.apis.PacketApi.available) {
+                const rkey_expired_private = !this.packetRkey || (this.packetRkey[0] && this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000);
+                const rkey_expired_group = !this.packetRkey || (this.packetRkey[0] && this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000);
                 if (rkey_expired_private || rkey_expired_group) {
                     this.packetRkey = await this.fetchRkeyWithRetry();
                 }

src/core/apis/friend.ts

@@ -86,4 +86,31 @@ export class NTQQFriendApi {
             accept,
         });
     }
+    async handleDoubtFriendRequest(friendUid: string, str1: string = '', str2: string = '') {
+        this.context.session.getBuddyService().approvalDoubtBuddyReq(friendUid, str1, str2);
+    }
+    async getDoubtFriendRequest(count: number) {
+        let date = Date.now().toString();
+        const [, ret] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelBuddyService/getDoubtBuddyReq',
+            'NodeIKernelBuddyListener/onDoubtBuddyReqChange',
+            [date, count, ''],
+            () => true,
+            (data) => data.reqId === date
+        );
+        let requests = Promise.all(ret.doubtList.map(async (item) => {
+            return {
+                flag: item.uid, //注意强制String 非isNumeric 不遵守则不符合设计
+                uin: await this.core.apis.UserApi.getUinByUidV2(item.uid) ?? 0,// 信息字段
+                nick: item.nick, // 信息字段 这个不是nickname 可能是来源的群内的昵称
+                source: item.source, // 信息字段
+                reason: item.reason, // 信息字段
+                msg: item.msg, // 信息字段
+                group_code: item.groupCode, // 信息字段
+                time: item.reqTime, // 信息字段
+                type: 'doubt' //保留字段
+            };
+        }))
+        return requests;
+    }
 }

src/core/apis/group.ts

@@ -10,11 +10,14 @@ 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;
@@ -27,6 +30,9 @@ export class NTQQGroupApi {
         this.core = core;
     }
 
+    async setGroupRemark(groupCode: string, remark: string) {
+        return this.context.session.getGroupService().modifyGroupRemark(groupCode, remark);
+    }
     async fetchGroupDetail(groupCode: string) {
         const [, detailInfo] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelGroupService/getGroupDetailInfo',
@@ -44,6 +50,22 @@ 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));
@@ -92,6 +114,58 @@ 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',
@@ -165,7 +239,13 @@ export class NTQQGroupApi {
 
         return this.groupMemberCache.get(groupCode);
     }
-
+    async refreshGroupMemberCachePartial(groupCode: string, uid: string) {
+        const member = await this.getGroupMemberEx(groupCode, uid, true);
+        if (member) {
+            this.groupMemberCache.get(groupCode)?.set(uid, member);
+        }
+        return member;
+    }
     async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
         const groupCodeStr = groupCode.toString();
         const memberUinOrUidStr = memberUinOrUid.toString();
@@ -209,6 +289,10 @@ export class NTQQGroupApi {
         return this.context.session.getRichMediaService().deleteGroupFolder(groupCode, folderId);
     }
 
+    async transGroupFile(groupCode: string, fileId: string) {
+        return this.context.session.getRichMediaService().transGroupFile(groupCode, fileId);
+    }
+
     async addGroupEssence(groupCode: string, msgId: string) {
         const MsgData = await this.context.session.getMsgService().getMsgsIncludeSelf({
             chatType: 2,
@@ -339,9 +423,9 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().uploadGroupBulletinPic(groupCode, _Pskey, imageurl);
     }
 
-    async handleGroupRequest(notify: GroupNotify, operateType: NTGroupRequestOperateTypes, reason?: string) {
+    async handleGroupRequest(doubt: boolean, notify: GroupNotify, operateType: NTGroupRequestOperateTypes, reason?: string) {
         return this.context.session.getGroupService().operateSysNotify(
-            false,
+            doubt,
             {
                 operateType: operateType,
                 targetMsg: {

src/core/apis/msg.ts

@@ -1,5 +1,5 @@
 import { ChatType, GetFileListParam, Peer, RawMessage, SendMessageElement, SendStatusType } from '@/core/types';
-import { GroupFileInfoUpdateItem, InstanceContext, NapCatCore } from '@/core';
+import { GroupFileInfoUpdateItem, InstanceContext, NapCatCore, NodeIKernelMsgService } from '@/core';
 import { GeneralCallResult } from '@/core/services/common';
 
 export class NTQQMsgApi {
@@ -12,6 +12,11 @@ export class NTQQMsgApi {
         this.context = context;
         this.core = core;
     }
+
+    async clickInlineKeyboardButton(...params: Parameters<NodeIKernelMsgService['clickInlineKeyboardButton']>) {
+        return this.context.session.getMsgService().clickInlineKeyboardButton(...params);
+    }
+
     getMsgByClientSeqAndTime(peer: Peer, replyMsgClientSeq: string, replyMsgTime: string) {
         // https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType 可以用过特殊方式拉取
         return this.context.session.getMsgService().getMsgByClientSeqAndTime(peer, replyMsgClientSeq, replyMsgTime);
@@ -66,6 +71,7 @@ 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',
@@ -79,6 +85,7 @@ export class NTQQMsgApi {
         return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
             chatInfo: peer,
             filterMsgType: [],
+            //searchFields: 3,
             filterSendersUid: SendersUid,
             filterMsgToTime: MsgTime,
             filterMsgFromTime: MsgTime,
@@ -95,6 +102,7 @@ export class NTQQMsgApi {
             filterMsgToTime: '0',
             filterMsgFromTime: '0',
             isReverseOrder: false,
+            //searchFields: 3,
             isIncludeCurrent: true,
             pageLimit: 1,
         });
@@ -105,6 +113,7 @@ export class NTQQMsgApi {
             filterMsgType: [],
             filterSendersUid: [],
             filterMsgToTime: '0',
+            //searchFields: 3,
             filterMsgFromTime: '0',
             isReverseOrder: true,
             isIncludeCurrent: true,
@@ -123,6 +132,7 @@ export class NTQQMsgApi {
             chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
             filterMsgType: [],
             filterSendersUid: [],
+            //searchFields: 3,
             filterMsgToTime: filterMsgToTime,
             filterMsgFromTime: filterMsgFromTime,
             isReverseOrder: false,
@@ -131,6 +141,21 @@ export class NTQQMsgApi {
         });
     }
 
+    async queryFirstMsgBySender(peer: Peer, SendersUid: string[]) {
+        console.log(peer, SendersUid);
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: SendersUid,
+            //searchFields: 3,
+            filterMsgToTime: '0',
+            filterMsgFromTime: '0',
+            isReverseOrder: true,
+            isIncludeCurrent: true,
+            pageLimit: 20000,
+        });
+    }
+
     async setMsgRead(peer: Peer) {
         return this.context.session.getMsgService().setMsgRead(peer);
     }

src/core/apis/user.ts

@@ -90,7 +90,30 @@ export class NTQQUserApi {
             () => true,
             (profile) => profile.uid === uid,
         );
-        const RetUser: User = {
+        return profile;
+    }
+
+    async getUserDetailInfo(uid: string, no_cache: boolean = false): Promise<User> {
+        let profile = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, no_cache ? UserDetailSource.KSERVER : UserDetailSource.KDB), uid);
+        if (profile && profile.uin !== '0' && profile.commonExt) {
+            return {
+                ...profile.simpleInfo.status,
+                ...profile.simpleInfo.vasInfo,
+                ...profile.commonExt,
+                ...profile.simpleInfo.baseInfo,
+                ...profile.simpleInfo.coreInfo,
+                qqLevel: profile.commonExt?.qqLevel,
+                age: profile.simpleInfo.baseInfo.age,
+                pendantId: '',
+                nick: profile.simpleInfo.coreInfo.nick || '',
+            };
+        }
+        this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.');
+        profile = await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
+        if (profile && profile.uin === '0') {
+            profile.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
+        }
+        return {
             ...profile.simpleInfo.status,
             ...profile.simpleInfo.vasInfo,
             ...profile.commonExt,
@@ -101,33 +124,6 @@ export class NTQQUserApi {
             pendantId: '',
             nick: profile.simpleInfo.coreInfo.nick || '',
         };
-        return RetUser;
-    }
-
-    async getUserDetailInfo(uid: string): Promise<User> {
-        let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid);
-        if (retUser && retUser.uin !== '0') {
-            return retUser;
-        }
-        this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.');
-        retUser = await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
-        if (retUser && retUser.uin === '0') {
-            retUser.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
-        }
-        return retUser;
-    }
-
-    async getUserDetailInfoV2(uid: string): Promise<User> {
-        const fallback = new Fallback<User>((user) => FallbackUtil.boolchecker(user, user !== undefined && user.uin !== '0'))
-            .add(() => this.fetchUserDetailInfo(uid, UserDetailSource.KDB))
-            .add(() => this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER));
-        const retUser = await fallback.run().then(async (user) => {
-            if (user && user.uin === '0') {
-                user.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
-            }
-            return user;
-        });
-        return retUser;
     }
 
     async modifySelfProfile(param: ModifyProfileParams) {

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: groupCode,
+            group_id: Number(groupCode),
             current_talkative: {},
             talkative_list: [],
             performer_list: [],

src/core/data/group.ts

@@ -0,0 +1,245 @@
+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

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

src/core/external/appid.json

@@ -186,5 +186,157 @@
     "9.9.17-31363": {
         "appid": 537266500,
         "qua": "V1_WIN_NQ_9.9.17_31363_GW_B"
+    },
+    "3.2.16-32690": {
+        "appid": 537271229,
+        "qua": "V1_LNX_NQ_3.2.16_32690_GW_B"
+    },
+    "9.9.18-32690": {
+        "appid": 537271194,
+        "qua": "V1_WIN_NQ_9.9.18_32690_GW_B"
+    },
+    "6.9.66-32690": {
+        "appid": 537271218,
+        "qua": "V1_MAC_NQ_6.9.66_32690_GW_B"
+    },
+    "3.2.16-32721": {
+        "appid": 537271229,
+        "qua": "V1_LNX_NQ_3.2.16_32721_GW_B"
+    },
+    "9.9.18-32793": {
+        "appid": 537271244,
+        "qua": "V1_WIN_NQ_9.9.18_32793_GW_B"
+    },
+    "3.2.16-32793": {
+        "appid": 537271279,
+        "qua": "V1_LNX_NQ_3.2.16_32793_GW_B"
+    },
+    "3.2.16-32869": {
+        "appid": 537271329,
+        "qua": "V1_LNX_NQ_3.2.16_32869_GW_B"
+    },
+    "9.9.18-32869": {
+        "appid": 537271294,
+        "qua": "V1_WIN_NQ_9.9.18_32869_GW_B"
+    },
+    "3.2.16-33139": {
+        "appid": 537273909,
+        "qua": "V1_LNX_NQ_3.2.16_33139_GW_B"
+    },
+    "9.9.18-33139": {
+        "appid": 537273874,
+        "qua": "V1_WIN_NQ_9.9.18_33139_GW_B"
+    },
+    "9.9.18-33800": {
+        "appid": 537273974,
+        "qua": "V1_WIN_NQ_9.9.18_33800_GW_B"
+    },
+    "3.2.16-33800": {
+        "appid": 537274009,
+        "qua": "V1_LNX_NQ_3.2.16_33800_GW_B"
+    },
+    "9.9.19-34231": {
+        "appid": 537279209,
+        "qua": "V1_WIN_NQ_9.9.19_34231_GW_B"
+    },
+    "3.2.17-34231": {
+        "appid": 537279245,
+        "qua": "V1_LNX_NQ_3.2.17_34231_GW_B"
+    },
+    "9.9.19-34362": {
+        "appid": 537279260,
+        "qua": "V1_WIN_NQ_9.9.19_34362_GW_B"
+    },
+    "3.2.17-34362": {
+        "appid": 537279296,
+        "qua": "V1_LNX_NQ_3.2.17_34362_GW_B"
+    },
+    "9.9.19-34467": {
+        "appid": 537282256,
+        "qua": "V1_WIN_NQ_9.9.19_34467_GW_B"
+    },
+    "3.2.17-34467": {
+        "appid": 537282292,
+        "qua": "V1_LNX_NQ_3.2.17_34467_GW_B"
+    },
+    "9.9.19-34566": {
+        "appid": 537282307,
+        "qua": "V1_WIN_NQ_9.9.19_34566_GW_B"
+    },
+    "3.2.17-34566": {
+        "appid": 537282343,
+        "qua": "V1_LNX_NQ_3.2.17_34566_GW_B"
+    },
+    "3.2.17-34606": {
+        "appid": 537282343,
+        "qua": "V1_LNX_NQ_3.2.17_34606_GW_B"
+    },
+    "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/napcat.json

@@ -4,5 +4,6 @@
     "fileLogLevel": "debug",
     "consoleLogLevel": "info",
     "packetBackend": "auto",
-    "packetServer": ""
-}
+    "packetServer": "",
+    "o3HookMode": 1
+  }

src/core/external/offset.json

@@ -175,7 +175,7 @@
         "send": "713A318",
         "recv": "713DB50"
     },
-    "6.9.63.30851-x64": {
+    "6.9.63-30851-x64": {
         "send": "46C8040",
         "recv": "46CA8AC"
     },
@@ -195,7 +195,7 @@
         "send": "713A318",
         "recv": "713DB50"
     },
-    "6.9.63.30899-x64": {
+    "6.9.63-30899-x64": {
         "send": "46C8040",
         "recv": "46CA8AC"
     },
@@ -211,7 +211,7 @@
         "send": "39C1350",
         "recv": "39C5784"
     },
-    "6.9.63.31245-x64": {
+    "6.9.63-31245-x64": {
         "send": "4720A40",
         "recv": "47232AC"
     },
@@ -239,12 +239,204 @@
         "send": "71BFD48",
         "recv": "71C3580"
     },
-    "6.9.65.31363-x64": {
+    "6.9.65-31363-x64": {
         "send": "4720E80",
         "recv": "47236EC"
     },
-    "6.9.65.31363-arm64": {
+    "6.9.65-31363-arm64": {
         "send": "422CEF8",
         "recv": "422F710"
+    },
+    "9.9.18-32690-x64": {
+        "send": "39F9630",
+        "recv": "39FDE30"
+    },
+    "3.2.16-32690-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32690-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "3.2.16-32721-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32721-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "9.9.18-32793-x64": {
+        "send": "39F9A30",
+        "recv": "39FE230"
+    },
+    "3.2.16-32793-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32793-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "9.9.18-32869-x64": {
+        "send": "39F9A30",
+        "recv": "39FE230"
+    },
+    "3.2.16-32869-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32869-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "9.9.18-33139-x64": {
+        "send": "39F5870",
+        "recv": "39FA070"
+    },
+    "3.2.16-33139-x64": {
+        "send": "A634F60",
+        "recv": "A638980"
+    },
+    "3.2.16-33139-arm64": {
+        "send": "7262BB0",
+        "recv": "72664E0"
+    },
+    "9.9.18-33800-x64": {
+        "send": "39F5870",
+        "recv": "39FA070"
+    },
+    "3.2.16-33800-x64": {
+        "send": "A634F60",
+        "recv": "A638980"
+    },
+    "3.2.16-33800-arm64": {
+        "send": "7262BB0",
+        "recv": "72664E0"
+    },
+    "9.9.19-34231-x64": {
+        "send": "3BD73D0",
+        "recv": "3BDBBD0"
+    },
+    "3.2.17-34231-x64": {
+        "send": "AD787E0",
+        "recv": "AD7C200"
+    },
+    "3.2.17-34231-arm64": {
+        "send": "770CDC0",
+        "recv": "77106F0"
+    },
+    "9.9.19-34362-x64": {
+        "send": "3BD80D0",
+        "recv": "3BDC8D0"
+    },
+    "9.9.19-34467-x64": {
+        "send": "3BD8690",
+        "recv": "3BDCE90"
+    },
+    "9.9.19-34566-x64": {
+        "send": "3BDA110",
+        "recv": "3BDE910"
+    },
+    "9.9.19-34606-x64": {
+        "send": "3BDA110",
+        "recv": "3BDE910"
+    },
+    "3.2.17-34606-x64": {
+        "send": "AD7DC60",
+        "recv": "AD81680"
+    },
+    "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/helper/config.ts

@@ -9,7 +9,8 @@ export const NapcatConfigSchema = Type.Object({
     fileLogLevel: Type.String({ default: 'debug' }),
     consoleLogLevel: Type.String({ default: 'info' }),
     packetBackend: Type.String({ default: 'auto' }),
-    packetServer: Type.String({ default: '' })
+    packetServer: Type.String({ default: '' }),
+    o3HookMode: Type.Number({ default: 0 }),
 });
 
 export type NapcatConfig = Static<typeof NapcatConfigSchema>;

src/core/helper/rkey.ts

@@ -6,6 +6,17 @@ interface ServerRkeyData {
     private_rkey: string;
     expired_time: number;
 }
+interface OneBotApiRet {
+    status: string,
+    retcode: number,
+    data: ServerRkeyData,
+    message: string,
+    wording: string,
+}
+interface UrlFailureInfo {
+    count: number;
+    lastTimestamp: number;
+}
 
 export class RkeyManager {
     serverUrl: string[] = [];
@@ -15,9 +26,8 @@ export class RkeyManager {
         private_rkey: '',
         expired_time: 0,
     };
-    private failureCount: number = 0;
-    private lastFailureTimestamp: number = 0;
-    private readonly FAILURE_LIMIT: number = 8;
+    private urlFailures: Map<string, UrlFailureInfo> = new Map();
+    private readonly FAILURE_LIMIT: number = 4;
     private readonly ONE_DAY: number = 24 * 60 * 60 * 1000;
 
     constructor(serverUrl: string[], logger: LogWrapper) {
@@ -26,50 +36,92 @@ export class RkeyManager {
     }
 
     async getRkey() {
-        const now = new Date().getTime();
-        if (now - this.lastFailureTimestamp > this.ONE_DAY) {
-            this.failureCount = 0; // 重置失败计数器
-        }
-
-        if (this.failureCount >= this.FAILURE_LIMIT) {
-            this.logger.logError('[Rkey] 服务存在异常, 图片使用FallBack机制');
-            throw new Error('获取rkey失败次数过多，请稍后再试');
+        const availableUrls = this.getAvailableUrls();
+        if (availableUrls.length === 0) {
+            this.logger.logError('[Rkey] 所有服务均已禁用, 图片使用FallBack机制');
+            throw new Error('获取rkey失败：所有服务URL均已被禁用');
         }
 
         if (this.isExpired()) {
             try {
                 await this.refreshRkey();
             } catch (e) {
-                throw new Error(`${e}`);//外抛
+                throw new Error(`${e}`);
             }
         }
         return this.rkeyData;
     }
 
+    private getAvailableUrls(): string[] {
+        return this.serverUrl.filter(url => !this.isUrlDisabled(url));
+    }
+
+    private isUrlDisabled(url: string): boolean {
+        const failureInfo = this.urlFailures.get(url);
+        if (!failureInfo) return false;
+
+        const now = new Date().getTime();
+        // 如果已经过了一天，重置失败计数
+        if (now - failureInfo.lastTimestamp > this.ONE_DAY) {
+            failureInfo.count = 0;
+            this.urlFailures.set(url, failureInfo);
+            return false;
+        }
+
+        return failureInfo.count >= this.FAILURE_LIMIT;
+    }
+
+    private updateUrlFailure(url: string) {
+        const now = new Date().getTime();
+        const failureInfo = this.urlFailures.get(url) || { count: 0, lastTimestamp: 0 };
+
+        // 如果已经过了一天，重置失败计数
+        if (now - failureInfo.lastTimestamp > this.ONE_DAY) {
+            failureInfo.count = 1;
+        } else {
+            failureInfo.count++;
+        }
+
+        failureInfo.lastTimestamp = now;
+        this.urlFailures.set(url, failureInfo);
+
+        if (failureInfo.count >= this.FAILURE_LIMIT) {
+            this.logger.logError(`[Rkey] URL ${url} 已被禁用，失败次数达到 ${this.FAILURE_LIMIT} 次`);
+        }
+    }
+
     isExpired(): boolean {
         const now = new Date().getTime() / 1000;
         return now > this.rkeyData.expired_time;
     }
 
     async refreshRkey() {
-        //刷新rkey
-        for (const url of this.serverUrl) {
+        const availableUrls = this.getAvailableUrls();
+
+        if (availableUrls.length === 0) {
+            this.logger.logError('[Rkey] 所有服务均已禁用');
+            throw new Error('获取rkey失败：所有服务URL均已被禁用');
+        }
+
+        for (const url of availableUrls) {
             try {
-                const temp = await RequestUtil.HttpGetJson<ServerRkeyData>(url, 'GET');
+                let temp = await RequestUtil.HttpGetJson<ServerRkeyData>(url, 'GET');
+                if ('retcode' in temp) {
+                    // 支持Onebot Ret风格
+                    temp = (temp as unknown as OneBotApiRet).data;
+                }
                 this.rkeyData = {
                     group_rkey: temp.group_rkey.slice(6),
                     private_rkey: temp.private_rkey.slice(6),
                     expired_time: temp.expired_time
                 };
-                this.failureCount = 0;
                 return;
             } catch (e) {
                 this.logger.logError(`[Rkey] 异常服务 ${url} 异常 / `, e);
-                this.failureCount++;
-                this.lastFailureTimestamp = new Date().getTime();
-                //是否为最后一个url
-                if (url === this.serverUrl[this.serverUrl.length - 1]) {
-                    throw new Error(`获取rkey失败: ${e}`);//外抛
+                this.updateUrlFailure(url);
+
+                if (url === availableUrls[availableUrls.length - 1]) {
+                    throw new Error(`获取rkey失败: ${e}`);
                 }
             }
         }

src/core/listeners/NodeIKernelBuddyListener.ts

@@ -3,57 +3,75 @@ 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);
     }
 
-    onDoubtBuddyReqChange(arg: unknown): any {
+    onDoubtBuddyReqChange(_arg:
+        {
+            reqId: string;
+            cookie: string;
+            doubtList: Array<{
+                uid: string;
+                nick: string;
+                age: number,
+                sex: number;
+                commFriendNum: number;
+                reqTime: string;
+                msg: string;
+                source: string;
+                reason: string;
+                groupCode: string;
+                nameMore?: null;
+            }>;
+        }): void | Promise<void> {
     }
 
-    onDoubtBuddyReqUnreadNumChange(arg: unknown): any {
+    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/listeners/NodeIKernelLoginListener.ts

@@ -1,5 +1,5 @@
 export class NodeIKernelLoginListener {
-    onLoginConnected(...args: any[]): any {
+    onLoginConnected(): Promise<void> | void {
     }
 
     onLoginDisConnected(...args: any[]): any {

src/core/listeners/NodeIKernelMsgListener.ts

@@ -21,7 +21,8 @@ export interface OnRichMediaDownloadCompleteParams {
     clientMsg: string,
     businessId: number,
     userTotalSpacePerDay: unknown,
-    userUsedSpacePerDay: unknown
+    userUsedSpacePerDay: unknown,
+    chatType: number,
 }
 
 export interface GroupFileInfoUpdateParamType {
@@ -97,112 +98,112 @@ export interface TempOnRecvParams {
 }
 
 export class NodeIKernelMsgListener {
-    onAddSendMsg(msgRecord: RawMessage): any {
+    onAddSendMsg(_msgRecord: RawMessage): any {
 
     }
 
-    onBroadcastHelperDownloadComplete(broadcastHelperTransNotifyInfo: unknown): any {
+    onBroadcastHelperDownloadComplete(_broadcastHelperTransNotifyInfo: unknown): any {
 
     }
 
-    onBroadcastHelperProgressUpdate(broadcastHelperTransNotifyInfo: unknown): any {
+    onBroadcastHelperProgressUpdate(_broadcastHelperTransNotifyInfo: unknown): any {
 
     }
 
-    onChannelFreqLimitInfoUpdate(contact: unknown, z: unknown, freqLimitInfo: unknown): any {
+    onChannelFreqLimitInfoUpdate(_contact: unknown, _z: unknown, _freqLimitInfo: unknown): any {
 
     }
 
-    onContactUnreadCntUpdate(hashMap: unknown): any {
+    onContactUnreadCntUpdate(_hashMap: unknown): any {
 
     }
 
-    onCustomWithdrawConfigUpdate(customWithdrawConfig: unknown): any {
+    onCustomWithdrawConfigUpdate(_customWithdrawConfig: unknown): any {
 
     }
 
-    onDraftUpdate(contact: unknown, arrayList: unknown, j2: unknown): any {
+    onDraftUpdate(_contact: unknown, _arrayList: unknown, _j2: unknown): any {
 
     }
 
-    onEmojiDownloadComplete(emojiNotifyInfo: unknown): any {
+    onEmojiDownloadComplete(_emojiNotifyInfo: unknown): any {
 
     }
 
-    onEmojiResourceUpdate(emojiResourceInfo: unknown): any {
+    onEmojiResourceUpdate(_emojiResourceInfo: unknown): any {
 
     }
 
-    onFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
+    onFeedEventUpdate(_firstViewDirectMsgNotifyInfo: unknown): any {
 
     }
 
-    onFileMsgCome(arrayList: unknown): any {
+    onFileMsgCome(_arrayList: unknown): any {
 
     }
 
-    onFirstViewDirectMsgUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
+    onFirstViewDirectMsgUpdate(_firstViewDirectMsgNotifyInfo: unknown): any {
 
     }
 
-    onFirstViewGroupGuildMapping(arrayList: unknown): any {
+    onFirstViewGroupGuildMapping(_arrayList: unknown): any {
 
     }
 
-    onGrabPasswordRedBag(i2: unknown, str: unknown, i3: unknown, recvdOrder: unknown, msgRecord: unknown): any {
+    onGrabPasswordRedBag(_i2: unknown, _str: unknown, _i3: unknown, _recvdOrder: unknown, _msgRecord: unknown): any {
 
     }
 
-    onGroupFileInfoAdd(groupItem: unknown): any {
+    onGroupFileInfoAdd(_groupItem: unknown): any {
 
     }
 
-    onGroupFileInfoUpdate(groupFileListResult: GroupFileInfoUpdateParamType): any {
+    onGroupFileInfoUpdate(_groupFileListResult: GroupFileInfoUpdateParamType): any {
 
     }
 
-    onGroupGuildUpdate(groupGuildNotifyInfo: unknown): any {
+    onGroupGuildUpdate(_groupGuildNotifyInfo: unknown): any {
 
     }
 
 
-    onGroupTransferInfoAdd(groupItem: unknown): any {
+    onGroupTransferInfoAdd(_groupItem: unknown): any {
 
     }
 
-    onGroupTransferInfoUpdate(groupFileListResult: unknown): any {
+    onGroupTransferInfoUpdate(_groupFileListResult: unknown): any {
 
     }
 
-    onGuildInteractiveUpdate(guildInteractiveNotificationItem: unknown): any {
+    onGuildInteractiveUpdate(_guildInteractiveNotificationItem: unknown): any {
 
     }
 
-    onGuildMsgAbFlagChanged(guildMsgAbFlag: unknown): any {
+    onGuildMsgAbFlagChanged(_guildMsgAbFlag: unknown): any {
 
     }
 
-    onGuildNotificationAbstractUpdate(guildNotificationAbstractInfo: unknown): any {
+    onGuildNotificationAbstractUpdate(_guildNotificationAbstractInfo: unknown): any {
 
     }
 
-    onHitCsRelatedEmojiResult(downloadRelateEmojiResultInfo: unknown): any {
+    onHitCsRelatedEmojiResult(_downloadRelateEmojiResultInfo: unknown): any {
 
     }
 
-    onHitEmojiKeywordResult(hitRelatedEmojiWordsResult: unknown): any {
+    onHitEmojiKeywordResult(_hitRelatedEmojiWordsResult: unknown): any {
 
     }
 
-    onHitRelatedEmojiResult(relatedWordEmojiInfo: unknown): any {
+    onHitRelatedEmojiResult(_relatedWordEmojiInfo: unknown): any {
 
     }
 
-    onImportOldDbProgressUpdate(importOldDbMsgNotifyInfo: unknown): any {
+    onImportOldDbProgressUpdate(_importOldDbMsgNotifyInfo: unknown): any {
 
     }
 
-    onInputStatusPush(inputStatusInfo: {
+    onInputStatusPush(_inputStatusInfo: {
         chatType: number;
         eventType: number;
         fromUin: string;
@@ -215,55 +216,55 @@ export class NodeIKernelMsgListener {
 
     }
 
-    onKickedOffLine(kickedInfo: KickedOffLineInfo): any {
+    onKickedOffLine(_kickedInfo: KickedOffLineInfo): any {
 
     }
 
-    onLineDev(arrayList: unknown): any {
+    onLineDev(_arrayList: unknown): any {
 
     }
 
-    onLogLevelChanged(j2: unknown): any {
+    onLogLevelChanged(_j2: unknown): any {
 
     }
 
-    onMsgAbstractUpdate(arrayList: unknown): any {
+    onMsgAbstractUpdate(_arrayList: unknown): any {
 
     }
 
-    onMsgBoxChanged(arrayList: unknown): any {
+    onMsgBoxChanged(_arrayList: unknown): any {
 
     }
 
-    onMsgDelete(contact: unknown, arrayList: unknown): any {
+    onMsgDelete(_contact: unknown, _arrayList: unknown): any {
 
     }
 
-    onMsgEventListUpdate(hashMap: unknown): any {
+    onMsgEventListUpdate(_hashMap: unknown): any {
 
     }
 
-    onMsgInfoListAdd(arrayList: unknown): any {
+    onMsgInfoListAdd(_arrayList: unknown): any {
 
     }
 
-    onMsgInfoListUpdate(msgList: RawMessage[]): any {
+    onMsgInfoListUpdate(_msgList: RawMessage[]): any {
 
     }
 
-    onMsgQRCodeStatusChanged(i2: unknown): any {
+    onMsgQRCodeStatusChanged(_i2: unknown): any {
 
     }
 
-    onMsgRecall(chatType: ChatType, uid: string, msgSeq: string): any {
+    onMsgRecall(_chatType: ChatType, _uid: string, _msgSeq: string): any {
 
     }
 
-    onMsgSecurityNotify(msgRecord: unknown): any {
+    onMsgSecurityNotify(_msgRecord: unknown): any {
 
     }
 
-    onMsgSettingUpdate(msgSetting: unknown): any {
+    onMsgSettingUpdate(_msgSetting: unknown): any {
 
     }
 
@@ -279,108 +280,108 @@ export class NodeIKernelMsgListener {
 
     }
 
-    onReadFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
+    onReadFeedEventUpdate(_firstViewDirectMsgNotifyInfo: unknown): any {
 
     }
 
-    onRecvGroupGuildFlag(i2: unknown): any {
+    onRecvGroupGuildFlag(_i2: unknown): any {
 
     }
 
-    onRecvMsg(arrayList: RawMessage[]): any {
+    onRecvMsg(_arrayList: RawMessage[]): any {
 
     }
 
-    onRecvMsgSvrRspTransInfo(j2: unknown, contact: unknown, i2: unknown, i3: unknown, str: unknown, bArr: unknown): any {
+    onRecvMsgSvrRspTransInfo(_j2: unknown, _contact: unknown, _i2: unknown, _i3: unknown, _str: unknown, _bArr: unknown): any {
 
     }
 
-    onRecvOnlineFileMsg(arrayList: unknown): any {
+    onRecvOnlineFileMsg(_arrayList: unknown): any {
 
     }
 
-    onRecvS2CMsg(arrayList: unknown): any {
+    onRecvS2CMsg(_arrayList: unknown): any {
 
     }
 
-    onRecvSysMsg(arrayList: Array<number>): any {
+    onRecvSysMsg(_arrayList: Array<number>): any {
 
     }
 
-    onRecvUDCFlag(i2: unknown): any {
+    onRecvUDCFlag(_i2: unknown): any {
 
     }
 
-    onRichMediaDownloadComplete(fileTransNotifyInfo: OnRichMediaDownloadCompleteParams): any {
+    onRichMediaDownloadComplete(_fileTransNotifyInfo: OnRichMediaDownloadCompleteParams): any {
     }
 
-    onRichMediaProgerssUpdate(fileTransNotifyInfo: unknown): any {
+    onRichMediaProgerssUpdate(_fileTransNotifyInfo: unknown): any {
 
     }
 
-    onRichMediaUploadComplete(fileTransNotifyInfo: unknown): any {
+    onRichMediaUploadComplete(_fileTransNotifyInfo: unknown): any {
 
     }
 
-    onSearchGroupFileInfoUpdate(searchGroupFileResult: unknown): any {
+    onSearchGroupFileInfoUpdate(_searchGroupFileResult: unknown): any {
 
     }
 
-    onSendMsgError(j2: unknown, contact: unknown, i2: unknown, str: unknown): any {
+    onSendMsgError(_j2: unknown, _contact: unknown, _i2: unknown, _str: unknown): any {
 
     }
 
-    onSysMsgNotification(i2: unknown, j2: unknown, j3: unknown, arrayList: unknown): any {
+    onSysMsgNotification(_i2: unknown, _j2: unknown, _j3: unknown, _arrayList: unknown): any {
 
     }
 
-    onTempChatInfoUpdate(tempChatInfo: TempOnRecvParams): any {
+    onTempChatInfoUpdate(_tempChatInfo: TempOnRecvParams): any {
 
     }
 
-    onUnreadCntAfterFirstView(hashMap: unknown): any {
+    onUnreadCntAfterFirstView(_hashMap: unknown): any {
 
     }
 
-    onUnreadCntUpdate(hashMap: unknown): any {
+    onUnreadCntUpdate(_hashMap: unknown): any {
 
     }
 
-    onUserChannelTabStatusChanged(z: unknown): any {
+    onUserChannelTabStatusChanged(_z: unknown): any {
 
     }
 
-    onUserOnlineStatusChanged(z: unknown): any {
+    onUserOnlineStatusChanged(_z: unknown): any {
 
     }
 
-    onUserTabStatusChanged(arrayList: unknown): any {
+    onUserTabStatusChanged(_arrayList: unknown): any {
 
     }
 
-    onlineStatusBigIconDownloadPush(i2: unknown, j2: unknown, str: unknown): any {
+    onlineStatusBigIconDownloadPush(_i2: unknown, _j2: unknown, _str: unknown): any {
 
     }
 
-    onlineStatusSmallIconDownloadPush(i2: unknown, j2: unknown, str: unknown): any {
+    onlineStatusSmallIconDownloadPush(_i2: unknown, _j2: unknown, _str: unknown): any {
 
     }
 
     // 第一次发现于Linux
-    onUserSecQualityChanged(...args: unknown[]): any {
+    onUserSecQualityChanged(..._args: unknown[]): any {
 
     }
 
-    onMsgWithRichLinkInfoUpdate(...args: unknown[]): any {
+    onMsgWithRichLinkInfoUpdate(..._args: unknown[]): any {
 
     }
 
-    onRedTouchChanged(...args: unknown[]): any {
+    onRedTouchChanged(..._args: unknown[]): any {
 
     }
 
     // 第一次发现于Win 9.9.9-23159
-    onBroadcastHelperProgerssUpdate(...args: unknown[]): any {
+    onBroadcastHelperProgerssUpdate(..._args: unknown[]): any {
 
     }
 }

src/core/listeners/NodeIKernelSearchListener.ts

@@ -1,4 +1,4 @@
-import { ChatType } from '@/core';
+import { ChatType, RawMessage } from '@/core';
 export interface SearchGroupInfo {
     groupCode: string;
     ownerUid: string;
@@ -56,7 +56,7 @@ export interface GroupSearchResult {
     nextPos: number;
 }
 export interface NodeIKernelSearchListener {
-    
+
     onSearchGroupResult(params: GroupSearchResult): any;
 
     onSearchFileKeywordsResult(params: {
@@ -94,4 +94,27 @@ export interface NodeIKernelSearchListener {
             }[]
         }[]
     }): any;
+
+    onSearchMsgKeywordsResult(params: {
+        searchId: string,
+        hasMore: boolean,
+        resultItems: Array<{
+            msgId: string,
+            msgSeq: string,
+            msgTime: string,
+            senderUid: string,
+            senderUin: string,
+            senderNick: string,
+            senderNickHits: unknown[],
+            senderRemark: string,
+            senderRemarkHits: unknown[],
+            senderCard: string,
+            senderCardHits: unknown[],
+            fieldType: number,
+            fieldText: string,
+            msgRecord: RawMessage;
+            hitsInfo: Array<unknown>,
+            msgAbstract: unknown,
+        }>
+    }): void | Promise<void>;
 }

src/core/listeners/NodeIKernelSessionListener.ts

@@ -11,7 +11,7 @@ export class NodeIKernelSessionListener {
 
     }
 
-    onOpentelemetryInit(args: unknown): any {
+    onOpentelemetryInit(info: { is_init: boolean, is_report: boolean }): any {
 
     }
 

src/core/packet/client/nativeClient.ts

@@ -11,7 +11,7 @@ import { PacketLogger } from '@/core/packet/context/loggerContext';
 
 // 0 send 1 recv
 export interface NativePacketExportType {
-    InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void) => boolean;
+    InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void, o3_hook: boolean) => boolean;
     SendPacket?: (cmd: string, data: string, trace_id: string) => void;
 }
 
@@ -38,11 +38,13 @@ export class NativePacketClient extends IPacketClient {
         return true;
     }
 
-    async init(pid: number, recv: string, send: string): Promise<void> {
+    async init(_pid: number, recv: string, send: string): Promise<void> {
         const platform = process.platform + '.' + process.arch;
-        const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + '.node');
+        const isNewQQ = this.napcore.basicInfo.requireMinNTQQBuild("36580");
+        const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + (isNewQQ ? '.new' : '') + '.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) => {
+
+        this.MoeHooExport.exports.InitHook?.(send, recv, (type: number, _uin: string, cmd: string, seq: number, hex_data: string) => {
             const trace_id = createHash('md5').update(Buffer.from(hex_data, 'hex')).digest('hex');
             if (type === 0 && this.cb.get(trace_id + 'recv')) {
                 //此时为send 提取seq
@@ -55,7 +57,7 @@ export class NativePacketClient extends IPacketClient {
                 // console.log('callback:', callback, trace_id);
                 callback?.({ seq, cmd, hex_data });
             }
-        });
+        }, this.napcore.config.o3HookMode == 1);
         this.available = true;
     }
 

src/core/packet/client/wsClient.ts

@@ -1,113 +0,0 @@
-import { Data, WebSocket, ErrorEvent } from 'ws';
-import { IPacketClient, RecvPacket } from '@/core/packet/client/baseClient';
-import { LogStack } from '@/core/packet/context/clientContext';
-import { NapCoreContext } from '@/core/packet/context/napCoreContext';
-import { PacketLogger } from '@/core/packet/context/loggerContext';
-
-export class WsPacketClient extends IPacketClient {
-    private websocket: WebSocket | null = null;
-    private reconnectAttempts: number = 0;
-    private readonly maxReconnectAttempts: number = 60; // 现在暂时不可配置
-    private readonly clientUrl: string;
-    private readonly clientUrlWrap: (url: string) => string = (url: string) => `ws://${url}/ws`;
-
-    private isInitialized: boolean = false;
-    private initPayload: { pid: number, recv: string, send: string } | null = null;
-
-    constructor(napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) {
-        super(napCore, logger, logStack);
-        this.clientUrl = this.napcore.config.packetServer
-            ? this.clientUrlWrap(this.napcore.config.packetServer)
-            : this.clientUrlWrap('127.0.0.1:8083');
-    }
-
-    check(): boolean {
-        if (!this.napcore.config.packetServer) {
-            this.logStack.pushLogWarn('wsPacketClient 未配置服务器地址');
-            return false;
-        }
-        return true;
-    }
-
-    async init(pid: number, recv: string, send: string): Promise<void> {
-        this.initPayload = { pid, recv, send };
-        await this.connectWithRetry();
-    }
-
-    sendCommandImpl(cmd: string, data: string, trace_id: string): void {
-        if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
-            this.websocket.send(JSON.stringify({
-                action: 'send',
-                cmd,
-                data,
-                trace_id
-            }));
-        } else {
-            this.logStack.pushLogWarn(`WebSocket 未连接，无法发送命令: ${cmd}`);
-        }
-    }
-
-    private async connectWithRetry(): Promise<void> {
-        while (this.reconnectAttempts < this.maxReconnectAttempts) {
-            try {
-                await this.connect();
-                return;
-            } catch {
-                this.reconnectAttempts++;
-                this.logStack.pushLogWarn(`第 ${this.reconnectAttempts}/${this.maxReconnectAttempts} 次尝试重连失败！`);
-                await this.delay(5000);
-            }
-        }
-        this.logStack.pushLogError(`wsPacketClient 在 ${this.clientUrl} 达到最大重连次数 (${this.maxReconnectAttempts})！`);
-        throw new Error(`无法连接到 WebSocket 服务器：${this.clientUrl}`);
-    }
-
-    private connect(): Promise<void> {
-        return new Promise((resolve, reject) => {
-            this.websocket = new WebSocket(this.clientUrl);
-            this.websocket.onopen = () => {
-                this.available = true;
-                this.reconnectAttempts = 0;
-                this.logger.info(`wsPacketClient 已连接到 ${this.clientUrl}`);
-                if (!this.isInitialized && this.initPayload) {
-                    this.websocket!.send(JSON.stringify({
-                        action: 'init',
-                        ...this.initPayload
-                    }));
-                    this.isInitialized = true;
-                }
-                resolve();
-            };
-            this.websocket.onclose = () => {
-                this.available = false;
-                this.logger.warn('WebSocket 连接关闭，尝试重连...');
-                reject(new Error('WebSocket 连接关闭'));
-            };
-            this.websocket.onmessage = (event) => this.handleMessage(event.data).catch(err => {
-                this.logger.error(`处理消息时出错: ${err}`);
-            });
-            this.websocket.onerror = (event: ErrorEvent) => {
-                this.available = false;
-                this.logger.error(`WebSocket 出错: ${event.message}`);
-                this.websocket?.close();
-                reject(new Error(`WebSocket 出错: ${event.message}`));
-            };
-        });
-    }
-
-    private delay(ms: number): Promise<void> {
-        return new Promise(resolve => setTimeout(resolve, ms));
-    }
-
-    private async handleMessage(message: Data): Promise<void> {
-        try {
-            const json: RecvPacket = JSON.parse(message.toString());
-            const trace_id_md5 = json.trace_id_md5;
-            const action = json?.type ?? 'init';
-            const event = this.cb.get(`${trace_id_md5}${action}`);
-            if (event) await event(json.data);
-        } catch (error) {
-            this.logger.error(`解析ws消息时出错: ${(error as Error).message}`);
-        }
-    }
-}

src/core/packet/context/clientContext.ts

@@ -1,6 +1,5 @@
 import { IPacketClient } from '@/core/packet/client/baseClient';
 import { NativePacketClient } from '@/core/packet/client/nativeClient';
-import { WsPacketClient } from '@/core/packet/client/wsClient';
 import { OidbPacket } from '@/core/packet/transformer/base';
 import { PacketLogger } from '@/core/packet/context/loggerContext';
 import { NapCoreContext } from '@/core/packet/context/napCoreContext';
@@ -10,8 +9,7 @@ type clientPriorityType = {
 }
 
 const clientPriority: clientPriorityType = {
-    10: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new NativePacketClient(napCore, logger, logStack),
-    1: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new WsPacketClient(napCore, logger, logStack),
+    10: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new NativePacketClient(napCore, logger, logStack)
 };
 
 export class LogStack {
@@ -88,10 +86,6 @@ export class PacketClientContext {
             this.logger.info('使用指定的 NativePacketClient 作为后端');
             client = new NativePacketClient(this.napCore, this.logger, this.logStack);
             break;
-        case 'frida':
-            this.logger.info('[Core] [Packet] 使用指定的 FridaPacketClient 作为后端');
-            client = new WsPacketClient(this.napCore, this.logger, this.logStack);
-            break;
         case 'auto':
         case undefined:
             client = this.judgeClient();

src/core/packet/context/napCoreContext.ts

@@ -1,6 +1,7 @@
 import { NapCatCore } from '@/core';
 
 export interface NapCoreCompatBasicInfo {
+    readonly requireMinNTQQBuild: (buildVer: string) => boolean;
     readonly uin: number;
     readonly uid: string;
     readonly uin2uid: (uin: number) => Promise<string>;
@@ -21,6 +22,7 @@ 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

@@ -1,22 +1,23 @@
 import * as crypto from 'crypto';
-import {PacketContext} from '@/core/packet/context/packetContext';
+import { PacketContext } from '@/core/packet/context/packetContext';
 import * as trans from '@/core/packet/transformer';
-import {PacketMsg} from '@/core/packet/message/message';
+import { PacketMsg } from '@/core/packet/message/message';
 import {
     PacketMsgFileElement,
     PacketMsgPicElement,
     PacketMsgPttElement,
-    PacketMsgVideoElement
+    PacketMsgReplyElement,
+    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} from '@/core/packet/transformer/proto';
-import {OidbPacket} from '@/core/packet/transformer/base';
-import {ImageOcrResult} from '@/core/packet/entities/ocrResult';
-import {gunzipSync} from 'zlib';
-import {PacketMsgConverter} from '@/core/packet/message/converter';
+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 { OidbPacket } from '@/core/packet/transformer/base';
+import { ImageOcrResult } from '@/core/packet/entities/ocrResult';
+import { gunzipSync } from 'zlib';
+import { PacketMsgConverter } from '@/core/packet/message/converter';
 
 export class PacketOperationContext {
     private readonly context: PacketContext;
@@ -29,13 +30,8 @@ export class PacketOperationContext {
         return await this.context.client.sendOidbPacket(pkt, rsp);
     }
 
-    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);
+    async SendPoke(is_group: boolean, peer: number, target?: number) {
+        const req = trans.SendPoke.build(is_group, peer, target ?? peer);
         await this.context.client.sendOidbPacket(req);
     }
 
@@ -59,39 +55,41 @@ export class PacketOperationContext {
             const res = trans.GetStrangerInfo.parse(resp);
             const extBigInt = BigInt(res.data.status.value);
             if (extBigInt <= 10n) {
-                return {status: Number(extBigInt) * 10, ext_status: 0};
+                return { status: Number(extBigInt) * 10, ext_status: 0 };
             }
             status = Number((extBigInt & 0xff00n) + ((extBigInt >> 16n) & 0xffn));
-            return {status: 10, ext_status: status};
+            return { status: 10, ext_status: status };
         } catch {
             return undefined;
         }
     }
 
-    async SetGroupSpecialTitle(groupUin: number, uid: string, tittle: string) {
-        const req = trans.SetSpecialTitle.build(groupUin, uid, tittle);
+    async SetGroupSpecialTitle(groupUin: number, uid: string, title: string) {
+        const req = trans.SetSpecialTitle.build(groupUin, uid, title);
         await this.context.client.sendOidbPacket(req);
     }
 
     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}`);
@@ -100,10 +98,13 @@ 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');
@@ -118,6 +119,20 @@ 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);
@@ -125,6 +140,21 @@ 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);
@@ -137,23 +167,79 @@ 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;
     }
 
-    async UploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
+    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);
         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
+    ) {
+        const req = trans.MoveGroupFile.build(groupUin, fileUUID, currentParentDirectory, targetParentDirectory);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.MoveGroupFile.parse(resp);
+        return res.move.retCode;
+    }
+
+    async RenameGroupFile(groupUin: number, fileUUID: string, currentParentDirectory: string, newName: string) {
+        const req = trans.RenameGroupFile.build(groupUin, fileUUID, currentParentDirectory, newName);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.RenameGroupFile.parse(resp);
+        return res.rename.retCode;
+    }
+
     async GetGroupFileUrl(groupUin: number, fileUUID: string) {
         const req = trans.DownloadGroupFile.build(groupUin, fileUUID);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -161,11 +247,11 @@ export class PacketOperationContext {
         return `https://${res.download.downloadDns}/ftn_handler/${Buffer.from(res.download.downloadUrl).toString('hex')}/?fname=`;
     }
 
-    async GetGroupPttUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadGroupPtt.build(groupUin, node);
+    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);
-        const res = trans.DownloadGroupPtt.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
+        const res = trans.DownloadPrivateFile.parse(resp);
+        return `http://${res.body?.result?.server}:${res.body?.result?.port}${res.body?.result?.url?.slice(8)}&isthumb=0`;
     }
 
     async GetMiniAppAdaptShareInfo(param: MiniAppReqParams) {
@@ -183,12 +269,17 @@ 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);
@@ -216,6 +307,7 @@ 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) {
@@ -231,12 +323,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;
@@ -249,7 +341,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/highway/highwayContext.ts

@@ -144,7 +144,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadGroupImageReq get upload ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
@@ -181,7 +181,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadC2CImageReq get upload ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
@@ -219,7 +219,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadGroupVideoReq get upload video ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
                 fileUuid: index.fileUuid,
@@ -244,16 +244,16 @@ export class PacketHighwayContext {
             this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid ukey ${ukey}, don't need upload!`);
         }
         const subFile = preRespData.upload.subFileInfos[0];
-        if (subFile.uKey && subFile.uKey != '') {
-            this.logger.debug(`[Highway] uploadGroupVideoReq get upload video thumb ukey: ${subFile.uKey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[1].index;
+        if (subFile!.uKey && subFile!.uKey != '') {
+            this.logger.debug(`[Highway] uploadGroupVideoReq get upload video thumb ukey: ${subFile!.uKey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[1]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
                 fileUuid: index.fileUuid,
-                uKey: subFile.uKey,
+                uKey: subFile!.uKey,
                 network: {
-                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile.ipv4S)
+                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile!.ipv4S)
                 },
                 msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
                 blockSize: BlockSize,
@@ -269,7 +269,7 @@ export class PacketHighwayContext {
                 extend
             );
         } else {
-            this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid thumb ukey ${subFile.uKey}, don't need upload!`);
+            this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid thumb ukey ${subFile!.uKey}, don't need upload!`);
         }
         video.msgInfo = preRespData.upload.msgInfo;
     }
@@ -284,7 +284,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadC2CVideoReq get upload video ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
                 fileUuid: index.fileUuid,
@@ -309,16 +309,16 @@ export class PacketHighwayContext {
             this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid ukey ${ukey}, don't need upload!`);
         }
         const subFile = preRespData.upload.subFileInfos[0];
-        if (subFile.uKey && subFile.uKey != '') {
-            this.logger.debug(`[Highway] uploadC2CVideoReq get upload video thumb ukey: ${subFile.uKey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[1].index;
+        if (subFile!.uKey && subFile!.uKey != '') {
+            this.logger.debug(`[Highway] uploadC2CVideoReq get upload video thumb ukey: ${subFile!.uKey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[1]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
                 fileUuid: index.fileUuid,
-                uKey: subFile.uKey,
+                uKey: subFile!.uKey,
                 network: {
-                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile.ipv4S)
+                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile!.ipv4S)
                 },
                 msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
                 blockSize: BlockSize,
@@ -334,7 +334,7 @@ export class PacketHighwayContext {
                 extend
             );
         } else {
-            this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid thumb ukey ${subFile.uKey}, don't need upload!`);
+            this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid thumb ukey ${subFile!.uKey}, don't need upload!`);
         }
         video.msgInfo = preRespData.upload.msgInfo;
     }
@@ -347,7 +347,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadGroupPttReq get upload ptt ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
@@ -383,7 +383,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadC2CPttReq get upload ptt ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({

src/core/packet/message/builder.ts

@@ -24,12 +24,15 @@ export class PacketMsgBuilder {
             }
             return {
                 responseHead: {
-                    fromUid: '',
                     fromUin: node.senderUin,
-                    toUid: node.groupId ? undefined : selfUid,
+                    type: 0,
+                    sigMap: 0,
+                    toUin: 0,
+                    fromUid: '',
                     forward: node.groupId ? undefined : {
                         friendName: node.senderName,
                     },
+                    toUid: node.groupId ? undefined : selfUid,
                     grp: node.groupId ? {
                         groupUin: node.groupId,
                         memberName: node.senderName,
@@ -40,16 +43,13 @@ export class PacketMsgBuilder {
                     type: node.groupId ? 82 : 9,
                     subType: node.groupId ? undefined : 4,
                     divSeq: node.groupId ? undefined : 4,
-                    msgId: crypto.randomBytes(4).readUInt32LE(0),
+                    autoReply: 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 ? 0 : 2,
+                        field3: node.groupId ? 1 : 2,
                         unknownBase64: avatar,
                         avatar: avatar
                     }

src/core/packet/message/converter.ts

@@ -9,10 +9,10 @@ import {
     SendFileElement,
     SendMarkdownElement,
     SendMarketFaceElement,
+    SendMultiForwardMsgElement,
     SendPicElement,
     SendPttElement,
     SendReplyElement,
-    SendStructLongMsgElement,
     SendTextElement,
     SendVideoElement
 } from '@/core';
@@ -46,7 +46,7 @@ const SupportedElementTypes = [
     ElementType.PTT,
     ElementType.ARK,
     ElementType.MARKDOWN,
-    ElementType.STRUCTLONGMSG
+    ElementType.MULTIFORWARD
 ];
 
 type SendMessageTypeElementMap = {
@@ -59,7 +59,7 @@ type SendMessageTypeElementMap = {
     [ElementType.REPLY]: SendReplyElement,
     [ElementType.ARK]: SendArkElement,
     [ElementType.MFACE]: SendMarketFaceElement,
-    [ElementType.STRUCTLONGMSG]: SendStructLongMsgElement,
+    [ElementType.MULTIFORWARD]: SendMultiForwardMsgElement,
     [ElementType.MARKDOWN]: SendMarkdownElement,
 };
 
@@ -118,9 +118,8 @@ export class PacketMsgConverter {
         [ElementType.MARKDOWN]: (element) => {
             return new PacketMsgMarkDownElement(element as SendMarkdownElement);
         },
-        // TODO: check this logic, move it in arkElement?
-        [ElementType.STRUCTLONGMSG]: (element) => {
-            return new PacketMultiMsgElement(element as SendStructLongMsgElement);
+        [ElementType.MULTIFORWARD]: (element) => {
+            return new PacketMultiMsgElement(element as SendMultiForwardMsgElement);
         }
     };
 

src/core/packet/message/element.ts

@@ -10,6 +10,7 @@ import {
     MsgInfo,
     NotOnlineImage,
     OidbSvcTrpcTcp0XE37_800Response,
+    PushMsgBody,
     QBigFaceExtra,
     QSmallFaceExtra,
 } from '@/core/packet/transformer/proto';
@@ -27,9 +28,10 @@ import {
     SendPicElement,
     SendPttElement,
     SendReplyElement,
-    SendStructLongMsgElement,
+    SendMultiForwardMsgElement,
     SendTextElement,
-    SendVideoElement
+    SendVideoElement,
+    Peer
 } from '@/core';
 import {ForwardMsgBuilder} from '@/common/forward-msg-builder';
 import {PacketMsg, PacketSendMsgElement} from '@/core/packet/message/message';
@@ -146,41 +148,40 @@ export class PacketMsgAtElement extends PacketMsgTextElement {
 }
 
 export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
-    messageId: bigint;
-    messageSeq: number;
-    messageClientSeq: number;
+    time: number;
+    targetMessageId: bigint;
+    targetMessageSeq: number;
+    targetMessageClientSeq: number;
     targetUin: number;
     targetUid: string;
-    time: number;
-    elems: PacketMsg[];
+    targetElems?: NapProtoEncodeStructType<typeof Elem>[];
+    targetSourceMsg?: NapProtoEncodeStructType<typeof PushMsgBody>;
+    targetPeer?: Peer;
 
     constructor(element: SendReplyElement) {
         super(element);
-        this.messageId = BigInt(element.replyElement.replayMsgId ?? 0);
-        this.messageSeq = +(element.replyElement.replayMsgSeq ?? 0);
-        this.messageClientSeq = +(element.replyElement.replyMsgClientSeq ?? 0);
+        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.targetUin = +(element.replyElement.senderUin ?? 0);
         this.targetUid = element.replyElement.senderUidStr ?? '';
-        this.time = +(element.replyElement.replyMsgTime ?? 0);
-        this.elems = []; // TODO: in replyElement.sourceMsgTextElems
+        this.targetPeer = element.replyElement._replyMsgPeer;
     }
 
     get isGroupReply(): boolean {
-        return this.messageClientSeq === 0;
+        return this.targetMessageClientSeq === 0;
     }
 
     override buildElement(): NapProtoEncodeStructType<typeof Elem>[] {
         return [{
             srcMsg: {
-                origSeqs: [this.isGroupReply ? this.messageClientSeq : this.messageSeq],
+                origSeqs: [this.isGroupReply ? this.targetMessageSeq : this.targetMessageClientSeq],
                 senderUin: BigInt(this.targetUin),
                 time: this.time,
-                elems: [], // TODO: in replyElement.sourceMsgTextElems
-                pbReserve: {
-                    messageId: this.messageId,
-                },
-                toUin: BigInt(this.targetUin),
-                type: 1,
+                elems: this.targetElems ?? [],
+                sourceMsg: new NapProtoMsg(PushMsgBody).encode(this.targetSourceMsg ?? {}),
+                toUin: BigInt(0),
             }
         }];
     }
@@ -661,13 +662,13 @@ export class PacketMsgMarkDownElement extends IPacketMsgElement<SendMarkdownElem
     }
 }
 
-export class PacketMultiMsgElement extends IPacketMsgElement<SendStructLongMsgElement> {
+export class PacketMultiMsgElement extends IPacketMsgElement<SendMultiForwardMsgElement> {
     resid: string;
     message: PacketMsg[];
 
-    constructor(rawElement: SendStructLongMsgElement, message?: PacketMsg[]) {
+    constructor(rawElement: SendMultiForwardMsgElement, message?: PacketMsg[]) {
         super(rawElement);
-        this.resid = rawElement.structLongMsgElement.resId;
+        this.resid = rawElement.multiForwardMsgElement.resId;
         this.message = message ?? [];
     }
 

src/core/packet/message/message.ts

@@ -1,7 +1,7 @@
 import { IPacketMsgElement } from '@/core/packet/message/element';
-import { SendMessageElement, SendStructLongMsgElement } from '@/core';
+import {SendMessageElement, SendMultiForwardMsgElement} from '@/core';
 
-export type PacketSendMsgElement = SendMessageElement | SendStructLongMsgElement
+export type PacketSendMsgElement = SendMessageElement | SendMultiForwardMsgElement
 
 export interface PacketMsg {
     seq?: number;

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

@@ -0,0 +1,35 @@
+import * as proto from '@/core/packet/transformer/proto';
+import { NapProtoMsg } from '@napneko/nap-proto-core';
+import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
+import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
+
+class MoveGroupFile extends PacketTransformer<typeof proto.OidbSvcTrpcTcp0x6D6Response> {
+    constructor() {
+        super();
+    }
+
+    build(groupUin: number, fileUUID: string, currentParentDirectory: string, targetParentDirectory: string): OidbPacket {
+        const body = new NapProtoMsg(proto.OidbSvcTrpcTcp0x6D6).encode({
+            move: {
+                groupUin: groupUin,
+                appId: 5,
+                busId: 102,
+                fileId: fileUUID,
+                parentDirectory: currentParentDirectory,
+                targetDirectory: targetParentDirectory,
+            }
+        });
+        return OidbBase.build(0x6D6, 5, body, true, false);
+    }
+
+    parse(data: Buffer) {
+        const oidbBody = OidbBase.parse(data).body;
+        const res = new NapProtoMsg(proto.OidbSvcTrpcTcp0x6D6Response).decode(oidbBody);
+        if (res.move.retCode !== 0) {
+            throw new Error(`sendGroupFileMoveReq error: ${res.move.clientWording} (code=${res.move.retCode})`);
+        }
+        return res;
+    }
+}
+
+export default new MoveGroupFile();

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

@@ -0,0 +1,34 @@
+import * as proto from '@/core/packet/transformer/proto';
+import { NapProtoMsg } from '@napneko/nap-proto-core';
+import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
+import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
+
+class RenameGroupFile extends PacketTransformer<typeof proto.OidbSvcTrpcTcp0x6D6Response> {
+    constructor() {
+        super();
+    }
+
+    build(groupUin: number, fileUUID: string, currentParentDirectory: string, newName: string): OidbPacket {
+        const body = new NapProtoMsg(proto.OidbSvcTrpcTcp0x6D6).encode({
+            rename: {
+                groupUin: groupUin,
+                busId: 102,
+                fileId: fileUUID,
+                parentFolder: currentParentDirectory,
+                newFileName: newName,
+            }
+        });
+        return OidbBase.build(0x6D6, 4, body, true, false);
+    }
+
+    parse(data: Buffer) {
+        const oidbBody = OidbBase.parse(data).body;
+        const res = new NapProtoMsg(proto.OidbSvcTrpcTcp0x6D6Response).decode(oidbBody);
+        if (res.rename.retCode !== 0) {
+            throw new Error(`sendGroupFileRenameReq error: ${res.rename.clientWording} (code=${res.rename.retCode})`);
+        }
+        return res;
+    }
+}
+
+export default new RenameGroupFile();

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

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

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

@@ -8,16 +8,15 @@ class SetSpecialTitle extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase>
         super();
     }
 
-    build(groupCode: number, uid: string, tittle: string): OidbPacket {
-        const oidb_0x8FC_2_body = new NapProtoMsg(proto.OidbSvcTrpcTcp0X8FC_2_Body).encode({
-            targetUid: uid,
-            specialTitle: tittle,
-            expiredTime: -1,
-            uinName: tittle
-        });
+    build(groupCode: number, uid: string, title: string): OidbPacket {
         const oidb_0x8FC_2 = new NapProtoMsg(proto.OidbSvcTrpcTcp0X8FC_2).encode({
             groupUin: +groupCode,
-            body: oidb_0x8FC_2_body
+            body: {
+                targetUid: uid,
+                specialTitle: title,
+                expiredTime: -1,
+                uinName: title
+            }
         });
         return OidbBase.build(0x8FC, 2, oidb_0x8FC_2, false, false);
     }

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

@@ -6,3 +6,5 @@ export { default as GetStrangerInfo } from './GetStrangerInfo';
 export { default as SendPoke } from './SendPoke';
 export { default as SetSpecialTitle } from './SetSpecialTitle';
 export { default as ImageOCR } from './ImageOCR';
+export { default as MoveGroupFile } from './MoveGroupFile';
+export { default as RenameGroupFile } from './RenameGroupFile';

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

@@ -0,0 +1,50 @@
+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

@@ -0,0 +1,51 @@
+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();