Add peerUid validation in AT message handler

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

.env.shell-analysis

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

.vscode/settings.json

@@ -9,4 +9,9 @@
     "css.customData": [
         ".vscode/tailwindcss.json"
     ],
-}
+    "editor.formatOnPaste": false,
+     "editor.formatOnSave": false,
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": "never"
+    },
+}

README.md

@@ -13,6 +13,15 @@ _Modern protocol-side framework implemented based on NTQQ._
 
 ---
 
+## New Feature
+在 v4.8.115+ 版本开始
+
+1. NapCatQQ 支持 [Stream Api](https://napneko.github.io/develop/file)
+2. NapCatQQ 推荐 message_id/user_id/group_id 均使用字符串类型
+
+- [1] 解决 Docker/跨设备/大文件 的多媒体上下传问题
+- [2] 采用字符串可以解决扩展到int64的问题，同时也可以解决部分语言（如JavaScript）对大整数支持不佳的问题，增加极少成本。
+
 ## Welcome
 + NapCatQQ is a modern implementation of the Bot protocol based on NTQQ.
   - NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
@@ -33,6 +42,7 @@ _Modern protocol-side framework implemented based on NTQQ._
 
 **首次使用**请务必查看如下文档看使用教程
 
+> 项目非盈利，对接问题/基础问题/下层框架问题 请自行搜索解决，本项目社区不提供此类解答。
 ## Link
 
 | Docs | [![Github.IO](https://img.shields.io/badge/docs%20on-Github.IO-orange)](https://napneko.github.io/) | [![Cloudflare.Worker](https://img.shields.io/badge/docs%20on-Cloudflare.Worker-black)](https://doc.napneko.icu/) | [![Cloudflare.HKServer](https://img.shields.io/badge/docs%20on-Cloudflare.HKServer-informational)](https://napcat.napneko.icu/) |
@@ -41,12 +51,17 @@ _Modern protocol-side framework implemented based on NTQQ._
 | Docs | [![Cloudflare.Pages](https://img.shields.io/badge/docs%20on-Cloudflare.Pages-blue)](https://napneko.pages.dev/) | [![Server.Other](https://img.shields.io/badge/docs%20on-Server.Other-green)](https://napcat.cyou/) | [![NapCat.Wiki](https://img.shields.io/badge/docs%20on-NapCat.Wiki-red)](https://www.napcat.wiki) |
 |:-:|:-:|:-:|:-:|
 
-| QQ Group | [![QQ Group#4](https://img.shields.io/badge/QQ%20Group%234-Join-blue)](https://qm.qq.com/q/CMmPbGw0jA) | [![QQ Group#3](https://img.shields.io/badge/QQ%20Group%233-Join-blue)](https://qm.qq.com/q/8zJMLjqy2Y) | [![QQ Group#2](https://img.shields.io/badge/QQ%20Group%232-Join-blue)](https://qm.qq.com/q/HaRcfrHpUk) | [![QQ Group#1](https://img.shields.io/badge/QQ%20Group%231-Join-blue)](https://qm.qq.com/q/I6LU87a0Yq) |
+| 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/CMmPbGw0jA) | [![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) |
+| Telegram | [![Telegram](https://img.shields.io/badge/Telegram-napcatqq-blue)](https://t.me/napcatqq) |
 |:-:|:-:|
 
+| DeepWiki | [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/NapNeko/NapCatQQ) |
+|:-:|:-:|
+
+> 请不要在其余社区提及本项目(包括其余协议端/相关应用端项目)引发争论，如有建议到达官方交流群讨论或PR。
+
 ## Thanks
 
 + [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
@@ -54,7 +69,9 @@ _Modern protocol-side framework implemented based on NTQQ._
 + [AstrBot](https://github.com/AstrBotDevs/AstrBot) 是完美适配本项目的LLM Bot框架 在此推荐一下
 
 + [MaiBot](https://github.com/MaiM-with-u/MaiBot) 一只赛博群友 麦麦 Bot框架 在此推荐一下
-  
+
++ [qq-chat-exporter](https://github.com/shuakami/qq-chat-exporter/) 基于NapCat的消息导出工具 在此推荐一下
+
 + 不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---

launcher/qqnt.json

@@ -1,9 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.19-34740",
-  "verHash": "f31348f2",
-  "linuxVersion": "3.2.17-34740",
-  "linuxVerHash": "5aa2d8d6",
+  "verHash": "cc326038",
+  "version": "9.9.21-39038",
+  "linuxVersion": "3.2.19-39038",
+  "linuxVerHash": "c773cdf7",
   "private": true,
   "description": "QQ",
   "productName": "QQ",
@@ -17,7 +17,7 @@
     "qd": "externals/devtools/cli/index.js"
   },
   "main": "./loadNapCat.js",
-  "buildVersion": "34740",
+  "buildVersion": "39038",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",

manifest.json

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

napcat.webui/src/components/display_card/common_card.tsx

@@ -62,24 +62,39 @@ const NetworkDisplayCard = <T extends keyof NetworkType>({
         <ButtonGroup
           fullWidth
           isDisabled={editing}
-          radius="full"
+          radius="sm"
           size="sm"
-          variant="shadow"
+          variant="flat"
         >
-          <Button color="warning" startContent={<FiEdit3 />} onPress={onEdit}>
+          <Button
+            color="warning"
+            startContent={<FiEdit3 size={16} />}
+            onPress={onEdit}
+          >
             编辑
           </Button>
 
           <Button
-            color={debug ? 'success' : 'default'}
-            startContent={<CgDebug />}
+            color={debug ? 'secondary' : 'success'}
+            variant="flat"
+            startContent={
+              <CgDebug
+                style={{
+                  width: '16px',
+                  height: '16px',
+                  minWidth: '16px',
+                  minHeight: '16px'
+                }}
+              />
+            }
             onPress={handleEnableDebug}
           >
             {debug ? '关闭调试' : '开启调试'}
           </Button>
           <Button
-            color="primary"
-            startContent={<MdDeleteForever />}
+            className="bg-danger/20 text-danger hover:bg-danger/30 transition-colors"
+            variant="flat"
+            startContent={<MdDeleteForever size={16} />}
             onPress={handleDelete}
           >
             删除

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/controllers/webui_manager.ts

@@ -33,13 +33,6 @@ export default class WebUIManager {
     return data.data
   }
 
-  public static async checkUsingDefaultToken() {
-    const { data } = await serverRequest.get<ServerResponse<boolean>>(
-      '/auth/check_using_default_token'
-    )
-    return data.data
-  }
-
   public static async proxy<T>(url = '') {
     const data = await serverRequest.get<ServerResponse<string>>(
       '/base/proxy?url=' + encodeURIComponent(url)
@@ -152,4 +145,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/about.tsx

@@ -155,7 +155,7 @@ export default function AboutPage() {
             shadow="sm"
             isPressable
             isExternal
-            href="https://t.me/MelodicMoonlight"
+            href="https://t.me/napcatqq"
           >
             <CardBody className="flex-row items-center gap-2">
               <span className="p-2 rounded-small bg-primary-50 text-primary-500">

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

@@ -14,8 +14,9 @@ const ChangePasswordCard = () => {
   const {
     control,
     handleSubmit: handleWebuiSubmit,
-    formState: { isSubmitting },
-    reset
+    formState: { isSubmitting, errors },
+    reset,
+    watch
   } = useForm<{
     oldToken: string
     newToken: string
@@ -29,9 +30,14 @@ const ChangePasswordCard = () => {
   const navigate = useNavigate()
   const [_, setToken] = useLocalStorage(key.token, '')
 
+  // 监听旧密码的值
+  const oldTokenValue = watch('oldToken')
+
   const onSubmit = handleWebuiSubmit(async (data) => {
     try {
+      // 使用正常密码更新流程
       await WebUIManager.changePassword(data.oldToken, data.newToken)
+
       toast.success('修改成功')
       setToken('')
       localStorage.removeItem(key.token)
@@ -45,30 +51,75 @@ const ChangePasswordCard = () => {
   return (
     <>
       <title>修改密码 - NapCat WebUI</title>
+
       <Controller
         control={control}
         name="oldToken"
+        rules={{
+          required: '旧密码不能为空',
+          validate: (value) => {
+            if (!value || value.trim().length === 0) {
+              return '旧密码不能为空'
+            }
+            return true
+          }
+        }}
         render={({ field }) => (
           <Input
             {...field}
             label="旧密码"
             placeholder="请输入旧密码"
             type="password"
+            isRequired
+            isInvalid={!!errors.oldToken}
+            errorMessage={errors.oldToken?.message}
           />
         )}
       />
+
       <Controller
         control={control}
         name="newToken"
+        rules={{
+          required: '新密码不能为空',
+          minLength: {
+            value: 6,
+            message: '新密码至少需要6个字符'
+          },
+          validate: (value) => {
+            if (!value || value.trim().length === 0) {
+              return '新密码不能为空'
+            }
+            if (value.trim().length !== value.length) {
+              return '新密码不能包含前后空格'
+            }
+            if (value === oldTokenValue) {
+              return '新密码不能与旧密码相同'
+            }
+            // 检查是否包含字母
+            if (!/[a-zA-Z]/.test(value)) {
+              return '新密码必须包含字母'
+            }
+            // 检查是否包含数字
+            if (!/[0-9]/.test(value)) {
+              return '新密码必须包含数字'
+            }
+            return true
+          }
+        }}
         render={({ field }) => (
           <Input
             {...field}
             label="新密码"
-            placeholder="请输入新密码"
+            placeholder="至少6位，包含字母和数字"
             type="password"
+            isRequired
+            isInvalid={!!errors.newToken}
+            errorMessage={errors.newToken?.message}
           />
         )}
       />
+
       <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/index.tsx

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

napcat.webui/src/pages/web_login.tsx

@@ -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')
@@ -93,42 +92,65 @@ export default function WebLoginPage() {
             </CardHeader>
 
             <CardBody className="flex gap-5 py-5 px-5 md:px-10">
-              <Input
-                isClearable
-                type="password"
-                classNames={{
-                  label: 'text-black/50 dark:text-white/90',
-                  input: [
-                    'bg-transparent',
-                    'text-black/90 dark:text-white/90',
-                    'placeholder:text-default-700/50 dark:placeholder:text-white/60'
-                  ],
-                  innerWrapper: 'bg-transparent',
-                  inputWrapper: [
-                    'shadow-xl',
-                    'bg-default-100/70',
-                    'dark:bg-default/60',
-                    'backdrop-blur-xl',
-                    'backdrop-saturate-200',
-                    'hover:bg-default-0/70',
-                    'dark:hover:bg-default/70',
-                    'group-data-[focus=true]:bg-default-100/50',
-                    'dark:group-data-[focus=true]:bg-default/60',
-                    '!cursor-text'
-                  ]
+              <form
+                onSubmit={(e) => {
+                  e.preventDefault()
+                  onSubmit()
                 }}
-                isDisabled={isLoading}
-                label="Token"
-                placeholder="请输入token"
-                radius="lg"
-                size="lg"
-                startContent={
-                  <IoKeyOutline className="text-black/50 mb-0.5 dark:text-white/90 text-slate-400 pointer-events-none flex-shrink-0" />
-                }
-                value={tokenValue}
-                onChange={(e) => setTokenValue(e.target.value)}
-                onClear={() => setTokenValue('')}
-              />
+              >
+                {/* 隐藏的用户名字段，帮助浏览器识别登录表单 */}
+                <input
+                  type="text"
+                  name="username"
+                  value="napcat-webui"
+                  autoComplete="username"
+                  className="absolute -left-[9999px] opacity-0 pointer-events-none"
+                  readOnly
+                  tabIndex={-1}
+                  aria-label="Username"
+                />
+                <Input
+                  isClearable
+                  type="password"
+                  name="password"
+                  autoComplete="current-password"
+                  classNames={{
+                    label: 'text-black/50 dark:text-white/90',
+                    input: [
+                      'bg-transparent',
+                      'text-black/90 dark:text-white/90',
+                      'placeholder:text-default-700/50 dark:placeholder:text-white/60'
+                    ],
+                    innerWrapper: 'bg-transparent',
+                    inputWrapper: [
+                      'shadow-xl',
+                      'bg-default-100/70',
+                      'dark:bg-default/60',
+                      'backdrop-blur-xl',
+                      'backdrop-saturate-200',
+                      'hover:bg-default-0/70',
+                      'dark:hover:bg-default/70',
+                      'group-data-[focus=true]:bg-default-100/50',
+                      'dark:group-data-[focus=true]:bg-default/60',
+                      '!cursor-text'
+                    ]
+                  }}
+                  isDisabled={isLoading}
+                  label="Token"
+                  placeholder="请输入token"
+                  radius="lg"
+                  size="lg"
+                  startContent={
+                    <IoKeyOutline className="text-black/50 mb-0.5 dark:text-white/90 text-slate-400 pointer-events-none flex-shrink-0" />
+                  }
+                  value={tokenValue}
+                  onChange={(e) => setTokenValue(e.target.value)}
+                  onClear={() => setTokenValue('')}
+                />
+              </form>
+              <div className="text-center text-small text-default-600 dark:text-default-400 px-2">
+                💡 提示：请从 NapCat 启动日志中查看登录密钥
+              </div>
               <Button
                 className="mx-10 mt-10 text-lg py-7"
                 color="primary"

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.80",
+  "version": "4.8.116",
   "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,22 +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",
     "@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",
-    "@sinclair/typebox": "^0.34.9",
+    "@rollup/plugin-typescript": "^12.1.4",
+    "@sinclair/typebox": "^0.34.38",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
     "@types/multer": "^1.4.12",
@@ -37,33 +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.5",
+    "esbuild": "0.25.8",
     "eslint": "^9.14.0",
-    "eslint-import-resolver-typescript": "^4.0.0",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint-import-resolver-typescript": "^4.4.4",
+    "eslint-plugin-import": "^2.32.0",
     "express-rate-limit": "^7.5.0",
     "fast-xml-parser": "^4.3.6",
     "file-type": "^21.0.0",
     "globals": "^16.0.0",
     "json5": "^2.2.3",
     "multer": "^2.0.1",
+    "napcat.protobuf": "^1.1.4",
     "typescript": "^5.3.3",
-    "typescript-eslint": "^8.13.0",
-    "vite": "^6.0.1",
+    "typescript-eslint": "^8.35.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",
-    "compressing": "^1.10.1"
+    "winston": "^3.17.0"
   },
   "dependencies": {
     "express": "^5.0.0",
     "silk-wasm": "^3.6.1",
-    "ws": "^8.18.0"
+    "ws": "^8.18.3"
   }
 }

src/common/download-ffmpeg.ts

@@ -8,12 +8,16 @@ import { pipeline } from 'stream/promises';
 import { fileURLToPath } from 'url';
 import { LogWrapper } from './log';
 
-const downloadOri = "https://github.com/NapNeko/ffmpeg-build/releases/download/v1.0.0/ffmpeg-7.1.1-win64.zip"
+const downloadOri = 'https://github.com/NapNeko/ffmpeg-build/releases/download/v1.0.0/ffmpeg-7.1.1-win64.zip';
 const urls = [
-    "https://github.moeyy.xyz/" + downloadOri,
-    "https://ghp.ci/" + downloadOri,
-    "https://gh.api.99988866.xyz/" + downloadOri,
-    "https://gh.api.99988866.xyz/" + downloadOri,
+    '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
 ];
 
@@ -350,11 +354,11 @@ export async function downloadFFmpegIfNotExists(log: LogWrapper) {
         return {
             path: path.join(currentPath, 'ffmpeg'),
             reset: true
-        }
+        };
     }
 
     return {
         path: path.join(currentPath, 'ffmpeg'),
         reset: true
-    }
+    };
 }

src/common/file.ts

@@ -182,28 +182,28 @@ export async function uriToLocalFile(dir: string, uri: string, filename: string
     const filePath = path.join(dir, filename);
 
     switch (UriType) {
-        case FileUriType.Local: {
-            const fileExt = path.extname(HandledUri);
-            const localFileName = path.basename(HandledUri, fileExt) + fileExt;
-            const tempFilePath = path.join(dir, filename + fileExt);
-            fs.copyFileSync(HandledUri, tempFilePath);
-            return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
-        }
+    case FileUriType.Local: {
+        const fileExt = path.extname(HandledUri);
+        const localFileName = path.basename(HandledUri, fileExt) + fileExt;
+        const tempFilePath = path.join(dir, filename + fileExt);
+        fs.copyFileSync(HandledUri, tempFilePath);
+        return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
+    }
 
-        case FileUriType.Remote: {
-            const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
-            fs.writeFileSync(filePath, buffer);
-            return { success: true, errMsg: '', fileName: filename, path: filePath };
-        }
+    case FileUriType.Remote: {
+        const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
+        fs.writeFileSync(filePath, buffer);
+        return { success: true, errMsg: '', fileName: filename, path: filePath };
+    }
 
-        case FileUriType.Base64: {
-            const base64 = HandledUri.replace(/^base64:\/\//, '');
-            const base64Buffer = Buffer.from(base64, 'base64');
-            fs.writeFileSync(filePath, base64Buffer);
-            return { success: true, errMsg: '', fileName: filename, path: filePath };
-        }
+    case FileUriType.Base64: {
+        const base64 = HandledUri.replace(/^base64:\/\//, '');
+        const base64Buffer = Buffer.from(base64, 'base64');
+        fs.writeFileSync(filePath, base64Buffer);
+        return { success: true, errMsg: '', fileName: filename, path: filePath };
+    }
 
-        default:
-            return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
+    default:
+        return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
     }
 }

src/common/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,6 +9,7 @@ export class NapCatPathWrapper {
     configPath: string;
     cachePath: string;
     staticPath: string;
+    pluginPath: string;
 
     constructor(mainPath: string = dirname(fileURLToPath(import.meta.url))) {
         this.binaryPath = mainPath;
@@ -24,6 +25,7 @@ export class NapCatPathWrapper {
 
         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`,
-            darwin: `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
-            linux: `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            win32: `V1_WIN_${this.getFullQQVersion()}_${this.getQQBuildStr()}_GW_B`,
+            darwin: `V1_MAC_${this.getFullQQVersion()}_${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.80';
+export const napCatVersion = '4.8.116';

src/common/worker.ts

@@ -9,7 +9,7 @@ export async function runTask<T, R>(workerScript: string, taskData: T): Promise<
                     console.error('Worker Log--->:', (result as { log: string }).log);
                 }
                 if ((result as any)?.error) {
-                    reject(new Error("Worker error: " + (result as { error: string }).error));
+                    reject(new Error('Worker error: ' + (result as { error: string }).error));
                 }
                 resolve(result);
             });

src/core/apis/file.ts

@@ -42,10 +42,10 @@ 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
+        this.context.logger
         );
     }
 
@@ -64,13 +64,13 @@ export class NTQQFileApi {
         }
     }
 
-    async getFileUrl(chatType: ChatType, peer: string, fileUUID?: string, file10MMd5?: string | undefined) {
-        if (this.core.apis.PacketApi.available) {
+    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);
+                    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);
+                    return this.core.apis.PacketApi.pkt.operation.GetPrivateFileUrl(peer, fileUUID, file10MMd5, timeout);
                 }
             } catch (error) {
                 this.context.logger.logError('获取文件URL失败', (error as Error).message);
@@ -79,8 +79,8 @@ export class NTQQFileApi {
         throw new Error('fileUUID or file10MMd5 is undefined');
     }
 
-    async getPttUrl(peer: string, fileUUID?: string) {
-        if (this.core.apis.PacketApi.available && fileUUID) {
+    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) {
@@ -90,7 +90,7 @@ export class NTQQFileApi {
                         uploadTime: 0,
                         ttl: 0,
                         subType: 0,
-                    });
+                    }, timeout);
                 } else if (fileUUID) {
                     return this.core.apis.PacketApi.pkt.operation.GetPttUrl(peer, {
                         fileUuid: fileUUID,
@@ -98,7 +98,7 @@ export class NTQQFileApi {
                         uploadTime: 0,
                         ttl: 0,
                         subType: 0,
-                    });
+                    }, timeout);
                 }
             } catch (error) {
                 this.context.logger.logError('获取文件URL失败', (error as Error).message);
@@ -107,8 +107,8 @@ export class NTQQFileApi {
         throw new Error('packet cant get ptt url');
     }
 
-    async getVideoUrlPacket(peer: string, fileUUID?: string) {
-        if (this.core.apis.PacketApi.available && fileUUID) {
+    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) {
@@ -118,7 +118,7 @@ export class NTQQFileApi {
                         uploadTime: 0,
                         ttl: 0,
                         subType: 0,
-                    });
+                    }, timeout);
                 } else if (fileUUID) {
                     return this.core.apis.PacketApi.pkt.operation.GetVideoUrl(peer, {
                         fileUuid: fileUUID,
@@ -126,7 +126,7 @@ export class NTQQFileApi {
                         uploadTime: 0,
                         ttl: 0,
                         subType: 0,
-                    });
+                    }, timeout);
                 }
             } catch (error) {
                 this.context.logger.logError('获取文件URL失败', (error as Error).message);
@@ -260,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;
@@ -379,18 +378,18 @@ export class NTQQFileApi {
                     element.elementType === ElementType.FILE
                 ) {
                     switch (element.elementType) {
-                        case ElementType.PIC:
+                    case ElementType.PIC:
                             element.picElement!.sourcePath = elementResults?.[elementIndex] ?? '';
-                            break;
-                        case ElementType.VIDEO:
+                        break;
+                    case ElementType.VIDEO:
                             element.videoElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
-                        case ElementType.PTT:
+                        break;
+                    case ElementType.PTT:
                             element.pttElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
-                        case ElementType.FILE:
+                        break;
+                    case ElementType.FILE:
                             element.fileElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
+                        break;
                     }
                     elementIndex++;
                 }
@@ -502,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

@@ -110,7 +110,7 @@ export class NTQQFriendApi {
                 time: item.reqTime, // 信息字段
                 type: 'doubt' //保留字段
             };
-        }))
+        }));
         return requests;
     }
 }

src/core/apis/group.ts

@@ -58,13 +58,13 @@ export class NTQQGroupApi {
             } as Peer,
             {
                 busiId: 2201,
-                jsonStr: JSON.stringify({ "align": "center", "items": [{ "txt": tip, "type": "nor" }] }),
+                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)) {
@@ -247,6 +247,12 @@ export class NTQQGroupApi {
         return member;
     }
     async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
+        // 添加参数验证，防止 undefined/null 导致的崩溃
+        if (groupCode === undefined || groupCode === null || memberUinOrUid === undefined || memberUinOrUid === null) {
+            this.context.logger.logError('getGroupMember: 无效的参数', { groupCode, memberUinOrUid });
+            return undefined;
+        }
+
         const groupCodeStr = groupCode.toString();
         const memberUinOrUidStr = memberUinOrUid.toString();
 

src/core/apis/msg.ts

@@ -142,7 +142,6 @@ 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: [],
@@ -192,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())
-            .then()
+        this.packetStatus = (await this.InitSendPacket(this.context.basicInfoWrapper.getFullQQVersion())
+            .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;
@@ -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(pskey);
-        const cookie = `p_uin=${uin}; p_skey=${pskey}; skey=${skey}; uin=${uin}`;
-        const body = {
-            control_req: [{
-                uin: uin,
-                token: {
-                    type: 4,
-                    data: pskey,
-                    appid: 5
-                },
-                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 GTK = this.getBknFromSKey(skey);
+        const cookie = `p_uin=o${uin}; p_skey=${pskey}; skey=${skey}; uin=o${uin}`;
+        const body = qunAlbumControl({
+            uin,
+            group_id: gc,
+            pskey,
+            pic_md5: img_md5,
+            img_size,
+            img_name,
+            sAlbumName: sAlbumName,
+            sAlbumID: sAlbumID
+        });
         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

@@ -1,4 +1,4 @@
-import { GroupDetailInfoV2Param, GroupExtInfo, GroupExtFilter } from "../types";
+import { GroupDetailInfoV2Param, GroupExtInfo, GroupExtFilter } from '../types';
 
 export function createGroupDetailInfoV2Param(group_code: string): GroupDetailInfoV2Param {
     return {
@@ -51,7 +51,7 @@ export function createGroupDetailInfoV2Param(group_code: string): GroupDetailInf
             }, groupSecLevel: 0,
             groupSecLevelInfo: 0,
             subscriptionUin: 0,
-            subscriptionUid: "",
+            subscriptionUid: '',
             allowMemberInvite: 0,
             groupQuestion: 0,
             groupAnswer: 0,
@@ -81,34 +81,34 @@ export function createGroupDetailInfoV2Param(group_code: string): GroupDetailInf
         modifyInfo: {
             noCodeFingerOpenFlag: 0,
             noFingerOpenFlag: 0,
-            groupName: "",
+            groupName: '',
             classExt: 0,
-            classText: "",
-            fingerMemo: "",
-            richFingerMemo: "",
+            classText: '',
+            fingerMemo: '',
+            richFingerMemo: '',
             tagRecord: [],
             groupGeoInfo: {
-                ownerUid: "",
+                ownerUid: '',
                 SetTime: 0,
                 CityId: 0,
-                Longitude: "",
-                Latitude: "",
-                GeoContent: "",
-                poiId: ""
+                Longitude: '',
+                Latitude: '',
+                GeoContent: '',
+                poiId: ''
             },
             groupExtAdminNum: 0,
             flag: 0,
-            groupMemo: "",
-            groupAioSkinUrl: "",
-            groupBoardSkinUrl: "",
-            groupCoverSkinUrl: "",
+            groupMemo: '',
+            groupAioSkinUrl: '',
+            groupBoardSkinUrl: '',
+            groupCoverSkinUrl: '',
             groupGrade: 0,
             activeMemberNum: 0,
             certificationType: 0,
-            certificationText: "",
+            certificationText: '',
             groupNewGuideLines: {
                 enabled: false,
-                content: ""
+                content: ''
             }, groupFace: 0,
             addOption: 0,
             shutUpTime: 0,
@@ -121,15 +121,15 @@ export function createGroupDetailInfoV2Param(group_code: string): GroupDetailInf
             },
             groupSecLevel: 0,
             groupSecLevelInfo: 0,
-            subscriptionUin: "",
-            subscriptionUid: "",
+            subscriptionUin: '',
+            subscriptionUid: '',
             allowMemberInvite: 0,
-            groupQuestion: "",
-            groupAnswer: "",
+            groupQuestion: '',
+            groupAnswer: '',
             groupFlagExt3: 0,
             groupFlagExt3Mask: 0,
             groupOpenAppid: 0,
-            rootId: "",
+            rootId: '',
             msgLimitFrequency: 0,
             hlGuildAppid: 0,
             hlGuildSubType: 0,
@@ -137,20 +137,20 @@ export function createGroupDetailInfoV2Param(group_code: string): GroupDetailInf
             groupFlagExt4: 0,
             groupFlagExt4Mask: 0,
             groupSchoolInfo: {
-                location: "",
+                location: '',
                 grade: 0,
-                school: ""
+                school: ''
             },
             groupCardPrefix:
             {
-                introduction: "",
+                introduction: '',
                 rptPrefix: []
             },
-            allianceId: "",
+            allianceId: '',
             groupFlagPro1: 0,
             groupFlagPro1Mask: 0
         }
-    }
+    };
 }
 export function createGroupExtInfo(group_code: string): GroupExtInfo {
     return {
@@ -205,7 +205,7 @@ export function createGroupExtInfo(group_code: string): GroupExtInfo {
             inviteRobotMemberExamine: 0,
             groupSquareSwitch: 0,
         }
-    }
+    };
 }
 export function createGroupExtFilter(): GroupExtFilter {
     return {
@@ -241,5 +241,5 @@ export function createGroupExtFilter(): GroupExtFilter {
         inviteRobotMemberSwitch: 0,
         inviteRobotMemberExamine: 0,
         groupSquareSwitch: 0,
-    }
+    };
 };

src/core/data/index.ts

@@ -1 +1 @@
-export * from "./group";
+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

@@ -322,5 +322,69 @@
     "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

@@ -404,8 +404,8 @@
         "recv": "AFBF520"
     },
     "9.9.20-36580-x64": {
-        "send":"30824B8",
-        "recv":"3085C5C"
+        "send": "30824B8",
+        "recv": "3085C5C"
     },
     "3.2.18-36580-x64": {
         "send": "B0853E0",
@@ -414,5 +414,101 @@
     "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

@@ -40,7 +40,6 @@ export class NodeIKernelBuddyListener {
     }
 
     onDelBatchBuddyInfos(_arg: unknown): any {
-        console.log('onDelBatchBuddyInfos not implemented', ...arguments);
     }
 
     onDoubtBuddyReqChange(_arg:

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> {
-        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 = () => {
+    private async sendCommand(cmd: string, data: string, trace_data: 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.registerCallback(trace_id, 'send', async (json: RecvPacketData) => {
+            this.cb.set(hash + '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, trace_id);
+            this.sendCommandImpl(cmd, data, hash, timeout);
         });
     }
 
-    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);
-        return this.sendCommand(cmd, data, trace_id, rsp, 20000, async () => {
-            await this.napcore.sendSsoCmdReqByContend(cmd, trace_id);
+        const trace_data = (randText(4) + md5 + data).slice(0, data.length / 2);// trace_data
+        return this.sendCommand(cmd, data, trace_data, rsp, timeout, async () => {
+            await this.napcore.sendSsoCmdReqByContend(cmd, trace_data);
         });
     }
 
-    async sendOidbPacket(pkt: OidbPacket, rsp = false): Promise<RecvPacketData> {
-        return this.sendPacket(pkt.cmd, pkt.data, rsp);
+    async sendOidbPacket(pkt: OidbPacket, rsp = false, timeout = 20000): Promise<RecvPacketData> {
+        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,30 +40,36 @@ export class NativePacketClient extends IPacketClient {
 
     async init(_pid: number, recv: string, send: string): Promise<void> {
         const platform = process.platform + '.' + process.arch;
-        const isNewQQ = this.napcore.basicInfo.requireMinNTQQBuild("36580");
+        const 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');
-            if (type === 0 && this.cb.get(trace_id + 'recv')) {
+            const hash = createHash('md5').update(Buffer.from(hex_data, 'hex')).digest('hex');
+            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 trace_id = this.sendEvent.get(seq);
-                const callback = this.cb.get(trace_id + 'recv');
-                // console.log('callback:', callback, trace_id);
+                const hash = this.sendEvent.get(seq);
+                const callback = this.cb.get(hash + 'recv');
                 callback?.({ seq, cmd, hex_data });
             }
         }, this.napcore.config.o3HookMode == 1);
         this.available = true;
     }
 
-    sendCommandImpl(cmd: string, data: string, trace_id: string): void {
-        const trace_id_md5 = createHash('md5').update(trace_id).digest('hex');
-        this.MoeHooExport.exports.SendPacket?.(cmd, data, trace_id_md5);
-        this.cb.get(trace_id_md5 + 'send')?.({ seq: 0, cmd, hex_data: '' });
+    sendCommandImpl(cmd: string, data: string, hash: string, timeout: number): void {
+        this.timeEvent.set(hash, setTimeout(() => {
+            this.timeEvent.delete(hash);//考虑情况为正式send都没进
+        }, 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> {
-        const raw = await this._client.sendOidbPacket(pkt, rsp);
+    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, timeout);
         return (rsp ? Buffer.from(raw.hex_data, 'hex') : undefined) as T extends true ? Buffer : void;
     }
 

src/core/packet/context/operationContext.ts

@@ -34,10 +34,13 @@ export class PacketOperationContext {
         const req = trans.SendPoke.build(is_group, peer, target ?? peer);
         await this.context.client.sendOidbPacket(req);
     }
-
-    async FetchRkey() {
+    async SetGroupTodo(groupUin: number, msgSeq: string) {
+        const req = trans.SetGroupTodo.build(groupUin, msgSeq);
+        await this.context.client.sendOidbPacket(req, true);
+    }
+    async FetchRkey(timeout: number = 10000) {
         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;
     }
@@ -119,37 +122,37 @@ export class PacketOperationContext {
         return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
     }
 
-    async GetPttUrl(selfUid: string, 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);
+        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>) {
+    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);
+        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>) {
+    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>) {
+    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);
+        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>) {
+    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);
+        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}`;
     }
@@ -180,9 +183,9 @@ export class PacketOperationContext {
         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...`);
+                    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!`);
+                        this.context.logger.error('targetPeer is undefined!');
                     }
                     let targetMsg: NapProtoEncodeStructType<typeof PushMsgBody>[] | undefined;
                     if (e.isGroupReply) {
@@ -195,7 +198,7 @@ export class PacketOperationContext {
                 }
             });
         }).flat();
-        await Promise.all(ps)
+        await Promise.all(ps);
         await this.UploadResources(msg, groupUin);
     }
 
@@ -203,14 +206,14 @@ export class PacketOperationContext {
         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
+        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
+        return res.messages;
     }
 
     async UploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
@@ -240,16 +243,16 @@ 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`;
     }

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/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/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
-
-    doQunComment(...args: unknown[]): unknown;// needs 6 arguments
+    //seq random
+    //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/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

@@ -15,7 +15,7 @@ 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(
@@ -37,7 +37,7 @@ 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) {

src/onebot/action/OneBotAction.ts

@@ -4,9 +4,10 @@ import { NapCatCore } from '@/core';
 import { NapCatOneBot11Adapter, OB11Return } from '@/onebot';
 import { NetworkAdapterConfig } from '../config/config';
 import { TSchema } from '@sinclair/typebox';
+import { StreamPacket, StreamPacketBasic, StreamStatus } from './stream/StreamBasic';
 
 export class OB11Response {
-    private static createResponse<T>(data: T, status: string, retcode: number, message: string = '', echo: unknown = null): OB11Return<T> {
+    private static createResponse<T>(data: T, status: string, retcode: number, message: string = '', echo: unknown = null, useStream: boolean = false): OB11Return<T> {
         return {
             status,
             retcode,
@@ -14,28 +15,32 @@ export class OB11Response {
             message,
             wording: message,
             echo,
+            stream: useStream ? 'stream-action' : 'normal-action'
         };
     }
 
-    static res<T>(data: T, status: string, retcode: number, message: string = ''): OB11Return<T> {
-        return this.createResponse(data, status, retcode, message);
+    static res<T>(data: T, status: string, retcode: number, message: string = '', echo: unknown = null, useStream: boolean = false): OB11Return<T> {
+        return this.createResponse(data, status, retcode, message, echo, useStream);
     }
 
-    static ok<T>(data: T, echo: unknown = null): OB11Return<T> {
-        return this.createResponse(data, 'ok', 0, '', echo);
+    static ok<T>(data: T, echo: unknown = null, useStream: boolean = false): OB11Return<T> {
+        return this.createResponse(data, 'ok', 0, '', echo, useStream);
     }
 
-    static error(err: string, retcode: number, echo: unknown = null): OB11Return<null> {
-        return this.createResponse(null, 'failed', retcode, err, echo);
+    static error(err: string, retcode: number, echo: unknown = null, useStream: boolean = false): OB11Return<null | StreamPacketBasic> {
+        return this.createResponse(useStream ? { type: StreamStatus.Error, data_type: 'error' } : null, 'failed', retcode, err, echo, useStream);
     }
 }
-
+export abstract class OneBotRequestToolkit {
+    abstract send<T>(packet: StreamPacket<T>): Promise<void>;
+}
 export abstract class OneBotAction<PayloadType, ReturnDataType> {
     actionName: typeof ActionName[keyof typeof ActionName] = ActionName.Unknown;
     core: NapCatCore;
     private validate?: ValidateFunction<unknown> = undefined;
     payloadSchema?: TSchema = undefined;
     obContext: NapCatOneBot11Adapter;
+    useStream: boolean = false;
 
     constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
         this.obContext = obContext;
@@ -57,33 +62,33 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
         return { valid: true };
     }
 
-    public async handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig): Promise<OB11Return<ReturnDataType | null>> {
+    public async handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig, req: OneBotRequestToolkit = { send: async () => { } }, echo?: string): Promise<OB11Return<ReturnDataType | StreamPacketBasic | null>> {
         const result = await this.check(payload);
         if (!result.valid) {
             return OB11Response.error(result.message, 400);
         }
         try {
-            const resData = await this._handle(payload, adaptername, config);
-            return OB11Response.ok(resData);
+            const resData = await this._handle(payload, adaptername, config, req);
+            return OB11Response.ok(resData, echo, this.useStream);
         } catch (e: unknown) {
             this.core.context.logger.logError('发生错误', e);
-            return OB11Response.error((e as Error).message.toString() || (e as Error)?.stack?.toString() || '未知错误，可能操作超时', 200);
+            return OB11Response.error((e as Error).message.toString() || (e as Error)?.stack?.toString() || '未知错误，可能操作超时', 200, echo, this.useStream);
         }
     }
 
-    public async websocketHandle(payload: PayloadType, echo: unknown, adaptername: string, config: NetworkAdapterConfig): Promise<OB11Return<ReturnDataType | null>> {
+    public async websocketHandle(payload: PayloadType, echo: unknown, adaptername: string, config: NetworkAdapterConfig, req: OneBotRequestToolkit = { send: async () => { } }): Promise<OB11Return<ReturnDataType | StreamPacketBasic | null>> {
         const result = await this.check(payload);
         if (!result.valid) {
-            return OB11Response.error(result.message, 1400, echo);
+            return OB11Response.error(result.message, 1400, echo, this.useStream);
         }
         try {
-            const resData = await this._handle(payload, adaptername, config);
-            return OB11Response.ok(resData, echo);
+            const resData = await this._handle(payload, adaptername, config, req);
+            return OB11Response.ok(resData, echo, this.useStream);
         } catch (e: unknown) {
             this.core.context.logger.logError('发生错误', e);
-            return OB11Response.error(((e as Error).message.toString() || (e as Error).stack?.toString()) ?? 'Error', 1200, echo);
+            return OB11Response.error(((e as Error).message.toString() || (e as Error).stack?.toString()) ?? 'Error', 1200, echo, this.useStream);
         }
     }
 
-    abstract _handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig): Promise<ReturnDataType>;
+    abstract _handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig, req: OneBotRequestToolkit): Promise<ReturnDataType>;
 }

src/onebot/action/extends/ClickInlineKeyboardButton.ts

@@ -25,6 +25,6 @@ export class ClickInlineKeyboardButton extends OneBotAction<Payload, unknown> {
             callback_data: payload.callback_data,
             dmFlag: 0,
             chatType: 2
-        })
+        });
     }
 }

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;
+    }
+}

src/onebot/action/extends/GetUnidirectionalFriendList.ts

@@ -36,7 +36,7 @@ export class GetUnidirectionalFriendList extends OneBotAction<void, Friend[]> {
             uint64_uin: self_id,
             uint64_top: 0,
             uint32_req_num: 99,
-            bytes_cookies: ""
+            bytes_cookies: ''
         };
         const packed_data = await this.pack_data(JSON.stringify(req_json));
         const data = Buffer.from(packed_data).toString('hex');

src/onebot/action/extends/SetGroupAlbumMediaLike.ts

@@ -0,0 +1,27 @@
+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(),
+    id: Type.String(),//421_1_0_1012959257|V61Yiali4PELg90bThrH4Bo2iI1M5Kab|V5bCgAxMDEyOTU5MjU3.PyqaPndPxg!^||^421_1_0_1012959257|V61Yiali4PELg90bThrH4Bo2iI1M5Kab|17560363448^||^1
+    set: Type.Boolean({default: true})//true=点赞 false=取消点赞 未实现
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class SetGroupAlbumMediaLike extends OneBotAction<Payload, unknown> {
+    override actionName = ActionName.SetGroupAlbumMediaLike;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        return await this.core.apis.WebApi.doAlbumMediaLikeByNTQQ(
+            payload.group_id,
+            payload.album_id,
+            payload.lloc,
+            payload.id
+        );
+    }
+}

src/onebot/action/extends/UploadImageToQunAlbum.ts

@@ -0,0 +1,31 @@
+import { uriToLocalFile } from '@/common/file';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { Static, Type } from '@sinclair/typebox';
+import { existsSync } from 'node:fs';
+import { unlink } from 'node:fs/promises';
+
+const SchemaData = Type.Object({
+    group_id: Type.String(),
+    album_id: Type.String(),
+    album_name: Type.String(),
+    file: Type.String()
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class UploadImageToQunAlbum extends OneBotAction<Payload, unknown> {
+    override actionName = ActionName.UploadImageToQunAlbum;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        const downloadResult = await uriToLocalFile(this.core.NapCatTempPath, payload.file);
+        try {
+            return await this.core.apis.WebApi.uploadImageToQunAlbum(payload.group_id, payload.album_id, payload.album_name, downloadResult.path);
+        } finally {
+            if (downloadResult.path && existsSync(downloadResult.path)) {
+                await unlink(downloadResult.path);
+            }
+        }
+    }
+}

src/onebot/action/file/GetFile.ts

@@ -41,12 +41,12 @@ export class GetFileBase extends OneBotAction<GetFilePayload, GetFileResponse> {
             let url = '';
             if (mixElement?.picElement && rawMessage) {
                 const tempData =
-                    await this.obContext.apis.MsgApi.rawToOb11Converters.picElement?.(mixElement?.picElement, rawMessage, mixElement, { parseMultMsg: false }) as OB11MessageImage | undefined;
+                    await this.obContext.apis.MsgApi.rawToOb11Converters.picElement?.(mixElement?.picElement, rawMessage, mixElement, { parseMultMsg: false, disableGetUrl: false, quick_reply: true }) as OB11MessageImage | undefined;
                 url = tempData?.data.url ?? '';
             }
             if (mixElement?.videoElement && rawMessage) {
                 const tempData =
-                    await this.obContext.apis.MsgApi.rawToOb11Converters.videoElement?.(mixElement?.videoElement, rawMessage, mixElement, { parseMultMsg: false }) as OB11MessageVideo | undefined;
+                    await this.obContext.apis.MsgApi.rawToOb11Converters.videoElement?.(mixElement?.videoElement, rawMessage, mixElement, { parseMultMsg: false, disableGetUrl: false, quick_reply: true }) as OB11MessageVideo | undefined;
                 url = tempData?.data.url ?? '';
             }
             const res: GetFileResponse = {

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

@@ -130,7 +130,7 @@ export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
                     throw new Error('消息不存在或已过期');
                 }
                 // 6. 解析消息内容
-                const resMsg = (await this.obContext.apis.MsgApi.parseMessageV2(singleMsg))?.arrayMsg;
+                const resMsg = (await this.obContext.apis.MsgApi.parseMessage(singleMsg, 'array', true));
 
                 const forwardContent = (resMsg?.message?.[0] as OB11MessageForward)?.data?.content;
                 if (forwardContent) {

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

@@ -14,7 +14,10 @@ const SchemaData = Type.Object({
     user_id: Type.String(),
     message_seq: Type.Optional(Type.String()),
     count: Type.Number({ default: 20 }),
-    reverseOrder: Type.Boolean({ default: false })
+    reverseOrder: Type.Boolean({ default: false }),
+    disable_get_url: Type.Boolean({ default: false }),
+    parse_mult_msg: Type.Boolean({ default: true }),
+    quick_reply: Type.Boolean({ default: false }),
 });
 
 
@@ -41,7 +44,7 @@ export default class GetFriendMsgHistory extends OneBotAction<Payload, Response>
         }));
         //烘焙消息
         const ob11MsgList = (await Promise.all(
-            msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg, config.messagePostFormat)))
+            msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg, config.messagePostFormat, payload.parse_mult_msg, payload.disable_get_url)))
         ).filter(msg => msg !== undefined);
         return { 'messages': ob11MsgList };
     }

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

