feat: 支持禁用webui 速率配置 禁用外网访问 禁用webui

Introduces installation instructions for the example plugin, detailing how to place the build output in the appropriate plugins directory.

.env.shell-analysis

@@ -0,0 +1,2 @@
+VITE_BUILD_TYPE = DEBUG
+VITE_BUILD_PLATFORM = Shell

.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/

README.md

@@ -1,8 +1,9 @@
+<img src="https://napneko.github.io/assets/newnewlogo.png" width = "305" height = "411" alt="NapCat" align=right />
 <div align="center">
 
 # NapCat
 
-![NapCatQQ](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Fnewlogo.png&name=1&owner=1&pattern=Diagonal+Stripes&stargazers=1&theme=Auto)
+
 
 _Modern protocol-side framework implemented based on NTQQ._
 
@@ -40,14 +41,19 @@ _Modern protocol-side framework implemented based on NTQQ._
 | Docs | [![Cloudflare.Pages](https://img.shields.io/badge/docs%20on-Cloudflare.Pages-blue)](https://napneko.pages.dev/) | [![Server.Other](https://img.shields.io/badge/docs%20on-Server.Other-green)](https://napcat.cyou/) | [![NapCat.Wiki](https://img.shields.io/badge/docs%20on-NapCat.Wiki-red)](https://www.napcat.wiki) |
 |:-:|:-:|:-:|:-:|
 
-| Contact | [![QQ Group#1](https://img.shields.io/badge/QQ%20Group%231-Join-blue)](https://qm.qq.com/q/I6LU87a0Yq) | [![QQ Group#2](https://img.shields.io/badge/QQ%20Group%232-Join-blue)](https://qm.qq.com/q/HaRcfrHpUk) | [![Telegram](https://img.shields.io/badge/Telegram-MelodicMoonlight-blue)](https://t.me/MelodicMoonlight) |
+| QQ Group | [![QQ Group#4](https://img.shields.io/badge/QQ%20Group%234-Join-blue)](https://qm.qq.com/q/CMmPbGw0jA) | [![QQ Group#3](https://img.shields.io/badge/QQ%20Group%233-Join-blue)](https://qm.qq.com/q/8zJMLjqy2Y) | [![QQ Group#2](https://img.shields.io/badge/QQ%20Group%232-Join-blue)](https://qm.qq.com/q/HaRcfrHpUk) | [![QQ Group#1](https://img.shields.io/badge/QQ%20Group%231-Join-blue)](https://qm.qq.com/q/I6LU87a0Yq) |
-|:-:|:-:|:-:|:-:|
+|:-:|:-:|:-:|:-:|:-:|
+
+| Telegram | [![Telegram](https://img.shields.io/badge/Telegram-MelodicMoonlight-blue)](https://t.me/MelodicMoonlight) |
+|:-:|:-:|
 
 ## Thanks
 
 + [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
 
-+ [LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目部分开发
++ [AstrBot](https://github.com/AstrBotDevs/AstrBot) 是完美适配本项目的LLM Bot框架 在此推荐一下
+
++ [MaiBot](https://github.com/MaiM-with-u/MaiBot) 一只赛博群友 麦麦 Bot框架 在此推荐一下
   
 + 不过最最重要的 还是需要感谢屏幕前的你哦~
 

launcher/qqnt.json

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

manifest.json

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

napcat.webui/package.json

@@ -55,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",
@@ -88,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/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/network_edit/generic_form.tsx

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

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

@@ -1,4 +1,4 @@
-import GenericForm from './generic_form'
+import GenericForm, { random_token } from './generic_form'
 import type { Field } from './generic_form'
 
 export interface HTTPClientFormProps {
@@ -20,7 +20,7 @@ const HTTPClientForm: React.FC<HTTPClientFormProps> = ({
     url: 'http://localhost:8080',
     reportSelfMessage: false,
     messagePostFormat: 'array',
-    token: '',
+    token: random_token(16),
     debug: false
   }
 

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

@@ -1,4 +1,4 @@
-import GenericForm from './generic_form'
+import GenericForm, { random_token } from './generic_form'
 import type { Field } from './generic_form'
 
 export interface HTTPServerFormProps {
@@ -17,12 +17,12 @@ const HTTPServerForm: React.FC<HTTPServerFormProps> = ({
   const defaultValues: HTTPServerFormType[0] = {
     enable: false,
     name: '',
-    host: '0.0.0.0',
+    host: '127.0.0.1',
     port: 3000,
     enableCors: true,
     enableWebsocket: true,
     messagePostFormat: 'array',
-    token: '',
+    token: random_token(16),
     debug: false
   }
 

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

@@ -1,4 +1,4 @@
-import GenericForm from './generic_form'
+import GenericForm, { random_token } from './generic_form'
 import type { Field } from './generic_form'
 
 export interface HTTPServerSSEFormProps {
@@ -19,12 +19,12 @@ const HTTPServerSSEForm: React.FC<HTTPServerSSEFormProps> = ({
   const defaultValues: HTTPServerSSEFormType[0] = {
     enable: false,
     name: '',
-    host: '0.0.0.0',
+    host: '127.0.0.1',
     port: 3000,
     enableCors: true,
     enableWebsocket: true,
     messagePostFormat: 'array',
-    token: '',
+    token: random_token(16),
     debug: false,
     reportSelfMessage: false
   }

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

@@ -1,4 +1,4 @@
-import GenericForm from './generic_form'
+import GenericForm, { random_token } from './generic_form'
 import type { Field } from './generic_form'
 
 export interface WebsocketClientFormProps {
@@ -22,7 +22,7 @@ const WebsocketClientForm: React.FC<WebsocketClientFormProps> = ({
     url: 'ws://localhost:8082',
     reportSelfMessage: false,
     messagePostFormat: 'array',
-    token: '',
+    token: random_token(16),
     debug: false,
     heartInterval: 30000,
     reconnectInterval: 30000

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

@@ -1,4 +1,4 @@
-import GenericForm from './generic_form'
+import GenericForm, { random_token } from './generic_form'
 import type { Field } from './generic_form'
 
 export interface WebsocketServerFormProps {
@@ -19,12 +19,12 @@ const WebsocketServerForm: React.FC<WebsocketServerFormProps> = ({
   const defaultValues: WebsocketServerFormType[0] = {
     enable: false,
     name: '',
-    host: '0.0.0.0',
+    host: '127.0.0.1',
     port: 3001,
     reportSelfMessage: false,
     enableForcePushEvent: true,
     messagePostFormat: 'array',
-    token: '',
+    token: random_token(16),
     debug: false,
     heartInterval: 30000
   }

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/const/ob_api/group.ts

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

@@ -3,7 +3,7 @@ import { EventSourcePolyfill } from 'event-source-polyfill'
 import { LogLevel } from '@/const/enum'
 
 import { serverRequest } from '@/utils/request'
-
+import CryptoJS from "crypto-js";
 export interface Log {
   level: LogLevel
   message: string
@@ -17,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
   }
@@ -32,6 +33,14 @@ export default class WebUIManager {
     return data.data
   }
 
+  public static async changePasswordFromDefault(newToken: string) {
+    const { data } = await serverRequest.post<ServerResponse<boolean>>(
+      '/auth/update_token',
+      { newToken, fromDefault: true }
+    )
+    return data.data
+  }
+
   public static async checkUsingDefaultToken() {
     const { data } = await serverRequest.get<ServerResponse<boolean>>(
       '/auth/check_using_default_token'
@@ -151,4 +160,55 @@ export default class WebUIManager {
 
     return eventSource
   }
+
+  // 获取WebUI基础配置
+  public static async getWebUIConfig() {
+    const { data } = await serverRequest.get<ServerResponse<WebUIConfig>>(
+      '/WebUIConfig/GetConfig'
+    )
+    return data.data
+  }
+
+  // 更新WebUI基础配置
+  public static async updateWebUIConfig(config: Partial<WebUIConfig>) {
+    const { data } = await serverRequest.post<ServerResponse<boolean>>(
+      '/WebUIConfig/UpdateConfig',
+      config
+    )
+    return data.data
+  }
+
+  // 获取是否禁用WebUI
+  public static async getDisableWebUI() {
+    const { data } = await serverRequest.get<ServerResponse<boolean>>(
+      '/WebUIConfig/GetDisableWebUI'
+    )
+    return data.data
+  }
+
+  // 更新是否禁用WebUI
+  public static async updateDisableWebUI(disable: boolean) {
+    const { data } = await serverRequest.post<ServerResponse<boolean>>(
+      '/WebUIConfig/UpdateDisableWebUI',
+      { disable }
+    )
+    return data.data
+  }
+
+  // 获取是否禁用非局域网访问
+  public static async getDisableNonLANAccess() {
+    const { data } = await serverRequest.get<ServerResponse<boolean>>(
+      '/WebUIConfig/GetDisableNonLANAccess'
+    )
+    return data.data
+  }
+
+  // 更新是否禁用非局域网访问
+  public static async updateDisableNonLANAccess(disable: boolean) {
+    const { data } = await serverRequest.post<ServerResponse<boolean>>(
+      '/WebUIConfig/UpdateDisableNonLANAccess',
+      { disable }
+    )
+    return data.data
+  }
 }

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

@@ -1,5 +1,6 @@
 import { Input } from '@heroui/input'
 import { useLocalStorage } from '@uidotdev/usehooks'
+import { useEffect, useState } from 'react'
 import { Controller, useForm } from 'react-hook-form'
 import toast from 'react-hot-toast'
 import { useNavigate } from 'react-router-dom'
@@ -11,6 +12,9 @@ import SaveButtons from '@/components/button/save_buttons'
 import WebUIManager from '@/controllers/webui_manager'
 
 const ChangePasswordCard = () => {
+  const [isDefaultToken, setIsDefaultToken] = useState<boolean>(false)
+  const [isLoadingCheck, setIsLoadingCheck] = useState<boolean>(true)
+
   const {
     control,
     handleSubmit: handleWebuiSubmit,
@@ -29,9 +33,32 @@ const ChangePasswordCard = () => {
   const navigate = useNavigate()
   const [_, setToken] = useLocalStorage(key.token, '')
 
+  // 检查是否使用默认密码
+  useEffect(() => {
+    const checkDefaultToken = async () => {
+      try {
+        const isDefault = await WebUIManager.checkUsingDefaultToken()
+        setIsDefaultToken(isDefault)
+      } catch (error) {
+        console.error('检查默认密码状态失败:', error)
+      } finally {
+        setIsLoadingCheck(false)
+      }
+    }
+
+    checkDefaultToken()
+  }, [])
+
   const onSubmit = handleWebuiSubmit(async (data) => {
     try {
-      await WebUIManager.changePassword(data.oldToken, data.newToken)
+      if (isDefaultToken) {
+        // 从默认密码更新
+        await WebUIManager.changePasswordFromDefault(data.newToken)
+      } else {
+        // 正常密码更新
+        await WebUIManager.changePassword(data.oldToken, data.newToken)
+      }
+
       toast.success('修改成功')
       setToken('')
       localStorage.removeItem(key.token)
@@ -42,33 +69,57 @@ const ChangePasswordCard = () => {
     }
   })
 
+  if (isLoadingCheck) {
+    return (
+      <>
+        <title>修改密码 - NapCat WebUI</title>
+        <div className="flex justify-center items-center h-32">
+          <div className="text-center">加载中...</div>
+        </div>
+      </>
+    )
+  }
+
   return (
     <>
       <title>修改密码 - NapCat WebUI</title>
-      <Controller
+
-        control={control}
+      {isDefaultToken && (
-        name="oldToken"
+        <div className="mb-4 p-3 bg-warning-50 border border-warning-200 rounded-lg">
-        render={({ field }) => (
+          <p className="text-warning-700 text-sm">
-          <Input
+            检测到您正在使用默认密码，为了安全起见，请立即设置新密码。
-            {...field}
+          </p>
-            label="旧密码"
+        </div>
-            placeholder="请输入旧密码"
+      )}
-            type="password"
+
-          />
+      {!isDefaultToken && (
-        )}
+        <Controller
-      />
+          control={control}
+          name="oldToken"
+          render={({ field }) => (
+            <Input
+              {...field}
+              label="旧密码"
+              placeholder="请输入旧密码"
+              type="password"
+            />
+          )}
+        />
+      )}
+
       <Controller
         control={control}
         name="newToken"
         render={({ field }) => (
           <Input
             {...field}
-            label="新密码"
+            label={isDefaultToken ? "设置新密码" : "新密码"}
-            placeholder="请输入新密码"
+            placeholder={isDefaultToken ? "请设置一个安全的新密码" : "请输入新密码"}
             type="password"
           />
         )}
       />
+
       <SaveButtons
         onSubmit={onSubmit}
         reset={reset}

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

@@ -7,6 +7,7 @@ import { useNavigate, useSearchParams } from 'react-router-dom'
 import ChangePasswordCard from './change_password'
 import LoginConfigCard from './login'
 import OneBotConfigCard from './onebot'
+import ServerConfigCard from './server'
 import ThemeConfigCard from './theme'
 import WebUIConfigCard from './webui'
 
@@ -67,6 +68,11 @@ export default function ConfigPage() {
             <OneBotConfigCard />
           </ConfingPageItem>
         </Tab>
+        <Tab title="服务器配置" key="server">
+          <ConfingPageItem>
+            <ServerConfigCard />
+          </ConfingPageItem>
+        </Tab>
         <Tab title="WebUI配置" key="webui">
           <ConfingPageItem>
             <WebUIConfigCard />

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

@@ -0,0 +1,185 @@
+import { Input } from '@heroui/input'
+import { Switch } from '@heroui/switch'
+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 WebUIManager from '@/controllers/webui_manager'
+
+const ServerConfigCard = () => {
+  const {
+    data: configData,
+    loading: configLoading,
+    error: configError,
+    refreshAsync: refreshConfig
+  } = useRequest(WebUIManager.getWebUIConfig)
+
+  const {
+    control,
+    handleSubmit: handleConfigSubmit,
+    formState: { isSubmitting },
+    setValue: setConfigValue
+  } = useForm<{
+    host: string
+    port: number
+    loginRate: number
+    disableWebUI: boolean
+    disableNonLANAccess: boolean
+  }>({
+    defaultValues: {
+      host: '0.0.0.0',
+      port: 6099,
+      loginRate: 10,
+      disableWebUI: false,
+      disableNonLANAccess: false
+    }
+  })
+
+  const reset = () => {
+    if (configData) {
+      setConfigValue('host', configData.host)
+      setConfigValue('port', configData.port)
+      setConfigValue('loginRate', configData.loginRate)
+      setConfigValue('disableWebUI', configData.disableWebUI)
+      setConfigValue('disableNonLANAccess', configData.disableNonLANAccess)
+    }
+  }
+
+  const onSubmit = handleConfigSubmit(async (data) => {
+    try {
+      await WebUIManager.updateWebUIConfig(data)
+      toast.success('保存成功')
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`保存失败: ${msg}`)
+    }
+  })
+
+  const onRefresh = async () => {
+    try {
+      await refreshConfig()
+      toast.success('刷新成功')
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`刷新失败: ${msg}`)
+    }
+  }
+
+  useEffect(() => {
+    reset()
+  }, [configData])
+
+  if (configLoading) return <PageLoading loading={true} />
+
+  return (
+    <>
+      <title>服务器配置 - NapCat WebUI</title>
+      <div className="flex flex-col gap-4">
+        <div className="flex flex-col gap-2">
+          <div className="flex-shrink-0 w-full">服务器配置</div>
+          <Controller
+            control={control}
+            name="host"
+            render={({ field }) => (
+              <Input
+                {...field}
+                label="监听地址"
+                placeholder="请输入监听地址"
+                description="服务器监听的IP地址，0.0.0.0表示监听所有网卡"
+                isDisabled={!!configError}
+                errorMessage={configError ? '获取配置失败' : undefined}
+              />
+            )}
+          />
+          <Controller
+            control={control}
+            name="port"
+            render={({ field }) => (
+              <Input
+                {...field}
+                type="number"
+                value={field.value?.toString() || ''}
+                label="监听端口"
+                placeholder="请输入监听端口"
+                description="服务器监听的端口号，范围1-65535"
+                isDisabled={!!configError}
+                errorMessage={configError ? '获取配置失败' : undefined}
+                onChange={(e) => field.onChange(parseInt(e.target.value) || 0)}
+              />
+            )}
+          />
+          <Controller
+            control={control}
+            name="loginRate"
+            render={({ field }) => (
+              <Input
+                {...field}
+                type="number"
+                value={field.value?.toString() || ''}
+                label="登录速率限制"
+                placeholder="请输入登录速率限制"
+                description="每小时允许的登录尝试次数"
+                isDisabled={!!configError}
+                errorMessage={configError ? '获取配置失败' : undefined}
+                onChange={(e) => field.onChange(parseInt(e.target.value) || 0)}
+              />
+            )}
+          />
+        </div>
+
+        <div className="flex flex-col gap-2">
+          <div className="flex-shrink-0 w-full">安全配置</div>
+          <Controller
+            control={control}
+            name="disableWebUI"
+            render={({ field }) => (
+              <Switch
+                isSelected={field.value}
+                onValueChange={field.onChange}
+                isDisabled={!!configError}
+              >
+                <div className="flex flex-col">
+                  <span>禁用WebUI</span>
+                  <span className="text-sm text-default-400">
+                    启用后将完全禁用WebUI服务，需要重启生效
+                  </span>
+                </div>
+              </Switch>
+            )}
+          />
+          <Controller
+            control={control}
+            name="disableNonLANAccess"
+            render={({ field }) => (
+              <Switch
+                isSelected={field.value}
+                onValueChange={field.onChange}
+                isDisabled={!!configError}
+              >
+                <div className="flex flex-col">
+                  <span>禁用非局域网访问</span>
+                  <span className="text-sm text-default-400">
+                    启用后只允许局域网内的设备访问WebUI，提高安全性
+                  </span>
+                </div>
+              </Switch>
+            )}
+          />
+        </div>
+      </div>
+
+      <SaveButtons
+        onSubmit={onSubmit}
+        reset={reset}
+        isSubmitting={isSubmitting || configLoading}
+        refresh={onRefresh}
+      />
+    </>
+  )
+}
+
+export default ServerConfigCard

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

@@ -18,11 +18,17 @@ const CheckDefaultPassword = () => {
     if (data) {
       dialog.confirm({
         title: '修改默认密码',
-        content: '检测到当前密码为默认密码，请尽快修改密码。',
+        content: '检测到当前密码为默认密码，为了您的安全，必须立即修改密码。',
         confirmText: '前往修改',
         onConfirm: () => {
           navigate('/config?tab=token')
-        }
+        },
+        onCancel: () => {
+          navigate('/config?tab=token')
+        },
+        onClose() {
+          navigate('/config?tab=token')
+        },
       })
     }
   }

napcat.webui/src/pages/web_login.tsx

@@ -25,7 +25,6 @@ export default function WebLoginPage() {
   const [tokenValue, setTokenValue] = useState<string>(token || '')
   const [isLoading, setIsLoading] = useState<boolean>(false)
   const [, setLocalToken] = useLocalStorage<string>(key.token, '')
-
   const onSubmit = async () => {
     if (!tokenValue) {
       toast.error('请输入token')
@@ -47,6 +46,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()

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

@@ -181,3 +181,11 @@ interface ThemeConfig {
   dark: ThemeConfigItem
   light: ThemeConfigItem
 }
+
+interface WebUIConfig {
+  host: string
+  port: number
+  loginRate: number
+  disableWebUI: boolean
+  disableNonLANAccess: boolean
+}

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.17",
+  "version": "4.8.105",
   "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",
@@ -11,23 +11,28 @@
     "dev:universal": "vite build --mode universal",
     "dev:framework": "vite build --mode framework",
     "dev:shell": "vite build --mode shell",
+    "dev:shell-analysis": "vite build --mode shell-analysis",
     "dev:webui": "cd napcat.webui && npm run dev",
     "lint": "eslint --fix src/**/*.{js,ts,vue}",
     "depend": "cd dist && npm install --omit=dev",
     "dev:depend": "npm i && cd napcat.webui && npm i"
   },
   "devDependencies": {
+    "@babel/core": "^7.28.0",
+    "@babel/generator": "^7.28.0",
+    "@babel/parser": "^7.28.0",
     "@babel/preset-typescript": "^7.24.7",
-    "@eslint/compat": "^1.2.2",
+    "@babel/traverse": "^7.28.0",
+    "@babel/types": "^7.28.2",
+    "@eslint/compat": "^1.3.1",
     "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^9.14.0",
+    "@eslint/js": "^9.33.0",
-    "@ffmpeg.wasm/main": "^0.13.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",
+    "@sinclair/typebox": "^0.34.38",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
     "@types/multer": "^1.4.12",
@@ -38,35 +43,33 @@
     "@types/type-is": "^1.6.7",
     "@types/ws": "^8.5.12",
     "@typescript-eslint/eslint-plugin": "^8.3.0",
-    "@typescript-eslint/parser": "^8.3.0",
+    "@typescript-eslint/parser": "^8.39.0",
     "ajv": "^8.13.0",
     "async-mutex": "^0.5.0",
     "commander": "^13.0.0",
+    "compressing": "^1.10.1",
     "cors": "^2.8.5",
-    "esbuild": "0.25.0",
+    "esbuild": "0.25.8",
     "eslint": "^9.14.0",
-    "eslint-import-resolver-typescript": "^4.0.0",
+    "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-import": "^2.32.0",
     "express-rate-limit": "^7.5.0",
     "fast-xml-parser": "^4.3.6",
-    "file-type": "^20.0.0",
+    "file-type": "^21.0.0",
     "globals": "^16.0.0",
-    "image-size": "^1.1.1",
     "json5": "^2.2.3",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^2.0.1",
+    "napcat.protobuf": "^1.1.4",
     "typescript": "^5.3.3",
-    "typescript-eslint": "^8.13.0",
+    "typescript-eslint": "^8.35.1",
-    "vite": "^6.0.1",
+    "vite": "^7.1.1",
     "vite-plugin-cp": "^6.0.0",
     "vite-tsconfig-paths": "^5.1.0",
-    "napcat.protobuf": "^1.1.4",
+    "winston": "^3.17.0"
-    "winston": "^3.17.0",
-    "compressing": "^1.10.1"
   },
   "dependencies": {
-    "@ffmpeg.wasm/core-mt": "^0.13.2",
     "express": "^5.0.0",
     "silk-wasm": "^3.6.1",
-    "ws": "^8.18.0"
+    "ws": "^8.18.3"
   }
 }

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,308 +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';
-import { parentPort } from 'worker_threads';
-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 });
-        }
-    });
-}
-export function sendLog(_log: string) {
-    //parentPort?.postMessage({ log });
-}
-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> {
-        const startTime = Date.now();
-        sendLog(`开始获取视频信息: ${videoPath}`);
-
-        // 创建一个超时包装函数
-        const withTimeout = <T>(promise: Promise<T>, timeoutMs: number, taskName: string): Promise<T> => {
-            return Promise.race([
-                promise,
-                new Promise<T>((_, reject) => {
-                    setTimeout(() => reject(new Error(`任务超时: ${taskName} (${timeoutMs}ms)`)), timeoutMs);
-                })
-            ]);
-        };
-
-        // 并行执行多个任务
-        const [fileInfo, durationInfo] = await Promise.all([
-            // 任务1: 获取文件信息和提取缩略图
-            (async () => {
-                sendLog(`开始任务1: 获取文件信息和提取缩略图`);
-
-                // 获取文件信息 (并行)
-                const fileInfoStartTime = Date.now();
-                const [fileType, fileSize] = await Promise.all([
-                    withTimeout(fileTypeFromFile(videoPath), 10000, '获取文件类型')
-                        .then(result => {
-                            sendLog(`获取文件类型完成，耗时: ${Date.now() - fileInfoStartTime}ms`);
-                            return result;
-                        }),
-                    (async () => {
-                        const result = statSync(videoPath).size;
-                        sendLog(`获取文件大小完成，耗时: ${Date.now() - fileInfoStartTime}ms`);
-                        return result;
-                    })()
-                ]);
-
-                // 直接实现缩略图提取 (不调用extractThumbnail方法)
-                const thumbStartTime = Date.now();
-                sendLog(`开始提取缩略图`);
-
-                const ffmpegInstance = await withTimeout(
-                    FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' }),
-                    15000,
-                    '创建FFmpeg实例(缩略图)'
-                );
-
-                const videoFileName = `${randomUUID()}.mp4`;
-                const outputFileName = `${randomUUID()}.jpg`;
-
-                try {
-                    // 写入视频文件到FFmpeg
-                    const writeFileStartTime = Date.now();
-                    ffmpegInstance.fs.writeFile(videoFileName, readFileSync(videoPath));
-                    sendLog(`写入视频文件到FFmpeg完成，耗时: ${Date.now() - writeFileStartTime}ms`);
-
-                    // 提取缩略图
-                    const extractStartTime = Date.now();
-                    const code = await withTimeout(
-                        ffmpegInstance.run('-i', videoFileName, '-ss', '00:00:01.000', '-vframes', '1', outputFileName),
-                        30000,
-                        '提取缩略图'
-                    );
-                    sendLog(`FFmpeg提取缩略图命令执行完成，耗时: ${Date.now() - extractStartTime}ms`);
-
-                    if (code !== 0) {
-                        throw new Error('Error extracting thumbnail: FFmpeg process exited with code ' + code);
-                    }
-
-                    // 读取并保存缩略图
-                    const saveStartTime = Date.now();
-                    const thumbnail = ffmpegInstance.fs.readFile(outputFileName);
-                    writeFileSync(thumbnailPath, thumbnail);
-                    sendLog(`读取并保存缩略图完成，耗时: ${Date.now() - saveStartTime}ms`);
-
-                    // 获取缩略图尺寸
-                    const imageSizeStartTime = Date.now();
-                    const image = imageSize(thumbnailPath);
-                    sendLog(`获取缩略图尺寸完成，耗时: ${Date.now() - imageSizeStartTime}ms`);
-
-                    sendLog(`提取缩略图完成，总耗时: ${Date.now() - thumbStartTime}ms`);
-
-                    return {
-                        format: fileType?.ext ?? 'mp4',
-                        size: fileSize,
-                        width: image.width ?? 100,
-                        height: image.height ?? 100
-                    };
-                } finally {
-                    // 清理资源
-                    try {
-                        ffmpegInstance.fs.unlink(outputFileName);
-                    } catch (error) {
-                        sendLog(`清理输出文件失败: ${(error as Error).message}`);
-                    }
-
-                    try {
-                        ffmpegInstance.fs.unlink(videoFileName);
-                    } catch (error) {
-                        sendLog(`清理视频文件失败: ${(error as Error).message}`);
-                    }
-                }
-            })(),
-
-            // 任务2: 获取视频时长
-            (async () => {
-                const task2StartTime = Date.now();
-                sendLog(`开始任务2: 获取视频时长`);
-
-                // 创建FFmpeg实例
-                const ffmpegCreateStartTime = Date.now();
-                const ffmpegInstance = await withTimeout(
-                    FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' }),
-                    15000,
-                    '创建FFmpeg实例(时长)'
-                );
-                sendLog(`创建FFmpeg实例完成，耗时: ${Date.now() - ffmpegCreateStartTime}ms`);
-
-                const inputFileName = `${randomUUID()}.mp4`;
-
-                try {
-                    // 写入文件
-                    const writeStartTime = Date.now();
-                    ffmpegInstance.fs.writeFile(inputFileName, readFileSync(videoPath));
-                    sendLog(`写入文件到FFmpeg完成，耗时: ${Date.now() - writeStartTime}ms`);
-
-                    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;
-                        }
-                    });
-
-                    // 执行FFmpeg
-                    const runStartTime = Date.now();
-                    await withTimeout(
-                        ffmpegInstance.run('-i', inputFileName),
-                        20000,
-                        '获取视频时长'
-                    );
-                    sendLog(`执行FFmpeg命令完成，耗时: ${Date.now() - runStartTime}ms`);
-
-                    sendLog(`任务2(获取视频时长)完成，总耗时: ${Date.now() - task2StartTime}ms`);
-                    return { time: duration };
-                } finally {
-                    try {
-                        ffmpegInstance.fs.unlink(inputFileName);
-                    } catch (error) {
-                        sendLog(`清理输入文件失败: ${(error as Error).message}`);
-                    }
-                }
-            })()
-        ]);
-
-        // 合并结果并返回
-        const totalDuration = Date.now() - startTime;
-        sendLog(`获取视频信息完成，总耗时: ${totalDuration}ms`);
-
-        return {
-            width: fileInfo.width,
-            height: fileInfo.height,
-            time: durationInfo.time,
-            format: fileInfo.format,
-            size: fileInfo.size,
-            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}`);
-    }
-}
-recvTask<FFmpegTask>(async ({ method, args }: FFmpegTask) => {
-    return await handleFFmpegTask({ method, args });
-});

src/common/ffmpeg.ts

@@ -1,36 +1,195 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+import { readFileSync, statSync, existsSync, mkdirSync } from 'fs';
-import { VideoInfo } from './video';
+import path, { dirname } from 'path';
-import path from 'path';
+import { execFile } from 'child_process';
-import { fileURLToPath } from 'url';
+import { promisify } from 'util';
-import { runTask } from './worker';
+import type { VideoInfo } from './video';
-
+import { fileTypeFromFile } from 'file-type';
-type EncodeArgs = {
+import { fileURLToPath } from 'node:url';
-    method: 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
+import { platform } from 'node:os';
-    args: any[];
+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;
 };
-
+export let FFMPEG_CMD = getFFmpegPath('ffmpeg');
-type EncodeResult = any;
+export let FFPROBE_CMD = getFFmpegPath('ffprobe');
-
-function getWorkerPath() {
-    return path.join(path.dirname(fileURLToPath(import.meta.url)), './ffmpeg-worker.mjs');
-}
-
 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> {
-        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
+        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> {
-        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convertFile', args: [inputFile, outputFile, format] });
+        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 result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convert', args: [filePath, pcmPath] });
+        try {
-        return result;
+            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 result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
+        try {
-        return result;
+            // 并行执行获取文件信息和提取缩略图
+            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

@@ -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)) {
+        if (fs.existsSync(path.normalize(uri))) {
-            return { Uri: uri, Type: FileUriType.Local };
+            return { Uri: path.normalize(uri), Type: FileUriType.Local };
         }
         return undefined;
     }, Uri);

src/common/health.ts

@@ -0,0 +1,328 @@
+export interface ResourceConfig<T extends any[], R> {
+    /** 资源获取函数 */
+    resourceFn: (...args: T) => Promise<R>;
+    /** 失败后禁用时间（毫秒），默认 30 秒 */
+    disableTime?: number;
+    /** 最大重试次数，默认 3 次 */
+    maxRetries?: number;
+    /** 主动测试间隔（毫秒），默认 60 秒 */
+    healthCheckInterval?: number;
+    /** 最大健康检查失败次数，超过后永久禁用，默认 5 次 */
+    maxHealthCheckFailures?: number;
+    /** 资源名称（用于日志） */
+    name?: string;
+    /** 测试参数（用于健康检查） */
+    testArgs?: T;
+    /** 健康检查函数，如果提供则优先使用此函数进行健康检查 */
+    healthCheckFn?: (...args: T) => Promise<boolean>;
+}
+
+interface ResourceState<T extends any[], R> {
+    config: ResourceConfig<T, R>;
+    isEnabled: boolean;
+    disableUntil: number;
+    currentRetries: number;
+    healthCheckFailureCount: number;
+    isPermanentlyDisabled: boolean;
+    lastError?: Error;
+    lastHealthCheckTime: number;
+    registrationKey: string;
+}
+
+export class ResourceManager {
+    private resources = new Map<string, ResourceState<any, any>>();
+    private destroyed = false;
+    private healthCheckTimer?: NodeJS.Timeout;
+    private readonly HEALTH_CHECK_TASK_INTERVAL = 5000; // 5秒执行一次健康检查任务
+
+    constructor() {
+        this.startHealthCheckTask();
+    }
+
+    /**
+     * 注册资源（注册即调用，重复注册只实际注册一次）
+     */
+    async register<T extends any[], R>(
+        key: string,
+        config: ResourceConfig<T, R>,
+        ...args: T
+    ): Promise<R> {
+        if (this.destroyed) {
+            throw new Error('ResourceManager has been destroyed');
+        }
+
+        const registrationKey = this.generateRegistrationKey(key, config);
+
+        // 检查是否已经注册
+        if (this.resources.has(key)) {
+            const existingState = this.resources.get(key)!;
+
+            // 如果是相同的配置，直接调用
+            if (existingState.registrationKey === registrationKey) {
+                return this.callResource<T, R>(key, ...args);
+            }
+
+            // 配置不同，清理旧的并重新注册
+            this.unregister(key);
+        }
+
+        // 创建新的资源状态
+        const state: ResourceState<T, R> = {
+            config: {
+                disableTime: 30000,
+                maxRetries: 3,
+                healthCheckInterval: 60000,
+                maxHealthCheckFailures: 5,
+                name: key,
+                ...config
+            },
+            isEnabled: true,
+            disableUntil: 0,
+            currentRetries: 0,
+            healthCheckFailureCount: 0,
+            isPermanentlyDisabled: false,
+            lastHealthCheckTime: 0,
+            registrationKey
+        };
+
+        this.resources.set(key, state);
+
+        // 注册即调用
+        return await this.callResource<T, R>(key, ...args);
+    }
+
+    /**
+     * 调用资源
+     */
+    async callResource<T extends any[], R>(key: string, ...args: T): Promise<R> {
+        const state = this.resources.get(key) as ResourceState<T, R> | undefined;
+        if (!state) {
+            throw new Error(`Resource ${key} not registered`);
+        }
+
+        if (state.isPermanentlyDisabled) {
+            throw new Error(`Resource ${key} is permanently disabled due to repeated health check failures`);
+        }
+
+        if (!this.isResourceAvailable(key)) {
+            const disableUntilDate = new Date(state.disableUntil).toISOString();
+            throw new Error(`Resource ${key} is currently disabled until ${disableUntilDate}`);
+        }
+
+        try {
+            const result = await state.config.resourceFn(...args);
+            this.onResourceSuccess(state);
+            return result;
+        } catch (error) {
+            this.onResourceFailure(state, error as Error);
+            throw error;
+        }
+    }
+
+    /**
+     * 检查资源是否可用
+     */
+    isResourceAvailable(key: string): boolean {
+        const state = this.resources.get(key);
+        if (!state) {
+            return false;
+        }
+
+        if (state.isPermanentlyDisabled || !state.isEnabled) {
+            return false;
+        }
+
+        return Date.now() >= state.disableUntil;
+    }
+
+    /**
+     * 注销资源
+     */
+    unregister(key: string): boolean {
+        return this.resources.delete(key);
+    }
+
+    /**
+     * 销毁管理器，清理所有资源
+     */
+    destroy(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.stopHealthCheckTask();
+        this.resources.clear();
+        this.destroyed = true;
+    }
+
+    private generateRegistrationKey<T extends any[], R>(key: string, config: ResourceConfig<T, R>): string {
+        const configStr = JSON.stringify({
+            name: config.name,
+            disableTime: config.disableTime,
+            maxRetries: config.maxRetries,
+            healthCheckInterval: config.healthCheckInterval,
+            maxHealthCheckFailures: config.maxHealthCheckFailures,
+            functionStr: config.resourceFn.toString(),
+            healthCheckFnStr: config.healthCheckFn?.toString()
+        });
+
+        return `${key}_${this.simpleHash(configStr)}`;
+    }
+
+    private simpleHash(str: string): string {
+        let hash = 0;
+        for (let i = 0; i < str.length; i++) {
+            const char = str.charCodeAt(i);
+            hash = ((hash << 5) - hash) + char;
+            hash = hash & hash; // Convert to 32bit integer
+        }
+        return Math.abs(hash).toString(36);
+    }
+
+    private onResourceSuccess<T extends any[], R>(state: ResourceState<T, R>): void {
+        state.currentRetries = 0;
+        state.disableUntil = 0;
+        state.healthCheckFailureCount = 0;
+        state.lastError = undefined;
+    }
+
+    private onResourceFailure<T extends any[], R>(state: ResourceState<T, R>, error: Error): void {
+        state.currentRetries++;
+        state.lastError = error;
+
+        // 如果重试次数达到上限，禁用资源
+        if (state.currentRetries >= state.config.maxRetries!) {
+            state.disableUntil = Date.now() + state.config.disableTime!;
+            state.currentRetries = 0;
+        }
+    }
+
+    private startHealthCheckTask(): void {
+        if (this.healthCheckTimer) {
+            return;
+        }
+
+        this.healthCheckTimer = setInterval(() => {
+            this.runHealthCheckTask();
+        }, this.HEALTH_CHECK_TASK_INTERVAL);
+    }
+
+    private stopHealthCheckTask(): void {
+        if (this.healthCheckTimer) {
+            clearInterval(this.healthCheckTimer);
+            this.healthCheckTimer = undefined;
+        }
+    }
+
+    private async runHealthCheckTask(): Promise<void> {
+        if (this.destroyed) {
+            return;
+        }
+
+        const now = Date.now();
+
+        for (const [key, state] of this.resources) {
+            // 跳过永久禁用或可用的资源
+            if (state.isPermanentlyDisabled || this.isResourceAvailable(key)) {
+                continue;
+            }
+
+            // 跳过还在禁用期内的资源
+            if (now < state.disableUntil) {
+                continue;
+            }
+
+            // 检查是否需要进行健康检查（根据间隔时间）
+            const lastHealthCheck = state.lastHealthCheckTime || 0;
+            const healthCheckInterval = state.config.healthCheckInterval!;
+
+            if (now - lastHealthCheck < healthCheckInterval) {
+                continue;
+            }
+
+            // 执行健康检查
+            await this.performHealthCheck(state);
+        }
+    }
+
+    private async performHealthCheck<T extends any[], R>(state: ResourceState<T, R>): Promise<void> {
+        state.lastHealthCheckTime = Date.now();
+
+        try {
+            let healthCheckResult: boolean;
+
+            // 如果有专门的健康检查函数，使用它
+            if (state.config.healthCheckFn) {
+                const testArgs = state.config.testArgs || [] as unknown as T;
+                healthCheckResult = await state.config.healthCheckFn(...testArgs);
+            } else {
+                // 否则使用原始函数进行检查
+                const testArgs = state.config.testArgs || [] as unknown as T;
+                await state.config.resourceFn(...testArgs);
+                healthCheckResult = true;
+            }
+
+            if (healthCheckResult) {
+                // 健康检查成功，重新启用
+                state.isEnabled = true;
+                state.disableUntil = 0;
+                state.currentRetries = 0;
+                state.healthCheckFailureCount = 0;
+                state.lastError = undefined;
+            } else {
+                throw new Error('Health check function returned false');
+            }
+        } catch (error) {
+            // 健康检查失败，增加失败计数
+            state.healthCheckFailureCount++;
+            state.lastError = error as Error;
+
+            // 检查是否达到最大健康检查失败次数
+            if (state.healthCheckFailureCount >= state.config.maxHealthCheckFailures!) {
+                // 永久禁用资源
+                state.isPermanentlyDisabled = true;
+                state.disableUntil = 0;
+            } else {
+                // 继续禁用一段时间
+                state.disableUntil = Date.now() + state.config.disableTime!;
+            }
+        }
+    }
+}
+
+// 创建全局实例
+export const resourceManager = new ResourceManager();
+
+// 便捷函数
+export async function registerResource<T extends any[], R>(
+    key: string,
+    config: ResourceConfig<T, R>,
+    ...args: T
+): Promise<R> {
+    return resourceManager.register(key, config, ...args);
+}
+
+// 使用示例：
+/*
+await registerResource(
+  'api-with-health-check',
+  {
+    resourceFn: async (id: string) => {
+      const response = await fetch(`https://api.example.com/data/${id}`);
+      return response.json();
+    },
+    healthCheckFn: async (id: string) => {
+      try {
+        const response = await fetch(`https://api.example.com/health`);
+        return response.ok;
+      } catch {
+        return false;
+      }
+    },
+    testArgs: ['health-check-id'],
+    healthCheckInterval: 30000,
+    maxHealthCheckFailures: 3
+  },
+  'user123'
+);
+*/

src/common/path.ts

@@ -9,17 +9,23 @@ export class NapCatPathWrapper {
     configPath: string;
     cachePath: string;
     staticPath: string;
+    pluginPath: string;
 
     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.pluginPath = path.join(writePath, 'plugins');//dynamic load
         this.cachePath = path.join(writePath, 'cache');
         this.staticPath = path.join(this.binaryPath, 'static');
         if (!fs.existsSync(this.logsPath)) {

src/common/performance-monitor.ts

@@ -0,0 +1,316 @@
+/**
+ * 性能监控器 - 用于统计函数调用次数、耗时等信息
+ */
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+export interface FunctionStats {
+    name: string;
+    callCount: number;
+    totalTime: number;
+    averageTime: number;
+    minTime: number;
+    maxTime: number;
+    fileName?: string;
+    lineNumber?: number;
+}
+
+export class PerformanceMonitor {
+    private static instance: PerformanceMonitor;
+    private stats = new Map<string, FunctionStats>();
+    private startTimes = new Map<string, number>();
+    private reportInterval: NodeJS.Timeout | null = null;
+
+    static getInstance(): PerformanceMonitor {
+        if (!PerformanceMonitor.instance) {
+            PerformanceMonitor.instance = new PerformanceMonitor();
+            // 启动定时统计报告
+            PerformanceMonitor.instance.startPeriodicReport();
+        }
+        return PerformanceMonitor.instance;
+    }
+
+    /**
+     * 开始定时统计报告 (每60秒)
+     */
+    private startPeriodicReport(): void {
+        if (this.reportInterval) {
+            clearInterval(this.reportInterval);
+        }
+
+        this.reportInterval = setInterval(() => {
+            if (this.stats.size > 0) {
+                this.printPeriodicReport();
+                this.writeDetailedLogToFile();
+            }
+        }, 60000); // 60秒
+    }
+
+    /**
+     * 停止定时统计报告
+     */
+    stopPeriodicReport(): void {
+        if (this.reportInterval) {
+            clearInterval(this.reportInterval);
+            this.reportInterval = null;
+        }
+    }
+
+    /**
+     * 打印定时统计报告 (简化版本)
+     */
+    private printPeriodicReport(): void {
+        const now = new Date().toLocaleString();
+        console.log(`\n=== 性能监控定时报告 [${now}] ===`);
+
+        const totalFunctions = this.stats.size;
+        const totalCalls = Array.from(this.stats.values()).reduce((sum, stat) => sum + stat.callCount, 0);
+        const totalTime = Array.from(this.stats.values()).reduce((sum, stat) => sum + stat.totalTime, 0);
+
+        console.log(`📊 总览: ${totalFunctions} 个函数, ${totalCalls} 次调用, 总耗时: ${totalTime.toFixed(2)}ms`);
+
+        // 显示Top 5最活跃的函数
+        console.log('\n🔥 最活跃函数 (Top 5):');
+        this.getTopByCallCount(5).forEach((stat, index) => {
+            console.log(`${index + 1}. ${stat.name} - 调用: ${stat.callCount}次, 总耗时: ${stat.totalTime.toFixed(2)}ms`);
+        });
+
+        // 显示Top 5最耗时的函数
+        console.log('\n⏱️ 最耗时函数 (Top 5):');
+        this.getTopByTotalTime(5).forEach((stat, index) => {
+            console.log(`${index + 1}. ${stat.name} - 总耗时: ${stat.totalTime.toFixed(2)}ms, 平均: ${stat.averageTime.toFixed(2)}ms`);
+        });
+
+        console.log('===============================\n');
+    }
+
+    /**
+     * 将详细统计数据写入日志文件
+     */
+    private writeDetailedLogToFile(): void {
+        try {
+            const now = new Date();
+            const dateStr = now.toISOString().replace(/[:.]/g, '-').split('T')[0];
+            const timeStr = now.toTimeString().split(' ')[0]?.replace(/:/g, '-') || 'unknown-time';
+            const timestamp = `${dateStr}_${timeStr}`;
+            const fileName = `${timestamp}.log.txt`;
+            const logPath = path.join(process.cwd(), 'logs', fileName);
+
+            // 确保logs目录存在
+            const logsDir = path.dirname(logPath);
+            if (!fs.existsSync(logsDir)) {
+                fs.mkdirSync(logsDir, { recursive: true });
+            }
+
+            const totalFunctions = this.stats.size;
+            const totalCalls = Array.from(this.stats.values()).reduce((sum, stat) => sum + stat.callCount, 0);
+            const totalTime = Array.from(this.stats.values()).reduce((sum, stat) => sum + stat.totalTime, 0);
+
+            let logContent = '';
+            logContent += `=== 性能监控详细报告 ===\n`;
+            logContent += `生成时间: ${now.toLocaleString()}\n`;
+            logContent += `统计周期: 60秒\n`;
+            logContent += `总览: ${totalFunctions} 个函数, ${totalCalls} 次调用, 总耗时: ${totalTime.toFixed(2)}ms\n\n`;
+
+            // 详细函数统计
+            logContent += `=== 所有函数详细统计 ===\n`;
+            const allStats = this.getStats().sort((a, b) => b.totalTime - a.totalTime);
+            
+            allStats.forEach((stat, index) => {
+                logContent += `${index + 1}. 函数: ${stat.name}\n`;
+                logContent += `   文件: ${stat.fileName || 'N/A'}\n`;
+                logContent += `   行号: ${stat.lineNumber || 'N/A'}\n`;
+                logContent += `   调用次数: ${stat.callCount}\n`;
+                logContent += `   总耗时: ${stat.totalTime.toFixed(4)}ms\n`;
+                logContent += `   平均耗时: ${stat.averageTime.toFixed(4)}ms\n`;
+                logContent += `   最小耗时: ${stat.minTime === Infinity ? 'N/A' : stat.minTime.toFixed(4)}ms\n`;
+                logContent += `   最大耗时: ${stat.maxTime.toFixed(4)}ms\n`;
+                logContent += `   性能占比: ${((stat.totalTime / totalTime) * 100).toFixed(2)}%\n`;
+                logContent += `\n`;
+            });
+
+            // 排行榜统计
+            logContent += `=== 总耗时排行榜 (Top 20) ===\n`;
+            this.getTopByTotalTime(20).forEach((stat, index) => {
+                logContent += `${index + 1}. ${stat.name} - 总耗时: ${stat.totalTime.toFixed(2)}ms, 调用: ${stat.callCount}次, 平均: ${stat.averageTime.toFixed(2)}ms\n`;
+            });
+
+            logContent += `\n=== 调用次数排行榜 (Top 20) ===\n`;
+            this.getTopByCallCount(20).forEach((stat, index) => {
+                logContent += `${index + 1}. ${stat.name} - 调用: ${stat.callCount}次, 总耗时: ${stat.totalTime.toFixed(2)}ms, 平均: ${stat.averageTime.toFixed(2)}ms\n`;
+            });
+
+            logContent += `\n=== 平均耗时排行榜 (Top 20) ===\n`;
+            this.getTopByAverageTime(20).forEach((stat, index) => {
+                logContent += `${index + 1}. ${stat.name} - 平均: ${stat.averageTime.toFixed(2)}ms, 调用: ${stat.callCount}次, 总耗时: ${stat.totalTime.toFixed(2)}ms\n`;
+            });
+
+            logContent += `\n=== 性能热点分析 ===\n`;
+            // 找出最耗时的前10个函数
+            const hotSpots = this.getTopByTotalTime(10);
+            hotSpots.forEach((stat, index) => {
+                const efficiency = stat.callCount / stat.totalTime; // 每毫秒的调用次数
+                logContent += `${index + 1}. ${stat.name}\n`;
+                logContent += `   性能影响: ${((stat.totalTime / totalTime) * 100).toFixed(2)}%\n`;
+                logContent += `   调用效率: ${efficiency.toFixed(4)} 调用/ms\n`;
+                logContent += `   优化建议: ${stat.averageTime > 10 ? '考虑优化此函数的执行效率' : 
+                                           stat.callCount > 1000 ? '考虑减少此函数的调用频率' : 
+                                           '性能表现良好'}\n\n`;
+            });
+
+            logContent += `=== 报告结束 ===\n`;
+
+            // 写入文件
+            fs.writeFileSync(logPath, logContent, 'utf8');
+            console.log(`📄 详细性能报告已保存到: ${logPath}`);
+
+        } catch (error) {
+            console.error('写入性能日志文件时出错:', error);
+        }
+    }
+
+    /**
+     * 开始记录函数调用
+     */
+    startFunction(functionName: string, fileName?: string, lineNumber?: number): string {
+        const callId = `${functionName}_${Date.now()}_${Math.random()}`;
+        this.startTimes.set(callId, performance.now());
+
+        // 初始化或更新统计信息
+        if (!this.stats.has(functionName)) {
+            this.stats.set(functionName, {
+                name: functionName,
+                callCount: 0,
+                totalTime: 0,
+                averageTime: 0,
+                minTime: Infinity,
+                maxTime: 0,
+                fileName,
+                lineNumber
+            });
+        }
+
+        const stat = this.stats.get(functionName)!;
+        stat.callCount++;
+
+        return callId;
+    }
+
+    /**
+     * 结束记录函数调用
+     */
+    endFunction(callId: string, functionName: string): void {
+        const startTime = this.startTimes.get(callId);
+        if (!startTime) return;
+
+        const endTime = performance.now();
+        const duration = endTime - startTime;
+
+        this.startTimes.delete(callId);
+
+        const stat = this.stats.get(functionName);
+        if (!stat) return;
+
+        stat.totalTime += duration;
+        stat.averageTime = stat.totalTime / stat.callCount;
+        stat.minTime = Math.min(stat.minTime, duration);
+        stat.maxTime = Math.max(stat.maxTime, duration);
+    }
+
+    /**
+     * 获取所有统计信息
+     */
+    getStats(): FunctionStats[] {
+        return Array.from(this.stats.values());
+    }
+
+    /**
+     * 获取排行榜 - 按总耗时排序
+     */
+    getTopByTotalTime(limit = 20): FunctionStats[] {
+        return this.getStats()
+            .sort((a, b) => b.totalTime - a.totalTime)
+            .slice(0, limit);
+    }
+
+    /**
+     * 获取排行榜 - 按调用次数排序
+     */
+    getTopByCallCount(limit = 20): FunctionStats[] {
+        return this.getStats()
+            .sort((a, b) => b.callCount - a.callCount)
+            .slice(0, limit);
+    }
+
+    /**
+     * 获取排行榜 - 按平均耗时排序
+     */
+    getTopByAverageTime(limit = 20): FunctionStats[] {
+        return this.getStats()
+            .sort((a, b) => b.averageTime - a.averageTime)
+            .slice(0, limit);
+    }
+
+    /**
+     * 清空统计数据
+     */
+    clear(): void {
+        this.stats.clear();
+        this.startTimes.clear();
+    }
+
+    /**
+     * 打印统计报告
+     */
+    printReport(): void {
+        console.log('\n=== 函数性能监控报告 ===');
+
+        console.log('\n🔥 总耗时排行榜 (Top 10):');
+        this.getTopByTotalTime(10).forEach((stat, index) => {
+            console.log(`${index + 1}. ${stat.name} - 总耗时: ${stat.totalTime.toFixed(2)}ms, 调用次数: ${stat.callCount}, 平均耗时: ${stat.averageTime.toFixed(2)}ms`);
+        });
+
+        console.log('\n📈 调用次数排行榜 (Top 10):');
+        this.getTopByCallCount(10).forEach((stat, index) => {
+            console.log(`${index + 1}. ${stat.name} - 调用次数: ${stat.callCount}, 总耗时: ${stat.totalTime.toFixed(2)}ms, 平均耗时: ${stat.averageTime.toFixed(2)}ms`);
+        });
+
+        console.log('\n⏱️ 平均耗时排行榜 (Top 10):');
+        this.getTopByAverageTime(10).forEach((stat, index) => {
+            console.log(`${index + 1}. ${stat.name} - 平均耗时: ${stat.averageTime.toFixed(2)}ms, 调用次数: ${stat.callCount}, 总耗时: ${stat.totalTime.toFixed(2)}ms`);
+        });
+
+        console.log('\n========================\n');
+    }
+
+    /**
+     * 获取JSON格式的统计数据
+     */
+    toJSON(): FunctionStats[] {
+        return this.getStats();
+    }
+}
+
+// 全局性能监控器实例
+export const performanceMonitor = PerformanceMonitor.getInstance();
+
+// 在进程退出时打印报告并停止定时器
+if (typeof process !== 'undefined') {
+    process.on('exit', () => {
+        performanceMonitor.stopPeriodicReport();
+        performanceMonitor.printReport();
+    });
+
+    process.on('SIGINT', () => {
+        performanceMonitor.stopPeriodicReport();
+        performanceMonitor.printReport();
+        process.exit(0);
+    });
+
+    process.on('SIGTERM', () => {
+        performanceMonitor.stopPeriodicReport();
+        performanceMonitor.printReport();
+        process.exit(0);
+    });
+}

src/common/qq-basic-info.ts

@@ -42,7 +42,7 @@ export class QQBasicInfoWrapper {
         return this.isQuickUpdate ? this.QQVersionConfig?.buildId : this.QQPackageInfo?.buildVersion;
     }
 
-    getFullQQVesion() {
+    getFullQQVersion() {
         const version = this.isQuickUpdate ? this.QQVersionConfig?.curVersion : this.QQPackageInfo?.version;
         if (!version) throw new Error('QQ版本获取失败');
         return version;
@@ -57,9 +57,9 @@ export class QQBasicInfoWrapper {
     //此方法不要直接使用
     getQUAFallback() {
         const platformMapping: Partial<Record<NodeJS.Platform, string>> = {
-            win32: `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            win32: `V1_WIN_${this.getFullQQVersion()}_${this.getQQBuildStr()}_GW_B`,
-            darwin: `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            darwin: `V1_MAC_${this.getFullQQVersion()}_${this.getQQBuildStr()}_GW_B`,
-            linux: `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            linux: `V1_LNX_${this.getFullQQVersion()}_${this.getQQBuildStr()}_GW_B`,
         };
         return platformMapping[systemPlatform] ?? (platformMapping.win32)!;
     }
@@ -76,7 +76,7 @@ export class QQBasicInfoWrapper {
     getAppidV2(): { appid: string; qua: string } {
         // 通过已有表 性能好
         const appidTbale = AppidTable as unknown as QQAppidTableType;
-        const fullVersion = this.getFullQQVesion();
+        const fullVersion = this.getFullQQVersion();
         if (fullVersion) {
             const data = appidTbale[fullVersion];
             if (data) {

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.7.17';
+export const napCatVersion = '4.8.105';

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,8 +42,8 @@ export class NTQQFileApi {
         this.context = context;
         this.core = core;
         this.rkeyManager = new RkeyManager([
-            'https://secret-service.bietiaop.com/rkeys',
             'http://ss.xingzhige.com/music_card/rkey',
+            'https://secret-service.bietiaop.com/rkeys',
         ],
             this.context.logger
         );
@@ -63,6 +64,76 @@ export class NTQQFileApi {
         }
     }
 
+    async getFileUrl(chatType: ChatType, peer: string, fileUUID?: string, file10MMd5?: string | undefined,timeout: number = 20000) {
+        if (this.core.apis.PacketApi.packetStatus) {
+            try {
+                if (chatType === ChatType.KCHATTYPEGROUP && fileUUID) {
+                    return this.core.apis.PacketApi.pkt.operation.GetGroupFileUrl(+peer, fileUUID, timeout);
+                } else if (file10MMd5 && fileUUID) {
+                    return this.core.apis.PacketApi.pkt.operation.GetPrivateFileUrl(peer, fileUUID, file10MMd5, timeout);
+                }
+            } 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,timeout: number = 20000) {
+        if (this.core.apis.PacketApi.packetStatus && 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,
+                    }, timeout);
+                } else if (fileUUID) {
+                    return this.core.apis.PacketApi.pkt.operation.GetPttUrl(peer, {
+                        fileUuid: fileUUID,
+                        storeId: 1,
+                        uploadTime: 0,
+                        ttl: 0,
+                        subType: 0,
+                    }, timeout);
+                }
+            } 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,timeout: number = 20000) {
+        if (this.core.apis.PacketApi.packetStatus && 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,
+                    }, timeout);
+                } else if (fileUUID) {
+                    return this.core.apis.PacketApi.pkt.operation.GetVideoUrl(peer, {
+                        fileUuid: fileUUID,
+                        storeId: 1,
+                        uploadTime: 0,
+                        ttl: 0,
+                        subType: 0,
+                    }, timeout);
+                }
+            } 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);
@@ -137,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,
@@ -189,23 +260,22 @@ export class NTQQFileApi {
         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);
+            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'));
+        }
         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;
@@ -325,6 +395,7 @@ export class NTQQFileApi {
                 }
             });
         });
+        return res.flat();
     }
 
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
@@ -345,6 +416,7 @@ export class NTQQFileApi {
             'NodeIKernelMsgListener/onRichMediaDownloadComplete',
             [{
                 fileModelId: '0',
+                downSourceType: 0,
                 downloadSourceType: 0,
                 triggerType: 1,
                 msgId: msgId,
@@ -363,19 +435,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);
@@ -442,7 +501,7 @@ export class NTQQFileApi {
         };
 
         try {
-            if (this.core.apis.PacketApi.available) {
+            if (this.core.apis.PacketApi.packetStatus) {
                 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) {

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;
@@ -47,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));
@@ -95,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',

src/core/apis/msg.ts

@@ -71,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',
@@ -84,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,
@@ -100,6 +102,7 @@ export class NTQQMsgApi {
             filterMsgToTime: '0',
             filterMsgFromTime: '0',
             isReverseOrder: false,
+            //searchFields: 3,
             isIncludeCurrent: true,
             pageLimit: 1,
         });
@@ -110,6 +113,7 @@ export class NTQQMsgApi {
             filterMsgType: [],
             filterSendersUid: [],
             filterMsgToTime: '0',
+            //searchFields: 3,
             filterMsgFromTime: '0',
             isReverseOrder: true,
             isIncludeCurrent: true,
@@ -128,6 +132,7 @@ export class NTQQMsgApi {
             chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
             filterMsgType: [],
             filterSendersUid: [],
+            //searchFields: 3,
             filterMsgToTime: filterMsgToTime,
             filterMsgFromTime: filterMsgFromTime,
             isReverseOrder: false,
@@ -137,11 +142,11 @@ 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,
@@ -186,7 +191,7 @@ export class NTQQMsgApi {
     }
 
     async recallMsg(peer: Peer, msgId: string) {
-        await this.core.eventWrapper.callNormalEventV2(
+        return await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelMsgService/recallMsg',
             'NodeIKernelMsgListener/onMsgInfoListUpdate',
             [peer, [msgId]],

src/core/apis/packet.ts

@@ -21,20 +21,26 @@ export class NTQQPacketApi {
     qqVersion: string | undefined;
     pkt!: PacketClientSession;
     errStack: string[] = [];
+    packetStatus: boolean = false;
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
         this.logger = core.context.logger;
     }
+
     async initApi() {
-        await this.InitSendPacket(this.context.basicInfoWrapper.getFullQQVesion())
+        this.packetStatus = (await this.InitSendPacket(this.context.basicInfoWrapper.getFullQQVersion())
-            .then()
+            .then((result) => {
+                return result;
+            })
             .catch((err) => {
                 this.logger.logError(err);
                 this.errStack.push(err);
-            });
+                return false;
+            })) && this.pkt?.available;
     }
+
     get available(): boolean {
         return this.pkt?.available ?? false;
     }
@@ -61,6 +67,12 @@ export class NTQQPacketApi {
         }
         this.pkt = new PacketClientSession(this.core);
         await this.pkt.init(process.pid, table.recv, table.send);
+        try {
+            await this.pkt.operation.FetchRkey(1500);
+        } catch (error) {
+            this.logger.logError('测试Packet状态异常', error);
+            return false;
+        }
         return true;
     }
 }

src/core/apis/webapi.ts

@@ -8,10 +8,11 @@ import {
     WebHonorType,
 } from '@/core';
 import { NapCatCore } from '..';
-import { readFileSync } from 'node:fs';
+import { createReadStream, readFileSync, statSync } from 'node:fs';
 import { createHash } from 'node:crypto';
 import { basename } from 'node:path';
-
+import { qunAlbumControl } from '../data/webapi';
+import { createAlbumCommentRequest, createAlbumFeedPublish, createAlbumMediaFeed } from '../data/album';
 export class NTQQWebApi {
     context: InstanceContext;
     core: NapCatCore;
@@ -264,7 +265,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: [],
@@ -323,64 +324,193 @@ export class NTQQWebApi {
         }
         return (hash & 0x7FFFFFFF).toString();
     }
-    async createQunAlbumSession(gc: string, sAlbumID: string, sAlbumName: string, path: string, skey: string, pskey: string, uin: string) {
+    async getAlbumListByNTQQ(gc: string) {
+        return await this.context.session.getAlbumService().getAlbumList({
+            qun_id: gc,
+            attach_info: '',
+            seq: 3331,
+            request_time_line: {
+                request_invoke_time: "0"
+            }
+        })
+    }
+    async getAlbumList(gc: string) {
+        const skey = await this.core.apis.UserApi.getSKey() || '';
+        const pskey = (await this.core.apis.UserApi.getPSkey(['qzone.qq.com'])).domainPskeyMap.get('qzone.qq.com') || '';
+        const bkn = this.getBknFromSKey(skey);
+        const uin = this.core.selfInfo.uin || '10001';
+        const cookies = `p_uin=o${this.core.selfInfo.uin}; p_skey=${pskey}; skey=${skey}; uin=o${uin} `;
+        const api = `https://h5.qzone.qq.com/proxy/domain/u.photo.qzone.qq.com/cgi-bin/upp/qun_list_album_v2?`;
+        const params = new URLSearchParams({
+            random: '7570',
+            g_tk: bkn,
+            format: 'json',
+            inCharset: 'utf-8',
+            outCharset: 'utf-8',
+            qua: 'V1_IPH_SQ_6.2.0_0_HDBM_T',
+            cmd: 'qunGetAlbumList',
+            qunId: gc,
+            qunid: gc,
+            start: '0',
+            num: '1000',
+            uin: uin,
+            getMemberRole: '0'
+        });
+        const response = await RequestUtil.HttpGetJson<{ data: { album: Array<{ id: string, title: string }> } }>(api + params.toString(), 'GET', '', {
+            'Cookie': cookies
+        });
+        return response.data.album;
+    }
+
+    async createQunAlbumSession(gc: string, sAlbumID: string, sAlbumName: string, path: string, skey: string, pskey: string, img_md5: string, uin: string) {
         const img = readFileSync(path);
-        const img_md5 = createHash('md5').update(img).digest('hex');
         const img_size = img.length;
         const img_name = basename(path);
-        const time = Math.floor(Date.now() / 1000);
+        const GTK = this.getBknFromSKey(skey);
-        const GTK = this.getBknFromSKey(pskey);
+        const cookie = `p_uin=o${uin}; p_skey=${pskey}; skey=${skey}; uin=o${uin}`;
-        const cookie = `p_uin=${uin}; p_skey=${pskey}; skey=${skey}; uin=${uin}`;
+        const body = qunAlbumControl({
-        const body = {
+            uin,
-            control_req: [{
+            group_id: gc,
-                uin: uin,
+            pskey,
-                token: {
+            pic_md5: img_md5,
-                    type: 4,
+            img_size,
-                    data: pskey,
+            img_name,
-                    appid: 5
+            sAlbumName: sAlbumName,
-                },
+            sAlbumID: sAlbumID
-                appid: 'qun',
+        });
-                checksum: img_md5,
-                check_type: 0,
-                file_len: img_size,
-                env: {
-                    refer: 'qzone',
-                    deviceInfo: 'h5'
-                },
-                model: 0,
-                biz_req: {
-                    sPicTitle: img_name,
-                    sPicDesc: '',
-                    sAlbumName: sAlbumName,
-                    sAlbumID: sAlbumID,
-                    iAlbumTypeID: 0,
-                    iBitmap: 0,
-                    iUploadType: 0,
-                    iUpPicType: 0,
-                    iBatchID: time,
-                    sPicPath: '',
-                    iPicWidth: 0,
-                    iPicHight: 0,
-                    iWaterType: 0,
-                    iDistinctUse: 0,
-                    iNeedFeeds: 1,
-                    iUploadTime: time,
-                    mapExt: {
-                        appid: 'qun',
-                        userid: gc
-                    }
-                },
-                session: '',
-                asy_upload: 0,
-                cmd: 'FileUpload'
-            }]
-        };
         const api = `https://h5.qzone.qq.com/webapp/json/sliceUpload/FileBatchControl/${img_md5}?g_tk=${GTK}`;
-        const post = await RequestUtil.HttpGetJson(api, 'POST', body, {
+        const post = await RequestUtil.HttpGetJson<{ data: { session: string }, ret: number, msg: string }>(api, 'POST', body, {
             'Cookie': cookie,
             'Content-Type': 'application/json'
         });
-
         return post;
     }
+
+    async uploadQunAlbumSlice(path: string, session: string, skey: string, pskey: string, uin: string, slice_size: number) {
+        const img_size = statSync(path).size;
+        let seq = 0;
+        let offset = 0;
+        const GTK = this.getBknFromSKey(skey);
+        const cookie = `p_uin=o${uin}; p_skey=${pskey}; skey=${skey}; uin=o${uin}`;
+
+        const stream = createReadStream(path, { highWaterMark: slice_size });
+
+        for await (const chunk of stream) {
+            const end = Math.min(offset + chunk.length, img_size);
+            const form = new FormData();
+            form.append('uin', uin);
+            form.append('appid', 'qun');
+            form.append('session', session);
+            form.append('offset', offset.toString());
+            form.append('data', new Blob([chunk], { type: 'application/octet-stream' }), 'blob');
+            form.append('checksum', '');
+            form.append('check_type', '0');
+            form.append('retry', '0');
+            form.append('seq', seq.toString());
+            form.append('end', end.toString());
+            form.append('cmd', 'FileUpload');
+            form.append('slice_size', slice_size.toString());
+            form.append('biz_req.iUploadType', '0');
+
+            const api = `https://h5.qzone.qq.com/webapp/json/sliceUpload/FileUpload?seq=${seq}&retry=0&offset=${offset}&end=${end}&total=${img_size}&type=form&g_tk=${GTK}`;
+            const response = await fetch(api, {
+                method: 'POST',
+                headers: {
+                    'Cookie': cookie,
+                },
+                body: form
+            });
+
+            if (!response.ok) {
+                throw new Error(`HTTP error! status: ${response.status}`);
+            }
+
+            const post = await response.json() as { ret: number, msg: string }; if (post.ret !== 0) {
+                throw new Error(`分片 ${seq} 上传失败: ${post.msg}`);
+            }
+            offset += chunk.length;
+            seq++;
+        }
+
+        return { success: true, message: '上传完成' };
+    }
+
+    async uploadImageToQunAlbum(gc: string, sAlbumID: string, sAlbumName: string, path: string) {
+        const skey = await this.core.apis.UserApi.getSKey() || '';
+        const pskey = (await this.core.apis.UserApi.getPSkey(['qzone.qq.com'])).domainPskeyMap.get('qzone.qq.com') || '';
+        const img_md5 = createHash('md5').update(readFileSync(path)).digest('hex');
+        const uin = this.core.selfInfo.uin || '10001';
+        const session = (await this.createQunAlbumSession(gc, sAlbumID, sAlbumName, path, skey, pskey, img_md5, uin)).data.session;
+        if (!session) throw new Error('创建群相册会话失败');
+        await this.uploadQunAlbumSlice(path, session, skey, pskey, uin, 16384);
+    }
+    async getAlbumMediaListByNTQQ(gc: string, albumId: string, attach_info: string = '') {
+        return (await this.context.session.getAlbumService().getMediaList({
+            qun_id: gc,
+            attach_info: attach_info,
+            seq: 0,
+            request_time_line: {
+                request_invoke_time: "0"
+            },
+            album_id: albumId,
+            lloc: '',
+            batch_id: ''
+        })).response;
+    }
+
+    async doAlbumMediaPlainCommentByNTQQ(
+        qunId: string,
+        albumId: string,
+        lloc: string,
+        content: string) {
+        const random_seq = Math.floor(Math.random() * 9000) + 1000;
+        const uin = this.core.selfInfo.uin || '10001';
+        //16位number数字
+        const client_key = Date.now() * 1000
+        return await this.context.session.getAlbumService().doQunComment(
+            random_seq, {
+            map_info: [],
+            map_bytes_info: [],
+            map_user_account: []
+        },
+            qunId,
+            2,
+            createAlbumMediaFeed(uin, albumId, lloc),
+            createAlbumCommentRequest(uin, content, client_key)
+        );
+    }
+
+    async deleteAlbumMediaByNTQQ(
+        qunId: string,
+        albumId: string,
+        lloc: string) {
+        const random_seq = Math.floor(Math.random() * 9000) + 1000;
+        return await this.context.session.getAlbumService().deleteMedias(
+            random_seq,
+            qunId,
+            albumId,
+            [lloc],
+            []
+        );
+    }
+
+    async doAlbumMediaLikeByNTQQ(
+        qunId: string,
+        albumId: string,
+        lloc: string,
+        id: string) {
+        const random_seq = Math.floor(Math.random() * 9000) + 1000;
+        const uin = this.core.selfInfo.uin || '10001';
+        return await this.context.session.getAlbumService().doQunLike(
+            random_seq, {
+            map_info: [],
+            map_bytes_info: [],
+            map_user_account: []
+        }, {
+            id: id,
+            status: 1
+        },
+            createAlbumFeedPublish(qunId, uin, albumId, lloc)
+        )
+    }
 }

src/core/data/album.ts

@@ -0,0 +1,221 @@
+/**
+ * 群相册列表请求参数接口
+ */
+export interface AlbumListRequest {
+    qun_id: string;
+    attach_info: string;
+    seq: number;
+    request_time_line: {
+        request_invoke_time: string;
+    };
+    album_id: string;
+    lloc: string;
+    batch_id: string;
+}
+
+/**
+ * 创建群相册列表请求参数
+ * @param qunId 群号
+ * @param albumId 相册ID
+ * @param seq 请求序列号，默认值为0
+ * @returns 请求参数对象
+ */
+export function createAlbumListRequest(
+    qunId: string,
+    albumId: string,
+    seq: number = 0
+): AlbumListRequest {
+    return {
+        qun_id: qunId,
+        attach_info: "",
+        seq: seq,
+        request_time_line: {
+            request_invoke_time: "0"
+        },
+        album_id: albumId,
+        lloc: "",
+        batch_id: ""
+    };
+}
+
+/**
+ * 相册媒体项请求接口
+ */
+export interface AlbumMediaFeed {
+    cell_common: {
+        time: string;
+    };
+    cell_user_info: {
+        user: {
+            uin: string;
+        };
+    };
+    cell_media: {
+        album_id: string;
+        batch_id: string;
+        media_items: Array<{
+            image: {
+                lloc: string;
+            };
+        }>;
+    };
+}
+
+/**
+ * 创建相册媒体请求参数
+ * @param uin 用户QQ号
+ * @param albumId 相册ID
+ * @param lloc
+ * @returns 媒体请求参数对象
+ */
+export function createAlbumMediaFeed(
+    uin: string,
+    albumId: string,
+    lloc: string
+): AlbumMediaFeed {
+    return {
+        cell_common: {
+            time: ""
+        },
+        cell_user_info: {
+            user: {
+                uin: uin
+            }
+        },
+        cell_media: {
+            album_id: albumId,
+            batch_id: "",
+            media_items: [{
+                image: {
+                    lloc: lloc
+                }
+            }]
+        }
+    };
+}
+/**
+ * 相册评论内容接口
+ */
+export interface AlbumCommentContent {
+    type: number;
+    content: string;
+    who: number;
+    uid: string;
+    name: string;
+    url: string;
+}
+
+/**
+ * 相册评论请求接口
+ */
+export interface AlbumCommentReplyContent {
+    client_key: number;
+    content: AlbumCommentContent[];
+    user: {
+        uin: string;
+    };
+}
+export enum RichMsgType {
+    KRICHMSGTYPEPLAINTEXT,
+    KRICHMSGTYPEAT,
+    KRICHMSGTYPEURL,
+    KRICHMSGTYPEMEDIA
+}
+
+/**
+ * 创建相册评论请求参数
+ * @param uin 用户QQ号
+ * @param content 评论内容
+ * @param client_key 客户端鉴权密钥
+ * @returns 评论请求参数对象
+ */
+export function createAlbumCommentRequest(
+    uin: string,
+    content: string,
+    client_key: number
+): AlbumCommentReplyContent {
+    return {
+        client_key: client_key,
+        //暂时只支持纯文本吧
+        content: [{
+            type: RichMsgType.KRICHMSGTYPEPLAINTEXT,
+            content: content,
+            who: 0,
+            uid: "",
+            name: "",
+            url: ""
+        }],
+        user: {
+            uin: uin
+        }
+    };
+}
+
+export interface AlbumFeedLikePublish {
+    cell_common: {
+        time: number;
+        feed_id: string;
+    };
+    cell_user_info: {
+        user: {
+            uin: string;
+        };
+    };
+    cell_media: {
+        album_id: string;
+        batch_id: number;
+        media_items: Array<{
+            type: number;
+            image: {
+                lloc: string;
+                sloc: string;
+            };
+        }>;
+    };
+    cell_qun_info: {
+        qun_id: string;
+    };
+}
+
+/**
+ * 创建相册动态发布请求参数
+ * @param qunId 群号
+ * @param uin 用户QQ号
+ * @param albumId 相册ID
+ * @param lloc 信息
+ * @param sloc 信息(可选，默认与lloc相同)
+ * @returns 动态发布请求参数对象
+ */
+export function createAlbumFeedPublish(
+    qunId: string,
+    uin: string,
+    albumId: string,
+    lloc: string,
+    sloc?: string
+): AlbumFeedLikePublish {
+    return {
+        cell_common: {
+            time: Date.now(),
+            feed_id: ""
+        },
+        cell_user_info: {
+            user: {
+                uin: uin
+            }
+        },
+        cell_media: {
+            album_id: albumId,
+            batch_id: 0,
+            media_items: [{
+                type: 0,
+                image: {
+                    lloc: lloc,
+                    sloc: sloc || lloc
+                }
+            }]
+        },
+        cell_qun_info: {
+            qun_id: qunId
+        }
+    };
+}

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/data/webapi.ts

@@ -0,0 +1,177 @@
+
+export interface ControlReq {
+    appid?: string;
+    asy_upload?: number;
+    biz_req?: BizReq;
+    check_type?: number;
+    checksum?: string;
+    cmd?: string;
+    env?: Env;
+    file_len?: number;
+    model?: number;
+    session?: string;
+    token?: Token;
+    uin?: string;
+}
+
+export interface BizReq {
+    iAlbumTypeID: number;
+    iBatchID: number;
+    iBitmap: number;
+    iDistinctUse: number;
+    iNeedFeeds: number;
+    iPicHight: number;
+    iPicWidth: number;
+    iUploadTime: number;
+    iUploadType: number;
+    iUpPicType: number;
+    iWaterType: number;
+    mapExt: MapExt;
+    sAlbumID: string;
+    sAlbumName: string;
+    sPicDesc: string;
+    sPicPath: string;
+    sPicTitle: string;
+    stExtendInfo: StExtendInfo;
+}
+
+export interface MapExt {
+    appid: string;
+    userid: string;
+}
+
+export interface StExtendInfo {
+    mapParams: MapParams;
+}
+
+export interface MapParams {
+    batch_num: string;
+    photo_num: string;
+    video_num: string;
+}
+
+export interface Env {
+    deviceInfo: string;
+    refer: string;
+}
+
+export interface Token {
+    appid: number;
+    data: string;
+    type: number;
+}
+
+export function qunAlbumControl({
+    uin,
+    group_id,
+    pskey,
+    pic_md5,
+    img_size,
+    img_name,
+    sAlbumName,
+    sAlbumID,
+    photo_num = "1",
+    video_num = "0",
+    batch_num = "1"
+}: {
+    uin: string,
+    group_id: string,
+    pskey: string,
+    pic_md5: string,
+    img_size: number,
+    img_name: string,
+    sAlbumName: string,
+    sAlbumID: string,
+    photo_num?: string,
+    video_num?: string,
+    batch_num?: string
+}
+): {
+    control_req: ControlReq[]
+} {
+    const timestamp = Math.floor(Date.now() / 1000);
+
+    return {
+        control_req: [
+            {
+                uin: uin,
+                token: {
+                    type: 4,
+                    data: pskey,
+                    appid: 5
+                },
+                appid: "qun",
+                checksum: pic_md5,
+                check_type: 0,
+                file_len: img_size,
+                env: {
+                    refer: "qzone",
+                    deviceInfo: "h5"
+                },
+                model: 0,
+                biz_req: {
+                    sPicTitle: img_name,
+                    sPicDesc: "",
+                    sAlbumName: sAlbumName,
+                    sAlbumID: sAlbumID,
+                    iAlbumTypeID: 0,
+                    iBitmap: 0,
+                    iUploadType: 0,
+                    iUpPicType: 0,
+                    iBatchID: timestamp,
+                    sPicPath: "",
+                    iPicWidth: 0,
+                    iPicHight: 0,
+                    iWaterType: 0,
+                    iDistinctUse: 0,
+                    iNeedFeeds: 1,
+                    iUploadTime: timestamp,
+                    mapExt: {
+                        appid: "qun",
+                        userid: group_id
+                    },
+                    stExtendInfo: {
+                        mapParams: {
+                            photo_num: photo_num,
+                            video_num: video_num,
+                            batch_num: batch_num
+                        }
+                    }
+                },
+                session: "",
+                asy_upload: 0,
+                cmd: "FileUpload"
+            }]
+    }
+}
+
+export function createStreamUpload(
+    {
+        uin,
+        session,
+        offset,
+        seq,
+        end,
+        slice_size,
+        data
+
+    }: { uin: string, session: string, offset: number, seq: number, end: number, slice_size: number, data: string }
+) {
+    return {
+        uin: uin,
+        appid: "qun",
+        session: session,
+        offset: offset,//分片起始位置
+        data: data,//base64编码数据
+        checksum: "",
+        check_type: 0,
+        retry: 0,//重试次数
+        seq: seq,//分片序号
+        end: end,//分片结束位置 文件总大小
+        cmd: "FileUpload",
+        slice_size: slice_size,//分片大小16KB 16384
+        biz_req: {
+            iUploadType: 3
+        }
+    };
+}

src/core/external/appid.json

@@ -242,5 +242,149 @@
     "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"
+    },
+    "9.9.20-37475": {
+        "appid": 537304173,
+        "qua": "V1_WIN_NQ_9.9.20_37475_GW_B"
+    },
+    "3.2.18-37475": {
+        "appid": 537304210,
+        "qua": "V1_LNX_NQ_3.2.18_37475_GW_B"
+    },
+    "9.9.20-37625": {
+        "appid": 537304224,
+        "qua": "V1_WIN_NQ_9.9.20_37625_GW_B"
+    },
+    "3.2.18-37625": {
+        "appid": 537304261,
+        "qua": "V1_LNX_NQ_3.2.18_37625_GW_B"
+    },
+    "9.9.21-38503": {
+        "appid": 537307604,
+        "qua": "V1_WIN_NQ_9.9.21_38503_GW_B"
+    },
+    "3.2.19-38503": {
+        "appid": 537307640,
+        "qua": "V1_LNX_NQ_3.2.19_38503_GW_B"
+    },
+    "3.2.19-38626": {
+        "appid": 537307691,
+        "qua": "V1_LNX_NQ_3.2.19_38626_GW_B"
+    },
+    "9.9.21-38711": {
+        "appid": 537307655,
+        "qua": "V1_WIN_NQ_9.9.21_38626_GW_B"
+    },
+    "9.9.21-38960": {
+        "appid": 537313855,
+        "qua": "V1_WIN_NQ_9.9.21_38960_GW_B"
+    },
+    "3.2.19-38960": {
+        "appid": 537313891,
+        "qua": "V1_LNX_NQ_3.2.19_38960_GW_B"
+    },
+    "3.2.19-39038": {
+        "appid": 537313942,
+        "qua": "V1_LNX_NQ_3.2.19_39038_GW_B"
+    },
+    "9.9.21-39038": {
+        "appid": 537313906,
+        "qua": "V1_WIN_NQ_9.9.21_39038_GW_B"
     }
 }

src/core/external/offset.json

@@ -326,5 +326,189 @@
     "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"
+    },
+    "9.9.20-37475-x64": {
+        "send": "30D30D8",
+        "recv": "30D687C"
+    },
+    "3.2.18-37475-x64": {
+        "send": "B238EC0",
+        "recv": "B23C940"
+    },
+    "3.2.18-37475-arm64": {
+        "send": "7A34B38",
+        "recv": "7A384C8"
+    },
+    "9.9.20-37625-x64": {
+        "send": "30D39D8",
+        "recv": "30D717C"
+    },
+    "3.2.18-37625-x64": {
+        "send": "B2397E0",
+        "recv": "B23D260"
+    },
+    "3.2.18-37625-arm64": {
+        "send": "7A350D8",
+        "recv": "7A38A68"
+    },
+    "9.9.21-38503-x64": {
+        "send": "3105F38",
+        "recv": "31096DC"
+    },
+    "3.2.19-38503-x64": {
+        "send": "B2C1A60",
+        "recv": "B2C54E0"
+    },
+    "3.2.19-38626-x64": {
+        "send": "B2C1BE0",
+        "recv": "B2C5660"
+    },
+    "9.9.21-38626-x64": {
+        "send": "310A758",
+        "recv": "310DEFC"
+    },
+    "3.2.19-38626-arm64": {
+        "send": "7A8A490",
+        "recv": "7A8DE20"
+    },
+    "9.9.21-38711-x64": {
+        "send": "310A758",
+        "recv": "310DEFC"
+    },
+    "3.2.19-38960-x64": {
+        "send": "B3740E0",
+        "recv": "B377B60"
+    },
+    "9.9.21-38960-x64": {
+        "send": "313F7D8",
+        "recv": "3142F7C"
+    },
+    "3.2.19-38960-arm64": {
+        "send": "7B01D98",
+        "recv": "7B05728"
+    },
+    "3.2.19-39038-x64": {
+        "send": "B3759E0",
+        "recv": "B379460"
+    },
+    "3.2.19-39038-arm64": {
+        "send": "7B025C8",
+        "recv": "7B05F58"
+    },
+     "9.9.21-39038-x64": {
+        "send": "313FB58",
+        "recv": "31432FC"
     }
 }

src/core/listeners/NodeIKernelBuddyListener.ts

@@ -3,57 +3,74 @@ 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 {
     }
 
-    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/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/packet/client/baseClient.ts

@@ -1,4 +1,3 @@
-import { LRUCache } from '@/common/lru-cache';
 import crypto, { createHash } from 'crypto';
 import { OidbPacket, PacketHexStr } from '@/core/packet/transformer/base';
 import { LogStack } from '@/core/packet/context/clientContext';
@@ -7,7 +6,6 @@ import { PacketLogger } from '@/core/packet/context/loggerContext';
 
 export interface RecvPacket {
     type: string, // 仅recv
-    trace_id_md5?: string,
     data: RecvPacketData
 }
 
@@ -30,7 +28,7 @@ function randText(len: number): string {
 export abstract class IPacketClient {
     protected readonly napcore: NapCoreContext;
     protected readonly logger: PacketLogger;
-    protected readonly cb = new LRUCache<string, (json: RecvPacketData) => Promise<void>>(500); // trace_id-type callback
+    protected readonly cb = new Map<string, (json: RecvPacketData) => Promise<any> | any>(); // hash-type callback
     logStack: LogStack;
     available: boolean = false;
 
@@ -44,24 +42,21 @@ export abstract class IPacketClient {
 
     abstract init(pid: number, recv: string, send: string): Promise<void>;
 
-    abstract sendCommandImpl(cmd: string, data: string, trace_id: string): void;
+    abstract sendCommandImpl(cmd: string, data: string, hash: string, timeout: number): void;
 
-    private async registerCallback(trace_id: string, type: string, callback: (json: RecvPacketData) => Promise<void>): Promise<void> {
+    private async sendCommand(cmd: string, data: string, trace_data: string, rsp: boolean = false, timeout: number = 20000, sendcb: (json: RecvPacketData) => void = () => {
-        this.cb.put(createHash('md5').update(trace_id).digest('hex') + type, callback);
-    }
-
-    private async sendCommand(cmd: string, data: string, trace_id: string, rsp: boolean = false, timeout: number = 20000, sendcb: (json: RecvPacketData) => void = () => {
     }): Promise<RecvPacketData> {
         return new Promise<RecvPacketData>((resolve, reject) => {
             if (!this.available) {
                 reject(new Error('packetBackend 当前不可用！'));
             }
-
+            let hash = createHash('md5').update(trace_data).digest('hex');
             const timeoutHandle = setTimeout(() => {
-                reject(new Error(`sendCommand timed out after ${timeout} ms for ${cmd} with trace_id ${trace_id}`));
+                this.cb.delete(hash + 'send');
+                this.cb.delete(hash + 'recv');
+                reject(new Error(`sendCommand timed out after ${timeout} ms for ${cmd} with hash ${hash}`));
             }, timeout);
-
+            this.cb.set(hash + 'send', async (json: RecvPacketData) => {
-            this.registerCallback(trace_id, 'send', async (json: RecvPacketData) => {
                 sendcb(json);
                 if (!rsp) {
                     clearTimeout(timeoutHandle);
@@ -70,25 +65,24 @@ export abstract class IPacketClient {
             });
 
             if (rsp) {
-                this.registerCallback(trace_id, 'recv', async (json: RecvPacketData) => {
+                this.cb.set(hash + 'recv', async (json: RecvPacketData) => {
                     clearTimeout(timeoutHandle);
                     resolve(json);
                 });
             }
-
+            this.sendCommandImpl(cmd, data, hash, timeout);
-            this.sendCommandImpl(cmd, data, trace_id);
         });
     }
 
-    async sendPacket(cmd: string, data: PacketHexStr, rsp = false): Promise<RecvPacketData> {
+    async sendPacket(cmd: string, data: PacketHexStr, rsp = false, timeout = 20000): Promise<RecvPacketData> {
         const md5 = crypto.createHash('md5').update(data).digest('hex');
-        const trace_id = (randText(4) + md5 + data).slice(0, data.length / 2);
+        const trace_data = (randText(4) + md5 + data).slice(0, data.length / 2);// trace_data
-        return this.sendCommand(cmd, data, trace_id, rsp, 20000, async () => {
+        return this.sendCommand(cmd, data, trace_data, rsp, timeout, async () => {
-            await this.napcore.sendSsoCmdReqByContend(cmd, trace_id);
+            await this.napcore.sendSsoCmdReqByContend(cmd, trace_data);
         });
     }
 
-    async sendOidbPacket(pkt: OidbPacket, rsp = false): Promise<RecvPacketData> {
+    async sendOidbPacket(pkt: OidbPacket, rsp = false, timeout = 20000): Promise<RecvPacketData> {
-        return this.sendPacket(pkt.cmd, pkt.data, rsp);
+        return this.sendPacket(pkt.cmd, pkt.data, rsp, timeout);
     }
 }

src/core/packet/client/nativeClient.ts

@@ -4,7 +4,6 @@ import { fileURLToPath } from 'url';
 import fs from 'fs';
 import { IPacketClient } from '@/core/packet/client/baseClient';
 import { constants } from 'node:os';
-import { LRUCache } from '@/common/lru-cache';
 import { LogStack } from '@/core/packet/context/clientContext';
 import { NapCoreContext } from '@/core/packet/context/napCoreContext';
 import { PacketLogger } from '@/core/packet/context/loggerContext';
@@ -18,7 +17,8 @@ export interface NativePacketExportType {
 export class NativePacketClient extends IPacketClient {
     private readonly supportedPlatforms = ['win32.x64', 'linux.x64', 'linux.arm64', 'darwin.x64', 'darwin.arm64'];
     private readonly MoeHooExport: { exports: NativePacketExportType } = { exports: {} };
-    private readonly sendEvent = new LRUCache<number, string>(500); // seq->trace_id
+    private readonly sendEvent = new Map<number, string>(); // seq - hash
+    private readonly timeEvent = new Map<string, NodeJS.Timeout>(); // hash - timeout
 
     constructor(napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) {
         super(napCore, logger, logStack);
@@ -40,29 +40,36 @@ export class NativePacketClient extends IPacketClient {
 
     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) => {
-            const trace_id = createHash('md5').update(Buffer.from(hex_data, 'hex')).digest('hex');
+            const hash = createHash('md5').update(Buffer.from(hex_data, 'hex')).digest('hex');
-            if (type === 0 && this.cb.get(trace_id + 'recv')) {
+            if (type === 0 && this.cb.get(hash + 'recv')) {
                 //此时为send 提取seq
-                this.sendEvent.put(seq, trace_id);
+                this.sendEvent.set(seq, hash);
+                setTimeout(() => {
+                    this.sendEvent.delete(seq);
+                    this.timeEvent.delete(hash);
+                }, +(this.timeEvent.get(hash) ?? 20000));
+                //正式send完成 无recv v
+                //均无异常 v
             }
             if (type === 1 && this.sendEvent.get(seq)) {
-                //此时为recv 调用callback
+                const hash = this.sendEvent.get(seq);
-                const trace_id = this.sendEvent.get(seq);
+                const callback = this.cb.get(hash + 'recv');
-                const callback = this.cb.get(trace_id + 'recv');
-                // console.log('callback:', callback, trace_id);
                 callback?.({ seq, cmd, hex_data });
             }
         }, this.napcore.config.o3HookMode == 1);
         this.available = true;
     }
 
-    sendCommandImpl(cmd: string, data: string, trace_id: string): void {
+    sendCommandImpl(cmd: string, data: string, hash: string, timeout: number): void {
-        const trace_id_md5 = createHash('md5').update(trace_id).digest('hex');
+        this.timeEvent.set(hash, setTimeout(() => {
-        this.MoeHooExport.exports.SendPacket?.(cmd, data, trace_id_md5);
+            this.timeEvent.delete(hash);//考虑情况为正式send都没进
-        this.cb.get(trace_id_md5 + 'send')?.({ seq: 0, cmd, hex_data: '' });
+        }, timeout));
+        this.MoeHooExport.exports.SendPacket?.(cmd, data, hash);
+        this.cb.get(hash + 'send')?.({ seq: 0, cmd, hex_data: '' });
     }
 }

src/core/packet/context/clientContext.ts

@@ -73,8 +73,8 @@ export class PacketClientContext {
         await this._client.init(pid, recv, send);
     }
 
-    async sendOidbPacket<T extends boolean = false>(pkt: OidbPacket, rsp?: T): Promise<T extends true ? Buffer : void> {
+    async sendOidbPacket<T extends boolean = false>(pkt: OidbPacket, rsp?: T, timeout?: number): Promise<T extends true ? Buffer : void> {
-        const raw = await this._client.sendOidbPacket(pkt, rsp);
+        const raw = await this._client.sendOidbPacket(pkt, rsp, timeout);
         return (rsp ? Buffer.from(raw.hex_data, 'hex') : undefined) as T extends true ? Buffer : void;
     }
 

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

@@ -6,13 +6,14 @@ 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 { 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';
@@ -29,19 +30,17 @@ export class PacketOperationContext {
         return await this.context.client.sendOidbPacket(pkt, rsp);
     }
 
-    async GroupPoke(groupUin: number, uin: number) {
+    async SendPoke(is_group: boolean, peer: number, target?: number) {
-        const req = trans.SendPoke.build(uin, groupUin);
+        const req = trans.SendPoke.build(is_group, peer, target ?? peer);
         await this.context.client.sendOidbPacket(req);
     }
-
+    async SetGroupTodo(groupUin: number, msgSeq: string) {
-    async FriendPoke(uin: number) {
+        const req = trans.SetGroupTodo.build(groupUin, msgSeq);
-        const req = trans.SendPoke.build(uin);
+        await this.context.client.sendOidbPacket(req, true);
-        await this.context.client.sendOidbPacket(req);
     }
-
+    async FetchRkey(timeout: number = 10000) {
-    async FetchRkey() {
         const req = trans.FetchRkey.build();
-        const resp = await this.context.client.sendOidbPacket(req, true);
+        const resp = await this.context.client.sendOidbPacket(req, true, timeout);
         const res = trans.FetchRkey.parse(resp);
         return res.data.rkeyList;
     }
@@ -76,22 +75,24 @@ export class PacketOperationContext {
     async UploadResources(msg: PacketMsg[], groupUin: number = 0) {
         const chatType = groupUin ? ChatType.KCHATTYPEGROUP : ChatType.KCHATTYPEC2C;
         const peerUid = groupUin ? String(groupUin) : this.context.napcore.basicInfo.uid;
-        const reqList = msg.flatMap(m =>
+        const reqList = msg.flatMap((m) =>
-            m.msg.map(e => {
+            m.msg
-                if (e instanceof PacketMsgPicElement) {
+                .map((e) => {
-                    return this.context.highway.uploadImage({ chatType, peerUid }, e);
+                    if (e instanceof PacketMsgPicElement) {
-                } else if (e instanceof PacketMsgVideoElement) {
+                        return this.context.highway.uploadImage({ chatType, peerUid }, e);
-                    return this.context.highway.uploadVideo({ chatType, peerUid }, e);
+                    } else if (e instanceof PacketMsgVideoElement) {
-                } else if (e instanceof PacketMsgPttElement) {
+                        return this.context.highway.uploadVideo({ chatType, peerUid }, e);
-                    return this.context.highway.uploadPtt({ chatType, peerUid }, e);
+                    } else if (e instanceof PacketMsgPttElement) {
-                } else if (e instanceof PacketMsgFileElement) {
+                        return this.context.highway.uploadPtt({ chatType, peerUid }, e);
-                    return this.context.highway.uploadFile({ chatType, peerUid }, e);
+                    } else if (e instanceof PacketMsgFileElement) {
-                }
+                        return this.context.highway.uploadFile({ chatType, peerUid }, e);
-                return null;
+                    }
-            }).filter(Boolean)
+                    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 +101,13 @@ export class PacketOperationContext {
     }
 
     async UploadImage(img: PacketMsgPicElement) {
-        await this.context.highway.uploadImage({
+        await this.context.highway.uploadImage(
-            chatType: ChatType.KCHATTYPEC2C,
+            {
-            peerUid: this.context.napcore.basicInfo.uid
+                chatType: ChatType.KCHATTYPEC2C,
-        }, img);
+                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,13 +122,42 @@ export class PacketOperationContext {
         return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
     }
 
-    async GetGroupImageUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
+    async GetPttUrl(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>,timeout: number = 20000) {
+        const req = trans.DownloadPtt.build(selfUid, node);
+        const resp = await this.context.client.sendOidbPacket(req, true, timeout);
+        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>, timeout: number = 20000) {
+        const req = trans.DownloadVideo.build(selfUid, node);
+        const resp = await this.context.client.sendOidbPacket(req, true, timeout);
+        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>, timeout: number = 20000) {
         const req = trans.DownloadGroupImage.build(groupUin, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
+        const resp = await this.context.client.sendOidbPacket(req, true, timeout);
         const res = trans.DownloadImage.parse(resp);
         return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
     }
 
+    async GetGroupPttUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>, timeout: number = 20000) {
+        const req = trans.DownloadGroupPtt.build(groupUin, node);
+        const resp = await this.context.client.sendOidbPacket(req, true, timeout);
+        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>, timeout: number = 20000) {
+        const req = trans.DownloadGroupVideo.build(groupUin, node);
+        const resp = await this.context.client.sendOidbPacket(req, true, timeout);
+        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,24 +170,66 @@ 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) {
+    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);
@@ -168,26 +243,20 @@ export class PacketOperationContext {
         return res.rename.retCode;
     }
 
-    async GetGroupFileUrl(groupUin: number, fileUUID: string) {
+    async GetGroupFileUrl(groupUin: number, fileUUID: string,timeout: number = 20000) {
         const req = trans.DownloadGroupFile.build(groupUin, fileUUID);
-        const resp = await this.context.client.sendOidbPacket(req, true);
+        const resp = await this.context.client.sendOidbPacket(req, true, timeout);
         const res = trans.DownloadGroupFile.parse(resp);
         return `https://${res.download.downloadDns}/ftn_handler/${Buffer.from(res.download.downloadUrl).toString('hex')}/?fname=`;
     }
-    async GetPrivateFileUrl(self_id: string, fileUUID: string, md5: string) {
+
+    async GetPrivateFileUrl(self_id: string, fileUUID: string, md5: string, timeout: number = 20000) {
         const req = trans.DownloadPrivateFile.build(self_id, fileUUID, md5);
-        const resp = await this.context.client.sendOidbPacket(req, true);
+        const resp = await this.context.client.sendOidbPacket(req, true, timeout);
         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 GetGroupPttUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadGroupPtt.build(groupUin, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadGroupPtt.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
     async GetMiniAppAdaptShareInfo(param: MiniAppReqParams) {
         const req = trans.GetMiniAppAdaptShareInfo.build(param);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -203,12 +272,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);
@@ -236,6 +310,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) {
@@ -251,12 +326,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;
@@ -269,7 +344,7 @@ export class PacketOperationContext {
                 elements: elements,
                 guildId: '',
                 isOnlineMsg: false,
-                msgId: '7467703692092974645',  // TODO: no necessary
+                msgId: '7467703692092974645', // TODO: no necessary
                 msgRandom: '0',
                 msgSeq: String(msg.contentHead.sequence ?? 0),
                 msgTime: String(msg.contentHead.timeStamp ?? 0),

src/core/packet/message/builder.ts

@@ -24,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/element.ts

@@ -10,6 +10,7 @@ import {
     MsgInfo,
     NotOnlineImage,
     OidbSvcTrpcTcp0XE37_800Response,
+    PushMsgBody,
     QBigFaceExtra,
     QSmallFaceExtra,
 } from '@/core/packet/transformer/proto';
@@ -29,7 +30,8 @@ import {
     SendReplyElement,
     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;
+    time: number;
-    messageSeq: number;
+    targetMessageId: bigint;
-    messageClientSeq: number;
+    targetMessageSeq: number;
+    targetMessageClientSeq: number;
     targetUin: number;
     targetUid: string;
-    time: number;
+    targetElems?: NapProtoEncodeStructType<typeof Elem>[];
-    elems: PacketMsg[];
+    targetSourceMsg?: NapProtoEncodeStructType<typeof PushMsgBody>;
+    targetPeer?: Peer;
 
     constructor(element: SendReplyElement) {
         super(element);
-        this.messageId = BigInt(element.replyElement.replayMsgId ?? 0);
+        this.time = +(element.replyElement.replyMsgTime ?? Math.floor(Date.now() / 1000));
-        this.messageSeq = +(element.replyElement.replayMsgSeq ?? 0);
+        this.targetMessageId = BigInt(element.replyElement.replayMsgId ?? 0);
-        this.messageClientSeq = +(element.replyElement.replyMsgClientSeq ?? 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.targetPeer = element.replyElement._replyMsgPeer;
-        this.elems = []; // TODO: in replyElement.sourceMsgTextElems
     }
 
     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
+                elems: this.targetElems ?? [],
-                pbReserve: {
+                sourceMsg: new NapProtoMsg(PushMsgBody).encode(this.targetSourceMsg ?? {}),
-                    messageId: this.messageId,
+                toUin: BigInt(0),
-                },
-                toUin: BigInt(this.targetUin),
-                type: 1,
             }
         }];
     }

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

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

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

@@ -0,0 +1,24 @@
+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 SetGroupTodo extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase> {
+    constructor() {
+        super();
+    }
+
+    build(peer: number, msgSeq: string): OidbPacket {
+        const data = new NapProtoMsg(proto.OidbSvcTrpcTcp0XF90_1).encode({
+            groupUin: peer,
+            msgSeq: BigInt(msgSeq)
+        });
+        return OidbBase.build(0xF90, 1, data);
+    }
+
+    parse(data: Buffer) {
+        return OidbBase.parse(data);
+    }
+}
+
+export default new SetGroupTodo();

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

@@ -8,3 +8,4 @@ export { default as SetSpecialTitle } from './SetSpecialTitle';
 export { default as ImageOCR } from './ImageOCR';
 export { default as MoveGroupFile } from './MoveGroupFile';
 export { default as RenameGroupFile } from './RenameGroupFile';
+export { default as SetGroupTodo } from './SetGroupTodo';

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();

src/core/packet/transformer/highway/DownloadVideo.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 DownloadVideo extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
+    constructor() {
+        super();
+    }
+
+    build(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
+        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
+            reqHead: {
+                common: {
+                    requestId: 1,
+                    command: 200
+                },
+                scene: {
+                    requestType: 2,
+                    businessType: 2,
+                    sceneType: 1,
+                    c2C: {
+                        accountType: 2,
+                        targetUid: selfUid
+                    },
+                },
+                client: {
+                    agentType: 2,
+                }
+            },
+            download: {
+                node: node,
+                download: {
+                    video: {
+                        busiType: 0,
+                        sceneType: 0
+                    }
+                }
+            }
+        });
+        return OidbBase.build(0x11E9, 200, body, true, false);
+    }
+
+    parse(data: Buffer) {
+        const oidbBody = OidbBase.parse(data).body;
+        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
+    }
+}
+
+export default new DownloadVideo();

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

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

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

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

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

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

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

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

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

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

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

@@ -30,3 +30,4 @@ export * from './oidb/Oidb.0xED3_1';
 export * from './oidb/Oidb.0XFE1_2';
 export * from './oidb/OidbBase';
 export * from './oidb/Oidb.0xE07';
+export * from './oidb/Oidb.0xf90_1';

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

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

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

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

src/core/packet/transformer/proto/oidb/Oidb.0xf90_1.ts

@@ -0,0 +1,6 @@
+import { ProtoField, ScalarType } from "@napneko/nap-proto-core";
+
+export const OidbSvcTrpcTcp0XF90_1 = {
+    groupUin: ProtoField(1, ScalarType.UINT32),
+    msgSeq: ProtoField(2, ScalarType.UINT64),
+};

src/core/services/NodeIKernelAlbumService.ts

@@ -1,22 +1,52 @@
+import { AlbumCommentReplyContent, AlbumFeedLikePublish, AlbumListRequest, AlbumMediaFeed } from "../data/album";
+
 export interface NodeIKernelAlbumService {
 
     setAlbumServiceInfo(...args: unknown[]): unknown;// needs 3 arguments
 
     getMainPage(...args: unknown[]): unknown;// needs 2 arguments
 
-    getAlbumList(...args: unknown[]): unknown;// needs 1 arguments
+    getAlbumList(params: {
-
+        qun_id: string,
+        attach_info: string,
+        seq: number,
+        request_time_line: {
+            request_invoke_time: string
+        }
+    }): Promise<{
+        response: {
+            seq: number,
+            result: number,
+            errMs: string,//没错就是errMs不是errMsg
+            trace_id: string,
+            is_from_cache: boolean,
+            request_time_line: unknown,
+            album_list: Array<{ name: string, album_id: string }>,
+            attach_info: string,
+            has_more: boolean,
+            right: unknown,
+            banner: unknown
+        }
+    }>
     getAlbumInfo(...args: unknown[]): unknown;// needs 1 arguments
 
     deleteAlbum(...args: unknown[]): unknown;// needs 3 arguments
 
     addAlbum(...args: unknown[]): unknown;// needs 2 arguments
 
-    deleteMedias(...args: unknown[]): unknown;// needs 4 arguments
+    deleteMedias(seq: number, group_code: string, album_id: string, media_ids: string[], ban_ids: unknown[]): Promise<unknown>;// needs 4 arguments
 
     modifyAlbum(...args: unknown[]): unknown;// needs 3 arguments
 
-    getMediaList(...args: unknown[]): unknown;// needs 1 arguments
+    getMediaList(param: AlbumListRequest): Promise<{
+        response: {
+            seq: number,
+            result: number,
+            errMs: string,//没错就是errMs不是errMsg
+            trace_id: string,
+            request_time_line: unknown,
+        }
+    }>;// needs 1 arguments
 
     quoteToQzone(...args: unknown[]): unknown;// needs 1 arguments
 
@@ -35,12 +65,36 @@ export interface NodeIKernelAlbumService {
     getQunLikes(...args: unknown[]): unknown;// needs 4 arguments
 
     deleteQunFeed(...args: unknown[]): unknown;// needs 1 arguments
-
+    //seq random
-    doQunComment(...args: unknown[]): unknown;// needs 6 arguments
+    //stCommonExt {"map_info":[],"map_bytes_info":[],"map_user_account":[]}
+    //qunId string
+    doQunComment(seq: number, ext: {
+        map_info: unknown[],
+        map_bytes_info: unknown[],
+        map_user_account: unknown[]
+    },
+        qunId: string,
+        commentType: number,
+        feed: AlbumMediaFeed,
+        content: AlbumCommentReplyContent,
+    ): Promise<unknown>;// needs 6 arguments
 
     doQunReply(...args: unknown[]): unknown;// needs 7 arguments
 
-    doQunLike(...args: unknown[]): unknown;// needs 5 arguments
+    doQunLike(
+        seq: number,
+        ext: {
+            map_info: unknown[],
+            map_bytes_info: unknown[],
+            map_user_account: unknown[]
+        },
+        param: {
+            //{"id":"421_1_0_1012959257|V61Yiali4PELg90bThrH4Bo2iI1M5Kab|V5bCgAxMDEyOTU5MjU3e*KqaLVYdic!^||^421_1_0_1012959257|V61Yiali4PELg90bThrH4Bo2iI1M5Kab|17560336594^||^1","status":1}
+            id: string,
+            status: number
+        },
+        like: AlbumFeedLikePublish
+    ): Promise<unknown>;// needs 5 arguments
 
     getRedPoints(...args: unknown[]): unknown;// needs 3 arguments
 

src/core/services/NodeIKernelBuddyService.ts

@@ -106,15 +106,15 @@ export interface NodeIKernelBuddyService {
 
     getAddMeSetting(): unknown;
 
-    getDoubtBuddyReq(): unknown;
+    getDoubtBuddyReq(reqId: string, num: number,uk:string): Promise<GeneralCallResult>;
 
     getDoubtBuddyUnreadNum(): number;
 
-    approvalDoubtBuddyReq(uid: number, isAgree: boolean): void;
+    approvalDoubtBuddyReq(uid: string, str1: string, str2: string): void;
 
     delDoubtBuddyReq(uid: number): void;
 
-    delAllDoubtBuddyReq(): void;
+    delAllDoubtBuddyReq(): Promise<GeneralCallResult>;
 
     reportDoubtBuddyReqUnread(): void;
 

src/core/services/NodeIKernelGroupService.ts

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

src/core/services/NodeIKernelMsgService.ts

@@ -148,10 +148,11 @@ export interface NodeIKernelMsgService {
         msgList: RawMessage[]
     }>;
 
-    //@deprecated
+    // getMsgService/getMsgs { chatType: 2, peerUid: '975206796', privilegeFlag: 336068800 } 0 20 true
-    getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>;
+    getMsgs(peer: Peer & { privilegeFlag: number }, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
+        msgList: RawMessage[]
+    }>;
 
-    //@deprecated
     getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
         msgList: RawMessage[]
     }>;
@@ -425,7 +426,20 @@ export interface NodeIKernelMsgService {
 
     switchToOfflineGetRichMediaElement(...args: unknown[]): unknown;
 
-    downloadRichMedia(...args: unknown[]): unknown;
+    downloadRichMedia(args: {
+        fileModelId: string,
+        downSourceType: number,
+        triggerType: number,
+        msgId: string,
+        chatType: number,
+        peerUid: string,
+        elementId: string,
+        thumbSize: number,
+        downloadType: number,
+        filePath: string
+    } & {
+        downloadSourceType: number, //33800左右一下的老版本 新版34606已经完全上面格式
+    }): unknown;
 
     getFirstUnreadMsgSeq(args: {
         peerUid: string

src/core/types/element.ts

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

src/core/types/group.ts

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

src/core/types/msg.ts

@@ -501,13 +501,15 @@ export interface RawMessage {
     elements: MessageElement[];// 消息元素
     sourceType: MsgSourceType;// 消息来源类型
     isOnlineMsg: boolean;// 是否为在线消息
+    clientSeq?: string;
 }
 
 /**
  * 查询消息参数接口
  */
 export interface QueryMsgsParams {
-    chatInfo: Peer;
+    chatInfo: Peer & { privilegeFlag?: number };
+    //searchFields: number;
     filterMsgType: Array<{ type: NTMsgType, subType: Array<number> }>;
     filterSendersUid: string[];
     filterMsgFromTime: string;

src/core/types/notify.ts

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

src/core/types/webapi.ts

@@ -115,7 +115,7 @@ export interface GroupEssenceMsg {
     add_digest_uin: string;
     add_digest_nick: string;
     add_digest_time: number;
-    msg_content: unknown[];
+    msg_content: { msg_type: number, text?: string, image_url?: string }[];
     can_be_removed: true;
 }
 

src/example-plugin/README.md

@@ -0,0 +1,3 @@
+# Example Plugin
+## Install
+安装只需要将dist产物 `index.mjs` 目录放入 napcat根目录下`plugins/example`,如果没有这个目录请创建。

src/example-plugin/index.ts

@@ -0,0 +1,12 @@
+import { EventType } from "@/onebot/event/OneBotEvent";
+import type { PluginModule } from "@/onebot/network/plugin-manger";
+
+const plugin_init: PluginModule["plugin_init"] = async (_core, _obContext, _actions, _instance) => {
+    console.log(`[Plugin: example] 插件已初始化`);
+}
+const plugin_onmessage: PluginModule["plugin_onmessage"] = async (adapter, _core, _obCtx, event, actions, instance) => {
+    if (event.post_type === EventType.MESSAGE && event.raw_message.includes('ping')) {
+        await actions.get('send_group_msg')?.handle({ group_id: String(event.group_id), message: 'pong' }, adapter, instance.config);
+    }
+}
+export { plugin_init, plugin_onmessage };

src/example-plugin/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "advanced-plugin",
+  "version": "1.0.0",
+  "type": "module",
+  "main": "index.mjs",
+  "description": "一个高级的 NapCat 插件示例",
+  "scripts": {
+    "build": "vite build"
+  }
+}

src/example-plugin/vite.config.ts

@@ -0,0 +1,30 @@
+import { defineConfig } from 'vite';
+import { resolve } from 'path';
+import nodeResolve from '@rollup/plugin-node-resolve';
+import { builtinModules } from 'module';
+
+const nodeModules = [...builtinModules, builtinModules.map((m) => `node:${m}`)].flat();
+
+export default defineConfig({
+    resolve: {
+        conditions: ['node', 'default'],
+        alias: {
+            '@/core': resolve(__dirname, '../core'),
+            '@': resolve(__dirname, '../'),
+        },
+    },
+    build: {
+        sourcemap: false,
+        target: 'esnext',
+        minify: false,
+        lib: {
+            entry: 'index.ts',
+            formats: ['es'],
+            fileName: () => 'index.mjs',
+        },
+        rollupOptions: {
+            external: [...nodeModules],
+        },
+    },
+    plugins: [nodeResolve()],
+});

src/framework/napcat.ts

@@ -9,11 +9,13 @@ import { NodeIKernelLoginService } from '@/core/services';
 import { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper';
 import { InitWebUi, WebUiConfig, webUiRuntimePort } from '@/webui';
 import { NapCatOneBot11Adapter } from '@/onebot';
+import { downloadFFmpegIfNotExists } from '@/common/download-ffmpeg';
+import { FFmpegService } from '@/common/ffmpeg';
 
 //Framework ES入口文件
 export async function getWebUiUrl() {
     const WebUiConfigData = (await WebUiConfig.GetWebUIConfig());
-    return 'http://127.0.0.1:' + webUiRuntimePort + '/webui/?token=' + WebUiConfigData.token;
+    return 'http://127.0.0.1:' + webUiRuntimePort + '/webui/?token=' + encodeURIComponent(WebUiConfigData.token);
 }
 
 export async function NCoreInitFramework(
@@ -35,8 +37,23 @@ export async function NCoreInitFramework(
     const pathWrapper = new NapCatPathWrapper();
     const logger = new LogWrapper(pathWrapper.logsPath);
     const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
-    const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
+    const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVersion());
+    if (!process.env['NAPCAT_DISABLE_FFMPEG_DOWNLOAD']) {
+        downloadFFmpegIfNotExists(logger).then(({ path, reset }) => {
+            if (reset && path) {
+                FFmpegService.setFfmpegPath(path, logger);
+            }
+        }).catch(e => {
+            logger.logError('[Ffmpeg] Error:', e);
+        });
+    }
     //直到登录成功后，执行下一步
+    // const selfInfo = {
+    //     uid: 'u_FUSS0_x06S_9Tf4na_WpUg',
+    //     uin: '3684714082',
+    //     nick: '',
+    //     online: true
+    // }
     const selfInfo = await new Promise<SelfInfo>((resolveSelfInfo) => {
         const loginListener = new NodeIKernelLoginListener();
         loginListener.onQRCodeLoginSucceed = async (loginResult) => {

src/framework/nativeLoader.cjs

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

src/image-size/index.ts

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

src/onebot/action/extends/DelGroupAlbumMedia.ts

@@ -0,0 +1,24 @@
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    group_id: Type.String(),
+    album_id: Type.String(),
+    lloc: Type.String()
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class DelGroupAlbumMedia extends OneBotAction<Payload, unknown> {
+    override actionName = ActionName.DelGroupAlbumMedia;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        return await this.core.apis.WebApi.deleteAlbumMediaByNTQQ(
+            payload.group_id,
+            payload.album_id,
+            payload.lloc
+        );
+    }
+}

src/onebot/action/extends/DoGroupAlbumComment.ts

@@ -0,0 +1,26 @@
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    group_id: Type.String(),
+    album_id: Type.String(),
+    lloc: Type.String(),
+    content: Type.String(),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class DoGroupAlbumComment extends OneBotAction<Payload, unknown> {
+    override actionName = ActionName.DoGroupAlbumComment;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        return await this.core.apis.WebApi.doAlbumMediaPlainCommentByNTQQ(
+            payload.group_id,
+            payload.album_id,
+            payload.lloc,
+            payload.content
+        );
+    }
+}

src/onebot/action/extends/GetGroupAlbumMediaList.ts

@@ -0,0 +1,24 @@
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    group_id: Type.String(),
+    album_id: Type.String(),
+    attach_info: Type.String({ default: "" }),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class GetGroupAlbumMediaList extends OneBotAction<Payload, unknown> {
+    override actionName = ActionName.GetGroupAlbumMediaList;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        return await this.core.apis.WebApi.getAlbumMediaListByNTQQ(
+            payload.group_id,
+            payload.album_id,
+            payload.attach_info
+        );
+    }
+}

src/onebot/action/extends/GetQunAlbumList.ts

@@ -0,0 +1,19 @@
+
+import { NTQQWebApi } from '@/core/apis';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { Static, Type } from '@sinclair/typebox';
+const SchemaData = Type.Object({
+    group_id: Type.String()
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class GetQunAlbumList extends OneBotAction<Payload,Awaited<ReturnType<NTQQWebApi['getAlbumListByNTQQ']>>['response']['album_list']> {
+    override actionName = ActionName.GetQunAlbumList;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        return (await this.core.apis.WebApi.getAlbumListByNTQQ(payload.group_id)).response.album_list;
+    }
+}