@@ -14,7 +14,10 @@ const SchemaData = Type.Object({
     group_id: Type.String(),
     message_seq: Type.Optional(Type.String()),
     count: Type.Number({ default: 20 }),
-    reverseOrder: Type.Boolean({ default: false })
+    reverseOrder: Type.Boolean({ default: false }),
+    disable_get_url: Type.Boolean({ default: false }),
+    parse_mult_msg: Type.Boolean({ default: true }),
+    quick_reply: Type.Boolean({ default: false }),
 });
 
 
@@ -39,7 +42,7 @@ export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction<Payload, Re
         }));
         //烘焙消息
         const ob11MsgList = (await Promise.all(
-            msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg, config.messagePostFormat)))
+            msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg, config.messagePostFormat, payload.parse_mult_msg, payload.disable_get_url, payload.quick_reply)))
         ).filter(msg => msg !== undefined);
         return { 'messages': ob11MsgList };
     }

src/onebot/action/group/SetGroupAddRequest.ts

@@ -1,5 +1,5 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
-import { NTGroupRequestOperateTypes } from '@/core/types';
+import { GroupNotify, NTGroupRequestOperateTypes } from '@/core/types';
 import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
@@ -7,6 +7,7 @@ const SchemaData = Type.Object({
     flag: Type.Union([Type.String(), Type.Number()]),
     approve: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
     reason: Type.Optional(Type.Union([Type.String({ default: ' ' }), Type.Null()])),
+    count: Type.Optional(Type.Number({ default: 100 })),
 });
 
 type Payload = Static<typeof SchemaData>;
@@ -19,8 +20,12 @@ export default class SetGroupAddRequest extends OneBotAction<Payload, null> {
         const flag = payload.flag.toString();
         const approve = payload.approve?.toString() !== 'false';
         const reason = payload.reason ?? ' ';
+        const count = payload.count;
         const invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(flag);
-        const { doubt, notify } = invite_notify ? { doubt: false, notify: invite_notify } : await this.findNotify(flag);
+        const { doubt, notify } = invite_notify ? {
+            doubt: false,
+            notify: invite_notify,
+        } : await this.findNotify(flag, count);
         if (!notify) {
             throw new Error('No such request');
         }
@@ -33,12 +38,15 @@ export default class SetGroupAddRequest extends OneBotAction<Payload, null> {
         return null;
     }
 
-    private async findNotify(flag: string) {
-        let notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(false, 100)).find(e => e.seq == flag);
+    private async findNotify(flag: string, count: number = 100): Promise<{
+        doubt: boolean,
+        notify: GroupNotify | undefined
+    }> {
+        let notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(false, count)).find(e => e.seq == flag);
         if (!notify) {
-            notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(true, 100)).find(e => e.seq == flag);
+            notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(true, count)).find(e => e.seq == flag);
             return { doubt: true, notify };
         }
         return { doubt: false, notify };
     }
-}
+}

src/onebot/action/index.ts

@@ -123,10 +123,32 @@ import SetGroupKickMembers from './extends/SetGroupKickMembers';
 import { GetGroupDetailInfo } from './group/GetGroupDetailInfo';
 import GetGroupAddRequest from './extends/GetGroupAddRequest';
 import { GetCollectionList } from './extends/GetCollectionList';
+import { SetGroupTodo } from './packet/SetGroupTodo';
+import { GetQunAlbumList } from './extends/GetQunAlbumList';
+import { UploadImageToQunAlbum } from './extends/UploadImageToQunAlbum';
+import { DoGroupAlbumComment } from './extends/DoGroupAlbumComment';
+import { GetGroupAlbumMediaList } from './extends/GetGroupAlbumMediaList';
+import { SetGroupAlbumMediaLike } from './extends/SetGroupAlbumMediaLike';
+import { DelGroupAlbumMedia } from './extends/DelGroupAlbumMedia';
+import { CleanStreamTempFile } from './stream/CleanStreamTempFile';
+import { DownloadFileStream } from './stream/DownloadFileStream';
+import { TestDownloadStream } from './stream/TestStreamDownload';
+import { UploadFileStream } from './stream/UploadFileStream';
 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
     const actionHandlers = [
+        new CleanStreamTempFile(obContext, core),
+        new DownloadFileStream(obContext, core),
+        new TestDownloadStream(obContext, core),
+        new UploadFileStream(obContext, core),
+        new DelGroupAlbumMedia(obContext, core),
+        new SetGroupAlbumMediaLike(obContext, core),
+        new DoGroupAlbumComment(obContext, core),
+        new GetGroupAlbumMediaList(obContext, core),
+        new GetQunAlbumList(obContext, core),
+        new UploadImageToQunAlbum(obContext, core),
+        new SetGroupTodo(obContext, core),
         new GetGroupDetailInfo(obContext, core),
         new SetGroupKickMembers(obContext, core),
         new SetGroupAddOption(obContext, core),

src/onebot/action/msg/DeleteMsg.ts

@@ -16,6 +16,9 @@ class DeleteMsg extends OneBotAction<Payload, void> {
     async _handle(payload: Payload) {
         const msg = MessageUnique.getMsgIdAndPeerByShortId(Number(payload.message_id));
         if (msg) {
+            this.obContext.recallEventCache.set(msg.MsgId, setTimeout(() => {
+                this.obContext.recallEventCache.delete(msg.MsgId);
+            }, 5000));
             await this.core.apis.MsgApi.recallMsg(msg.Peer, msg.MsgId);
         } else {
             throw new Error('Recall failed');

src/onebot/action/msg/GetMsg.ts

@@ -28,13 +28,13 @@ class GetMsg extends OneBotAction<Payload, OB11Message> {
             throw new Error('消息不存在');
         }
         const peer = { guildId: '', peerUid: msgIdWithPeer?.Peer.peerUid, chatType: msgIdWithPeer.Peer.chatType };
-        const orimsg = this.obContext.recallMsgCache.get(msgIdWithPeer.MsgId);
+        //const orimsg = this.obContext.recallMsgCache.get(msgIdWithPeer.MsgId);
         let msg: RawMessage|undefined;
-        if (orimsg) {
-            msg = orimsg;
-        } else {
-            msg = (await this.core.apis.MsgApi.getMsgsByMsgId(peer, [msgIdWithPeer?.MsgId || payload.message_id.toString()])).msgList[0];
-        }
+        // if (orimsg) {
+        //     msg = orimsg;
+        // } else {
+        msg = (await this.core.apis.MsgApi.getMsgsByMsgId(peer, [msgIdWithPeer?.MsgId || payload.message_id.toString()])).msgList[0];
+        //}
         if (!msg) throw Error('消息不存在');
         const retMsg = await this.obContext.apis.MsgApi.parseMessage(msg, config.messagePostFormat);
         if (!retMsg) throw Error('消息为空');

src/onebot/action/msg/SendMsg.ts

@@ -55,7 +55,7 @@ export async function createContext(core: NapCatCore, payload: OB11PostContext |
                     chatType: ChatType.KCHATTYPEGROUP,
                     peerUid: payload.group_id.toString(),
                     guildId: ''
-                }
+                };
             }
             throw new Error('无法获取用户信息');
         }
@@ -130,7 +130,7 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         );
 
         if (getSpecialMsgNum(payload, OB11MessageDataType.node)) {
-            const packetMode = this.core.apis.PacketApi.available;
+            const packetMode = this.core.apis.PacketApi.packetStatus;
             let returnMsgAndResId: { message: RawMessage | null, res_id?: string } | null;
             try {
                 returnMsgAndResId = packetMode

src/onebot/action/packet/GetPacketStatus.ts

@@ -4,7 +4,7 @@ import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 
 export abstract class GetPacketStatusDepends<PT, RT> extends OneBotAction<PT, RT> {
     protected override async check(payload: PT): Promise<BaseCheckResult>{
-        if (!this.core.apis.PacketApi.available) {
+        if (!this.core.apis.PacketApi.packetStatus) {
             return {
                 valid: false,
                 message: 'packetBackend不可用，请参照文档 https://napneko.github.io/config/advanced 和启动日志检查packetBackend状态或进行配置！' +

src/onebot/action/packet/GetRkeyEx.ts

@@ -8,7 +8,7 @@ export class GetRkeyEx extends GetPacketStatusDepends<void, unknown> {
         let rkeys = await this.core.apis.PacketApi.pkt.operation.FetchRkey();
         return rkeys.map(rkey => {
             return {
-                type: rkey.type === 10 ? "private" : "group",
+                type: rkey.type === 10 ? 'private' : 'group',
                 rkey: rkey.rkey,
                 created_at: rkey.time,
                 ttl: rkey.ttl,

src/onebot/action/packet/GetRkeyServer.ts

@@ -30,7 +30,7 @@ export class GetRkeyServer extends GetPacketStatusDepends<void, { private_rkey?:
             private_rkey: privateRkeyItem ? privateRkeyItem.rkey : undefined,
             group_rkey: groupRkeyItem ? groupRkeyItem.rkey : undefined,
             expired_time: this.expiryTime,
-            name: "NapCat 4"
+            name: 'NapCat 4'
         };
 
         return this.rkeyCache;

src/onebot/action/packet/SendPoke.ts

@@ -14,8 +14,8 @@ export class SendPokeBase extends GetPacketStatusDepends<Payload, void> {
 
     async _handle(payload: Payload) {
         // 这里的 !! 可以传入空字符串 忽略这些数据有利用接口统一接口
-        const target_id = !!payload.target_id ? payload.target_id : payload.user_id;
-        const peer_id = !!payload.group_id ? payload.group_id : payload.user_id;
+        const target_id = payload.target_id ? payload.target_id : payload.user_id;
+        const peer_id = payload.group_id ? payload.group_id : payload.user_id;
 
         const is_group = !!payload.group_id;
         if (!target_id || !peer_id) {

src/onebot/action/packet/SetGroupTodo.ts

@@ -0,0 +1,31 @@
+
+import { MessageUnique } from '@/common/message-unique';
+import { ChatType, Peer } from '@/core';
+import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
+import { Static, Type } from '@sinclair/typebox';
+import { ActionName } from '../router';
+
+const SchemaData = Type.Object({
+    group_id: Type.String(),
+    message_id: Type.String(),
+    message_seq: Type.Optional(Type.String())
+});
+
+type Payload = Static<typeof SchemaData>;
+export class SetGroupTodo extends GetPacketStatusDepends<Payload, void> {
+    override payloadSchema = SchemaData;
+    override actionName = ActionName.SetGroupTodo;
+    async _handle(payload: Payload) {
+        if (payload.message_seq) {
+            return await this.core.apis.PacketApi.pkt.operation.SetGroupTodo(+payload.group_id, payload.message_seq);
+        }
+        const peer: Peer = {
+            chatType: ChatType.KCHATTYPEGROUP,
+            peerUid: payload.group_id
+        };
+        const { MsgId, Peer } = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id) ?? { Peer: peer, MsgId: payload.message_id };
+        let msg = (await this.core.apis.MsgApi.getMsgsByMsgId(Peer, [MsgId])).msgList[0];
+        if (!msg) throw new Error('消息不存在');
+        await this.core.apis.PacketApi.pkt.operation.SetGroupTodo(+payload.group_id, msg.msgSeq);
+    }
+}

src/onebot/action/router.ts

@@ -10,6 +10,21 @@ export interface InvalidCheckResult {
 }
 
 export const ActionName = {
+    // 所有 Normal Stream Api 表示并未流传输 表示与流传输有关
+    CleanStreamTempFile: 'clean_stream_temp_file',
+
+    // 所有 Upload/Download Stream Api 应当 _stream 结尾
+    TestDownloadStream: 'test_download_stream',
+    UploadFileStream: 'upload_file_stream',
+    DownloadFileStream: 'download_file_stream',
+
+    DelGroupAlbumMedia: 'del_group_album_media',
+    SetGroupAlbumMediaLike: 'set_group_album_media_like',
+    DoGroupAlbumComment: 'do_group_album_comment',
+    GetGroupAlbumMediaList: 'get_group_album_media_list',
+    UploadImageToQunAlbum: 'upload_image_to_qun_album',
+    GetQunAlbumList: 'get_qun_album_list',
+    SetGroupTodo: 'set_group_todo',
     SetGroupKickMembers: 'set_group_kick_members',
     SetGroupRobotAddOption: 'set_group_robot_add_option',
     SetGroupAddOption: 'set_group_add_option',

src/onebot/action/stream/CleanStreamTempFile.ts

@@ -0,0 +1,33 @@
+import { ActionName } from '@/onebot/action/router';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { join } from 'node:path';
+import { readdir, unlink } from 'node:fs/promises';
+
+export class CleanStreamTempFile extends OneBotAction<void, void> {
+    override actionName = ActionName.CleanStreamTempFile;
+
+    async _handle(_payload: void): Promise<void> {
+        try {
+            // 获取临时文件夹路径
+            const tempPath = this.core.NapCatTempPath;
+
+            // 读取文件夹中的所有文件
+            const files = await readdir(tempPath);
+
+            // 删除每个文件
+            const deletePromises = files.map(async (file) => {
+                const filePath = join(tempPath, file);
+                try {
+                    await unlink(filePath);
+                    this.core.context.logger.log(`已删除文件: ${filePath}`);
+                } catch (err: unknown) {
+                    this.core.context.logger.log(`删除文件 ${filePath} 失败: ${(err as Error).message}`);
+
+                }
+            });
+            await Promise.all(deletePromises);
+        } catch (err: unknown) {
+            this.core.context.logger.log(`清理流临时文件失败: ${(err as Error).message}`);
+        }
+    }
+}

src/onebot/action/stream/DownloadFileStream.ts

@@ -0,0 +1,133 @@
+import { ActionName } from '@/onebot/action/router';
+import { OneBotAction, OneBotRequestToolkit } from '@/onebot/action/OneBotAction';
+import { Static, Type } from '@sinclair/typebox';
+import { NetworkAdapterConfig } from '@/onebot/config/config';
+import { StreamPacket, StreamStatus } from './StreamBasic';
+import fs from 'fs';
+import { FileNapCatOneBotUUID } from '@/common/file-uuid';
+const SchemaData = Type.Object({
+    file: Type.Optional(Type.String()),
+    file_id: Type.Optional(Type.String()),
+    chunk_size: Type.Optional(Type.Number({ default: 64 * 1024 })) // 默认64KB分块
+});
+
+type Payload = Static<typeof SchemaData>;
+
+// 下载结果类型
+interface DownloadResult {
+    // 文件信息
+    file_name?: string;
+    file_size?: number;
+    chunk_size?: number;
+
+    // 分片数据
+    index?: number;
+    data?: string;
+    size?: number;
+    progress?: number;
+    base64_size?: number;
+
+    // 完成信息
+    total_chunks?: number;
+    total_bytes?: number;
+    message?: string;
+    data_type?: 'file_info' | 'file_chunk' | 'file_complete';
+}
+
+export class DownloadFileStream extends OneBotAction<Payload, StreamPacket<DownloadResult>> {
+    override actionName = ActionName.DownloadFileStream;
+    override payloadSchema = SchemaData;
+    override useStream = true;
+
+    async _handle(payload: Payload, _adaptername: string, _config: NetworkAdapterConfig, req: OneBotRequestToolkit): Promise<StreamPacket<DownloadResult>> {
+        try {
+            payload.file ||= payload.file_id || '';
+            const chunkSize = payload.chunk_size || 64 * 1024;
+            let downloadPath = '';
+            let fileName = '';
+            let fileSize = 0;
+
+            //接收消息标记模式
+            const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file);
+            if (contextMsgFile && contextMsgFile.msgId && contextMsgFile.elementId) {
+                const { peer, msgId, elementId } = contextMsgFile;
+                downloadPath = await this.core.apis.FileApi.downloadMedia(msgId, peer.chatType, peer.peerUid, elementId, '', '');
+                const rawMessage = (await this.core.apis.MsgApi.getMsgsByMsgId(peer, [msgId]))?.msgList
+                    .find(msg => msg.msgId === msgId);
+                const mixElement = rawMessage?.elements.find(e => e.elementId === elementId);
+                const mixElementInner = mixElement?.videoElement ?? mixElement?.fileElement ?? mixElement?.pttElement ?? mixElement?.picElement;
+                if (!mixElementInner) throw new Error('element not found');
+                fileSize = parseInt(mixElementInner.fileSize?.toString() ?? '0');
+                fileName = mixElementInner.fileName ?? '';
+            }
+            //群文件模式
+            else if (FileNapCatOneBotUUID.decodeModelId(payload.file)) {
+                const contextModelIdFile = FileNapCatOneBotUUID.decodeModelId(payload.file);
+                if (contextModelIdFile && contextModelIdFile.modelId) {
+                    const { peer, modelId } = contextModelIdFile;
+                    downloadPath = await this.core.apis.FileApi.downloadFileForModelId(peer, modelId, '');
+                }
+            }
+            //搜索名字模式
+            else {
+                const searchResult = (await this.core.apis.FileApi.searchForFile([payload.file]));
+                if (searchResult) {
+                    downloadPath = await this.core.apis.FileApi.downloadFileById(searchResult.id, parseInt(searchResult.fileSize));
+                    fileSize = parseInt(searchResult.fileSize);
+                    fileName = searchResult.fileName;
+                }
+            }
+
+            if (!downloadPath) {
+                throw new Error('file not found');
+            }
+
+            // 获取文件大小
+            const stats = await fs.promises.stat(downloadPath);
+            const totalSize = fileSize || stats.size;
+
+            // 发送文件信息
+            await req.send({
+                type: StreamStatus.Stream,
+                data_type: 'file_info',
+                file_name: fileName,
+                file_size: totalSize,
+                chunk_size: chunkSize
+            });
+
+            // 创建读取流并分块发送
+            const readStream = fs.createReadStream(downloadPath, { highWaterMark: chunkSize });
+            let chunkIndex = 0;
+            let bytesRead = 0;
+
+            for await (const chunk of readStream) {
+                const base64Chunk = chunk.toString('base64');
+                bytesRead += chunk.length;
+
+                await req.send({
+                    type: StreamStatus.Stream,
+                    data_type: 'file_chunk',
+                    index: chunkIndex,
+                    data: base64Chunk,
+                    size: chunk.length,
+                    progress: Math.round((bytesRead / totalSize) * 100),
+                    base64_size: base64Chunk.length
+                });
+
+                chunkIndex++;
+            }
+
+            // 返回完成状态
+            return {
+                type: StreamStatus.Response,
+                data_type: 'file_complete',
+                total_chunks: chunkIndex,
+                total_bytes: bytesRead,
+                message: 'Download completed'
+            };
+
+        } catch (error) {
+            throw new Error(`Download failed: ${(error as Error).message}`);
+        }
+    }
+}

src/onebot/action/stream/Readme.txt

@@ -0,0 +1,3 @@
+# Stream-Api
+
+## 流式接口

src/onebot/action/stream/StreamBasic.ts

@@ -0,0 +1,16 @@
+import { OneBotAction, OneBotRequestToolkit } from '../OneBotAction';
+import { NetworkAdapterConfig } from '@/onebot/config/config';
+export type StreamPacketBasic =   {
+    type: StreamStatus;
+    data_type?: string;
+};
+export type StreamPacket<T> = T & StreamPacketBasic;
+export enum StreamStatus {
+    Stream = 'stream', // 分片流数据包
+    Response = 'response', // 流最终响应
+    Reset = 'reset', // 重置流
+    Error = 'error' // 流错误
+}
+export abstract class BasicStream<T, R> extends OneBotAction<T, StreamPacket<R>> {
+    abstract override _handle(_payload: T, _adaptername: string, _config: NetworkAdapterConfig, req: OneBotRequestToolkit): Promise<StreamPacket<R>>;
+}

src/onebot/action/stream/TestStreamDownload.ts

@@ -0,0 +1,32 @@
+import { ActionName } from '@/onebot/action/router';
+import { OneBotAction, OneBotRequestToolkit } from '@/onebot/action/OneBotAction';
+import { Static, Type } from '@sinclair/typebox';
+import { NetworkAdapterConfig } from '@/onebot/config/config';
+import { StreamPacket, StreamStatus } from './StreamBasic';
+
+const SchemaData = Type.Object({
+    error: Type.Optional(Type.Boolean({ default: false }))
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class TestDownloadStream extends OneBotAction<Payload, StreamPacket<{ data: string }>> {
+    override actionName = ActionName.TestDownloadStream;
+    override payloadSchema = SchemaData;
+    override useStream = true;
+
+    async _handle(_payload: Payload, _adaptername: string, _config: NetworkAdapterConfig, req: OneBotRequestToolkit) {
+        for (let i = 0; i < 10; i++) {
+            await req.send({ type: StreamStatus.Stream, data: `Index-> ${i + 1}`, data_type: 'data_chunk' });
+            await new Promise(resolve => setTimeout(resolve, 100));
+        }
+        if( _payload.error ){
+            throw new Error('This is a test error');
+        }
+        return {
+            type: StreamStatus.Response,
+            data_type: 'data_complete',
+            data: 'Stream transmission complete'
+        };
+    }
+}

src/onebot/action/stream/UploadFileStream.ts

@@ -0,0 +1,346 @@
+import { ActionName } from '@/onebot/action/router';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { Static, Type } from '@sinclair/typebox';
+import { NetworkAdapterConfig } from '@/onebot/config/config';
+import { StreamPacket, StreamStatus } from './StreamBasic';
+import fs from 'fs';
+import { join as joinPath } from 'node:path';
+import { randomUUID } from 'crypto';
+import { createHash } from 'crypto';
+import { unlink } from 'node:fs';
+
+// 简化配置
+const CONFIG = {
+    TIMEOUT: 10 * 60 * 1000,           // 10分钟超时
+    MEMORY_THRESHOLD: 10 * 1024 * 1024, // 10MB，超过使用磁盘
+    MEMORY_LIMIT: 100 * 1024 * 1024     // 100MB内存总限制
+} as const;
+
+const SchemaData = Type.Object({
+    stream_id: Type.String(),
+    chunk_data: Type.Optional(Type.String()),
+    chunk_index: Type.Optional(Type.Number()),
+    total_chunks: Type.Optional(Type.Number()),
+    file_size: Type.Optional(Type.Number()),
+    expected_sha256: Type.Optional(Type.String()),
+    is_complete: Type.Optional(Type.Boolean()),
+    filename: Type.Optional(Type.String()),
+    reset: Type.Optional(Type.Boolean()),
+    verify_only: Type.Optional(Type.Boolean()),
+    file_retention: Type.Number({ default: 5 * 60 * 1000 }) // 默认5分钟 回收 不设置或0为不回收
+});
+
+type Payload = Static<typeof SchemaData>;
+
+// 简化流状态接口
+interface StreamState {
+    id: string;
+    filename: string;
+    totalChunks: number;
+    receivedChunks: number;
+    missingChunks: Set<number>;
+
+    // 可选属性
+    fileSize?: number;
+    expectedSha256?: string;
+
+    // 存储策略
+    useMemory: boolean;
+    memoryChunks?: Map<number, Buffer>;
+    tempDir?: string;
+    finalPath?: string;
+    fileRetention?: number;
+
+    // 管理
+    createdAt: number;
+    timeoutId: NodeJS.Timeout;
+}
+
+interface StreamResult {
+    stream_id: string;
+    status: 'file_created' | 'chunk_received' | 'file_complete';
+    received_chunks: number;
+    total_chunks: number;
+    file_path?: string;
+    file_size?: number;
+    sha256?: string;
+}
+
+export class UploadFileStream extends OneBotAction<Payload, StreamPacket<StreamResult>> {
+    override actionName = ActionName.UploadFileStream;
+    override payloadSchema = SchemaData;
+    override useStream = true;
+
+    private static streams = new Map<string, StreamState>();
+    private static memoryUsage = 0;
+
+    async _handle(payload: Payload, _adaptername: string, _config: NetworkAdapterConfig): Promise<StreamPacket<StreamResult>> {
+        const { stream_id, reset, verify_only } = payload;
+
+        if (reset) {
+            this.cleanupStream(stream_id);
+            throw new Error('Stream reset completed');
+        }
+
+        if (verify_only) {
+            const stream = UploadFileStream.streams.get(stream_id);
+            if (!stream) throw new Error('Stream not found');
+            return this.getStreamStatus(stream);
+        }
+
+        const stream = this.getOrCreateStream(payload);
+
+        if (payload.chunk_data && payload.chunk_index !== undefined) {
+            return await this.processChunk(stream, payload.chunk_data, payload.chunk_index);
+        }
+
+        if (payload.is_complete || stream.receivedChunks === stream.totalChunks) {
+            return await this.completeStream(stream);
+        }
+
+        return this.getStreamStatus(stream);
+    }
+
+
+
+    private getOrCreateStream(payload: Payload): StreamState {
+        let stream = UploadFileStream.streams.get(payload.stream_id);
+
+        if (!stream) {
+            if (!payload.total_chunks) {
+                throw new Error('total_chunks required for new stream');
+            }
+            stream = this.createStream(payload);
+        }
+
+        return stream;
+    }
+
+    private createStream(payload: Payload): StreamState {
+        const { stream_id, total_chunks, file_size, filename, expected_sha256 } = payload;
+
+        const useMemory = this.shouldUseMemory(file_size);
+        if (useMemory && file_size && (UploadFileStream.memoryUsage + file_size) > CONFIG.MEMORY_LIMIT) {
+            throw new Error('Memory limit exceeded');
+        }
+
+        const stream: StreamState = {
+            id: stream_id,
+            filename: filename || `upload_${randomUUID()}`,
+            totalChunks: total_chunks!,
+            receivedChunks: 0,
+            missingChunks: new Set(Array.from({ length: total_chunks! }, (_, i) => i)),
+            fileSize: file_size,
+            expectedSha256: expected_sha256,
+            useMemory,
+            createdAt: Date.now(),
+            timeoutId: this.setupTimeout(stream_id),
+            fileRetention: payload.file_retention
+        };
+        try {
+            if (useMemory) {
+                stream.memoryChunks = new Map();
+                if (file_size) UploadFileStream.memoryUsage += file_size;
+            } else {
+                this.setupDiskStorage(stream);
+            }
+
+            UploadFileStream.streams.set(stream_id, stream);
+            return stream;
+        } catch (error) {
+            // 如果设置存储失败，清理已创建的资源
+            clearTimeout(stream.timeoutId);
+            if (stream.tempDir && fs.existsSync(stream.tempDir)) {
+                try {
+                    fs.rmSync(stream.tempDir, { recursive: true, force: true });
+                } catch (cleanupError) {
+                    console.error('Failed to cleanup temp dir during creation error:', cleanupError);
+                }
+            }
+            throw error;
+        }
+    }
+
+    private shouldUseMemory(fileSize?: number): boolean {
+        return fileSize !== undefined && fileSize <= CONFIG.MEMORY_THRESHOLD;
+    }
+
+    private setupDiskStorage(stream: StreamState): void {
+        const tempDir = joinPath(this.core.NapCatTempPath, `upload_${stream.id}`);
+        const finalPath = joinPath(this.core.NapCatTempPath, stream.filename);
+
+        fs.mkdirSync(tempDir, { recursive: true });
+
+        stream.tempDir = tempDir;
+        stream.finalPath = finalPath;
+    }
+
+    private setupTimeout(streamId: string): NodeJS.Timeout {
+        return setTimeout(() => {
+            console.log(`Stream ${streamId} timeout`);
+            this.cleanupStream(streamId);
+        }, CONFIG.TIMEOUT);
+    }
+
+    private async processChunk(stream: StreamState, chunkData: string, chunkIndex: number): Promise<StreamPacket<StreamResult>> {
+        // 验证索引
+        if (chunkIndex < 0 || chunkIndex >= stream.totalChunks) {
+            throw new Error(`Invalid chunk index: ${chunkIndex}`);
+        }
+
+        // 检查重复
+        if (!stream.missingChunks.has(chunkIndex)) {
+            return this.getStreamStatus(stream);
+        }
+
+        const buffer = Buffer.from(chunkData, 'base64');
+
+        // 存储分片
+        if (stream.useMemory) {
+            stream.memoryChunks!.set(chunkIndex, buffer);
+        } else {
+            const chunkPath = joinPath(stream.tempDir!, `${chunkIndex}.chunk`);
+            await fs.promises.writeFile(chunkPath, buffer);
+        }
+
+        // 更新状态
+        stream.missingChunks.delete(chunkIndex);
+        stream.receivedChunks++;
+        this.refreshTimeout(stream);
+
+        return {
+            type: StreamStatus.Stream,
+            stream_id: stream.id,
+            status: 'chunk_received',
+            received_chunks: stream.receivedChunks,
+            total_chunks: stream.totalChunks
+        };
+    }
+
+    private refreshTimeout(stream: StreamState): void {
+        clearTimeout(stream.timeoutId);
+        stream.timeoutId = this.setupTimeout(stream.id);
+    }
+
+    private getStreamStatus(stream: StreamState): StreamPacket<StreamResult> {
+        return {
+            type: StreamStatus.Stream,
+            stream_id: stream.id,
+            status: 'file_created',
+            received_chunks: stream.receivedChunks,
+            total_chunks: stream.totalChunks
+        };
+    }
+
+    private async completeStream(stream: StreamState): Promise<StreamPacket<StreamResult>> {
+        // 合并分片
+        const finalBuffer = stream.useMemory ?
+            await this.mergeMemoryChunks(stream) :
+            await this.mergeDiskChunks(stream);
+
+        // 验证SHA256
+        const sha256 = this.validateSha256(stream, finalBuffer);
+
+        // 保存文件
+        const finalPath = stream.finalPath || joinPath(this.core.NapCatTempPath, stream.filename);
+        await fs.promises.writeFile(finalPath, finalBuffer);
+
+        // 清理资源但保留文件
+        this.cleanupStream(stream.id, false);
+        if (stream.fileRetention && stream.fileRetention > 0) {
+            setTimeout(() => {
+                unlink(finalPath, err => {
+                    if (err) this.core.context.logger.logError(`Failed to delete retained file ${finalPath}:`, err);
+                });
+            }, stream.fileRetention);
+        }
+        return {
+            type: StreamStatus.Response,
+            stream_id: stream.id,
+            status: 'file_complete',
+            received_chunks: stream.receivedChunks,
+            total_chunks: stream.totalChunks,
+            file_path: finalPath,
+            file_size: finalBuffer.length,
+            sha256
+        };
+    }
+
+    private async mergeMemoryChunks(stream: StreamState): Promise<Buffer> {
+        const chunks: Buffer[] = [];
+        for (let i = 0; i < stream.totalChunks; i++) {
+            const chunk = stream.memoryChunks!.get(i);
+            if (!chunk) throw new Error(`Missing memory chunk ${i}`);
+            chunks.push(chunk);
+        }
+        return Buffer.concat(chunks);
+    }
+
+    private async mergeDiskChunks(stream: StreamState): Promise<Buffer> {
+        const chunks: Buffer[] = [];
+        for (let i = 0; i < stream.totalChunks; i++) {
+            const chunkPath = joinPath(stream.tempDir!, `${i}.chunk`);
+            if (!fs.existsSync(chunkPath)) throw new Error(`Missing chunk file ${i}`);
+            chunks.push(await fs.promises.readFile(chunkPath));
+        }
+        return Buffer.concat(chunks);
+    }
+
+    private validateSha256(stream: StreamState, buffer: Buffer): string | undefined {
+        if (!stream.expectedSha256) return undefined;
+
+        const actualSha256 = createHash('sha256').update(buffer).digest('hex');
+        if (actualSha256 !== stream.expectedSha256) {
+            throw new Error(`SHA256 mismatch. Expected: ${stream.expectedSha256}, Got: ${actualSha256}`);
+        }
+        return actualSha256;
+    }
+
+    private cleanupStream(streamId: string, deleteFinalFile = true): void {
+        const stream = UploadFileStream.streams.get(streamId);
+        if (!stream) return;
+
+        try {
+            // 清理超时
+            clearTimeout(stream.timeoutId);
+
+            // 清理内存
+            if (stream.useMemory) {
+                if (stream.fileSize) {
+                    UploadFileStream.memoryUsage = Math.max(0, UploadFileStream.memoryUsage - stream.fileSize);
+                }
+                stream.memoryChunks?.clear();
+            }
+
+            // 清理临时文件夹及其所有内容
+            if (stream.tempDir) {
+                try {
+                    if (fs.existsSync(stream.tempDir)) {
+                        fs.rmSync(stream.tempDir, { recursive: true, force: true });
+                        console.log(`Cleaned up temp directory: ${stream.tempDir}`);
+                    }
+                } catch (error) {
+                    console.error(`Failed to cleanup temp directory ${stream.tempDir}:`, error);
+                }
+            }
+
+            // 删除最终文件（如果需要）
+            if (deleteFinalFile && stream.finalPath) {
+                try {
+                    if (fs.existsSync(stream.finalPath)) {
+                        fs.unlinkSync(stream.finalPath);
+                        console.log(`Deleted final file: ${stream.finalPath}`);
+                    }
+                } catch (error) {
+                    console.error(`Failed to delete final file ${stream.finalPath}:`, error);
+                }
+            }
+
+        } catch (error) {
+            console.error(`Cleanup error for stream ${streamId}:`, error);
+        } finally {
+            UploadFileStream.streams.delete(streamId);
+            console.log(`Stream ${streamId} cleaned up`);
+        }
+    }
+}

src/onebot/action/stream/test_upload_stream.py

@@ -0,0 +1,239 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+NapCat OneBot WebSocket 文件流上传测试脚本
+用于测试 UploadFileStream 接口的一次性分片上传功能
+"""
+
+import asyncio
+import json
+import base64
+import hashlib
+import os
+import uuid
+from typing import List, Optional
+import websockets
+import argparse
+from pathlib import Path
+
+class OneBotUploadTester:
+    def __init__(self, ws_url: str = "ws://localhost:3001", access_token: Optional[str] = None):
+        self.ws_url = ws_url
+        self.access_token = access_token
+        self.websocket = None
+        
+    async def connect(self):
+        """连接到 OneBot WebSocket"""
+        headers = {}
+        if self.access_token:
+            headers["Authorization"] = f"Bearer {self.access_token}"
+            
+        print(f"连接到 {self.ws_url}")
+        self.websocket = await websockets.connect(self.ws_url, additional_headers=headers)
+        print("WebSocket 连接成功")
+        
+    async def disconnect(self):
+        """断开 WebSocket 连接"""
+        if self.websocket:
+            await self.websocket.close()
+            print("WebSocket 连接已断开")
+            
+    def calculate_file_chunks(self, file_path: str, chunk_size: int = 64) -> tuple[List[bytes], str, int]:
+        """
+        计算文件分片和 SHA256
+        
+        Args:
+            file_path: 文件路径
+            chunk_size: 分片大小（默认64KB）
+            
+        Returns:
+            (chunks, sha256_hash, total_size)
+        """
+        chunks = []
+        hasher = hashlib.sha256()
+        total_size = 0
+        
+        with open(file_path, 'rb') as f:
+            while True:
+                chunk = f.read(chunk_size)
+                if not chunk:
+                    break
+                chunks.append(chunk)
+                hasher.update(chunk)
+                total_size += len(chunk)
+                
+        sha256_hash = hasher.hexdigest()
+        print(f"文件分析完成:")
+        print(f"  - 文件大小: {total_size} 字节")
+        print(f"  - 分片数量: {len(chunks)}")
+        print(f"  - SHA256: {sha256_hash}")
+        
+        return chunks, sha256_hash, total_size
+    
+    async def send_action(self, action: str, params: dict, echo: str = None) -> dict:
+        """发送 OneBot 动作请求"""
+        if not echo:
+            echo = str(uuid.uuid4())
+            
+        message = {
+            "action": action,
+            "params": params,
+            "echo": echo
+        }
+        
+        print(f"发送请求: {action}")
+        await self.websocket.send(json.dumps(message))
+        
+        # 等待响应
+        while True:
+            response = await self.websocket.recv()
+            data = json.loads(response)
+            
+            # 检查是否是我们的响应
+            if data.get("echo") == echo:
+                return data
+            else:
+                # 可能是其他消息，继续等待
+                print(f"收到其他消息: {data}")
+                continue
+    
+    async def upload_file_stream_batch(self, file_path: str, chunk_size: int = 64 ) -> str:
+        """
+        一次性批量上传文件流
+        
+        Args:
+            file_path: 要上传的文件路径
+            chunk_size: 分片大小
+            
+        Returns:
+            上传完成后的文件路径
+        """
+        file_path = Path(file_path)
+        if not file_path.exists():
+            raise FileNotFoundError(f"文件不存在: {file_path}")
+            
+        # 分析文件
+        chunks, sha256_hash, total_size = self.calculate_file_chunks(str(file_path), chunk_size)
+        stream_id = str(uuid.uuid4())
+        
+        print(f"\n开始上传文件: {file_path.name}")
+        print(f"流ID: {stream_id}")
+        
+        # 一次性发送所有分片
+        total_chunks = len(chunks)
+        
+        for chunk_index, chunk_data in enumerate(chunks):
+            # 将分片数据编码为 base64
+            chunk_base64 = base64.b64encode(chunk_data).decode('utf-8')
+            
+            # 构建参数
+            params = {
+                "stream_id": stream_id,
+                "chunk_data": chunk_base64,
+                "chunk_index": chunk_index,
+                "total_chunks": total_chunks,
+                "file_size": total_size,
+                "expected_sha256": sha256_hash,
+                "filename": file_path.name,
+                "file_retention": 30 * 1000
+            }
+            
+            # 发送分片
+            response = await self.send_action("upload_file_stream", params)
+            
+            if response.get("status") != "ok":
+                raise Exception(f"上传分片 {chunk_index} 失败: {response}")
+                
+            # 解析流响应
+            stream_data = response.get("data", {})
+            print(f"分片 {chunk_index + 1}/{total_chunks} 上传成功 "
+                  f"(接收: {stream_data.get('received_chunks', 0)}/{stream_data.get('total_chunks', 0)})")
+        
+        # 发送完成信号
+        print(f"\n所有分片发送完成，请求文件合并...")
+        complete_params = {
+            "stream_id": stream_id,
+            "is_complete": True
+        }
+        
+        response = await self.send_action("upload_file_stream", complete_params)
+        
+        if response.get("status") != "ok":
+            raise Exception(f"文件合并失败: {response}")
+            
+        result = response.get("data", {})
+        
+        if result.get("status") == "file_complete":
+            print(f"✅ 文件上传成功!")
+            print(f"  - 文件路径: {result.get('file_path')}")
+            print(f"  - 文件大小: {result.get('file_size')} 字节")
+            print(f"  - SHA256: {result.get('sha256')}")
+            return result.get('file_path')
+        else:
+            raise Exception(f"文件状态异常: {result}")
+    
+    async def test_upload(self, file_path: str, chunk_size: int = 64 ):
+        """测试文件上传"""
+        try:
+            await self.connect()
+            
+            # 执行上传
+            uploaded_path = await self.upload_file_stream_batch(file_path, chunk_size)
+            
+            print(f"\n🎉 测试完成! 上传后的文件路径: {uploaded_path}")
+            
+        except Exception as e:
+            print(f"❌ 测试失败: {e}")
+            raise
+        finally:
+            await self.disconnect()
+
+def create_test_file(file_path: str, size_mb: float = 1):
+    """创建测试文件"""
+    size_bytes = int(size_mb * 1024 * 1024)
+    
+    with open(file_path, 'wb') as f:
+        # 写入一些有意义的测试数据
+        test_data = b"NapCat Upload Test Data - " * 100
+        written = 0
+        while written < size_bytes:
+            write_size = min(len(test_data), size_bytes - written)
+            f.write(test_data[:write_size])
+            written += write_size
+    
+    print(f"创建测试文件: {file_path} ({size_mb}MB)")
+
+async def main():
+    parser = argparse.ArgumentParser(description="NapCat OneBot 文件流上传测试")
+    parser.add_argument("--url", default="ws://localhost:3001", help="WebSocket URL")
+    parser.add_argument("--token", help="访问令牌")
+    parser.add_argument("--file", help="要上传的文件路径")
+    parser.add_argument("--chunk-size", type=int, default=64*1024, help="分片大小(字节)")
+    parser.add_argument("--create-test", type=float, help="创建测试文件(MB)")
+    
+    args = parser.parse_args()
+    
+    # 创建测试文件
+    if args.create_test:
+        test_file = "test_upload_file.bin"
+        create_test_file(test_file, args.create_test)
+        if not args.file:
+            args.file = test_file
+    
+    if not args.file:
+        print("请指定要上传的文件路径，或使用 --create-test 创建测试文件")
+        return
+    
+    # 创建测试器并运行
+    tester = OneBotUploadTester(args.url, args.token)
+    await tester.test_upload(args.file, args.chunk_size)
+
+if __name__ == "__main__":
+    # 安装依赖提示
+    try:
+        import websockets
+    except ImportError:
+        print("请先安装依赖: pip install websockets")
+        exit(1)
+    
+    asyncio.run(main())

src/onebot/action/system/CleanCache.ts

@@ -1,7 +1,7 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { unlink, readdir } from 'fs/promises';
-import { join } from 'path';
+import path, { join } from 'path';
 
 export class CleanCache extends OneBotAction<void, void> {
     override actionName = ActionName.CleanCache;
@@ -28,6 +28,37 @@ export class CleanCache extends OneBotAction<void, void> {
 
             // 等待所有删除操作完成
             await Promise.all(deletePromises);
+            let basic_path = path.join(this.core.dataPath, this.core.selfInfo.uin || '10001', 'nt_qq', 'nt_data');
+
+            // 需要清理的目录列表
+            const dirsToClean = ['Pic', 'Ptt', 'Video', 'File', 'log'];
+
+            // 清理每个指定目录
+            for (const dir of dirsToClean) {
+                const dirPath = path.join(basic_path, dir);
+                try {
+                    // 检查目录是否存在
+                    const files = await readdir(dirPath).catch(() => null);
+                    if (files) {
+                        // 删除目录下的所有文件
+                        const dirDeletePromises = files.map(async (file) => {
+                            const filePath = path.join(dirPath, file);
+                            try {
+                                await unlink(filePath);
+                                this.core.context.logger.log(`已删除文件: ${filePath}`);
+                            } catch (err: unknown) {
+                                this.core.context.logger.log(`删除文件 ${filePath} 失败: ${(err as Error).message}`);
+                            }
+                        });
+
+                        await Promise.all(dirDeletePromises);
+                        this.core.context.logger.log(`目录清理完成: ${dirPath}`);
+                    }
+                } catch (err: unknown) {
+                    this.core.context.logger.log(`清理目录 ${dirPath} 失败: ${(err as Error).message}`);
+                }
+            }
+
 
             this.core.context.logger.log(`临时文件夹清理完成: ${tempPath}`);
         } catch (err: unknown) {

src/onebot/action/system/GetSystemMsg.ts

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

src/onebot/api/group.ts

@@ -189,7 +189,7 @@ export class OneBotGroupApi {
                 this.core,
                 parseInt(msg.peerUid),
                 MessageUnique.getShortIdByMsgId(msgData.msgList[0].msgId)!,
-                parseInt(msgData.msgList[0].senderUin),
+                parseInt(msgData.msgList[0].senderUin ?? await this.core.apis.UserApi.getUinByUidV2(msgData.msgList[0].senderUid)),
                 parseInt(realMsg?.add_digest_uin ?? '0'),
             );
         }

src/onebot/api/msg.ts

@@ -46,6 +46,7 @@ import { GroupChange, GroupChangeInfo, GroupInvite, PushMsgBody } from '@/core/p
 import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest';
 import { LRUCache } from '@/common/lru-cache';
 import { cleanTaskQueue } from '@/common/clean-task';
+import { registerResource } from '@/common/health';
 
 type RawToOb11Converters = {
     [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: (
@@ -69,7 +70,9 @@ export type SendMessageContext = {
 }
 
 export type RecvMessageContext = {
-    parseMultMsg: boolean
+    parseMultMsg: boolean,
+    disableGetUrl: boolean,
+    quick_reply: boolean
 }
 
 function keyCanBeParsed(key: string, parser: RawToOb11Converters): key is keyof RawToOb11Converters {
@@ -109,7 +112,7 @@ export class OneBotMsgApi {
             }
         },
 
-        picElement: async (element, msg, elementWrapper) => {
+        picElement: async (element, msg, elementWrapper, { disableGetUrl }) => {
             try {
                 const peer = {
                     chatType: msg.chatType,
@@ -129,7 +132,7 @@ export class OneBotMsgApi {
                         summary: element.summary,
                         file: element.fileName,
                         sub_type: element.picSubType,
-                        url: await this.core.apis.FileApi.getImageUrl(element),
+                        url: disableGetUrl ? (element.filePath ?? '') : await this.core.apis.FileApi.getImageUrl(element),
                         file_size: element.fileSize,
                     },
                 };
@@ -139,7 +142,7 @@ export class OneBotMsgApi {
             }
         },
 
-        fileElement: async (element, msg, elementWrapper) => {
+        fileElement: async (element, msg, elementWrapper, { disableGetUrl }) => {
             const peer = {
                 chatType: msg.chatType,
                 peerUid: msg.peerUid,
@@ -147,10 +150,24 @@ export class OneBotMsgApi {
             };
             FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileUuid);
             FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileName);
-            if (this.core.apis.PacketApi.available) {
+            if (this.core.apis.PacketApi.packetStatus && !disableGetUrl) {
                 let url;
                 try {
-                    url = await this.core.apis.FileApi.getFileUrl(msg.chatType, msg.peerUid, element.fileUuid, element.file10MMd5)
+                    //url = await this.core.apis.FileApi.getFileUrl(msg.chatType, msg.peerUid, element.fileUuid, element.file10MMd5, 1500)
+                    url = await registerResource(
+                        'file-url-get',
+                        {
+                            resourceFn: async () => {
+                                return await this.core.apis.FileApi.getFileUrl(msg.chatType, msg.peerUid, element.fileUuid, element.file10MMd5, 1500);
+                            },
+                            healthCheckFn: async () => {
+                                return await this.core.apis.PacketApi.pkt.operation.FetchRkey().then(() => true).catch(() => false);
+                            },
+                            testArgs: [],
+                            healthCheckInterval: 30000,
+                            maxHealthCheckFailures: 3
+                        },
+                    );
                 } catch (error) {
                     url = '';
                 }
@@ -163,7 +180,7 @@ export class OneBotMsgApi {
                             file_size: element.fileSize,
                             url: url,
                         },
-                    }
+                    };
                 }
             }
             return {
@@ -240,7 +257,7 @@ export class OneBotMsgApi {
             };
         },
 
-        replyElement: async (element, msg) => {
+        replyElement: async (element, msg, _, quick_reply) => {
             const peer = {
                 chatType: msg.chatType,
                 peerUid: msg.peerUid,
@@ -277,7 +294,10 @@ export class OneBotMsgApi {
                             : replyMsgList.find(msg => msg.msgSeq === msgSeq);
 
                         if (replyMsg) return replyMsg;
-
+                        if (quick_reply) {
+                            this.core.context.logger.logWarn(`快速回复，跳过方法1查询，序号: ${msgSeq}, 消息数: ${replyMsgList.length}`);
+                            return undefined;
+                        }
                         this.core.context.logger.logWarn(`方法1查询失败，序号: ${msgSeq}, 消息数: ${replyMsgList.length}`);
                     }
 
@@ -345,7 +365,7 @@ export class OneBotMsgApi {
 
             return null;
         },
-        videoElement: async (element, msg, elementWrapper) => {
+        videoElement: async (element, msg, elementWrapper, { disableGetUrl }) => {
             const peer = {
                 chatType: msg.chatType,
                 peerUid: msg.peerUid,
@@ -390,10 +410,24 @@ export class OneBotMsgApi {
             }
 
             //开始兜底
-            if (!videoDownUrl) {
-                if (this.core.apis.PacketApi.available) {
+            if (!videoDownUrl && !disableGetUrl) {
+                if (this.core.apis.PacketApi.packetStatus) {
                     try {
-                        videoDownUrl = await this.core.apis.FileApi.getVideoUrlPacket(msg.peerUid, element.fileUuid);
+                        //videoDownUrl = await this.core.apis.FileApi.getVideoUrlPacket(msg.peerUid, element.fileUuid, 1500);
+                        videoDownUrl = await registerResource(
+                            'video-url-get',
+                            {
+                                resourceFn: async () => {
+                                    return await this.core.apis.FileApi.getVideoUrlPacket(msg.peerUid, element.fileUuid, 1500);
+                                },
+                                healthCheckFn: async () => {
+                                    return await this.core.apis.PacketApi.pkt.operation.FetchRkey().then(() => true).catch(() => false);
+                                },
+                                testArgs: [],
+                                healthCheckInterval: 30000,
+                                maxHealthCheckFailures: 3
+                            },
+                        );
                     } catch (e) {
                         this.core.context.logger.logError('获取视频url失败', (e as Error).stack);
                         videoDownUrl = element.filePath;
@@ -414,7 +448,7 @@ export class OneBotMsgApi {
             };
         },
 
-        pttElement: async (element, msg, elementWrapper) => {
+        pttElement: async (element, msg, elementWrapper, { disableGetUrl }) => {
             const peer = {
                 chatType: msg.chatType,
                 peerUid: msg.peerUid,
@@ -422,9 +456,23 @@ export class OneBotMsgApi {
             };
             const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, '', element.fileName);
             let pttUrl = '';
-            if (this.core.apis.PacketApi.available) {
+            if (this.core.apis.PacketApi.packetStatus && !disableGetUrl) {
                 try {
-                    pttUrl = await this.core.apis.FileApi.getPttUrl(msg.peerUid, element.fileUuid);
+                    pttUrl = await registerResource(
+                        'ptt-url-get',
+                        {
+                            resourceFn: async () => {
+                                return await this.core.apis.FileApi.getPttUrl(msg.peerUid, element.fileUuid, 1500);
+                            },
+                            healthCheckFn: async () => {
+                                return await this.core.apis.PacketApi.pkt.operation.FetchRkey().then(() => true).catch(() => false);
+                            },
+                            testArgs: [],
+                            healthCheckInterval: 30000,
+                            maxHealthCheckFailures: 3
+                        },
+                    );
+                    //pttUrl = await this.core.apis.FileApi.getPttUrl(msg.peerUid, element.fileUuid, 1500);
                 } catch (e) {
                     this.core.context.logger.logError('获取语音url失败', (e as Error).stack);
                     pttUrl = element.filePath;
@@ -441,7 +489,7 @@ export class OneBotMsgApi {
                         url: pttUrl,
                         file_size: element.fileSize,
                     },
-                }
+                };
             }
             return {
                 type: OB11MessageDataType.voice,
@@ -532,6 +580,11 @@ export class OneBotMsgApi {
 
             if (!context.peer || context.peer.chatType == ChatType.KCHATTYPEC2C) return undefined;
             if (atQQ === 'all') return at(atQQ, atQQ, NTMsgAtType.ATTYPEALL, '全体成员');
+            // 检查 peerUid 是否有效
+            if (!context.peer.peerUid) {
+                this.core.context.logger.logWarn('AT消息处理：群组 peerUid 无效', { atQQ });
+                return undefined;
+            }
             const atMember = await this.core.apis.GroupApi.getGroupMember(context.peer.peerUid, atQQ);
             if (atMember) {
                 return at(atQQ, atMember.uid, NTMsgAtType.ATTYPEONE, atMember.nick || atMember.cardName);
@@ -908,17 +961,21 @@ export class OneBotMsgApi {
     async parseMessage(
         msg: RawMessage,
         messagePostFormat: string,
-        parseMultMsg: boolean = true
+        parseMultMsg: boolean = true,
+        disableGetUrl: boolean = false,
+        quick_reply: boolean = false
     ) {
         if (messagePostFormat === 'string') {
-            return (await this.parseMessageV2(msg, parseMultMsg))?.stringMsg;
+            return (await this.parseMessageV2(msg, parseMultMsg, disableGetUrl, quick_reply))?.stringMsg;
         }
-        return (await this.parseMessageV2(msg, parseMultMsg))?.arrayMsg;
+        return (await this.parseMessageV2(msg, parseMultMsg, disableGetUrl, quick_reply))?.arrayMsg;
     }
 
     async parseMessageV2(
         msg: RawMessage,
-        parseMultMsg: boolean = true
+        parseMultMsg: boolean = true,
+        disableGetUrl: boolean = false,
+        quick_reply: boolean = false
     ) {
         if (msg.senderUin == '0' || msg.senderUin == '') return;
         if (msg.peerUin == '0' || msg.peerUin == '') return;
@@ -939,7 +996,7 @@ export class OneBotMsgApi {
             return undefined;
         }
 
-        const validSegments = await this.parseMessageSegments(msg, parseMultMsg);
+        const validSegments = await this.parseMessageSegments(msg, parseMultMsg, disableGetUrl, quick_reply);
         resMsg.message = validSegments;
         resMsg.raw_message = validSegments.map(msg => encodeCQCode(msg)).join('').trim();
 
@@ -974,6 +1031,7 @@ export class OneBotMsgApi {
     private async handleGroupMessage(resMsg: OB11Message, msg: RawMessage) {
         resMsg.sub_type = 'normal';
         resMsg.group_id = parseInt(msg.peerUin);
+        resMsg.group_name = msg.peerName;
         let member = await this.core.apis.GroupApi.getGroupMember(msg.peerUin, msg.senderUin);
         if (!member) member = await this.core.apis.GroupApi.getGroupMember(msg.peerUin, msg.senderUin);
         if (member) {
@@ -1009,7 +1067,7 @@ export class OneBotMsgApi {
         }
     }
 
-    private async parseMessageSegments(msg: RawMessage, parseMultMsg: boolean): Promise<OB11MessageData[]> {
+    private async parseMessageSegments(msg: RawMessage, parseMultMsg: boolean, disableGetUrl: boolean = false, quick_reply: boolean = false): Promise<OB11MessageData[]> {
         const msgSegments = await Promise.allSettled(msg.elements.map(
             async (element) => {
                 for (const key in element) {
@@ -1024,7 +1082,7 @@ export class OneBotMsgApi {
                             element[key],
                             msg,
                             element,
-                            { parseMultMsg }
+                            { parseMultMsg, disableGetUrl, quick_reply }
                         );
                         if (key === 'faceElement' && !parsedElement) {
                             return null;
@@ -1071,10 +1129,13 @@ export class OneBotMsgApi {
             if (ignoreTypes.includes(sendMsg.type)) {
                 continue;
             }
-            const converter = this.ob11ToRawConverters[sendMsg.type] as (
+            const converter = this.ob11ToRawConverters[sendMsg.type] as ((
                 sendMsg: Extract<OB11MessageData, { type: OB11MessageData['type'] }>,
                 context: SendMessageContext,
-            ) => Promise<SendMessageElement | undefined>;
+            ) => Promise<SendMessageElement | undefined>) | undefined;
+            if (converter == undefined) {
+                throw new Error('未知的消息类型：' + sendMsg.type);
+            }
             const callResult = converter(
                 sendMsg,
                 { peer, deleteAfterSentFiles },
@@ -1094,16 +1155,16 @@ export class OneBotMsgApi {
         const calculateTotalSize = async (elements: SendMessageElement[]): Promise<number> => {
             const sizePromises = elements.map(async element => {
                 switch (element.elementType) {
-                    case ElementType.PTT:
-                        return (await fsPromise.stat(element.pttElement.filePath)).size;
-                    case ElementType.FILE:
-                        return (await fsPromise.stat(element.fileElement.filePath)).size;
-                    case ElementType.VIDEO:
-                        return (await fsPromise.stat(element.videoElement.filePath)).size;
-                    case ElementType.PIC:
-                        return (await fsPromise.stat(element.picElement.sourcePath)).size;
-                    default:
-                        return 0;
+                case ElementType.PTT:
+                    return (await fsPromise.stat(element.pttElement.filePath)).size;
+                case ElementType.FILE:
+                    return (await fsPromise.stat(element.fileElement.filePath)).size;
+                case ElementType.VIDEO:
+                    return (await fsPromise.stat(element.videoElement.filePath)).size;
+                case ElementType.PIC:
+                    return (await fsPromise.stat(element.picElement.sourcePath)).size;
+                default:
+                    return 0;
                 }
             });
             const sizes = await Promise.all(sizePromises);
@@ -1178,12 +1239,12 @@ export class OneBotMsgApi {
             let url = '';
             if (mixElement?.picElement && rawMessage) {
                 const tempData =
-                    await this.obContext.apis.MsgApi.rawToOb11Converters.picElement?.(mixElement?.picElement, rawMessage, mixElement, { parseMultMsg: false }) as OB11MessageImage | undefined;
+                    await this.obContext.apis.MsgApi.rawToOb11Converters.picElement?.(mixElement?.picElement, rawMessage, mixElement, { parseMultMsg: false, disableGetUrl: false, quick_reply: false }) as OB11MessageImage | undefined;
                 url = tempData?.data.url ?? '';
             }
             if (mixElement?.videoElement && rawMessage) {
                 const tempData =
-                    await this.obContext.apis.MsgApi.rawToOb11Converters.videoElement?.(mixElement?.videoElement, rawMessage, mixElement, { parseMultMsg: false }) as OB11MessageVideo | undefined;
+                    await this.obContext.apis.MsgApi.rawToOb11Converters.videoElement?.(mixElement?.videoElement, rawMessage, mixElement, { parseMultMsg: false, disableGetUrl: false, quick_reply: false }) as OB11MessageVideo | undefined;
                 url = tempData?.data.url ?? '';
             }
             return url !== '' ? url : await this.core.apis.FileApi.downloadMedia(msgId, peer.chatType, peer.peerUid, elementId, '', '');
@@ -1193,16 +1254,16 @@ export class OneBotMsgApi {
 
     groupChangDecreseType2String(type: number): GroupDecreaseSubType {
         switch (type) {
-            case 130:
-                return 'leave';
-            case 131:
-                return 'kick';
-            case 3:
-                return 'kick_me';
-            case 129:
-                return 'disband';
-            default:
-                return 'kick';
+        case 130:
+            return 'leave';
+        case 131:
+            return 'kick';
+        case 3:
+            return 'kick_me';
+        case 129:
+            return 'disband';
+        default:
+            return 'kick';
         }
     }
 

src/onebot/config/config.ts

@@ -1,11 +1,10 @@
 import { Type, Static } from '@sinclair/typebox';
 import Ajv from 'ajv';
-
 const HttpServerConfigSchema = Type.Object({
     name: Type.String({ default: 'http-server' }),
     enable: Type.Boolean({ default: false }),
     port: Type.Number({ default: 3000 }),
-    host: Type.String({ default: '0.0.0.0' }),
+    host: Type.String({ default: '127.0.0.1' }),
     enableCors: Type.Boolean({ default: true }),
     enableWebsocket: Type.Boolean({ default: true }),
     messagePostFormat: Type.String({ default: 'array' }),
@@ -17,7 +16,7 @@ const HttpSseServerConfigSchema = Type.Object({
     name: Type.String({ default: 'http-sse-server' }),
     enable: Type.Boolean({ default: false }),
     port: Type.Number({ default: 3000 }),
-    host: Type.String({ default: '0.0.0.0' }),
+    host: Type.String({ default: '127.0.0.1' }),
     enableCors: Type.Boolean({ default: true }),
     enableWebsocket: Type.Boolean({ default: true }),
     messagePostFormat: Type.String({ default: 'array' }),
@@ -39,7 +38,7 @@ const HttpClientConfigSchema = Type.Object({
 const WebsocketServerConfigSchema = Type.Object({
     name: Type.String({ default: 'websocket-server' }),
     enable: Type.Boolean({ default: false }),
-    host: Type.String({ default: '0.0.0.0' }),
+    host: Type.String({ default: '127.0.0.1' }),
     port: Type.Number({ default: 3001 }),
     messagePostFormat: Type.String({ default: 'array' }),
     reportSelfMessage: Type.Boolean({ default: false }),

src/onebot/index.ts

@@ -13,8 +13,11 @@ import {
     SendStatusType,
     NTMsgType,
     MessageElement,
+    ElementType,
+    NTMsgAtType,
 } from '@/core';
 import { OB11ConfigLoader } from '@/onebot/config';
+import { pendingTokenToSend } from '@/webui/index';
 import {
     OB11HttpClientAdapter,
     OB11WebSocketClientAdapter,
@@ -40,7 +43,6 @@ import { OB11FriendRequestEvent } from '@/onebot/event/request/OB11FriendRequest
 import { OB11GroupRequestEvent } from '@/onebot/event/request/OB11GroupRequest';
 import { OB11FriendRecallNoticeEvent } from '@/onebot/event/notice/OB11FriendRecallNoticeEvent';
 import { OB11GroupRecallNoticeEvent } from '@/onebot/event/notice/OB11GroupRecallNoticeEvent';
-import { LRUCache } from '@/common/lru-cache';
 import { BotOfflineEvent } from './event/notice/BotOfflineEvent';
 import {
     NetworkAdapterConfig,
@@ -50,6 +52,8 @@ import {
 import { OB11Message } from './types';
 import { IOB11NetworkAdapter } from '@/onebot/network/adapter';
 import { OB11HttpSSEServerAdapter } from './network/http-server-sse';
+import { OB11PluginMangerAdapter } from './network/plugin-manger';
+import { existsSync } from 'node:fs';
 
 //OneBot实现类
 export class NapCatOneBot11Adapter {
@@ -61,9 +65,8 @@ export class NapCatOneBot11Adapter {
     networkManager: OB11NetworkManager;
     actions: ActionMap;
     private readonly bootTime = Date.now() / 1000;
-    recallMsgCache = new LRUCache<string, RawMessage>(100);
-
-    constructor(core: NapCatCore, context: InstanceContext, pathWrapper: NapCatPathWrapper) {
+    recallEventCache = new Map<string, NodeJS.Timeout>();
+    constructor (core: NapCatCore, context: InstanceContext, pathWrapper: NapCatPathWrapper) {
         this.core = core;
         this.context = context;
         this.configLoader = new OB11ConfigLoader(core, pathWrapper.configPath, OneBotConfigSchema);
@@ -77,7 +80,7 @@ export class NapCatOneBot11Adapter {
         this.actions = createActionMap(this, core);
         this.networkManager = new OB11NetworkManager();
     }
-    async creatOneBotLog(ob11Config: OneBotConfig) {
+    async creatOneBotLog (ob11Config: OneBotConfig) {
         let log = '[network] 配置加载\n';
         for (const key of ob11Config.network.httpServers) {
             log += `HTTP服务: ${key.host}:${key.port}, : ${key.enable ? '已启动' : '未启动'}\n`;
@@ -96,14 +99,44 @@ export class NapCatOneBot11Adapter {
         }
         return log;
     }
-    async InitOneBot() {
+    async InitOneBot () {
         const selfInfo = this.core.selfInfo;
         const ob11Config = this.configLoader.configData;
 
         this.core.apis.UserApi.getUserDetailInfo(selfInfo.uid, false)
-            .then((user) => {
+            .then(async (user) => {
                 selfInfo.nick = user.nick;
                 this.context.logger.setLogSelfInfo(selfInfo);
+                
+                // 检查是否有待发送的token
+                if (pendingTokenToSend) {
+                    this.context.logger.log('[NapCat] [OneBot] 🔐 检测到待发送的WebUI Token，开始发送');
+                    try {
+                        await this.core.apis.MsgApi.sendMsg(
+                            { chatType: ChatType.KCHATTYPEC2C, peerUid: selfInfo.uid, guildId: '' },
+                            [{
+                                elementType: ElementType.TEXT,
+                                elementId: '',
+                                textElement: {
+                                    content: 
+                                    '[NapCat] 温馨提示:\n'+
+                                    'WebUI密码为默认密码，已进行强制修改\n'+
+                                    '新密码: ' +pendingTokenToSend,
+                                    atType: NTMsgAtType.ATTYPEUNKNOWN,
+                                    atUid: '',
+                                    atTinyId: '',
+                                    atNtUid: '',
+                                }
+                            }],
+                            5000
+                        );
+                        this.context.logger.log('[NapCat] [OneBot] ✅ WebUI Token 消息发送成功');
+                    } catch (error) {
+                        this.context.logger.logError('[NapCat] [OneBot] ❌ WebUI Token 消息发送失败:', error);
+                    }
+                }
+                
+                WebUiDataRuntime.getQQLoginCallback()(true);
             })
             .catch(e => this.context.logger.logError(e));
 
@@ -116,6 +149,12 @@ export class NapCatOneBot11Adapter {
         // this.networkManager.registerAdapter(
         //     new OB11PluginAdapter('myPlugin', this.core, this,this.actions)
         // );
+        if (existsSync(this.context.pathWrapper.pluginPath)) {
+            this.context.logger.log('[Plugins] 插件目录存在，开始加载插件');
+            this.networkManager.registerAdapter(
+                new OB11PluginMangerAdapter('plugin_manager', this.core, this, this.actions)
+            );
+        }
         for (const key of ob11Config.network.httpServers) {
             if (key.enable) {
                 this.networkManager.registerAdapter(
@@ -169,7 +208,7 @@ export class NapCatOneBot11Adapter {
         this.initBuddyListener();
         this.initGroupListener();
 
-        WebUiDataRuntime.setQQVersion(this.core.context.basicInfoWrapper.getFullQQVesion());
+        WebUiDataRuntime.setQQVersion(this.core.context.basicInfoWrapper.getFullQQVersion());
         WebUiDataRuntime.setQQLoginInfo(selfInfo);
         WebUiDataRuntime.setQQLoginStatus(true);
         WebUiDataRuntime.setOnOB11ConfigChanged(async (newConfig) => {
@@ -181,7 +220,7 @@ export class NapCatOneBot11Adapter {
     }
 
 
-    private async reloadNetwork(prev: OneBotConfig, now: OneBotConfig): Promise<void> {
+    private async reloadNetwork (prev: OneBotConfig, now: OneBotConfig): Promise<void> {
         const prevLog = await this.creatOneBotLog(prev);
         const newLog = await this.creatOneBotLog(now);
         this.context.logger.log(`[Notice] [OneBot11] 配置变更前:\n${prevLog}`);
@@ -194,7 +233,7 @@ export class NapCatOneBot11Adapter {
         await this.handleConfigChange(prev.network.websocketClients, now.network.websocketClients, OB11WebSocketClientAdapter);
     }
 
-    private async handleConfigChange<CT extends NetworkAdapterConfig>(
+    private async handleConfigChange<CT extends NetworkAdapterConfig> (
         prevConfig: NetworkAdapterConfig[],
         nowConfig: NetworkAdapterConfig[],
         adapterClass: new (
@@ -226,7 +265,7 @@ export class NapCatOneBot11Adapter {
         }
     }
 
-    private initMsgListener() {
+    private initMsgListener () {
         const msgListener = new NodeIKernelMsgListener();
         msgListener.onRecvSysMsg = (msg) => {
             this.apis.MsgApi.parseSysMessage(msg)
@@ -306,15 +345,18 @@ export class NapCatOneBot11Adapter {
             };
             let msg = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeq(peer, msgSeq)).msgList.find(e => e.msgType == NTMsgType.KMSGTYPEGRAYTIPS);
             const element = msg?.elements.find(e => !!e.grayTipElement?.revokeElement);
-            if (element?.grayTipElement?.revokeElement.isSelfOperate && msg) {
-                await this.core.eventWrapper.registerListen('NodeIKernelMsgListener/onMsgRecall',
-                    (chatType: ChatType, uid: string, msgSeq: string) => {
-                        return chatType === msg?.chatType && uid === msg?.peerUid && msgSeq === msg?.msgSeq;
-                    }
-                ).catch(() => {
-                    msg = undefined;
-                    this.context.logger.logDebug('自操作消息撤回事件');
-                });
+            if (msg && element?.grayTipElement?.revokeElement.isSelfOperate) {
+                const isSelfDevice = this.recallEventCache.has(msg.msgId);
+                if (isSelfDevice) {
+                    await this.core.eventWrapper.registerListen('NodeIKernelMsgListener/onMsgRecall',
+                        (chatType: ChatType, uid: string, msgSeq: string) => {
+                            return chatType === msg?.chatType && uid === msg?.peerUid && msgSeq === msg?.msgSeq;
+                        }
+                    ).catch(() => {
+                        msg = undefined;
+                        this.context.logger.logDebug('自操作消息撤回事件');
+                    });
+                }
             }
             if (msg && element) {
                 const recallEvent = await this.emitRecallMsg(msg, element);
@@ -337,7 +379,7 @@ export class NapCatOneBot11Adapter {
         this.context.session.getMsgService().addKernelMsgListener(proxiedListenerOf(msgListener, this.context.logger));
     }
 
-    private initBuddyListener() {
+    private initBuddyListener () {
         const buddyListener = new NodeIKernelBuddyListener();
 
         buddyListener.onBuddyReqChange = async (reqs) => {
@@ -368,7 +410,7 @@ export class NapCatOneBot11Adapter {
             .addKernelBuddyListener(proxiedListenerOf(buddyListener, this.context.logger));
     }
 
-    private initGroupListener() {
+    private initGroupListener () {
         const groupListener = new NodeIKernelGroupListener();
 
         groupListener.onGroupNotifiesUpdated = async (_, notifies) => {
@@ -461,7 +503,7 @@ export class NapCatOneBot11Adapter {
             .addKernelGroupListener(proxiedListenerOf(groupListener, this.context.logger));
     }
 
-    private async emitMsg(message: RawMessage) {
+    private async emitMsg (message: RawMessage) {
         const network = await this.networkManager.getAllConfig();
         this.context.logger.logDebug('收到新消息 RawMessage', message);
         await Promise.allSettled([
@@ -470,7 +512,7 @@ export class NapCatOneBot11Adapter {
         ]);
     }
 
-    private async handleMsg(message: RawMessage, network: Array<NetworkAdapterConfig>) {
+    private async handleMsg (message: RawMessage, network: Array<NetworkAdapterConfig>) {
         // 过滤无效消息
         if (message.msgType === NTMsgType.KMSGTYPENULL) {
             return;
@@ -491,17 +533,17 @@ export class NapCatOneBot11Adapter {
         }
     }
 
-    private isSelfMessage(ob11Msg: {
-        stringMsg: OB11Message;
-        arrayMsg: OB11Message;
+    private isSelfMessage (ob11Msg: {
+        stringMsg: OB11Message
+        arrayMsg: OB11Message
     }): boolean {
         return ob11Msg.stringMsg.user_id.toString() == this.core.selfInfo.uin ||
             ob11Msg.arrayMsg.user_id.toString() == this.core.selfInfo.uin;
     }
 
-    private createMsgMap(network: Array<NetworkAdapterConfig>, ob11Msg: {
-        stringMsg: OB11Message;
-        arrayMsg: OB11Message;
+    private createMsgMap (network: Array<NetworkAdapterConfig>, ob11Msg: {
+        stringMsg: OB11Message
+        arrayMsg: OB11Message
     }, isSelfMsg: boolean, message: RawMessage): Map<string, OB11Message> {
         const msgMap: Map<string, OB11Message> = new Map();
         network.filter(e => e.enable).forEach(e => {
@@ -519,7 +561,7 @@ export class NapCatOneBot11Adapter {
         return msgMap;
     }
 
-    private handleDebugNetwork(network: Array<NetworkAdapterConfig>, msgMap: Map<string, OB11Message>, message: RawMessage) {
+    private handleDebugNetwork (network: Array<NetworkAdapterConfig>, msgMap: Map<string, OB11Message>, message: RawMessage) {
         const debugNetwork = network.filter(e => e.enable && e.debug);
         if (debugNetwork.length > 0) {
             debugNetwork.forEach(adapter => {
@@ -533,7 +575,7 @@ export class NapCatOneBot11Adapter {
         }
     }
 
-    private handleNotReportSelfNetwork(network: Array<NetworkAdapterConfig>, msgMap: Map<string, OB11Message>, isSelfMsg: boolean) {
+    private handleNotReportSelfNetwork (network: Array<NetworkAdapterConfig>, msgMap: Map<string, OB11Message>, isSelfMsg: boolean) {
         if (isSelfMsg) {
             const notReportSelfNetwork = network.filter(e => e.enable && (('reportSelfMessage' in e && !e.reportSelfMessage) || !('reportSelfMessage' in e)));
             notReportSelfNetwork.forEach(adapter => {
@@ -542,7 +584,7 @@ export class NapCatOneBot11Adapter {
         }
     }
 
-    private async handleGroupEvent(message: RawMessage) {
+    private async handleGroupEvent (message: RawMessage) {
         try {
             // 群名片修改事件解析 任何都该判断
             if (message.senderUin && message.senderUin !== '0') {
@@ -575,7 +617,7 @@ export class NapCatOneBot11Adapter {
         }
     }
 
-    private async handlePrivateMsgEvent(message: RawMessage) {
+    private async handlePrivateMsgEvent (message: RawMessage) {
         try {
             if (message.msgType === NTMsgType.KMSGTYPEGRAYTIPS) {
                 // 灰条为单元素消息
@@ -593,7 +635,7 @@ export class NapCatOneBot11Adapter {
         }
     }
 
-    private async emitRecallMsg(message: RawMessage, element: MessageElement) {
+    private async emitRecallMsg (message: RawMessage, element: MessageElement) {
         const peer: Peer = { chatType: message.chatType, peerUid: message.peerUid, guildId: '' };
         const oriMessageId = MessageUnique.getShortIdByMsgId(message.msgId) ?? MessageUnique.createUniqueMsgId(peer, message.msgId);
         if (message.chatType == ChatType.KCHATTYPEC2C) {
@@ -604,7 +646,7 @@ export class NapCatOneBot11Adapter {
         return;
     }
 
-    private async emitFriendRecallMsg(message: RawMessage, oriMessageId: number, element: MessageElement) {
+    private async emitFriendRecallMsg (message: RawMessage, oriMessageId: number, element: MessageElement) {
         const operatorUid = element.grayTipElement?.revokeElement.operatorUid;
         if (!operatorUid) return undefined;
         return new OB11FriendRecallNoticeEvent(
@@ -614,7 +656,7 @@ export class NapCatOneBot11Adapter {
         );
     }
 
-    private async emitGroupRecallMsg(message: RawMessage, oriMessageId: number, element: MessageElement) {
+    private async emitGroupRecallMsg (message: RawMessage, oriMessageId: number, element: MessageElement) {
         const operatorUid = element.grayTipElement?.revokeElement.operatorUid;
         if (!operatorUid) return undefined;
         const operatorId = await this.core.apis.UserApi.getUinByUidV2(operatorUid);

src/onebot/network/adapter.ts

@@ -23,7 +23,7 @@ export abstract class IOB11NetworkAdapter<CT extends NetworkAdapterConfig> {
         this.logger = core.context.logger;
     }
 
-    abstract onEvent<T extends OB11EmitEventContent>(event: T): void;
+    abstract onEvent<T extends OB11EmitEventContent>(event: T): Promise<void>;
 
     abstract open(): void | Promise<void>;
 

src/onebot/network/http-client.ts

@@ -16,7 +16,7 @@ export class OB11HttpClientAdapter extends IOB11NetworkAdapter<HttpClientConfig>
         super(name, config, core, obContext, actions);
     }
 
-    onEvent<T extends OB11EmitEventContent>(event: T) {
+    async onEvent<T extends OB11EmitEventContent>(event: T) {
         this.emitEventAsync(event).catch(e => this.logger.logError('[OneBot] [Http Client] 新消息事件HTTP上报返回快速操作失败', e));
     }