fix: fallback

fix: 无法修改网络配置表单值

.gitignore

@@ -1,14 +1,12 @@
 # Develop
 node_modules/
 package-lock.json
-pnpm-lock.yaml
 out/
 dist/
 /src/core.lib/common/
 /localdebug/
 
 # Editor
-.vscode/*
 !.vscode/extensions.json
 .idea/*
 

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+    "explorer.fileNesting.enabled": true,
+    "explorer.fileNesting.expand": false,
+    "explorer.fileNesting.patterns": {
+        ".env.universal": ".env.*",
+        "tsconfig.json": "tsconfig.*.json, env.d.ts, vite.config.ts",
+        "package.json": "package-lock.json, eslint*, .prettier*, .editorconfig, manifest.json, logo.png, .gitignore, LICENSE"
+    }
+}

README.md

@@ -1,6 +1,6 @@
 <div align="center">
   
-  ![Logo](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Flogo.png&name=1&owner=1&pattern=Diagonal%20Stripes&stargazers=1&theme=Auto)
+![NapCatQQ](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Fnewlogo.png&name=1&owner=1&pattern=Diagonal+Stripes&stargazers=1&theme=Auto)
   
 </div>
 
@@ -32,10 +32,12 @@ NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
 [Server.Other](https://docs.napcat.cyou/)
 
+[NapCat.Wiki](https://www.napcat.wiki)
+
 ## 回家旅途
 [QQ Group#1](https://qm.qq.com/q/I6LU87a0Yq)
 
-[QQ Group#2](https://qm.qq.com/q/uqh4I87KoM)
+[QQ Group#2](https://qm.qq.com/q/HaRcfrHpUk)
 
 [Telegram](https://t.me/MelodicMoonlight)
 
@@ -44,7 +46,7 @@ NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 ## 性能设计/协议标准
 NapCat 已实现90％+的 OneBot / GoCQ 标准接口，并提供兼容性保留接口，其设计理念遵守 无数据库/异步优先/后台刷新 的性能思想。
 
-由此设计带来一系列好处，在开发中，获取群员列表通常小于50Ms，单条文本消息发送在320Ms以内，在1k+的群聊流畅运行，同时带来一些副作用，上报数据中大量使用Magic生成字段，消息Id无法持久，无法上报撤回消息原始内容。
+由此设计带来一系列好处，在开发中，获取群员列表通常小于50Ms，单条文本消息发送在320Ms以内，在1k+的群聊流畅运行，同时带来一些副作用，消息Id无法持久，无法上报撤回消息原始内容。
 
 NapCat 在设计理念下遵守 OneBot 规范大多数要求并且积极改进，任何合理的标准化 Issue 与 Pr 将被接收。
 

launcher/qqnt.json

@@ -1,9 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.16-29927",
-  "verHash": "3e273e30",
-  "linuxVersion": "3.2.13-29927",
-  "linuxVerHash": "833d113c",
+  "version": "9.9.17-30899",
+  "verHash": "ececf273",
+  "linuxVersion": "3.2.15-30899",
+  "linuxVerHash": "63c751e8",
   "type": "module",
   "private": true,
   "description": "QQ",
@@ -18,7 +18,7 @@
     "qd": "externals/devtools/cli/index.js"
   },
   "main": "./loadNapCat.js",
-  "buildVersion": "29927",
+  "buildVersion": "30899",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",

manifest.json

@@ -4,16 +4,12 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.2.30",
+  "version": "4.4.3",
   "icon": "./logo.png",
   "authors": [
     {
-      "name": "MliKiowa",
-      "link": "https://github.com/MliKiowa"
-    },
-    {
-      "name": "Young",
-      "link": "https://github.com/Wesley-Young"
+      "name": "NapNeko",
+      "link": "https://github.com/NapNeko"
     }
   ],
   "repository": {

napcat.webui/src/pages/AboutUs.vue

@@ -89,7 +89,11 @@
                         <t-tag class="tag-item pgk-color"> WebUi: {{ pkg.version }} </t-tag>
                         <t-tag class="tag-item nc-color">
                             NapCat:
-                            {{ githubReleasesData&&githubReleasesData[0] ?.tag_name ? githubReleasesData[0].tag_name : napCatVersion }}
+                            {{ napCatVersion }}
+                        </t-tag>
+                         <t-tag v-if="githubReleasesData&&githubReleasesData[0] ?.tag_name" class="tag-item nc-color">
+                            New NapCat:
+                            {{ githubReleasesData[0].tag_name }}
                         </t-tag>
                         <t-tag class="tag-item td-color"> TDesign: {{ pkg.dependencies['tdesign-vue-next'] }} </t-tag>
                     </span>

napcat.webui/src/pages/NetWork.vue

@@ -11,85 +11,66 @@
         <t-divider align="right">
             <t-button @click="addConfig()">
                 <template #icon><add-icon /></template>
-                添加配置</t-button
-            >
+                添加配置</t-button>
         </t-divider>
     </div>
     <div v-if="loadPage" ref="setting" class="setting">
         <t-tabs ref="tabsRef" :style="{ width: tabsWidth + 'px' }" default-value="all" @change="selectType">
             <t-tab-panel value="all" label="全部"></t-tab-panel>
             <t-tab-panel value="httpServers" label="HTTP 服务器"></t-tab-panel>
+            <t-tab-panel value="httpSseServers" label="HTTP SSE 服务器"></t-tab-panel>
             <t-tab-panel value="httpClients" label="HTTP 客户端"></t-tab-panel>
             <t-tab-panel value="websocketServers" label="WebSocket 服务器"></t-tab-panel>
             <t-tab-panel value="websocketClients" label="WebSocket 客户端"></t-tab-panel>
+
         </t-tabs>
     </div>
     <t-loading attach="#alice" :loading="!loadPage" :showOverlay="false">
-        <div id="alice" v-if="!loadPage" style="height: 80vh;position: relative" ></div>
+        <div id="alice" v-if="!loadPage" style="height: 80vh;position: relative"></div>
     </t-loading>
     <div v-if="loadPage" class="card-box" :style="{ width: tabsWidth + 'px' }">
         <div class="setting-box" :style="{ maxHeight: cardHeight + 'px' }" v-if="cardConfig.length > 0">
             <div v-for="(item, index) in cardConfig" :key="index">
-                <t-card
-                    :title="item.name"
-                    :description="item.type"
-                    :style="{ width: cardWidth + 'px' }"
-                    :header-bordered="true"
-                    class="setting-card"
-                >
+                <t-card :title="item.name" :description="item.type" :style="{ width: cardWidth + 'px' }"
+                    :header-bordered="true" class="setting-card">
                     <template #actions>
                         <t-space>
                             <edit2-icon size="20px" @click="editConfig(item)"></edit2-icon>
-                            <t-popconfirm  content="确认删除" @confirm="delConfig(item)">
+                            <t-popconfirm content="确认删除" @confirm="delConfig(item)">
                                 <delete-icon size="20px"></delete-icon>
                             </t-popconfirm>
                         </t-space>
                     </template>
                     <div class="setting-content">
-                        <t-card
-                            class="card-address"
-                            :style="{
-                                borderLeft:
-                                    '7px solid ' + (item.enable ? 'var(--td-success-color)' : 'var(--td-error-color)'),
-                            }"
-                        >
+                        <t-card class="card-address" :style="{
+                            borderLeft:
+                                '7px solid ' + (item.enable ? 'var(--td-success-color)' : 'var(--td-error-color)'),
+                        }">
                             <div class="local-box" v-if="item.host && item.port">
-                                <server-filled-icon class="local-icon" size="20px" @click="toggleProperty(item, 'enable')"></server-filled-icon>
+                                <server-filled-icon class="local-icon" size="20px"
+                                    @click="toggleProperty(item, 'enable')"></server-filled-icon>
                                 <strong class="local">{{ item.host }}:{{ item.port }}</strong>
-                                <copy-icon
-                                    class="copy-icon"
-                                    size="20px"
-                                    @click="copyText(item.host + ':' + item.port)"
-                                ></copy-icon>
+                                <copy-icon class="copy-icon" size="20px"
+                                    @click="copyText(item.host + ':' + item.port)"></copy-icon>
                             </div>
                             <div class="local-box" v-if="item.url">
-                                <server-filled-icon class="local-icon" size="20px"  @click="toggleProperty(item, 'enable')"></server-filled-icon>
+                                <server-filled-icon class="local-icon" size="20px"
+                                    @click="toggleProperty(item, 'enable')"></server-filled-icon>
                                 <strong class="local">{{ item.url }}</strong>
                                 <copy-icon class="copy-icon" size="20px" @click="copyText(item.url)"></copy-icon>
                             </div>
                         </t-card>
                         <t-collapse :default-value="[0]" expand-mutex style="margin-top: 10px" class="info-coll">
                             <t-collapse-panel header="基础信息">
-                                <t-descriptions
-                                    size="small"
-                                    :layout="infoOneCol ? 'vertical' : 'horizontal'"
-                                    class="setting-base-info"
-                                >
+                                <t-descriptions size="small" :layout="infoOneCol ? 'vertical' : 'horizontal'"
+                                    class="setting-base-info">
                                     <t-descriptions-item v-if="item.token" label="连接密钥">
                                         <div v-if="mediumScreen.matches || largeScreen.matches" class="token-view">
                                             <span>{{ showToken ? item.token : '******' }}</span>
-                                            <browse-icon
-                                                class="browse-icon"
-                                                v-if="showToken"
-                                                size="18px"
-                                                @click="showToken = false"
-                                            ></browse-icon>
-                                            <browse-off-icon
-                                                class="browse-icon"
-                                                v-else
-                                                size="18px"
-                                                @click="showToken = true"
-                                            ></browse-off-icon>
+                                            <browse-icon class="browse-icon" v-if="showToken" size="18px"
+                                                @click="showToken = false"></browse-icon>
+                                            <browse-off-icon class="browse-icon" v-else size="18px"
+                                                @click="showToken = true"></browse-off-icon>
                                         </div>
                                         <div v-else>
                                             <t-popup :showArrow="true" trigger="click">
@@ -106,60 +87,36 @@
                                 </t-descriptions>
                             </t-collapse-panel>
                             <t-collapse-panel header="状态信息">
-                                <t-descriptions
-                                    size="small"
-                                    :layout="infoOneCol ? 'vertical' : 'horizontal'"
-                                    class="setting-base-info"
-                                >
+                                <t-descriptions size="small" :layout="infoOneCol ? 'vertical' : 'horizontal'"
+                                    class="setting-base-info">
                                     <t-descriptions-item v-if="item.hasOwnProperty('debug')" label="调试日志">
-                                        <t-tag
-                                            :class="item.debug ? 'tag-item-on' : 'tag-item-off'"
-                                            @click="toggleProperty(item, 'debug')"
-                                        >
-                                            {{ item.debug ? '开启' : '关闭' }}</t-tag
-                                        >
+                                        <t-tag :class="item.debug ? 'tag-item-on' : 'tag-item-off'"
+                                            @click="toggleProperty(item, 'debug')">
+                                            {{ item.debug ? '开启' : '关闭' }}</t-tag>
                                     </t-descriptions-item>
-                                    <t-descriptions-item
-                                        v-if="item.hasOwnProperty('enableWebsocket')"
-                                        label="Websocket 功能"
-                                    >
-                                        <t-tag
-                                            :class="item.enableWebsocket ? 'tag-item-on' : 'tag-item-off'"
-                                            @click="toggleProperty(item, 'enableWebsocket')"
-                                        >
-                                            {{ item.enableWebsocket ? '启用' : '禁用' }}</t-tag
-                                        >
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableWebsocket')"
+                                        label="Websocket 功能">
+                                        <t-tag :class="item.enableWebsocket ? 'tag-item-on' : 'tag-item-off'"
+                                            @click="toggleProperty(item, 'enableWebsocket')">
+                                            {{ item.enableWebsocket ? '启用' : '禁用' }}</t-tag>
                                     </t-descriptions-item>
-                                    <t-descriptions-item
-                                        v-if="item.hasOwnProperty('enableCors')"
-                                        label="跨域放行"
-                                    >
-                                        <t-tag  :class="item.enableCors ? 'tag-item-on' : 'tag-item-off'" @click="toggleProperty(item, 'enableCors')">
-                                            {{ item.enableCors ? '开启' : '关闭' }}</t-tag
-                                        >
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableCors')" label="跨域放行">
+                                        <t-tag :class="item.enableCors ? 'tag-item-on' : 'tag-item-off'"
+                                            @click="toggleProperty(item, 'enableCors')">
+                                            {{ item.enableCors ? '开启' : '关闭' }}</t-tag>
                                     </t-descriptions-item>
-                                    <t-descriptions-item
-                                        v-if="item.hasOwnProperty('enableForcePushEvent')"
-                                        label="上报自身消息"
-                                    >
-                                        <t-tag
-                                            :class="item.reportSelfMessage ? 'tag-item-on' : 'tag-item-off'"
-                                            @click="toggleProperty(item, 'reportSelfMessage')"
-                                        >
-                                            {{ item.reportSelfMessage ? '开启' : '关闭' }}</t-tag
-                                        >
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableForcePushEvent')"
+                                        label="上报自身消息">
+                                        <t-tag :class="item.reportSelfMessage ? 'tag-item-on' : 'tag-item-off'"
+                                            @click="toggleProperty(item, 'reportSelfMessage')">
+                                            {{ item.reportSelfMessage ? '开启' : '关闭' }}</t-tag>
                                     </t-descriptions-item>
-                                    <t-descriptions-item
-                                        v-if="item.hasOwnProperty('enableForcePushEvent')"
-                                        label="强制推送事件"
-                                    >
-                                        <t-tag
-                                            class="tag-item"
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableForcePushEvent')"
+                                        label="强制推送事件">
+                                        <t-tag class="tag-item"
                                             :class="item.enableForcePushEvent ? 'tag-item-on' : 'tag-item-off'"
-                                            @click="toggleProperty(item, 'enableForcePushEvent')"
-                                        >
-                                            {{ item.enableForcePushEvent ? '开启' : '关闭' }}</t-tag
-                                        >
+                                            @click="toggleProperty(item, 'enableForcePushEvent')">
+                                            {{ item.enableForcePushEvent ? '开启' : '关闭' }}</t-tag>
                                     </t-descriptions-item>
                                 </t-descriptions>
                             </t-collapse-panel>
@@ -173,32 +130,19 @@
             <t-empty class="card-none" title="暂无网络配置"> </t-empty>
         </t-card>
     </div>
-    <t-dialog
-        v-model:visible="visibleBody"
-        :header="dialogTitle"
-        :destroy-on-close="true"
-        :show-in-attached-element="true"
-        :on-confirm="saveConfig"
-        class=".t-dialog__ctx .t-dialog__position"
-    >
+    <t-dialog v-model:visible="visibleBody" :header="dialogTitle" :destroy-on-close="true"
+        :show-in-attached-element="true" :on-confirm="saveConfig" class=".t-dialog__ctx .t-dialog__position">
         <div slot="body" class="dialog-body">
             <t-form ref="form" :data="newTab" labelAlign="left" :model="newTab">
-                <t-form-item
-                    style="text-align: left"
-                    :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
-                    label="名称"
-                    name="name"
-                >
+                <t-form-item style="text-align: left" :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
+                    label="名称" name="name">
                     <t-input v-model="newTab.name" />
                 </t-form-item>
-                <t-form-item
-                    style="text-align: left"
-                    :rules="[{ required: true, message: '请选择类型', trigger: 'change' }]"
-                    label="类型"
-                    name="type"
-                >
+                <t-form-item style="text-align: left" :rules="[{ required: true, message: '请选择类型', trigger: 'change' }]"
+                    label="类型" name="type">
                     <t-select v-model="newTab.type" @change="onloadDefault">
                         <t-option value="httpServers">HTTP 服务器</t-option>
+                        <t-option value="httpSseServers">HTTP SSE 服务器</t-option>
                         <t-option value="httpClients">HTTP 客户端</t-option>
                         <t-option value="websocketServers">WebSocket 服务器</t-option>
                         <t-option value="websocketClients">WebSocket 客户端</t-option>
@@ -207,7 +151,7 @@
                 <div>
                     <component
                         :is="resolveDynamicComponent(getComponent(newTab.type as ComponentKey))"
-                        :config="newTab.data"
+                        :config="newTab"
                     />
                 </div>
             </t-form>
@@ -226,12 +170,10 @@ import {
     BrowseIcon,
     Wifi1Icon,
 } from 'tdesign-icons-vue-next';
-import { onMounted, onUnmounted, ref, resolveDynamicComponent, watch } from 'vue';
-import emitter from '@/ts/event-bus';
 import {
-    mergeNetworkDefaultConfig,
-    mergeOneBotConfigs,
-    NetworkConfig,
+    loadConfig as loadConfigOnebot,
+    NetworkAdapterConfig,
+    NetworkConfigKey,
     OneBotConfig,
 } from '../../../src/onebot/config/config';
 import HttpServerComponent from '@/pages/network/HttpServerComponent.vue';
@@ -240,6 +182,9 @@ import WebsocketServerComponent from '@/pages/network/WebsocketServerComponent.v
 import WebsocketClientComponent from '@/pages/network/WebsocketClientComponent.vue';
 import { MessagePlugin } from 'tdesign-vue-next';
 import { QQLoginManager } from '@/backend/shell';
+import { onMounted, onUnmounted, ref, watch, resolveDynamicComponent } from 'vue';
+import emitter from '@/ts/event-bus';
+import HttpSseServerComponent from './network/HttpSseServerComponent.vue';
 
 const showToken = ref<boolean>(false);
 const infoOneCol = ref<boolean>(true);
@@ -256,16 +201,17 @@ const visibleBody = ref<boolean>(false);
 const newTab = ref<{ name: string; data: any; type: string }>({ name: '', data: {}, type: '' });
 const dialogTitle = ref<string>('');
 
-type ComponentKey = keyof typeof mergeNetworkDefaultConfig;
-
+type ComponentKey = Exclude<NetworkConfigKey, 'plugins'>
 const componentMap: Record<
     ComponentKey,
     | typeof HttpServerComponent
     | typeof HttpClientComponent
     | typeof WebsocketServerComponent
     | typeof WebsocketClientComponent
+    | typeof HttpSseServerComponent
 > = {
     httpServers: HttpServerComponent,
+    httpSseServers: HttpSseServerComponent,
     httpClients: HttpClientComponent,
     websocketServers: WebsocketServerComponent,
     websocketClients: WebsocketClientComponent,
@@ -276,9 +222,10 @@ const operateType = ref<string>('');
 //配置项索引
 const configIndex = ref<number>(0);
 //保存时所用数据
-const networkConfig: NetworkConfig & { [key: string]: any } = {
+const networkConfig: { [key: string]: any } = {
     websocketClients: [],
     websocketServers: [],
+    httpSseServers: [],
     httpClients: [],
     httpServers: [],
 };
@@ -289,6 +236,7 @@ const WebConfg = ref(
         ['all', []],
         ['httpServers', []],
         ['httpClients', []],
+        ['httpSseServers', []],
         ['websocketServers', []],
         ['websocketClients', []],
     ])
@@ -296,6 +244,7 @@ const WebConfg = ref(
 const typeCh: Record<ComponentKey, string> = {
     httpServers: 'HTTP 服务器',
     httpClients: 'HTTP 客户端',
+    httpSseServers: 'HTTP SSE 服务器',
     websocketServers: 'WebSocket 服务器',
     websocketClients: 'WebSocket 客户端',
 };
@@ -315,15 +264,12 @@ const addConfig = () => {
 };
 
 const editConfig = (item: any) => {
-    dialogTitle.value = '修改配置';
-    const type = getKeyByValue(typeCh, item.type);
-    if (type) {
-        newTab.value = { name: item.name, data: item, type: type };
-    }
+    dialogTitle.value = '编辑配置';
+    newTab.value = { name: item.name, data: { ...item }, type: getKeyByValue(typeCh, item.type) || '' };
     operateType.value = 'edit';
-    configIndex.value = networkConfig[newTab.value.type].findIndex((obj: any) => obj.name === item.name);
     visibleBody.value = true;
 };
+
 const toggleProperty = async (item: any, tagData: string) => {
     const type = getKeyByValue(typeCh, item.type);
     const newData = { ...item };
@@ -349,11 +295,11 @@ const delConfig = (item: any) => {
 };
 
 const selectType = (key: ComponentKey) => {
-    cardConfig.value = WebConfg.value.get(key);
+    cardConfig.value = WebConfg.value.get(key) || [];
 };
 
 const onloadDefault = (key: ComponentKey) => {
-    newTab.value.data = structuredClone(mergeNetworkDefaultConfig[key]);
+    newTab.value.data = {};
 };
 //检测重名
 const checkName = (name: string) => {
@@ -383,7 +329,7 @@ const saveConfig = async () => {
     }
     const userConfig = await getOB11Config();
     if (!userConfig) return;
-    userConfig.network = networkConfig;
+    userConfig.network = networkConfig as any;
     const success = await setOB11Config(userConfig);
     if (success) {
         operateType.value = '';
@@ -416,12 +362,12 @@ const setOB11Config = async (config: OneBotConfig): Promise<boolean> => {
 };
 
 //获取卡片数据
-const getAllData = (data: NetworkConfig) => {
+const getAllData = (data: { [key: string]: Array<NetworkAdapterConfig> }) => {
     cardConfig.value = [];
     WebConfg.value.set('all', []);
     for (const key in data) {
-        const configs = data[key as keyof NetworkConfig];
-        if (key in mergeNetworkDefaultConfig) {
+        const configs = data[key as keyof NetworkAdapterConfig];
+        if (key in networkConfig) {
             networkConfig[key] = [...configs];
             const newConfigsArray = configs.map((config: any) => ({
                 ...config,
@@ -442,13 +388,12 @@ const loadConfig = async () => {
     try {
         const userConfig = await getOB11Config();
         if (!userConfig) return;
-        const mergedConfig = mergeOneBotConfigs(userConfig);
+        const mergedConfig = loadConfigOnebot(userConfig);
         getAllData(mergedConfig.network);
     } catch (error) {
         console.error('Error loading config:', error);
     }
 };
-
 const copyText = async (text: string) => {
     const textarea = document.createElement('textarea');
     textarea.value = text;
@@ -474,9 +419,9 @@ const handleResize = () => {
         cardWidth.value = tabsWidth.value;
     }
     loadPage.value = true;
-    setTimeout(()=>{
+    setTimeout(() => {
         cardHeight.value = window.innerHeight - (headerBox.value?.offsetHeight ?? 0) - (setting.value?.offsetHeight ?? 0) - 21;
-    },300)
+    }, 300)
 };
 emitter.on('sendWidth', (width) => {
     if (typeof width === 'string') {
@@ -486,30 +431,30 @@ emitter.on('sendWidth', (width) => {
 });
 watch(menuWidth, (newValue, oldValue) => {
     loadPage.value = false;
-    setTimeout(()=>{
+    setTimeout(() => {
         handleResize();
-    },300)
+    }, 300)
 });
 onMounted(() => {
     loadConfig();
     const cachedWidth = localStorage.getItem('menuWidth');
     if (cachedWidth) {
         menuWidth.value = parseInt(cachedWidth);
-        setTimeout(()=>{
+        setTimeout(() => {
             handleResize();
-        },300)
+        }, 300)
     }
-    window.addEventListener('resize', ()=>{
-        setTimeout(()=>{
+    window.addEventListener('resize', () => {
+        setTimeout(() => {
             handleResize();
-        },300)
+        }, 300)
     });
 });
 onUnmounted(() => {
-    window.removeEventListener('resize', ()=>{
-        setTimeout(()=>{
+    window.removeEventListener('resize', () => {
+        setTimeout(() => {
             handleResize();
-        },300)
+        }, 300)
     });
 });
 </script>
@@ -550,9 +495,11 @@ onUnmounted(() => {
     display: flex;
     margin-top: 2px;
 }
+
 .local-icon {
     flex: 1;
 }
+
 .local {
     flex: 6;
     margin: 0 10px 0 10px;
@@ -579,22 +526,26 @@ onUnmounted(() => {
     text-overflow: ellipsis;
 }
 
-.tag-item-on{
+.tag-item-on {
     color: white;
     cursor: pointer;
     background-image: linear-gradient(to top, #0ba360 0%, #3cba92 100%) !important;
 }
-.tag-item-off{
+
+.tag-item-off {
     color: white;
     cursor: pointer;
     background-image: linear-gradient(to top, rgba(255, 8, 68, 0.93) 0%, #D54941 100%) !important;
 }
+
 .browse-icon {
     flex: 2;
 }
+
 :global(.t-dialog__ctx .t-dialog__position) {
     padding: 48px 10px;
 }
+
 @media (max-width: 1024px) {
     .setting-box {
         grid-template-columns: 1fr 1fr;
@@ -644,7 +595,7 @@ onUnmounted(() => {
     padding: 0 var(--td-comp-paddingLR-l) !important;
 }
 
-.setting-base-info tr > td:last-child {
+.setting-base-info tr>td:last-child {
     text-align: right;
 }
 

napcat.webui/src/pages/network/HttpClientComponent.vue

@@ -2,22 +2,22 @@
     <div>
         <t-form labelAlign="left">
             <t-form-item label="启用">
-                <t-switch v-model="config.enable" />
+                <t-switch v-model="props.config.data.enable" />
             </t-form-item>
             <t-form-item label="URL">
-                <t-input v-model="config.url" />
+                <t-input v-model="props.config.data.url" />
             </t-form-item>
             <t-form-item label="消息格式">
-                <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+                <t-select v-model="props.config.data.messagePostFormat" :options="messageFormatOptions" />
             </t-form-item>
             <t-form-item label="报告自身消息">
-                <t-switch v-model="config.reportSelfMessage" />
+                <t-switch v-model="props.config.data.reportSelfMessage" />
             </t-form-item>
             <t-form-item label="Token">
-                <t-input v-model="config.token" />
+                <t-input v-model="props.config.data.token" />
             </t-form-item>
             <t-form-item label="调试模式">
-                <t-switch v-model="config.debug" />
+                <t-switch v-model="props.config.data.debug" />
             </t-form-item>
         </t-form>
     </div>
@@ -27,20 +27,32 @@
 import { ref, watch } from 'vue';
 import { HttpClientConfig } from '../../../../src/onebot/config/config';
 
+const defaultConfig: HttpClientConfig = {
+    name: 'http-client',
+    enable: false,
+    url: 'http://localhost:8080',
+    messagePostFormat: 'array',
+    reportSelfMessage: false,
+    token: '',
+    debug: false,
+};
+
 const props = defineProps<{
-    config: HttpClientConfig;
+    config: { data: HttpClientConfig };
 }>();
 
+props.config.data = { ...defaultConfig, ...props.config.data };
+
 const messageFormatOptions = ref([
     { label: 'Array', value: 'array' },
     { label: 'String', value: 'string' },
 ]);
 
 watch(
-    () => props.config.messagePostFormat,
+    () => props.config.data.messagePostFormat,
     (newValue) => {
         if (newValue !== 'array' && newValue !== 'string') {
-            props.config.messagePostFormat = 'array';
+            props.config.data.messagePostFormat = 'array';
         }
     }
 );

napcat.webui/src/pages/network/HttpServerComponent.vue

@@ -2,28 +2,28 @@
     <div>
         <t-form labelAlign="left">
             <t-form-item label="启用">
-                <t-switch v-model="config.enable" />
+                <t-switch v-model="props.config.data.enable" />
             </t-form-item>
             <t-form-item label="端口">
-                <t-input v-model.number="config.port" type="number" />
+                <t-input v-model.number="props.config.data.port" type="number" />
             </t-form-item>
             <t-form-item label="主机">
-                <t-input v-model="config.host" type="text" />
+                <t-input v-model="props.config.data.host" type="text" />
             </t-form-item>
             <t-form-item label="启用 CORS">
-                <t-switch v-model="config.enableCors" />
+                <t-switch v-model="props.config.data.enableCors" />
             </t-form-item>
             <t-form-item label="启用 WS">
-                <t-switch v-model="config.enableWebsocket" />
+                <t-switch v-model="props.config.data.enableWebsocket" />
             </t-form-item>
             <t-form-item label="消息格式">
-                <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+                <t-select v-model="props.config.data.messagePostFormat" :options="messageFormatOptions" />
             </t-form-item>
             <t-form-item label="Token">
-                <t-input v-model="config.token" type="text" />
+                <t-input v-model="props.config.data.token" type="text" />
             </t-form-item>
             <t-form-item label="调试模式">
-                <t-switch v-model="config.debug" />
+                <t-switch v-model="props.config.data.debug" />
             </t-form-item>
         </t-form>
     </div>
@@ -33,20 +33,34 @@
 import { ref, watch } from 'vue';
 import { HttpServerConfig } from '../../../../src/onebot/config/config';
 
+const defaultConfig: HttpServerConfig = {
+    name: 'http-server',
+    enable: false,
+    port: 3000,
+    host: '0.0.0.0',
+    enableCors: true,
+    enableWebsocket: true,
+    messagePostFormat: 'array',
+    token: '',
+    debug: false,
+};
+
 const props = defineProps<{
-    config: HttpServerConfig;
+    config: { data: HttpServerConfig };
 }>();
 
+props.config.data = { ...defaultConfig, ...props.config.data };
+
 const messageFormatOptions = ref([
     { label: 'Array', value: 'array' },
     { label: 'String', value: 'string' },
 ]);
 
 watch(
-    () => props.config.messagePostFormat,
+    () => props.config.data.messagePostFormat,
     (newValue) => {
         if (newValue !== 'array' && newValue !== 'string') {
-            props.config.messagePostFormat = 'array';
+            props.config.data.messagePostFormat = 'array';
         }
     }
 );

napcat.webui/src/pages/network/HttpSseServerComponent.vue

@@ -0,0 +1,73 @@
+<template>
+    <div>
+        <t-form labelAlign="left">
+            <t-form-item label="启用">
+                <t-switch v-model="props.config.data.enable" />
+            </t-form-item>
+            <t-form-item label="端口">
+                <t-input v-model.number="props.config.data.port" type="number" />
+            </t-form-item>
+            <t-form-item label="主机">
+                <t-input v-model="props.config.data.host" type="text" />
+            </t-form-item>
+            <t-form-item label="报告自身消息">
+                <t-switch v-model="props.config.data.reportSelfMessage" />
+            </t-form-item>
+            <t-form-item label="启用 CORS">
+                <t-switch v-model="props.config.data.enableCors" />
+            </t-form-item>
+            <t-form-item label="启用 WS">
+                <t-switch v-model="props.config.data.enableWebsocket" />
+            </t-form-item>
+            <t-form-item label="消息格式">
+                <t-select v-model="props.config.data.messagePostFormat" :options="messageFormatOptions" />
+            </t-form-item>
+            <t-form-item label="Token">
+                <t-input v-model="props.config.data.token" type="text" />
+            </t-form-item>
+            <t-form-item label="调试模式">
+                <t-switch v-model="props.config.data.debug" />
+            </t-form-item>
+        </t-form>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue';
+import { HttpSseServerConfig } from '../../../../src/onebot/config/config';
+
+const defaultConfig: HttpSseServerConfig = {
+    name: 'http-sse-server',
+    enable: false,
+    port: 3000,
+    host: '0.0.0.0',
+    enableCors: true,
+    enableWebsocket: true,
+    messagePostFormat: 'array',
+    token: '',
+    debug: false,
+    reportSelfMessage: false,
+};
+
+const props = defineProps<{
+    config: { data: HttpSseServerConfig };
+}>();
+
+props.config.data = { ...defaultConfig, ...props.config.data };
+
+const messageFormatOptions = ref([
+    { label: 'Array', value: 'array' },
+    { label: 'String', value: 'string' },
+]);
+
+watch(
+    () => props.config.data.messagePostFormat,
+    (newValue) => {
+        if (newValue !== 'array' && newValue !== 'string') {
+            props.config.data.messagePostFormat = 'array';
+        }
+    }
+);
+</script>
+
+<style scoped></style>

napcat.webui/src/pages/network/WebsocketClientComponent.vue

@@ -2,25 +2,25 @@
     <div>
         <t-form labelAlign="left">
             <t-form-item label="启用">
-                <t-switch v-model="config.enable" />
+                <t-switch v-model="props.config.data.enable" />
             </t-form-item>
             <t-form-item label="URL">
-                <t-input v-model="config.url" />
+                <t-input v-model="props.config.data.url" />
             </t-form-item>
             <t-form-item label="消息格式">
-                <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+                <t-select v-model="props.config.data.messagePostFormat" :options="messageFormatOptions" />
             </t-form-item>
             <t-form-item label="报告自身消息">
-                <t-switch v-model="config.reportSelfMessage" />
+                <t-switch v-model="props.config.data.reportSelfMessage" />
             </t-form-item>
             <t-form-item label="Token">
-                <t-input v-model="config.token" />
+                <t-input v-model="props.config.data.token" />
             </t-form-item>
             <t-form-item label="调试模式">
-                <t-switch v-model="config.debug" />
+                <t-switch v-model="props.config.data.debug" />
             </t-form-item>
             <t-form-item label="心跳间隔">
-                <t-input v-model.number="config.heartInterval" type="number" />
+                <t-input v-model.number="props.config.data.heartInterval" type="number" />
             </t-form-item>
         </t-form>
     </div>
@@ -30,20 +30,34 @@
 import { ref, watch } from 'vue';
 import { WebsocketClientConfig } from '../../../../src/onebot/config/config';
 
+const defaultConfig: WebsocketClientConfig = {
+    name: 'websocket-client',
+    enable: false,
+    url: 'ws://localhost:8082',
+    messagePostFormat: 'array',
+    reportSelfMessage: false,
+    reconnectInterval: 5000,
+    token: '',
+    debug: false,
+    heartInterval: 30000,
+};
+
 const props = defineProps<{
-    config: WebsocketClientConfig;
+    config: { data: WebsocketClientConfig };
 }>();
 
+props.config.data = { ...defaultConfig, ...props.config.data };
+
 const messageFormatOptions = ref([
     { label: 'Array', value: 'array' },
     { label: 'String', value: 'string' },
 ]);
 
 watch(
-    () => props.config.messagePostFormat,
+    () => props.config.data.messagePostFormat,
     (newValue) => {
         if (newValue !== 'array' && newValue !== 'string') {
-            props.config.messagePostFormat = 'array';
+            props.config.data.messagePostFormat = 'array';
         }
     }
 );

napcat.webui/src/pages/network/WebsocketServerComponent.vue

@@ -2,31 +2,31 @@
     <div>
         <t-form labelAlign="left">
             <t-form-item label="启用">
-                <t-switch v-model="config.enable" />
+                <t-switch v-model="props.config.data.enable" />
             </t-form-item>
             <t-form-item label="主机">
-                <t-input v-model="config.host" />
+                <t-input v-model="props.config.data.host" />
             </t-form-item>
             <t-form-item label="端口">
-                <t-input v-model.number="config.port" type="number" />
+                <t-input v-model.number="props.config.data.port" type="number" />
             </t-form-item>
             <t-form-item label="消息格式">
-                <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+                <t-select v-model="props.config.data.messagePostFormat" :options="messageFormatOptions" />
             </t-form-item>
             <t-form-item label="上报自身消息">
-                <t-switch v-model="config.reportSelfMessage" />
+                <t-switch v-model="props.config.data.reportSelfMessage" />
             </t-form-item>
             <t-form-item label="Token">
-                <t-input v-model="config.token" />
+                <t-input v-model="props.config.data.token" />
             </t-form-item>
             <t-form-item label="强制推送事件">
-                <t-switch v-model="config.enableForcePushEvent" />
+                <t-switch v-model="props.config.data.enableForcePushEvent" />
             </t-form-item>
             <t-form-item label="调试模式">
-                <t-switch v-model="config.debug" />
+                <t-switch v-model="props.config.data.debug" />
             </t-form-item>
             <t-form-item label="心跳间隔">
-                <t-input v-model.number="config.heartInterval" type="number" />
+                <t-input v-model.number="props.config.data.heartInterval" type="number" />
             </t-form-item>
         </t-form>
     </div>
@@ -36,20 +36,35 @@
 import { ref, watch } from 'vue';
 import { WebsocketServerConfig } from '../../../../src/onebot/config/config';
 
+const defaultConfig: WebsocketServerConfig = {
+    name: 'websocket-server',
+    enable: false,
+    host: '0.0.0.0',
+    port: 3001,
+    messagePostFormat: 'array',
+    reportSelfMessage: false,
+    token: '',
+    enableForcePushEvent: true,
+    debug: false,
+    heartInterval: 30000,
+};
+
 const props = defineProps<{
-    config: WebsocketServerConfig;
+    config: { data: WebsocketServerConfig };
 }>();
 
+props.config.data = { ...defaultConfig, ...props.config.data };
+
 const messageFormatOptions = ref([
     { label: 'Array', value: 'array' },
     { label: 'String', value: 'string' },
 ]);
 
 watch(
-    () => props.config.messagePostFormat,
+    () => props.config.data.messagePostFormat,
     (newValue) => {
         if (newValue !== 'array' && newValue !== 'string') {
-            props.config.messagePostFormat = 'array';
+            props.config.data.messagePostFormat = 'array';
         }
     }
 );

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.2.30",
+  "version": "4.4.3",
   "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",
@@ -17,14 +17,15 @@
     "dev:depend": "npm i && cd napcat.webui && npm i"
   },
   "devDependencies": {
+    "esbuild": "0.24.0",
     "@babel/preset-typescript": "^7.24.7",
     "@eslint/compat": "^1.2.2",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.14.0",
     "@log4js-node/log4js-api": "^1.0.2",
     "@napneko/nap-proto-core": "^0.0.4",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.6",
+    "@rollup/plugin-typescript": "^12.1.2",
+    "@rollup/plugin-node-resolve": "^16.0.0",
     "@types/cors": "^2.8.17",
     "@sinclair/typebox": "^0.34.9",
     "@types/express": "^5.0.0",
@@ -36,13 +37,13 @@
     "@typescript-eslint/parser": "^8.3.0",
     "ajv": "^8.13.0",
     "async-mutex": "^0.5.0",
-    "commander": "^12.1.0",
+    "commander": "^13.0.0",
     "cors": "^2.8.5",
     "eslint": "^9.14.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
     "fast-xml-parser": "^4.3.6",
-    "file-type": "^19.0.0",
+    "file-type": "^20.0.0",
     "globals": "^15.12.0",
     "image-size": "^1.1.1",
     "typescript": "^5.3.3",
@@ -60,4 +61,4 @@
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   }
-}
+}

src/common/cancel-task.ts

@@ -0,0 +1,107 @@
+export type TaskExecutor<T> = (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void, onCancel: (callback: () => void) => void) => void;
+
+export class CancelableTask<T> {
+    private promise: Promise<T>;
+    private cancelCallback: (() => void) | null = null;
+    private isCanceled = false;
+    private cancelListeners: Array<() => void> = [];
+
+    constructor(executor: TaskExecutor<T>) {
+        this.promise = new Promise<T>((resolve, reject) => {
+            const onCancel = (callback: () => void) => {
+                this.cancelCallback = callback;
+            };
+
+            executor(
+                (value) => {
+                    if (!this.isCanceled) {
+                        resolve(value);
+                    }
+                },
+                (reason) => {
+                    if (!this.isCanceled) {
+                        reject(reason);
+                    }
+                },
+                onCancel
+            );
+        });
+    }
+
+    public cancel() {
+        if (this.cancelCallback) {
+            this.cancelCallback();
+        }
+        this.isCanceled = true;
+        this.cancelListeners.forEach(listener => listener());
+    }
+
+    public isTaskCanceled(): boolean {
+        return this.isCanceled;
+    }
+
+    public onCancel(listener: () => void) {
+        this.cancelListeners.push(listener);
+    }
+
+    public then<TResult1 = T, TResult2 = never>(
+        onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
+        onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null
+    ): Promise<TResult1 | TResult2> {
+        return this.promise.then(onfulfilled, onrejected);
+    }
+
+    public catch<TResult = never>(
+        onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null
+    ): Promise<T | TResult> {
+        return this.promise.catch(onrejected);
+    }
+
+    public finally(onfinally?: (() => void) | undefined | null): Promise<T> {
+        return this.promise.finally(onfinally);
+    }
+
+    [Symbol.asyncIterator]() {
+        return {
+            next: () => this.promise.then(value => ({ value, done: true })),
+        };
+    }
+}
+
+
+async function demoAwait() {
+    const executor: TaskExecutor<number> = (resolve, reject, onCancel) => {
+        let count = 0;
+        const intervalId = setInterval(() => {
+            count++;
+            console.log(`Task is running... Count: ${count}`);
+            if (count === 5) {
+                clearInterval(intervalId);
+                resolve(count);
+            }
+        }, 1000);
+
+        onCancel(() => {
+            clearInterval(intervalId);
+            console.log('Task has been canceled.');
+            reject(new Error('Task was canceled'));
+        });
+    };
+
+    const task = new CancelableTask(executor);
+
+    task.onCancel(() => {
+        console.log('Cancel listener triggered.');
+    });
+
+    setTimeout(() => {
+        task.cancel(); // 取消任务
+    }, 6000);
+
+    try {
+        const result = await task;
+        console.log(`Task completed with result: ${result}`);
+    } catch (error) {
+        console.error('Task failed:', error);
+    }
+}

src/common/decorator.ts

@@ -0,0 +1,22 @@
+// decoratorAsyncMethod(this,function,wrapper)
+async function decoratorMethod<T, R>(
+    target: T, 
+    method: () => Promise<R>, 
+    wrapper: (result: R) => Promise<any>, 
+    executeImmediately: boolean = true
+): Promise<any> {
+    const execute = async () => {
+        try {
+            const result = await method.call(target);
+            return wrapper(result);
+        } catch (error) {
+            return Promise.reject(error instanceof Error ? error : new Error(String(error)));
+        }
+    };
+
+    if (executeImmediately) {
+        return execute();
+    } else {
+        return execute;
+    }
+}

src/common/fall-back.ts

@@ -0,0 +1,43 @@
+type Handler<T> = () => T | Promise<T>;
+type Checker<T> = (result: T) => T | Promise<T>;
+
+export class Fallback<T> {
+    private handlers: Handler<T>[] = [];
+    private checker: Checker<T>;
+
+    constructor(checker?: Checker<T>) {
+        this.checker = checker || (async (result: T) => result);
+    }
+
+    add(handler: Handler<T>): this {
+        this.handlers.push(handler);
+        return this;
+    }
+
+    // 执行处理程序链
+    async run(): Promise<T> {
+        const errors: Error[] = [];
+        for (const handler of this.handlers) {
+            try {
+                const result = await handler();
+                const data = await this.checker(result);
+                if (data) {
+                    return data;
+                }
+            } catch (error) {
+                console.log(error);
+                errors.push(error instanceof Error ? error : new Error(String(error)));
+            }
+        }
+        throw new AggregateError(errors, 'All handlers failed');
+    }
+}
+export class FallbackUtil {
+    static boolchecker<T>(value: T, condition: boolean): T {
+        if (condition) {
+            return value;
+        } else {
+            throw new Error('Condition is false, throwing error');
+        }
+    }
+}

src/common/file-uuid.ts

@@ -0,0 +1,121 @@
+import { Peer } from '@/core';
+import { randomUUID } from 'crypto';
+
+class TimeBasedCache<K, V> {
+    private cache = new Map<K, { value: V, timestamp: number, frequency: number }>();
+    private keyList = new Set<K>();
+    private operationCount = 0;
+
+    constructor(private maxCapacity: number, private ttl: number = 30 * 1000 * 60, private cleanupCount: number = 10) {}
+
+    public put(key: K, value: V): void {
+        const timestamp = Date.now();
+        const cacheEntry = { value, timestamp, frequency: 1 };
+        this.cache.set(key, cacheEntry);
+        this.keyList.add(key);
+        this.operationCount++;
+        if (this.keyList.size > this.maxCapacity) this.evict();
+        if (this.operationCount >= this.cleanupCount) this.cleanup(this.cleanupCount);
+    }
+
+    public get(key: K): V | undefined {
+        const entry = this.cache.get(key);
+        if (entry && Date.now() - entry.timestamp < this.ttl) {
+            entry.timestamp = Date.now();
+            entry.frequency++;
+            this.operationCount++;
+            if (this.operationCount >= this.cleanupCount) this.cleanup(this.cleanupCount);
+            return entry.value;
+        } else {
+            this.deleteKey(key);
+        }
+        return undefined;
+    }
+
+    private cleanup(count: number): void {
+        const currentTime = Date.now();
+        let cleaned = 0;
+        for (const key of this.keyList) {
+            if (cleaned >= count) break;
+            const entry = this.cache.get(key);
+            if (entry && currentTime - entry.timestamp >= this.ttl) {
+                this.deleteKey(key);
+                cleaned++;
+            }
+        }
+        this.operationCount = 0; // 重置操作计数器
+    }
+
+    private deleteKey(key: K): void {
+        this.cache.delete(key);
+        this.keyList.delete(key);
+    }
+
+    private evict(): void {
+        while (this.keyList.size > this.maxCapacity) {
+            let oldestKey: K | undefined;
+            let minFrequency = Infinity;
+            for (const key of this.keyList) {
+                const entry = this.cache.get(key);
+                if (entry && entry.frequency < minFrequency) {
+                    minFrequency = entry.frequency;
+                    oldestKey = key;
+                }
+            }
+            if (oldestKey !== undefined) this.deleteKey(oldestKey);
+        }
+    }
+}
+
+interface FileUUIDData {
+    peer: Peer;
+    modelId?: string;
+    fileId?: string;
+    msgId?: string;
+    elementId?: string;
+    fileUUID?: string;
+}
+
+class FileUUIDManager {
+    private cache: TimeBasedCache<string, FileUUIDData>;
+
+    constructor(ttl: number) {
+        this.cache = new TimeBasedCache<string, FileUUIDData>(5000, ttl);
+    }
+
+    public encode(data: FileUUIDData, endString: string = "", customUUID?: string): string {
+        const uuid = customUUID ? customUUID : randomUUID().replace(/-/g, '') + endString;
+        this.cache.put(uuid, data);
+        return uuid;
+    }
+
+    public decode(uuid: string): FileUUIDData | undefined {
+        return this.cache.get(uuid);
+    }
+}
+
+export class FileNapCatOneBotUUIDWrap {
+    private manager: FileUUIDManager;
+
+    constructor(ttl: number = 86400000) {
+        this.manager = new FileUUIDManager(ttl);
+    }
+
+    public encodeModelId(peer: Peer, modelId: string, fileId: string, fileUUID: string = "", endString: string = "", customUUID?: string): string {
+        return this.manager.encode({ peer, modelId, fileId, fileUUID }, endString, customUUID);
+    }
+
+    public decodeModelId(uuid: string): FileUUIDData | undefined {
+        return this.manager.decode(uuid);
+    }
+
+    public encode(peer: Peer, msgId: string, elementId: string, fileUUID: string = "", customUUID?: string): string {
+        return this.manager.encode({ peer, msgId, elementId, fileUUID }, "", customUUID);
+    }
+
+    public decode(uuid: string): FileUUIDData | undefined {
+        return this.manager.decode(uuid);
+    }
+}
+
+export const FileNapCatOneBotUUID = new FileNapCatOneBotUUIDWrap();

src/common/file.ts

@@ -175,35 +175,34 @@ export async function checkUriType(Uri: string) {
     return { Uri: Uri, Type: FileUriType.Unknown };
 }
 
-export async function uriToLocalFile(dir: string, uri: string): Promise<Uri2LocalRes> {
+export async function uriToLocalFile(dir: string, uri: string, filename: string = randomUUID(), headers?: Record<string, string>): Promise<Uri2LocalRes> {
     const { Uri: HandledUri, Type: UriType } = await checkUriType(uri);
 
-    const filename = randomUUID();
     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(HandledUri);
-        fs.writeFileSync(filePath, buffer, { flag: 'wx' });
-        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, { flag: 'wx' });
-        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/helper.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import fs from 'fs';
 import os from 'node:os';
-import { Peer, QQLevel } from '@/core';
+import { QQLevel } from '@/core';
 
 export async function solveProblem<T extends (...arg: any[]) => any>(func: T, ...args: Parameters<T>): Promise<ReturnType<T> | undefined> {
     return new Promise<ReturnType<T> | undefined>((resolve) => {
@@ -24,81 +24,6 @@ export async function solveAsyncProblem<T extends (...args: any[]) => Promise<an
     });
 }
 
-export class FileNapCatOneBotUUID {
-    static encodeModelId(peer: Peer, modelId: string, fileId: string, fileUUID: string = "", endString: string = ""): string {
-        const data = `NapCatOneBot|ModelIdFile|${peer.chatType}|${peer.peerUid}|${modelId}|${fileId}|${fileUUID}`;
-        //前四个字节塞data长度
-        const length = Buffer.alloc(4 + data.length);
-        length.writeUInt32BE(data.length * 2, 0);//储存data的hex长度
-        length.write(data, 4);
-        return length.toString('hex') + endString;
-    }
-
-    static decodeModelId(uuid: string): undefined | {
-        peer: Peer,
-        modelId: string,
-        fileId: string,
-        fileUUID?: string
-    } {
-        //前四个字节是data长度
-        const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
-        //根据length计算需要读取的长度
-        const dataId = uuid.slice(8, 8 + length);
-        //hex还原为string
-        const realData = Buffer.from(dataId, 'hex').toString();
-        if (!realData.startsWith('NapCatOneBot|ModelIdFile|')) return undefined;
-        const data = realData.split('|');
-        if (data.length < 6) return undefined;  // compatibility requirement
-        const [, , chatType, peerUid, modelId, fileId, fileUUID = undefined] = data;
-        return {
-            peer: {
-                chatType: +chatType,
-                peerUid: peerUid,
-            },
-            modelId,
-            fileId,
-            fileUUID
-        };
-    }
-
-    static encode(peer: Peer, msgId: string, elementId: string, fileUUID: string = "", endString: string = ""): string {
-        const data = `NapCatOneBot|MsgFile|${peer.chatType}|${peer.peerUid}|${msgId}|${elementId}|${fileUUID}`;
-        //前四个字节塞data长度
-        //一个字节8位 一个ascii字符1字节 一个hex字符4位 表示一个ascii字符需要两个hex字符
-        const length = Buffer.alloc(4 + data.length);
-        length.writeUInt32BE(data.length * 2, 0);
-        length.write(data, 4);
-        return length.toString('hex') + endString;
-    }
-
-    static decode(uuid: string): undefined | {
-        peer: Peer,
-        msgId: string,
-        elementId: string,
-        fileUUID?: string
-    } {
-        //前四个字节是data长度
-        const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
-        //根据length计算需要读取的长度
-        const dataId = uuid.slice(8, 8 + length);
-        //hex还原为string
-        const realData = Buffer.from(dataId, 'hex').toString();
-        if (!realData.startsWith('NapCatOneBot|MsgFile|')) return undefined;
-        const data = realData.split('|');
-        if (data.length < 6) return undefined;  // compatibility requirement
-        const [, , chatType, peerUid, msgId, elementId, fileUUID = undefined] = data;
-        return {
-            peer: {
-                chatType: +chatType,
-                peerUid: peerUid,
-            },
-            msgId,
-            elementId,
-            fileUUID
-        };
-    }
-}
-
 export function sleep(ms: number): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }

src/common/message-unique.ts

@@ -78,7 +78,7 @@ class MessageUniqueWrapper {
     private readonly msgDataMap: LimitedHashTable<string, number>;
     private readonly msgIdMap: LimitedHashTable<string, number>;
 
-    constructor(maxMap: number = 1000) {
+    constructor(maxMap: number = 5000) {
         this.msgIdMap = new LimitedHashTable<string, number>(maxMap);
         this.msgDataMap = new LimitedHashTable<string, number>(maxMap);
     }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.30';
+export const napCatVersion = '4.4.3';

src/core/apis/file.ts

@@ -462,7 +462,7 @@ export class NTQQFileApi {
                 rkeyData.private_rkey = tempRkeyData.private_rkey;
                 rkeyData.online_rkey = tempRkeyData.expired_time > Date.now() / 1000;
             } catch (e) {
-                this.context.logger.logError('获取rkey失败 Fallback Old Mode', e);
+                this.context.logger.logDebug('获取rkey失败 Fallback Old Mode', e);
             }
         }
 
@@ -474,7 +474,7 @@ export class NTQQFileApi {
         if (rkeyData.online_rkey) {
             return IMAGE_HTTP_HOST_NT + `/download?appid=${appid}&fileid=${imageFileId}&rkey=${rkey}`;
         }
-        return IMAGE_HTTP_HOST + `/download?appid=${appid}&fileid=${imageFileId}&rkey=${rkey}`;
+        return IMAGE_HTTP_HOST + `/download?appid=${appid}&fileid=${imageFileId}&rkey=${rkey}&spec=0`;
     }
 
     private getImageUrlFromMd5(fileMd5: string | undefined, md5HexStr: string | undefined): string {

src/core/apis/group.ts

@@ -26,7 +26,7 @@ export class NTQQGroupApi {
     }
 
     async fetchGroupDetail(groupCode: string) {
-        let [, detailInfo] = await this.core.eventWrapper.callNormalEventV2(
+        const [, detailInfo] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelGroupService/getGroupDetailInfo',
             'NodeIKernelGroupListener/onGroupDetailInfoChange',
             [groupCode, GroupInfoSource.KDATACARD],
@@ -44,7 +44,7 @@ export class NTQQGroupApi {
 
     async initCache() {
         for (const group of await this.getGroups(true)) {
-            this.refreshGroupMemberCache(group.groupCode).then().catch();
+            this.refreshGroupMemberCache(group.groupCode, false).then().catch(e => this.context.logger.logError(e));
         }
     }
 
@@ -126,14 +126,23 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().getAllMemberList(groupCode, forced);
     }
 
-    async refreshGroupMemberCache(groupCode: string) {
-        try {
-            const members = await this.getGroupMemberAll(groupCode, true);
-            this.groupMemberCache.set(groupCode, members.result.infos);
-        } catch (e) {
-            this.context.logger.logError(`刷新群成员缓存失败, 群号: ${groupCode}, 错误: ${e}`);
+    async refreshGroupMemberCache(groupCode: string, isWait = true) {
+        const updateCache = async () => {
+            try {
+                const members = await this.getGroupMemberAll(groupCode, true);
+                this.groupMemberCache.set(groupCode, members.result.infos);
+            } catch (e) {
+                this.context.logger.logError(`刷新群成员缓存失败, 群号: ${groupCode}, 错误: ${e}`);
+            }
+        };
+
+        if (isWait) {
+            await updateCache();
+        } else {
+            updateCache();
         }
-        return this.groupMemberCache;
+
+        return this.groupMemberCache.get(groupCode);
     }
 
     async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
@@ -143,7 +152,7 @@ export class NTQQGroupApi {
         // 获取群成员缓存
         let members = this.groupMemberCache.get(groupCodeStr);
         if (!members) {
-            members = (await this.refreshGroupMemberCache(groupCodeStr)).get(groupCodeStr);
+            members = (await this.refreshGroupMemberCache(groupCodeStr, true));
         }
 
         const getMember = () => {
@@ -157,7 +166,7 @@ export class NTQQGroupApi {
         let member = getMember();
         // 如果缓存中不存在该成员，尝试刷新缓存
         if (!member) {
-            members = (await this.refreshGroupMemberCache(groupCodeStr)).get(groupCodeStr);
+            members = (await this.refreshGroupMemberCache(groupCodeStr, true));
             member = getMember();
         }
         return member;

src/core/apis/user.ts

@@ -2,8 +2,7 @@ import { ModifyProfileParams, User, UserDetailSource } from '@/core/types';
 import { RequestUtil } from '@/common/request';
 import { InstanceContext, NapCatCore, ProfileBizType } from '..';
 import { solveAsyncProblem } from '@/common/helper';
-import { promisify } from 'node:util';
-import { LRUCache } from '@/common/lru-cache';
+import { Fallback, FallbackUtil } from '@/common/fall-back';
 
 export class NTQQUserApi {
     context: InstanceContext;
@@ -108,6 +107,19 @@ export class NTQQUserApi {
         return retUser;
     }
 
+    async getUserDetailInfoV2(uid: string): Promise<User> {
+        const fallback = new Fallback<User>((user) => FallbackUtil.boolchecker(user, user !== undefined && user.uin !== '0'))
+            .add(() => this.fetchUserDetailInfo(uid, UserDetailSource.KDB))
+            .add(() => this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER));
+        const retUser = await fallback.run().then(async (user) => {
+            if (user && user.uin === '0') {
+                user.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
+            }
+            return user;
+        });
+        return retUser;
+    }
+
     async modifySelfProfile(param: ModifyProfileParams) {
         return this.context.session.getProfileService().modifyDesktopMiniProfile(param);
     }
@@ -169,46 +181,34 @@ export class NTQQUserApi {
         return skey;
     }
 
-    async getUidByUinV2(Uin: string) {
-        if (!Uin) {
+    async getUidByUinV2(uin: string) {
+        if (!uin) {
             return '';
         }
-        const services = [
-            () => this.context.session.getUixConvertService().getUid([Uin]).then((data) => data.uidInfo.get(Uin)).catch(() => undefined),
-            () => promisify<string, string[], Map<string, string>>
-            (this.context.session.getProfileService().getUidByUin)('FriendsServiceImpl', [Uin]).then((data) => data.get(Uin)).catch(() => undefined),
-            () => this.context.session.getGroupService().getUidByUins([Uin]).then((data) => data.uids.get(Uin)).catch(() => undefined),
-            () => this.getUserDetailInfoByUin(Uin).then((data) => data.detail.uid).catch(() => undefined),
-        ];
-        let uid: string | undefined = undefined;
-        for (const service of services) {
-            uid = await service();
-            if (uid && uid.indexOf('*') == -1 && uid !== '') {
-                break;
-            }
-        }
+
+        const fallback =
+            new Fallback<string | undefined>((uid) => FallbackUtil.boolchecker(uid, uid !== undefined && uid.indexOf('*') === -1 && uid !== ''))
+                .add(() => this.context.session.getUixConvertService().getUid([uin]).then((data) => data.uidInfo.get(uin)))
+                .add(() => this.context.session.getProfileService().getUidByUin('FriendsServiceImpl', [uin]).get(uin))
+                .add(() => this.context.session.getGroupService().getUidByUins([uin]).then((data) => data.uids.get(uin)))
+                .add(() => this.getUserDetailInfoByUin(uin).then((data) => data.detail.uid));
+
+        const uid = await fallback.run().catch(() => '');
         return uid ?? '';
     }
 
-    async getUinByUidV2(Uid: string) {
-        if (!Uid) {
+    async getUinByUidV2(uid: string) {
+        if (!uid) {
             return '0';
         }
-        const services = [
-            () => this.context.session.getUixConvertService().getUin([Uid]).then((data) => data.uinInfo.get(Uid)).catch(() => undefined),
-            () => this.context.session.getGroupService().getUinByUids([Uid]).then((data) => data.uins.get(Uid)).catch(() => undefined),
-            () => promisify<string, string[], Map<string, string>>
-            (this.context.session.getProfileService().getUinByUid)('FriendsServiceImpl', [Uid]).then((data) => data.get(Uid)).catch(() => undefined),
-            () => this.core.apis.FriendApi.getBuddyIdMap(true).then((data) => data.getKey(Uid)).catch(() => undefined),
-            () => this.getUserDetailInfo(Uid).then((data) => data.uin).catch(() => undefined),
-        ];
-        let uin: string | undefined = undefined;
-        for (const service of services) {
-            uin = await service();
-            if (uin && uin !== '0' && uin !== '') {
-                break;
-            }
-        }
+
+        const fallback = new Fallback<string | undefined>((uin) => FallbackUtil.boolchecker(uin, uin !== undefined && uin !== '0' && uin !== ''))
+            .add(() => this.context.session.getUixConvertService().getUin([uid]).then((data) => data.uinInfo.get(uid)))
+            .add(() => this.context.session.getProfileService().getUinByUid('FriendsServiceImpl', [uid]).get(uid))
+            .add(() => this.context.session.getGroupService().getUinByUids([uid]).then((data) => data.uins.get(uid)))
+            .add(() => this.getUserDetailInfo(uid).then((data) => data.uin));
+
+        const uin = await fallback.run().catch(() => '0');
         return uin ?? '0';
     }
 

src/core/apis/webapi.ts

@@ -8,7 +8,7 @@ import {
     WebHonorType,
 } from '@/core';
 import { NapCatCore } from '..';
-import { createReadStream, readFileSync, statSync } from 'node:fs';
+import { readFileSync } from 'node:fs';
 import { createHash } from 'node:crypto';
 import { basename } from 'node:path';
 

src/core/external/appid.json

@@ -134,5 +134,57 @@
     "3.2.15-30594": {
         "appid": 537258474,
         "qua": "V1_LNX_NQ_3.2.15_30594_GW_B"
+    },
+    "9.9.17-30851": {
+        "appid": 537263796,
+        "qua": "V1_WIN_NQ_9.9.17_30851_GW_B"
+    },
+    "3.2.15-30851": {
+        "appid": 537263831,
+        "qua": "V1_LNX_NQ_3.2.15_30851_GW_B"
+    },
+    "6.9.63-30851": {
+        "appid": 537263820,
+        "qua": "V1_MAC_NQ_6.9.63_30851_GW_B"
+    },
+    "9.9.17-30899": {
+        "appid": 537263796,
+        "qua": "V1_WIN_NQ_9.9.17_30899_GW_B"
+    },
+    "3.2.15-30899": {
+        "appid": 537263831,
+        "qua": "V1_LNX_NQ_3.2.15_30899_GW_B"
+    },
+    "6.9.63-30899": {
+        "appid": 537263820,
+        "qua": "V1_MAC_NQ_6.9.63_30899_GW_B"
+    },
+    "9.9.17-31219": {
+        "appid": 537266450,
+        "qua": "V1_WIN_NQ_9.9.17_31219_GW_B"
+    },
+    "9.9.17-31245": {
+        "appid": 537266450,
+        "qua": "V1_WIN_NQ_9.9.17_31245_GW_B"
+    },
+    "3.2.15-31245": {
+        "appid": 537266485,
+        "qua": "V1_LNX_NQ_3.2.15_31245_GW_B"
+    },
+    "6.9.63-31245": {
+        "appid": 537266474,
+        "qua": "V1_MAC_NQ_6.9.63_31245_GW_B"
+    },
+    "3.2.15-31363": {
+        "appid": 537266535,
+        "qua": "V1_LNX_NQ_3.2.15_31363_GW_B"
+    },
+    "6.9.65-31363": {
+        "appid": 537266524,
+        "qua": "V1_MAC_NQ_6.9.65_31363_GW_B"
+    },
+    "9.9.17-31363": {
+        "appid": 537266500,
+        "qua": "V1_WIN_NQ_9.9.17_31363_GW_B"
     }
-}
+}

src/core/external/face_config.json

@@ -2406,6 +2406,193 @@
             "AQLid": "211",
             "QHide": "1",
             "EMCode": "309"
+        },
+        {
+            "QSid": "424",
+            "QDes": "/续标识",
+            "IQLid": "424",
+            "AQLid": "424",
+            "EMCode": "10424",
+            "QHide": "0",
+            "AniStickerType": 1,
+            "AniStickerPackId": "1",
+            "AniStickerId": "52"
+        },
+        {
+            "QSid": "415",
+            "QDes": "/划龙舟",
+            "IQLid": "415",
+            "AQLid": "415",
+            "EMCode": "10415",
+            "QHide": "0",
+            "AniStickerType": 3,
+            "AniStickerPackId": "1",
+            "AniStickerId": "43"
+        },
+        {
+            "QSid": "416",
+            "QDes": "/中龙舟",
+            "IQLid": "416",
+            "AQLid": "416",
+            "EMCode": "10416",
+            "QHide": "1",
+            "AniStickerType": 3,
+            "AniStickerPackId": "1",
+            "AniStickerId": "44"
+        },
+        {
+            "QSid": "417",
+            "QDes": "/大龙舟",
+            "IQLid": "417",
+            "AQLid": "417",
+            "EMCode": "10417",
+            "QHide": "1",
+            "AniStickerType": 3,
+            "AniStickerPackId": "1",
+            "AniStickerId": "45"
+        },
+        {
+            "QSid": "425",
+            "QDes": "/求放过",
+            "IQLid": "425",
+            "AQLid": "425",
+            "EMCode": "10425",
+            "QHide": "0",
+            "AniStickerType": 1,
+            "AniStickerPackId": "1",
+            "AniStickerId": "53"
+        },
+        {
+            "QSid": "427",
+            "QDes": "/偷感",
+            "IQLid": "427",
+            "AQLid": "427",
+            "EMCode": "10427",
+            "QHide": "0",
+            "AniStickerType": 1,
+            "AniStickerPackId": "1",
+            "AniStickerId": "55"
+        },
+        {
+            "QSid": "426",
+            "QDes": "/玩火",
+            "IQLid": "426",
+            "AQLid": "426",
+            "EMCode": "10426",
+            "QHide": "0",
+            "AniStickerType": 1,
+            "AniStickerPackId": "1",
+            "AniStickerId": "54"
+        },
+        {
+            "QSid": "419",
+            "QDes": "/火车",
+            "IQLid": "419",
+            "AQLid": "419",
+            "EMCode": "10419",
+            "QHide": "0",
+            "AniStickerType": 3,
+            "AniStickerPackId": "1",
+            "AniStickerId": "47"
+        },
+        {
+            "QSid": "420",
+            "QDes": "/中火车",
+            "IQLid": "420",
+            "AQLid": "420",
+            "EMCode": "10420",
+            "QHide": "1",
+            "AniStickerType": 3,
+            "AniStickerPackId": "1",
+            "AniStickerId": "48"
+        },
+        {
+            "QSid": "421",
+            "QDes": "/大火车",
+            "IQLid": "421",
+            "AQLid": "421",
+            "EMCode": "10421",
+            "QHide": "1",
+            "AniStickerType": 3,
+            "AniStickerPackId": "1",
+            "AniStickerId": "49"
+        },
+        {
+            "QSid": "429",
+            "QDes": "/蛇年快乐",
+            "IQLid": "429",
+            "AQLid": "429",
+            "EMCode": "10429",
+            "QHide": "0",
+            "AniStickerType": 3,
+            "AniStickerPackId": "1",
+            "AniStickerId": "56"
+        },
+        {
+            "QSid": "430",
+            "QDes": "/蛇身",
+            "IQLid": "430",
+            "AQLid": "430",
+            "EMCode": "10430",
+            "QHide": "1",
+            "AniStickerType": 3,
+            "AniStickerPackId": "1",
+            "AniStickerId": "57"
+        },
+        {
+            "QSid": "431",
+            "QDes": "/蛇尾",
+            "IQLid": "431",
+            "AQLid": "431",
+            "EMCode": "10431",
+            "QHide": "1",
+            "AniStickerType": 3,
+            "AniStickerPackId": "1",
+            "AniStickerId": "56"
+        },
+        {
+            "QSid": "428",
+            "QDes": "/收到",
+            "IQLid": "428",
+            "AQLid": "428",
+            "EMCode": "10428",
+            "QHide": "0",
+            "AniStickerType": 0,
+            "AniStickerPackId": "0",
+            "AniStickerId": "0"
+        },
+        {
+            "QSid": "422",
+            "QDes": "/粽于等到你",
+            "IQLid": "422",
+            "AQLid": "422",
+            "EMCode": "10422",
+            "QHide": "1",
+            "AniStickerType": 1,
+            "AniStickerPackId": "1",
+            "AniStickerId": "50"
+        },
+        {
+            "QSid": "423",
+            "QDes": "/复兴号",
+            "IQLid": "423",
+            "AQLid": "423",
+            "EMCode": "10423",
+            "QHide": "1",
+            "AniStickerType": 1,
+            "AniStickerPackId": "1",
+            "AniStickerId": "51"
+        },
+        {
+            "QSid": "432",
+            "QDes": "/灵蛇献瑞",
+            "IQLid": "432",
+            "AQLid": "432",
+            "EMCode": "10432",
+            "QHide": "1",
+            "AniStickerType": 1,
+            "AniStickerPackId": "1",
+            "AniStickerId": "59"
         }
     ],
     "emoji": [

src/core/external/offset.json

@@ -162,5 +162,89 @@
     "3.2.15-30594-arm64": {
         "send": "70C40E8",
         "recv": "70C7920"
+    },
+    "9.9.17-30851-x64": {
+        "send": "395C150",
+        "recv": "3960584"
+    },
+    "3.2.15-30851-x64": {
+        "send": "A4A03E0",
+        "recv": "A4A3CE0"
+    },
+    "3.2.15-30851-arm64": {
+        "send": "713A318",
+        "recv": "713DB50"
+    },
+    "6.9.63.30851-x64": {
+        "send": "46C8040",
+        "recv": "46CA8AC"
+    },
+    "6.9.63-30851-arm64": {
+        "send": "41DCBD8",
+        "recv": "41DF3F0"
+    },
+    "9.9.17-30899-x64": {
+        "send": "395C150",
+        "recv": "3960584"
+    },
+    "3.2.15-30899-x64": {
+        "send": "A4A03E0",
+        "recv": "A4A3CE0"
+    },
+    "3.2.15-30899-arm64": {
+        "send": "713A318",
+        "recv": "713DB50"
+    },
+    "6.9.63.30899-x64": {
+        "send": "46C8040",
+        "recv": "46CA8AC"
+    },
+    "6.9.63-30899-arm64": {
+        "send": "41DCBD8",
+        "recv": "41DF3F0"
+    },
+    "9.9.17-31219-x64": {
+        "send": "39C1350",
+        "recv": "39C5784"
+    },
+    "9.9.17-31245-x64": {
+        "send": "39C1350",
+        "recv": "39C5784"
+    },
+    "6.9.63.31245-x64": {
+        "send": "4720A40",
+        "recv": "47232AC"
+    },
+    "6.9.63-31245-arm64": {
+        "send": "41DCBD8",
+        "recv": "422D4E8"
+    },
+    "3.2.15-31245-x64": {
+        "send": "A550F80",
+        "recv": "A554880"
+    },
+    "3.2.15-31245-arm64": {
+        "send": "71BEBB8",
+        "recv": "71C23F0"
+    },
+    "9.9.17-31363-x64": {
+        "send": "39C1910",
+        "recv": "39C5d44"
+    },
+    "3.2.15-31363-x64": {
+        "send": "A554500",
+        "recv": "A557E00"
+    },
+    "3.2.15-31363-arm64": {
+        "send": "71BFD48",
+        "recv": "71C3580"
+    },
+    "6.9.65.31363-x64": {
+        "send": "4720E80",
+        "recv": "47236EC"
+    },
+    "6.9.65.31363-arm64": {
+        "send": "422CEF8",
+        "recv": "422F710"
     }
-}
+}

src/core/helper/adaptSysMessageDecoder.ts

@@ -1,49 +0,0 @@
-// TODO: further refactor in NapCat.Packet v2
-import { NapProtoMsg, ProtoField, ScalarType } from "@napneko/nap-proto-core";
-
-const BodyInner = {
-    msgType: ProtoField(1, ScalarType.UINT32, true),
-    subType: ProtoField(2, ScalarType.UINT32, true)
-};
-
-const NoifyData = {
-    skip: ProtoField(1, ScalarType.BYTES, true),
-    innerData: ProtoField(2, ScalarType.BYTES, true)
-};
-
-const MsgHead = {
-    bodyInner: ProtoField(2, () => BodyInner, true),
-    noifyData: ProtoField(3, () => NoifyData, true)
-};
-
-const Message = {
-    msgHead: ProtoField(1, () => MsgHead)
-};
-
-const SubDetail = {
-    msgSeq: ProtoField(1, ScalarType.UINT32),
-    msgTime: ProtoField(2, ScalarType.UINT32),
-    senderUid: ProtoField(6, ScalarType.STRING)
-};
-
-const RecallDetails = {
-    operatorUid: ProtoField(1, ScalarType.STRING),
-    subDetail: ProtoField(3, () => SubDetail)
-};
-
-const RecallGroup = {
-    type: ProtoField(1, ScalarType.INT32),
-    peerUid: ProtoField(4, ScalarType.UINT32),
-    recallDetails: ProtoField(11, () => RecallDetails),
-    grayTipsSeq: ProtoField(37, ScalarType.UINT32)
-};
-
-export function decodeMessage(buffer: Uint8Array) {
-    const msg = new NapProtoMsg(Message);
-    return msg.decode(buffer);
-}
-
-export function decodeRecallGroup(buffer: Uint8Array){
-    const msg = new NapProtoMsg(RecallGroup);
-    return msg.decode(buffer);
-}

src/core/helper/rkey.ts

@@ -15,6 +15,10 @@ export class RkeyManager {
         private_rkey: '',
         expired_time: 0,
     };
+    private failureCount: number = 0;
+    private lastFailureTimestamp: number = 0;
+    private readonly FAILURE_LIMIT: number = 8;
+    private readonly ONE_DAY: number = 24 * 60 * 60 * 1000;
 
     constructor(serverUrl: string[], logger: LogWrapper) {
         this.logger = logger;
@@ -22,11 +26,21 @@ export class RkeyManager {
     }
 
     async getRkey() {
+        const now = new Date().getTime();
+        if (now - this.lastFailureTimestamp > this.ONE_DAY) {
+            this.failureCount = 0; // 重置失败计数器
+        }
+
+        if (this.failureCount >= this.FAILURE_LIMIT) {
+            this.logger.logError(`[Rkey] 服务存在异常, 图片使用FallBack机制`);
+            throw new Error('获取rkey失败次数过多，请稍后再试');
+        }
+
         if (this.isExpired()) {
             try {
                 await this.refreshRkey();
             } catch (e) {
-                throw new Error(`获取rkey失败: ${e}`);//外抛
+                throw new Error(`${e}`);//外抛
             }
         }
         return this.rkeyData;
@@ -34,7 +48,6 @@ export class RkeyManager {
 
     isExpired(): boolean {
         const now = new Date().getTime() / 1000;
-        // console.log(`now: ${now}, expired_time: ${this.rkeyData.expired_time}`);
         return now > this.rkeyData.expired_time;
     }
 
@@ -48,14 +61,17 @@ export class RkeyManager {
                     private_rkey: temp.private_rkey.slice(6),
                     expired_time: temp.expired_time
                 };
+                this.failureCount = 0;
+                return;
             } catch (e) {
-                this.logger.logError(`[Rkey] Get Rkey ${url} Error `, e);
+                this.logger.logError(`[Rkey] 异常服务 ${url} 异常 / `, e);
+                this.failureCount++;
+                this.lastFailureTimestamp = new Date().getTime();
                 //是否为最后一个url
                 if (url === this.serverUrl[this.serverUrl.length - 1]) {
                     throw new Error(`获取rkey失败: ${e}`);//外抛
                 }
             }
         }
-
     }
-}
+}

src/core/helper/status.ts

@@ -0,0 +1,138 @@
+import os from "node:os";
+import EventEmitter from "node:events";
+
+export interface SystemStatus {
+    cpu: {
+        model: string,
+        speed: string
+        usage: {
+            system: string
+            qq: string
+        },
+        core: number
+    },
+    memory: {
+        total: string
+        usage: {
+            system: string
+            qq: string
+        }
+    },
+    arch: string
+}
+
+export class StatusHelper {
+    private psCpuUsage = process.cpuUsage();
+    private psCurrentTime = process.hrtime();
+    private cpuTimes = os.cpus().map(cpu => cpu.times);
+
+    private replaceNaN(value: number) {
+        return isNaN(value) ? 0 : value;
+    }
+
+    private sysCpuInfo() {
+        const currentTimes = os.cpus().map(cpu => cpu.times);
+        const { total, active } = currentTimes.map((times, index) => {
+            const prevTimes = this.cpuTimes[index];
+            const totalCurrent = times.user + times.nice + times.sys + times.idle + times.irq;
+            const totalPrev = prevTimes.user + prevTimes.nice + prevTimes.sys + prevTimes.idle + prevTimes.irq;
+            const activeCurrent = totalCurrent - times.idle;
+            const activePrev = totalPrev - prevTimes.idle;
+            return {
+                total: totalCurrent - totalPrev,
+                active: activeCurrent - activePrev
+            };
+        }).reduce((acc, cur) => ({
+            total: acc.total + cur.total,
+            active: acc.active + cur.active
+        }), { total: 0, active: 0 });
+        this.cpuTimes = currentTimes;
+        return {
+            usage: this.replaceNaN(((active / total) * 100)).toFixed(2),
+            model: os.cpus()[0].model,
+            speed: os.cpus()[0].speed,
+            core: os.cpus().length
+        };
+    }
+
+    private sysMemoryUsage() {
+        const { total, free } = { total: os.totalmem(), free: os.freemem() };
+        return ((total - free) / 1024 / 1024).toFixed(2);
+    }
+
+    private qqUsage() {
+        const mem = process.memoryUsage();
+        const numCpus = os.cpus().length;
+        const usageDiff = process.cpuUsage(this.psCpuUsage);
+        const endTime = process.hrtime(this.psCurrentTime);
+        this.psCpuUsage = process.cpuUsage();
+        this.psCurrentTime = process.hrtime();
+        const usageMS = (usageDiff.user + usageDiff.system) / 1e3;
+        const totalMS = endTime[0] * 1e3 + endTime[1] / 1e6;
+        const normPercent = (usageMS / totalMS / numCpus) * 100;
+        return {
+            cpu: this.replaceNaN(normPercent).toFixed(2),
+            memory: ((mem.heapTotal + mem.external + mem.arrayBuffers) / 1024 / 1024).toFixed(2)
+        };
+    }
+
+    systemStatus(): SystemStatus {
+        const qqUsage = this.qqUsage();
+        const sysCpuInfo = this.sysCpuInfo();
+        return {
+            cpu: {
+                core: sysCpuInfo.core,
+                model: sysCpuInfo.model,
+                speed: (sysCpuInfo.speed / 1000).toFixed(2),
+                usage: {
+                    system: sysCpuInfo.usage,
+                    qq: qqUsage.cpu
+                },
+            },
+            memory: {
+                total: (os.totalmem() / 1024 / 1024).toFixed(2),
+                usage: {
+                    system: this.sysMemoryUsage(),
+                    qq: qqUsage.memory
+                }
+            },
+            arch: `${os.platform()} ${os.arch()} ${os.release()}`
+        };
+    }
+}
+
+class StatusHelperSubscription extends EventEmitter {
+    private statusHelper: StatusHelper;
+    private interval: NodeJS.Timeout | null = null;
+
+    constructor(time: number = 3000) {
+        super();
+        this.statusHelper = new StatusHelper();
+        this.on('newListener', (event: string) => {
+            if (event === 'statusUpdate' && this.listenerCount('statusUpdate') === 0) {
+                this.startInterval(time);
+            }
+        });
+        this.on('removeListener', (event: string) => {
+            if (event === 'statusUpdate' && this.listenerCount('statusUpdate') === 0) {
+                this.stopInterval();
+            }
+        });
+    }
+
+    private startInterval(time: number) {
+        this.interval ??= setInterval(() => {
+            const status = this.statusHelper.systemStatus();
+            this.emit('statusUpdate', status);
+        }, time);
+    }
+
+    private stopInterval() {
+        if (this.interval) {
+            clearInterval(this.interval);
+            this.interval = null;
+        }
+    }
+}
+
+export const statusHelperSubscription = new StatusHelperSubscription();

src/core/index.ts

@@ -152,6 +152,7 @@ export class NapCatCore {
     // Renamed from 'InitDataListener'
     async initNapCatCoreListeners() {
         const msgListener = new NodeIKernelMsgListener();
+
         msgListener.onKickedOffLine = (Info: KickedOffLineInfo) => {
             // 下线通知
             this.context.logger.logError('[KickedOffLine] [' + Info.tipsTitle + '] ' + Info.tipsDesc);

src/core/packet/client/baseClient.ts

@@ -1,8 +1,9 @@
 import { LRUCache } from "@/common/lru-cache";
 import crypto, { createHash } from "crypto";
-import { PacketContext } from "@/core/packet/context/packetContext";
 import { OidbPacket, PacketHexStr } from "@/core/packet/transformer/base";
 import { LogStack } from "@/core/packet/context/clientContext";
+import { NapCoreContext } from "@/core/packet/context/napCoreContext";
+import { PacketLogger } from "@/core/packet/context/loggerContext";
 
 export interface RecvPacket {
     type: string, // 仅recv
@@ -27,13 +28,15 @@ function randText(len: number): string {
 
 
 export abstract class IPacketClient {
-    protected readonly context: PacketContext;
+    protected readonly napcore: NapCoreContext;
+    protected readonly logger: PacketLogger;
     protected readonly cb = new LRUCache<string, (json: RecvPacketData) => Promise<void>>(500); // trace_id-type callback
     logStack: LogStack;
     available: boolean = false;
 
-    protected constructor(context: PacketContext, logStack: LogStack) {
-        this.context = context;
+    protected constructor(napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) {
+        this.napcore = napCore;
+        this.logger = logger;
         this.logStack = logStack;
     }
 
@@ -81,7 +84,7 @@ export abstract class IPacketClient {
         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.context.napcore.sendSsoCmdReqByContend(cmd, trace_id);
+            await this.napcore.sendSsoCmdReqByContend(cmd, trace_id);
         });
     }
 

src/core/packet/client/nativeClient.ts

@@ -5,8 +5,9 @@ import fs from "fs";
 import { IPacketClient } from "@/core/packet/client/baseClient";
 import { constants } from "node:os";
 import { LRUCache } from "@/common/lru-cache";
-import { PacketContext } from "@/core/packet/context/packetContext";
 import { LogStack } from "@/core/packet/context/clientContext";
+import { NapCoreContext } from "@/core/packet/context/napCoreContext";
+import { PacketLogger } from "@/core/packet/context/loggerContext";
 
 // 0 send 1 recv
 export interface NativePacketExportType {
@@ -19,8 +20,8 @@ export class NativePacketClient extends IPacketClient {
     private readonly MoeHooExport: { exports: NativePacketExportType } = { exports: {} };
     private readonly sendEvent = new LRUCache<number, string>(500); // seq->trace_id
 
-    constructor(context: PacketContext, logStack: LogStack) {
-        super(context, logStack);
+    constructor(napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) {
+        super(napCore, logger, logStack);
     }
 
     check(): boolean {

src/core/packet/client/wsClient.ts

@@ -1,7 +1,8 @@
 import { Data, WebSocket, ErrorEvent } from "ws";
 import { IPacketClient, RecvPacket } from "@/core/packet/client/baseClient";
-import { PacketContext } from "@/core/packet/context/packetContext";
 import { LogStack } from "@/core/packet/context/clientContext";
+import { NapCoreContext } from "@/core/packet/context/napCoreContext";
+import { PacketLogger } from "@/core/packet/context/loggerContext";
 
 export class WsPacketClient extends IPacketClient {
     private websocket: WebSocket | null = null;
@@ -13,15 +14,15 @@ export class WsPacketClient extends IPacketClient {
     private isInitialized: boolean = false;
     private initPayload: { pid: number, recv: string, send: string } | null = null;
 
-    constructor(context: PacketContext, logStack: LogStack) {
-        super(context, logStack);
-        this.clientUrl = this.context.napcore.config.packetServer
-            ? this.clientUrlWrap(this.context.napcore.config.packetServer)
+    constructor(napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) {
+        super(napCore, logger, logStack);
+        this.clientUrl = this.napcore.config.packetServer
+            ? this.clientUrlWrap(this.napcore.config.packetServer)
             : this.clientUrlWrap('127.0.0.1:8083');
     }
 
     check(): boolean {
-        if (!this.context.napcore.config.packetServer) {
+        if (!this.napcore.config.packetServer) {
             this.logStack.pushLogWarn(`wsPacketClient 未配置服务器地址`);
             return false;
         }
@@ -67,7 +68,7 @@ export class WsPacketClient extends IPacketClient {
             this.websocket.onopen = () => {
                 this.available = true;
                 this.reconnectAttempts = 0;
-                this.context.logger.info(`wsPacketClient 已连接到 ${this.clientUrl}`);
+                this.logger.info(`wsPacketClient 已连接到 ${this.clientUrl}`);
                 if (!this.isInitialized && this.initPayload) {
                     this.websocket!.send(JSON.stringify({
                         action: 'init',
@@ -79,15 +80,15 @@ export class WsPacketClient extends IPacketClient {
             };
             this.websocket.onclose = () => {
                 this.available = false;
-                this.context.logger.warn(`WebSocket 连接关闭，尝试重连...`);
+                this.logger.warn(`WebSocket 连接关闭，尝试重连...`);
                 reject(new Error('WebSocket 连接关闭'));
             };
             this.websocket.onmessage = (event) => this.handleMessage(event.data).catch(err => {
-                this.context.logger.error(`处理消息时出错: ${err}`);
+                this.logger.error(`处理消息时出错: ${err}`);
             });
             this.websocket.onerror = (event: ErrorEvent) => {
                 this.available = false;
-                this.context.logger.error(`WebSocket 出错: ${event.message}`);
+                this.logger.error(`WebSocket 出错: ${event.message}`);
                 this.websocket?.close();
                 reject(new Error(`WebSocket 出错: ${event.message}`));
             };
@@ -106,7 +107,7 @@ export class WsPacketClient extends IPacketClient {
             const event = this.cb.get(`${trace_id_md5}${action}`);
             if (event) await event(json.data);
         } catch (error) {
-            this.context.logger.error(`解析ws消息时出错: ${(error as Error).message}`);
+            this.logger.error(`解析ws消息时出错: ${(error as Error).message}`);
         }
     }
 }

src/core/packet/context/clientContext.ts

@@ -1,17 +1,17 @@
-import { PacketContext } from "@/core/packet/context/packetContext";
 import { IPacketClient } from "@/core/packet/client/baseClient";
 import { NativePacketClient } from "@/core/packet/client/nativeClient";
 import { WsPacketClient } from "@/core/packet/client/wsClient";
 import { OidbPacket } from "@/core/packet/transformer/base";
 import { PacketLogger } from "@/core/packet/context/loggerContext";
+import { NapCoreContext } from "@/core/packet/context/napCoreContext";
 
 type clientPriority = {
-    [key: number]: (context: PacketContext, logStack: LogStack) => IPacketClient;
+    [key: number]: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => IPacketClient;
 }
 
 const clientPriority: clientPriority = {
-    10: (context: PacketContext, logStack: LogStack) => new NativePacketClient(context, logStack),
-    1: (context: PacketContext, logStack: LogStack) => new WsPacketClient(context, logStack),
+    10: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new NativePacketClient(napCore, logger, logStack),
+    1: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new WsPacketClient(napCore, logger, logStack),
 };
 
 export class LogStack {
@@ -51,13 +51,15 @@ export class LogStack {
 }
 
 export class PacketClientContext {
-    private readonly context: PacketContext;
+    private readonly napCore: NapCoreContext;
+    private readonly logger: PacketLogger;
     private readonly logStack: LogStack;
     private readonly _client: IPacketClient;
 
-    constructor(context: PacketContext) {
-        this.context = context;
-        this.logStack = new LogStack(context.logger);
+    constructor(napCore: NapCoreContext, logger: PacketLogger) {
+        this.napCore = napCore;
+        this.logger = logger;
+        this.logStack = new LogStack(logger);
         this._client = this.newClient();
     }
 
@@ -79,23 +81,23 @@ export class PacketClientContext {
     }
 
     private newClient(): IPacketClient {
-        const prefer = this.context.napcore.config.packetBackend;
+        const prefer = this.napCore.config.packetBackend;
         let client: IPacketClient | null;
         switch (prefer) {
         case "native":
-            this.context.logger.info("使用指定的 NativePacketClient 作为后端");
-            client = new NativePacketClient(this.context, this.logStack);
+            this.logger.info("使用指定的 NativePacketClient 作为后端");
+            client = new NativePacketClient(this.napCore, this.logger, this.logStack);
             break;
         case "frida":
-            this.context.logger.info("[Core] [Packet] 使用指定的 FridaPacketClient 作为后端");
-            client = new WsPacketClient(this.context, this.logStack);
+            this.logger.info("[Core] [Packet] 使用指定的 FridaPacketClient 作为后端");
+            client = new WsPacketClient(this.napCore, this.logger, this.logStack);
             break;
         case "auto":
         case undefined:
             client = this.judgeClient();
             break;
         default:
-            this.context.logger.error(`未知的PacketBackend ${prefer}，请检查配置文件！`);
+            this.logger.error(`未知的PacketBackend ${prefer}，请检查配置文件！`);
             client = null;
         }
         if (!client?.check()) {
@@ -110,7 +112,7 @@ export class PacketClientContext {
     private judgeClient(): IPacketClient {
         const sortedClients = Object.entries(clientPriority)
             .map(([priority, clientFactory]) => {
-                const client = clientFactory(this.context, this.logStack);
+                const client = clientFactory(this.napCore, this.logger, this.logStack);
                 const score = +priority * +client.check();
                 return { client, score };
             })
@@ -120,7 +122,7 @@ export class PacketClientContext {
         if (!selectedClient) {
             throw new Error("[Core] [Packet] 无可用的后端，NapCat.Packet将不会加载！");
         }
-        this.context.logger.info(`自动选择 ${selectedClient.constructor.name} 作为后端`);
+        this.logger.info(`自动选择 ${selectedClient.constructor.name} 作为后端`);
         return selectedClient;
     }
 }

src/core/packet/context/loggerContext.ts

@@ -1,12 +1,12 @@
 import { LogLevel, LogWrapper } from "@/common/log";
-import { PacketContext } from "@/core/packet/context/packetContext";
+import { NapCoreContext } from "@/core/packet/context/napCoreContext";
 
 // TODO: check bind?
 export class PacketLogger {
     private readonly napLogger: LogWrapper;
 
-    constructor(context: PacketContext) {
-        this.napLogger = context.napcore.logger;
+    constructor(napcore: NapCoreContext) {
+        this.napLogger = napcore.logger;
     }
 
     private _log(level: LogLevel, ...msg: any[]): void {

src/core/packet/context/operationContext.ts

@@ -13,15 +13,22 @@ import { MiniAppRawData, MiniAppReqParams } from "@/core/packet/entities/miniApp
 import { AIVoiceChatType } from "@/core/packet/entities/aiChat";
 import { NapProtoDecodeStructType, NapProtoEncodeStructType } from "@napneko/nap-proto-core";
 import { IndexNode, MsgInfo } from "@/core/packet/transformer/proto";
+import { OidbPacket } from "@/core/packet/transformer/base";
+import { ImageOcrResult } from "@/core/packet/entities/ocrResult";
 
 export class PacketOperationContext {
     private readonly context: PacketContext;
+
     constructor(context: PacketContext) {
         this.context = context;
     }
 
+    async sendPacket<T extends boolean = false>(pkt: OidbPacket, rsp?: T): Promise<T extends true ? Buffer : void> {
+        return await this.context.client.sendOidbPacket(pkt, rsp);
+    }
+
     async GroupPoke(groupUin: number, uin: number) {
-        const req = trans.SendPoke.build(groupUin, uin);
+        const req = trans.SendPoke.build(uin, groupUin);
         await this.context.client.sendOidbPacket(req);
     }
 
@@ -90,6 +97,46 @@ export class PacketOperationContext {
         });
     }
 
+    async UploadImage(img: PacketMsgPicElement) {
+        await this.context.highway.uploadImage({
+            chatType: ChatType.KCHATTYPEC2C,
+            peerUid: this.context.napcore.basicInfo.uid
+        }, img);
+        const index = img.msgInfo?.msgInfoBody?.at(0)?.index;
+        if (!index) {
+            throw new Error('img.msgInfo?.msgInfoBody![0].index! is undefined');
+        }
+        return await this.GetImageUrl(this.context.napcore.basicInfo.uid, index);
+    }
+
+    async GetImageUrl(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>) {
+        const req = trans.DownloadImage.build(selfUid, node);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadImage.parse(resp);
+        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
+    }
+
+    async ImageOCR(imgUrl: string) {
+        const req = trans.ImageOCR.build(imgUrl);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.ImageOCR.parse(resp);
+        return {
+            texts: res.ocrRspBody.textDetections.map((item) => {
+                return {
+                    text: item.detectedText,
+                    confidence: item.confidence,
+                    coordinates: item.polygon.coordinates.map((c) => {
+                        return {
+                            x: c.x,
+                            y: c.y
+                        };
+                    }),
+                };
+            }),
+            language: res.ocrRspBody.language
+        } as ImageOcrResult;
+    }
+
     async UploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
         await this.UploadResources(msg, groupUin);
         const req = trans.UploadForwardMsg.build(this.context.napcore.basicInfo.uid, msg, groupUin);

src/core/packet/context/packetContext.ts

@@ -7,19 +7,19 @@ import { PacketOperationContext } from "@/core/packet/context/operationContext";
 import { PacketMsgConverter } from "@/core/packet/message/converter";
 
 export class PacketContext {
+    readonly msgConverter: PacketMsgConverter;
     readonly napcore: NapCoreContext;
     readonly logger: PacketLogger;
     readonly client: PacketClientContext;
     readonly highway: PacketHighwayContext;
-    readonly msgConverter: PacketMsgConverter;
     readonly operation: PacketOperationContext;
 
     constructor(core: NapCatCore) {
-        this.napcore = new NapCoreContext(core);
-        this.logger = new PacketLogger(this);
-        this.client = new PacketClientContext(this);
-        this.highway = new PacketHighwayContext(this);
         this.msgConverter = new PacketMsgConverter();
+        this.napcore = new NapCoreContext(core);
+        this.logger = new PacketLogger(this.napcore);
+        this.client = new PacketClientContext(this.napcore, this.logger);
+        this.highway = new PacketHighwayContext(this.napcore, this.logger, this.client);
         this.operation = new PacketOperationContext(this);
     }
 }

src/core/packet/entities/miniApp.ts

@@ -3,6 +3,7 @@ export interface MiniAppReqCustomParams {
     desc: string;
     picUrl: string;
     jumpUrl: string;
+    webUrl?: string;
 }
 
 export interface MiniAppReqTemplateParams {

src/core/packet/entities/ocrResult.ts

@@ -0,0 +1,15 @@
+export interface ImageOcrResult {
+    texts: TextDetection[];
+    language: string;
+}
+
+export interface TextDetection {
+    text: string;
+    confidence: number;
+    coordinates: Coordinate[];
+}
+
+export interface Coordinate {
+    x: number;
+    y: number;
+}

src/core/packet/highway/highwayContext.ts

@@ -1,5 +1,4 @@
 import { PacketHighwayClient } from "@/core/packet/highway/client";
-import { PacketContext } from "@/core/packet/context/packetContext";
 import { PacketLogger } from "@/core/packet/context/loggerContext";
 import FetchSessionKey from "@/core/packet/transformer/highway/FetchSessionKey";
 import { int32ip2str, oidbIpv4s2HighwayIpv4s } from "@/core/packet/highway/utils";
@@ -16,6 +15,8 @@ import { NapProtoMsg } from "@napneko/nap-proto-core";
 import * as proto from "@/core/packet/transformer/proto";
 import * as trans from "@/core/packet/transformer";
 import fs from "fs";
+import { NapCoreContext } from "@/core/packet/context/napCoreContext";
+import { PacketClientContext } from "@/core/packet/context/clientContext";
 
 export const BlockSize = 1024 * 1024;
 
@@ -33,23 +34,25 @@ export interface PacketHighwaySig {
 }
 
 export class PacketHighwayContext {
-    private readonly context: PacketContext;
+    private readonly napcore: NapCoreContext;
+    private readonly client: PacketClientContext;
     protected sig: PacketHighwaySig;
     protected logger: PacketLogger;
     protected hwClient: PacketHighwayClient;
     private cachedPrepareReq: Promise<void> | null = null;
 
-    constructor(context: PacketContext) {
-        this.context = context;
+    constructor(napcore: NapCoreContext, logger: PacketLogger, client: PacketClientContext) {
+        this.napcore = napcore;
+        this.client = client;
         this.sig = {
-            uin: String(context.napcore.basicInfo.uin),
-            uid: context.napcore.basicInfo.uid,
+            uin: String(this.napcore.basicInfo.uin),
+            uid: this.napcore.basicInfo.uid,
             sigSession: null,
             sessionKey: null,
             serverAddr: [],
         };
-        this.logger = context.logger;
-        this.hwClient = new PacketHighwayClient(this.sig, context.logger);
+        this.logger = logger;
+        this.hwClient = new PacketHighwayClient(this.sig, this.logger);
     }
 
     private async checkAvailable() {
@@ -66,7 +69,7 @@ export class PacketHighwayContext {
     private async prepareUpload(): Promise<void> {
         this.logger.debug('[Highway] on prepareUpload!');
         const packet = FetchSessionKey.build();
-        const req = await this.context.client.sendOidbPacket(packet, true);
+        const req = await this.client.sendOidbPacket(packet, true);
         const rsp = FetchSessionKey.parse(req);
         this.sig.sigSession = rsp.httpConn.sigSession;
         this.sig.sessionKey = rsp.httpConn.sessionKey;
@@ -136,7 +139,7 @@ export class PacketHighwayContext {
     private async uploadGroupImage(groupUin: number, img: PacketMsgPicElement): Promise<void> {
         img.sha1 = Buffer.from(await calculateSha1(img.path)).toString('hex');
         const req = UploadGroupImage.build(groupUin, img);
-        const resp = await this.context.client.sendOidbPacket(req, true);
+        const resp = await this.client.sendOidbPacket(req, true);
         const preRespData = UploadGroupImage.parse(resp);
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != "") {
@@ -173,7 +176,7 @@ export class PacketHighwayContext {
     private async uploadC2CImage(peerUid: string, img: PacketMsgPicElement): Promise<void> {
         img.sha1 = Buffer.from(await calculateSha1(img.path)).toString('hex');
         const req = trans.UploadPrivateImage.build(peerUid, img);
-        const resp = await this.context.client.sendOidbPacket(req, true);
+        const resp = await this.client.sendOidbPacket(req, true);
         const preRespData = trans.UploadPrivateImage.parse(resp);
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != "") {
@@ -211,7 +214,7 @@ export class PacketHighwayContext {
         video.fileSha1 = Buffer.from(await calculateSha1(video.filePath)).toString('hex');
         video.thumbSha1 = Buffer.from(await calculateSha1(video.thumbPath)).toString('hex');
         const req = trans.UploadGroupVideo.build(groupUin, video);
-        const resp = await this.context.client.sendOidbPacket(req, true);
+        const resp = await this.client.sendOidbPacket(req, true);
         const preRespData = trans.UploadGroupVideo.parse(resp);
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != "") {
@@ -276,7 +279,7 @@ export class PacketHighwayContext {
         video.fileSha1 = Buffer.from(await calculateSha1(video.filePath)).toString('hex');
         video.thumbSha1 = Buffer.from(await calculateSha1(video.thumbPath)).toString('hex');
         const req = trans.UploadPrivateVideo.build(peerUid, video);
-        const resp = await this.context.client.sendOidbPacket(req, true);
+        const resp = await this.client.sendOidbPacket(req, true);
         const preRespData = trans.UploadPrivateVideo.parse(resp);
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != "") {
@@ -339,7 +342,7 @@ export class PacketHighwayContext {
     private async uploadGroupPtt(groupUin: number, ptt: PacketMsgPttElement): Promise<void> {
         ptt.fileSha1 = Buffer.from(await calculateSha1(ptt.filePath)).toString('hex');
         const req = trans.UploadGroupPtt.build(groupUin, ptt);
-        const resp = await this.context.client.sendOidbPacket(req, true);
+        const resp = await this.client.sendOidbPacket(req, true);
         const preRespData = trans.UploadGroupPtt.parse(resp);
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != "") {
@@ -375,7 +378,7 @@ export class PacketHighwayContext {
     private async uploadC2CPtt(peerUid: string, ptt: PacketMsgPttElement): Promise<void> {
         ptt.fileSha1 = Buffer.from(await calculateSha1(ptt.filePath)).toString('hex');
         const req = trans.UploadPrivatePtt.build(peerUid, ptt);
-        const resp = await this.context.client.sendOidbPacket(req, true);
+        const resp = await this.client.sendOidbPacket(req, true);
         const preRespData = trans.UploadPrivatePtt.parse(resp);
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != "") {
@@ -413,7 +416,7 @@ export class PacketHighwayContext {
         file.fileMd5 = await computeMd5AndLengthWithLimit(file.filePath);
         file.fileSha1 = await calculateSha1(file.filePath);
         const req = trans.UploadGroupFile.build(groupUin, file);
-        const resp = await this.context.client.sendOidbPacket(req, true);
+        const resp = await this.client.sendOidbPacket(req, true);
         const preRespData = trans.UploadGroupFile.parse(resp);
         if (!preRespData?.upload?.boolFileExist) {
             this.logger.debug(`[Highway] uploadGroupFileReq file not exist, need upload!`);
@@ -476,7 +479,7 @@ export class PacketHighwayContext {
         file.fileMd5 = await computeMd5AndLengthWithLimit(file.filePath);
         file.fileSha1 = await calculateSha1(file.filePath);
         const req = await trans.UploadPrivateFile.build(this.sig.uid, peerUid, file);
-        const res = await this.context.client.sendOidbPacket(req, true);
+        const res = await this.client.sendOidbPacket(req, true);
         const preRespData  = trans.UploadPrivateFile.parse(res);
         if (!preRespData.upload?.boolFileExist) {
             this.logger.debug(`[Highway] uploadC2CFileReq file not exist, need upload!`);
@@ -531,7 +534,7 @@ export class PacketHighwayContext {
         file.fileUuid = preRespData.upload?.uuid;
         file.fileHash = preRespData.upload?.fileAddon;
         const fileExistReq = trans.DownloadOfflineFile.build(file.fileUuid!, file.fileHash!, this.sig.uid, peerUid);
-        const fileExistRes = await this.context.client.sendOidbPacket(fileExistReq, true);
+        const fileExistRes = await this.client.sendOidbPacket(fileExistReq, true);
         file._e37_800_rsp = trans.DownloadOfflineFile.parse(fileExistRes);
         file._private_send_uid = this.sig.uid;
         file._private_recv_uid = peerUid;

src/core/packet/message/element.ts

@@ -160,10 +160,12 @@ export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
 export class PacketMsgFaceElement extends IPacketMsgElement<SendFaceElement> {
     faceId: number;
     isLargeFace: boolean;
+    resultId?: string;
 
     constructor(element: SendFaceElement) {
         super(element);
         this.faceId = element.faceElement.faceIndex;
+        this.resultId = element.faceElement.resultId;
         this.isLargeFace = element.faceElement.faceType === FaceType.AniSticke;
     }
 
@@ -176,10 +178,10 @@ export class PacketMsgFaceElement extends IPacketMsgElement<SendFaceElement> {
                         aniStickerPackId: "1",
                         aniStickerId: "8",
                         faceId: this.faceId,
-                        field4: 1,
-                        field6: "",
+                        sourceType: 1,
+                        resultId: this.resultId,
                         preview: "",
-                        field9: 1
+                        randomType: 1
                     }),
                     businessType: 1
                 }
@@ -256,6 +258,8 @@ export class PacketMsgPicElement extends IPacketMsgElement<SendPicElement> {
     width: number;
     height: number;
     picType: PicType;
+    picSubType: number;
+    summary: string;
     sha1: string | null = null;
     msgInfo: NapProtoEncodeStructType<typeof MsgInfo> | null = null;
     groupPicExt: NapProtoEncodeStructType<typeof CustomFace> | null = null;
@@ -270,6 +274,10 @@ export class PacketMsgPicElement extends IPacketMsgElement<SendPicElement> {
         this.width = element.picElement.picWidth;
         this.height = element.picElement.picHeight;
         this.picType = element.picElement.picType;
+        this.picSubType = element.picElement.picSubType ?? 0;
+        this.summary = element.picElement.summary === '' ? (
+            element.picElement.picSubType === 0 ? '[图片]' : '[动画表情]'
+        ) : element.picElement.summary;
     }
 
     get valid(): boolean {
@@ -288,7 +296,7 @@ export class PacketMsgPicElement extends IPacketMsgElement<SendPicElement> {
     }
 
     toPreview(): string {
-        return "[图片]";
+        return this.summary;
     }
 }
 

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

@@ -30,7 +30,7 @@ class GetMiniAppAdaptShareInfo extends PacketTransformer<typeof proto.MiniAppAda
                 shareType: req.shareType,
                 versionId: req.versionId,
                 withShareTicket: req.withShareTicket,
-                webURL: "",
+                webURL: req.webUrl ?? "",
                 appidRich: Buffer.alloc(0),
                 template: {
                     templateId: "",

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

@@ -0,0 +1,37 @@
+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 ImageOCR extends PacketTransformer<typeof proto.OidbSvcTrpcTcp0xE07_0_Response> {
+    constructor() {
+        super();
+    }
+
+    build(url: string): OidbPacket {
+        const body = new NapProtoMsg(proto.OidbSvcTrpcTcp0xE07_0).encode(
+            {
+                version: 1,
+                client: 0,
+                entrance: 1,
+                ocrReqBody: {
+                    imageUrl: url,
+                    originMd5: "",
+                    afterCompressMd5: "",
+                    afterCompressFileSize: "",
+                    afterCompressWeight: "",
+                    afterCompressHeight: "",
+                    isCut: false,
+                }
+            }
+        );
+        return OidbBase.build(0XEB7, 1, body, false, false);
+    }
+
+    parse(data: Buffer) {
+        const base = OidbBase.parse(data);
+        return new NapProtoMsg(proto.OidbSvcTrpcTcp0xE07_0_Response).decode(base.body);
+    }
+}
+
+export default new ImageOCR();

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

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

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

@@ -0,0 +1,51 @@
+import * as proto from "@/core/packet/transformer/proto";
+import { NapProtoEncodeStructType, NapProtoMsg } from "@napneko/nap-proto-core";
+import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base";
+import OidbBase from "@/core/packet/transformer/oidb/oidbBase";
+import { IndexNode } from "@/core/packet/transformer/proto";
+
+class DownloadImage extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
+    constructor() {
+        super();
+    }
+
+    build(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
+        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
+            reqHead: {
+                common: {
+                    requestId: 1,
+                    command: 100
+                },
+                scene: {
+                    requestType: 2,
+                    businessType: 1,
+                    sceneType: 1,
+                    c2C: {
+                        accountType: 2,
+                        targetUid: selfUid
+                    },
+                },
+                client: {
+                    agentType: 2,
+                }
+            },
+            download: {
+                node: node,
+                download: {
+                    video: {
+                        busiType: 0,
+                        sceneType: 0
+                    }
+                }
+            }
+        });
+        return OidbBase.build(0x11C5, 200, body, true, false);
+    }
+
+    parse(data: Buffer) {
+        const oidbBody = OidbBase.parse(data).body;
+        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
+    }
+}
+
+export default new DownloadImage();

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

@@ -58,8 +58,11 @@ class UploadGroupImage extends PacketTransformer<typeof proto.NTV2RichMediaResp>
                     compatQMsgSceneType: 2,
                     extBizInfo: {
                         pic: {
-                            bytesPbReserveTroop: Buffer.from("0800180020004200500062009201009a0100a2010c080012001800200028003a00", 'hex'),
-                            textSummary: "Nya~",  // TODO:
+                            bizType: img.picSubType,
+                            bytesPbReserveTroop: {
+                                subType: img.picSubType,
+                            },
+                            textSummary: img.summary,
                         },
                         video: {
                             bytesPbReserve: Buffer.alloc(0),

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

@@ -58,8 +58,11 @@ class UploadPrivateImage extends PacketTransformer<typeof proto.NTV2RichMediaRes
                 compatQMsgSceneType: 1,
                 extBizInfo: {
                     pic: {
-                        bytesPbReserveTroop: Buffer.from("0800180020004200500062009201009a0100a2010c080012001800200028003a00", 'hex'),
-                        textSummary: "Nya~",  // TODO:
+                        bizType: img.picSubType,
+                        bytesPbReserveC2C: {
+                            subType: img.picSubType,
+                        },
+                        textSummary: img.summary,
                     },
                     video: {
                         bytesPbReserve: Buffer.alloc(0),

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

@@ -11,3 +11,4 @@ export { default as UploadPrivateFile } from './UploadPrivateFile';
 export { default as UploadPrivateImage } from './UploadPrivateImage';
 export { default as UploadPrivatePtt } from './UploadPrivatePtt';
 export { default as UploadPrivateVideo } from './UploadPrivateVideo';
+export { default as DownloadImage } from './DownloadImage';

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

@@ -29,3 +29,4 @@ export * from "./oidb/Oidb.0xEB7";
 export * from "./oidb/Oidb.0xED3_1";
 export * from "./oidb/Oidb.0XFE1_2";
 export * from "./oidb/OidbBase";
+export * from "./oidb/Oidb.0xE07";

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

@@ -342,11 +342,11 @@ export const QBigFaceExtra = {
     AniStickerPackId: ProtoField(1, ScalarType.STRING, true),
     AniStickerId: ProtoField(2, ScalarType.STRING, true),
     faceId: ProtoField(3, ScalarType.INT32, true),
-    Field4: ProtoField(4, ScalarType.INT32, true),
+    sourceType: ProtoField(4, ScalarType.INT32, true),
     AniStickerType: ProtoField(5, ScalarType.INT32, true),
-    field6: ProtoField(6, ScalarType.STRING, true),
+    resultId: ProtoField(6, ScalarType.STRING, true),
     preview: ProtoField(7, ScalarType.STRING, true),
-    field9: ProtoField(9, ScalarType.INT32, true),
+    randomType: ProtoField(9, ScalarType.INT32, true),
 };
 
 export const QSmallFaceExtra = {

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

@@ -72,6 +72,14 @@ export const GroupChange = {
     field7: ProtoField(7, ScalarType.BYTES, true),
 };
 
+export const GroupInvite = {
+    groupUin: ProtoField(1, ScalarType.UINT32),
+    field2: ProtoField(2, ScalarType.UINT32),
+    field3: ProtoField(2, ScalarType.UINT32),
+    field4: ProtoField(2, ScalarType.UINT32),
+    invitorUid: ProtoField(5, ScalarType.STRING),
+};
+
 export const PushMsgBody = {
     responseHead: ProtoField(1, () => ResponseHead),
     contentHead: ProtoField(2, () => ContentHead),

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

@@ -0,0 +1,59 @@
+import { ProtoField, ScalarType } from "@napneko/nap-proto-core";
+
+export const OidbSvcTrpcTcp0xE07_0 = {
+    version: ProtoField(1, ScalarType.UINT32),
+    client: ProtoField(2, ScalarType.UINT32),
+    entrance: ProtoField(3, ScalarType.UINT32),
+    ocrReqBody: ProtoField(10, () => OcrReqBody, true),
+};
+
+export const OcrReqBody = {
+    imageUrl: ProtoField(1, ScalarType.STRING),
+    languageType: ProtoField(2, ScalarType.UINT32),
+    scene: ProtoField(3, ScalarType.UINT32),
+    originMd5: ProtoField(10, ScalarType.STRING),
+    afterCompressMd5: ProtoField(11, ScalarType.STRING),
+    afterCompressFileSize: ProtoField(12, ScalarType.STRING),
+    afterCompressWeight: ProtoField(13, ScalarType.STRING),
+    afterCompressHeight: ProtoField(14, ScalarType.STRING),
+    isCut: ProtoField(15, ScalarType.BOOL),
+};
+
+export const OidbSvcTrpcTcp0xE07_0_Response = {
+    retCode: ProtoField(1, ScalarType.INT32),
+    errMsg: ProtoField(2, ScalarType.STRING),
+    wording: ProtoField(3, ScalarType.STRING),
+    ocrRspBody: ProtoField(10, () => OcrRspBody),
+};
+
+export const OcrRspBody = {
+    textDetections: ProtoField(1, () => TextDetection, false, true),
+    language: ProtoField(2, ScalarType.STRING),
+    requestId: ProtoField(3, ScalarType.STRING),
+    ocrLanguageList: ProtoField(101, ScalarType.STRING, false, true),
+    dstTranslateLanguageList: ProtoField(102, ScalarType.STRING, false, true),
+    languageList: ProtoField(103, () => Language, false, true),
+    afterCompressWeight: ProtoField(111, ScalarType.UINT32),
+    afterCompressHeight: ProtoField(112, ScalarType.UINT32),
+};
+
+export const TextDetection = {
+    detectedText: ProtoField(1, ScalarType.STRING),
+    confidence: ProtoField(2, ScalarType.UINT32),
+    polygon: ProtoField(3, () => Polygon),
+    advancedInfo: ProtoField(4, ScalarType.STRING),
+};
+
+export const Polygon = {
+    coordinates: ProtoField(1, () => Coordinate, false, true),
+};
+
+export const Coordinate = {
+    x: ProtoField(1, ScalarType.INT32),
+    y: ProtoField(2, ScalarType.INT32),
+};
+
+export const Language = {
+    languageCode: ProtoField(1, ScalarType.STRING),
+    languageDesc: ProtoField(2, ScalarType.STRING),
+};

src/core/packet/transformer/proto/oidb/common/Ntv2.RichMediaReq.ts

@@ -189,8 +189,8 @@ export const VideoExtBizInfo = {
 export const PicExtBizInfo = {
     BizType: ProtoField(1, ScalarType.UINT32),
     TextSummary: ProtoField(2, ScalarType.STRING),
-    BytesPbReserveC2c: ProtoField(11, ScalarType.BYTES),
-    BytesPbReserveTroop: ProtoField(12, ScalarType.BYTES),
+    BytesPbReserveC2c: ProtoField(11, () => BytesPbReserveC2c),
+    BytesPbReserveTroop: ProtoField(12, () => BytesPbReserveTroop),
     FromScene: ProtoField(1001, ScalarType.UINT32),
     ToScene: ProtoField(1002, ScalarType.UINT32),
     OldFileId: ProtoField(1003, ScalarType.UINT32),
@@ -211,3 +211,27 @@ export const UploadInfo = {
     FileInfo: ProtoField(1, () => FileInfo),
     SubFileType: ProtoField(2, ScalarType.UINT32),
 };
+
+export const BytesPbReserveC2c = {
+    subType: ProtoField(1, ScalarType.UINT32),
+    field3: ProtoField(3, ScalarType.UINT32),
+    field4: ProtoField(4, ScalarType.UINT32),
+    field8: ProtoField(8, ScalarType.STRING),
+    field10: ProtoField(10, ScalarType.UINT32),
+    field12: ProtoField(12, ScalarType.STRING),
+    field18: ProtoField(18, ScalarType.STRING),
+    field19: ProtoField(19, ScalarType.STRING),
+    field20: ProtoField(20, ScalarType.BYTES),
+};
+
+export const BytesPbReserveTroop = {
+    subType: ProtoField(1, ScalarType.UINT32),
+    field3: ProtoField(3, ScalarType.UINT32),
+    field4: ProtoField(4, ScalarType.UINT32),
+    field9: ProtoField(9, ScalarType.STRING),
+    field10: ProtoField(10, ScalarType.UINT32),
+    field12: ProtoField(12, ScalarType.STRING),
+    field18: ProtoField(18, ScalarType.STRING),
+    field19: ProtoField(19, ScalarType.STRING),
+    field21: ProtoField(21, ScalarType.BYTES),
+};

src/core/types/element.ts

@@ -40,6 +40,7 @@ export interface FaceElement {
     resultId?: string;
     surpriseId?: string;
     randomType?: number;
+    chainCount?: number;
 }
 export interface GrayTipRovokeElement {
     operatorRole: string;
@@ -56,6 +57,7 @@ export interface GrayTipElement {
     aioOpGrayTipElement: TipAioOpGrayTipElement;
     groupElement: TipGroupElement;
     xmlElement: {
+        busiId: string;
         content: string;
         templId: string;
     };
@@ -347,4 +349,4 @@ export type SendShareLocationElement = SendElementBase<ElementType.SHARELOCATION
 
 export type SendMessageElement = SendTextElement | SendPttElement |
     SendPicElement | SendReplyElement | SendFaceElement | SendMarketFaceElement | SendFileElement |
-    SendVideoElement | SendArkElement | SendMarkdownElement | SendShareLocationElement;
+    SendVideoElement | SendArkElement | SendMarkdownElement | SendShareLocationElement;

src/core/types/index.ts

@@ -9,4 +9,5 @@ export * from './sign';
 export * from './element';
 export * from './constant';
 export * from './graytip';
-export * from './emoji';
+export * from './emoji';
+export * from './service';

src/core/types/msg.ts

@@ -508,7 +508,7 @@ export interface RawMessage {
  */
 export interface QueryMsgsParams {
     chatInfo: Peer;
-    filterMsgType: [];
+    filterMsgType: Array<{ type: NTMsgType, subType: Array<number> }>;
     filterSendersUid: string[];
     filterMsgFromTime: string;
     filterMsgToTime: string;

src/core/types/service.ts

@@ -0,0 +1,35 @@
+export enum LoginErrorCode {
+    KLOGINERRORACCOUNTNOTUIN = 140022018,
+    KLOGINERRORACCOUNTORPASSWORDERROR = 140022013,
+    KLOGINERRORBLACKACCOUNT = 150022021,
+    KLOGINERRORDEFAULT = 140022000,
+    KLOGINERROREXPIRETICKET = 140022014,
+    KLOGINERRORFROZEN = 140022005,
+    KLOGINERRORILLAGETICKET = 140022016,
+    KLOGINERRORINVAILDCOOKIE = 140022012,
+    KLOGINERRORINVALIDPARAMETER = 140022001,
+    KLOGINERRORKICKEDTICKET = 140022015,
+    KLOGINERRORMUTIPLEPASSWORDINCORRECT = 150022029,
+    KLOGINERRORNEEDUPDATE = 140022004,
+    KLOGINERRORNEEDVERIFYREALNAME = 140022019,
+    KLOGINERRORNEWDEVICE = 140022010,
+    KLOGINERRORNICEACCOUNTEXPIRED = 150022020,
+    KLOGINERRORNICEACCOUNTPARENTCHILDEXPIRED = 150022025,
+    KLOGINERRORPASSWORD = 2,
+    KLOGINERRORPROOFWATER = 140022008,
+    KLOGINERRORPROTECT = 140022006,
+    KLOGINERRORREFUSEPASSOWRDLOGIN = 140022009,
+    KLOGINERRORREMINDCANAELLATEDSTATUS = 150022028,
+    KLOGINERRORSCAN = 1,
+    KLOGINERRORSCCESS = 0,
+    KLOGINERRORSECBEAT = 140022017,
+    KLOGINERRORSMSINVALID = 150022026,
+    KLOGINERRORSTRICK = 140022007,
+    KLOGINERRORSYSTEMFAILED = 140022002,
+    KLOGINERRORTGTGTEXCHAGEA1FORBID = 150022027,
+    KLOGINERRORTIMEOUTRETRY = 140022003,
+    KLOGINERRORTOOMANYTIMESTODAY = 150022023,
+    KLOGINERRORTOOOFTEN = 150022022,
+    KLOGINERRORUNREGISTERED = 150022024,
+    KLOGINERRORUNUSUALDEVICE = 140022011,
+}

src/core/types/user.ts

@@ -18,7 +18,7 @@ export interface BuddyCategoryType {
 export interface CoreInfo {
     uid: string;
     uin: string;
-    nick: string;
+    nick?: string;
     remark: string;
 }
 

src/framework/napcat.ts

@@ -27,6 +27,7 @@ export async function NCoreInitFramework(
     process.on('uncaughtException', (err) => {
         console.log('[NapCat] [Error] Unhandled Exception:', err.message);
     });
+
     process.on('unhandledRejection', (reason, promise) => {
         console.log('[NapCat] [Error] unhandledRejection:', reason);
     });

src/index.ts

@@ -0,0 +1 @@
+import '@/universal/napcat';

src/onebot/action/OneBotAction.ts

@@ -2,6 +2,7 @@ import { ActionName, BaseCheckResult } from './router';
 import Ajv, { ErrorObject, ValidateFunction } from 'ajv';
 import { NapCatCore } from '@/core';
 import { NapCatOneBot11Adapter, OB11Return } from '@/onebot';
+import { NetworkAdapterConfig } from '../config/config';
 
 export class OB11Response {
     private static createResponse<T>(data: T, status: string, retcode: number, message: string = '', echo: any = null): OB11Return<T> {
@@ -29,7 +30,7 @@ export class OB11Response {
 }
 
 export abstract class OneBotAction<PayloadType, ReturnDataType> {
-    actionName: ActionName = ActionName.Unknown;
+    actionName: typeof ActionName[keyof typeof ActionName] = ActionName.Unknown;
     core: NapCatCore;
     private validate: ValidateFunction<any> | undefined = undefined;
     payloadSchema: any = undefined;
@@ -55,13 +56,13 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
         return { valid: true };
     }
 
-    public async handle(payload: PayloadType, adaptername: string): Promise<OB11Return<ReturnDataType | null>> {
+    public async handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig): Promise<OB11Return<ReturnDataType | null>> {
         const result = await this.check(payload);
         if (!result.valid) {
             return OB11Response.error(result.message, 400);
         }
         try {
-            const resData = await this._handle(payload, adaptername);
+            const resData = await this._handle(payload, adaptername, config);
             return OB11Response.ok(resData);
         } catch (e: any) {
             this.core.context.logger.logError('发生错误', e);
@@ -69,13 +70,13 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
         }
     }
 
-    public async websocketHandle(payload: PayloadType, echo: any, adaptername: string): Promise<OB11Return<ReturnDataType | null>> {
+    public async websocketHandle(payload: PayloadType, echo: any, adaptername: string, config: NetworkAdapterConfig): Promise<OB11Return<ReturnDataType | null>> {
         const result = await this.check(payload);
         if (!result.valid) {
             return OB11Response.error(result.message, 1400, echo);
         }
         try {
-            const resData = await this._handle(payload, adaptername);
+            const resData = await this._handle(payload, adaptername, config);
             return OB11Response.ok(resData, echo);
         } catch (e: any) {
             this.core.context.logger.logError('发生错误', e);
@@ -83,5 +84,5 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
         }
     }
 
-    abstract _handle(payload: PayloadType, adaptername: string): PromiseLike<ReturnDataType>;
-}
+    abstract _handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig): Promise<ReturnDataType>;
+}

src/onebot/action/extends/GetClientkey.ts

@@ -0,0 +1,14 @@
+import { ActionName } from '@/onebot/action/router';
+import { OneBotAction } from '../OneBotAction';
+
+interface GetClientkeyResponse {
+    clientkey?: string;
+}
+
+export class GetClientkey extends OneBotAction<void, GetClientkeyResponse> {
+    actionName = ActionName.GetClientkey;
+
+    async _handle() {
+        return { clientkey: (await this.core.apis.UserApi.forceFetchClientKey()).clientKey };
+    }
+}

src/onebot/action/extends/GetMiniAppArk.ts

@@ -11,7 +11,8 @@ const SchemaData = Type.Union([
         desc: Type.String(),
         picUrl: Type.String(),
         jumpUrl: Type.String(),
-        rawArkData: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
+        webUrl: Type.Optional(Type.String()),
+        rawArkData: Type.Optional(Type.Union([Type.String()]))
     }),
     Type.Object({
         title: Type.String(),
@@ -19,6 +20,7 @@ const SchemaData = Type.Union([
         picUrl: Type.String(),
         jumpUrl: Type.String(),
         iconUrl: Type.String(),
+        webUrl: Type.Optional(Type.String()),
         appId: Type.String(),
         scene: Type.Union([Type.Number(), Type.String()]),
         templateType: Type.Union([Type.Number(), Type.String()]),
@@ -28,7 +30,7 @@ const SchemaData = Type.Union([
         versionId: Type.String(),
         sdkId: Type.String(),
         withShareTicket: Type.Union([Type.Number(), Type.String()]),
-        rawArkData: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
+        rawArkData: Type.Optional(Type.Union([Type.String()]))
     })
 ]);
 type Payload = Static<typeof SchemaData>;
@@ -45,7 +47,8 @@ export class GetMiniAppArk extends GetPacketStatusDepends<Payload, {
             title: payload.title,
             desc: payload.desc,
             picUrl: payload.picUrl,
-            jumpUrl: payload.jumpUrl
+            jumpUrl: payload.jumpUrl,
+            webUrl: payload.webUrl,
         } as MiniAppReqCustomParams;
         if ('type' in payload) {
             reqParam = MiniAppInfoHelper.generateReq(customParams, MiniAppInfo.get(payload.type)!.template);
@@ -63,13 +66,13 @@ export class GetMiniAppArk extends GetPacketStatusDepends<Payload, {
                     verType: +verType,
                     shareType: +shareType,
                     versionId: versionId,
-                    withShareTicket: +withShareTicket
+                    withShareTicket: +withShareTicket,
                 }
             );
         }
         const arkData = await this.core.apis.PacketApi.pkt.operation.GetMiniAppAdaptShareInfo(reqParam);
         return {
-            data: payload.rawArkData ? arkData : MiniAppInfoHelper.RawToSend(arkData)
+            data: payload.rawArkData === 'true' ? arkData : MiniAppInfoHelper.RawToSend(arkData)
         };
     }
 }

src/onebot/action/extends/OCRImage.ts

@@ -10,30 +10,34 @@ const SchemaData = Type.Object({
 
 type Payload = Static<typeof SchemaData>;
 
-export class OCRImage extends OneBotAction<Payload, any> {
-    actionName = ActionName.OCRImage;
+class OCRImageBase extends OneBotAction<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const { path, success } = (await uriToLocalFile(this.core.NapCatTempPath, payload.image));
+        const { path, success } = await uriToLocalFile(this.core.NapCatTempPath, payload.image);
         if (!success) {
-            throw new Error(`OCR ${payload.image}失败,image字段可能格式不正确`);
+            throw new Error(`OCR ${payload.image}失败, image字段可能格式不正确`);
         }
         if (path) {
-            await checkFileExist(path, 5000); // 避免崩溃
-            const ret = await this.core.apis.SystemApi.ocrImage(path);
-            fs.unlink(path, () => { });
-
-            if (!ret) {
-                throw new Error(`OCR ${payload.image}失败`);
+            try {
+                await checkFileExist(path, 5000); // 避免崩溃
+                const ret = await this.core.apis.SystemApi.ocrImage(path);
+                if (!ret) {
+                    throw new Error(`OCR ${payload.image}失败`);
+                }
+                return ret.result;
+            } finally {
+                fs.unlink(path, () => { });
             }
-            return ret.result;
         }
-        fs.unlink(path, () => { });
-        throw new Error(`OCR ${payload.image}失败,文件可能不存在`);
+        throw new Error(`OCR ${payload.image}失败, 文件可能不存在`);
     }
 }
 
-export class IOCRImage extends OCRImage {
-    actionName = ActionName.IOCRImage;
+export class OCRImage extends OCRImageBase {
+    actionName = ActionName.OCRImage;
 }
+
+export class IOCRImage extends OCRImageBase {
+    actionName = ActionName.IOCRImage;
+}

src/onebot/action/extends/SendPacket.ts

@@ -0,0 +1,21 @@
+import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
+import { ActionName } from '@/onebot/action/router';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    cmd: Type.String(),
+    data: Type.String(),
+    rsp: Type.Union([Type.String(), Type.Boolean()], { default: true }),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class SendPacket extends GetPacketStatusDepends<Payload, any> {
+    payloadSchema = SchemaData;
+    actionName = ActionName.SendPacket;
+    async _handle(payload: Payload) {
+        const rsp = typeof payload.rsp === 'boolean' ? payload.rsp : payload.rsp === 'true';
+        const data = await this.core.apis.PacketApi.pkt.operation.sendPacket({ cmd: payload.cmd, data: payload.data as any }, rsp);
+        return typeof data === 'object' ? data.toString('hex') : undefined;
+    }
+}

src/onebot/action/extends/SetGroupSign.ts

@@ -8,14 +8,18 @@ const SchemaData = Type.Object({
 
 type Payload = Static<typeof SchemaData>;
 
-export class SetGroupSign extends GetPacketStatusDepends<Payload, any> {
-    actionName = ActionName.SetGroupSign;
+class SetGroupSignBase extends GetPacketStatusDepends<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
         return await this.core.apis.PacketApi.pkt.operation.GroupSign(+payload.group_id);
     }
 }
-export class SendGroupSign extends SetGroupSign {
+
+export class SetGroupSign extends SetGroupSignBase {
+    actionName = ActionName.SetGroupSign;
+}
+
+export class SendGroupSign extends SetGroupSignBase {
     actionName = ActionName.SendGroupSign;
 }

src/onebot/action/file/GetFile.ts

@@ -1,6 +1,6 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import fs from 'fs/promises';
-import { FileNapCatOneBotUUID } from '@/common/helper';
+import { FileNapCatOneBotUUID } from '@/common/file-uuid';
 import { ActionName } from '@/onebot/action/router';
 import { OB11MessageImage, OB11MessageVideo } from '@/onebot/types';
 import { Static, Type } from '@sinclair/typebox';
@@ -28,7 +28,7 @@ export class GetFileBase extends OneBotAction<GetFilePayload, GetFileResponse> {
         payload.file ||= payload.file_id || '';
         //接收消息标记模式
         const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file);
-        if (contextMsgFile) {
+        if (contextMsgFile && contextMsgFile.msgId && contextMsgFile.elementId) {
             const { peer, msgId, elementId } = contextMsgFile;
             const downloadPath = await this.core.apis.FileApi.downloadMedia(msgId, peer.chatType, peer.peerUid, elementId, '', '');
             const rawMessage = (await this.core.apis.MsgApi.getMsgsByMsgId(peer, [msgId]))?.msgList
@@ -68,7 +68,7 @@ export class GetFileBase extends OneBotAction<GetFilePayload, GetFileResponse> {
 
         //群文件模式
         const contextModelIdFile = FileNapCatOneBotUUID.decodeModelId(payload.file);
-        if (contextModelIdFile) {
+        if (contextModelIdFile && contextModelIdFile.modelId) {
             const { peer, modelId } = contextModelIdFile;
             const downloadPath = await this.core.apis.FileApi.downloadFileForModelId(peer, modelId, '');
             const res: GetFileResponse = {

src/onebot/action/file/GetGroupFileUrl.ts

@@ -1,5 +1,5 @@
 import { ActionName } from '@/onebot/action/router';
-import { FileNapCatOneBotUUID } from "@/common/helper";
+import { FileNapCatOneBotUUID } from '@/common/file-uuid';
 import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus";
 import { Static, Type } from '@sinclair/typebox';
 

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

@@ -1,7 +1,7 @@
 
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { FileNapCatOneBotUUID } from '@/common/helper';
+import { FileNapCatOneBotUUID } from '@/common/file-uuid';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
@@ -16,7 +16,7 @@ export class DeleteGroupFile extends OneBotAction<Payload, any> {
     payloadSchema = SchemaData;
     async _handle(payload: Payload) {
         const data = FileNapCatOneBotUUID.decodeModelId(payload.file_id);
-        if (!data) throw new Error('Invalid file_id');
+        if (!data || !data.fileId) throw new Error('Invalid file_id');
         return await this.core.apis.GroupApi.delGroupFile(payload.group_id.toString(), [data.fileId]);
     }
 }

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

@@ -2,7 +2,7 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import fs from 'fs';
 import { join as joinPath } from 'node:path';
-import { calculateFileMD5, httpDownload } from '@/common/file';
+import { calculateFileMD5, uriToLocalFile } from '@/common/file';
 import { randomUUID } from 'crypto';
 import { Static, Type } from '@sinclair/typebox';
 
@@ -26,17 +26,20 @@ export default class GoCQHTTPDownloadFile extends OneBotAction<Payload, FileResp
     async _handle(payload: Payload): Promise<FileResponse> {
         const isRandomName = !payload.name;
         const name = payload.name || randomUUID();
-        const filePath = joinPath(this.core.NapCatTempPath, name);
+        let result: Awaited<ReturnType<typeof uriToLocalFile>>;
 
         if (payload.base64) {
-            fs.writeFileSync(filePath, payload.base64, 'base64');
+            result = await uriToLocalFile(this.core.NapCatTempPath, `base64://${payload.base64}`, name);
         } else if (payload.url) {
             const headers = this.getHeaders(payload.headers);
-            const buffer = await httpDownload({ url: payload.url, headers: headers });
-            fs.writeFileSync(filePath, Buffer.from(buffer), 'binary');
+            result = await uriToLocalFile(this.core.NapCatTempPath, payload.url, name, headers);
         } else {
             throw new Error('不存在任何文件, 无法下载');
         }
+        if (!result.success) {
+            throw new Error(result.errMsg);
+        }
+        const filePath = result.path;
         if (fs.existsSync(filePath)) {
 
             if (isRandomName) {

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

@@ -3,8 +3,9 @@ import { OB11Message } from '@/onebot';
 import { ActionName } from '@/onebot/action/router';
 import { ChatType } from '@/core/types';
 import { MessageUnique } from '@/common/message-unique';
-import { AdapterConfigWrap } from '@/onebot/config/config';
+
 import { Static, Type } from '@sinclair/typebox';
+import { NetworkAdapterConfig } from '@/onebot/config/config';
 
 interface Response {
     messages: OB11Message[];
@@ -23,7 +24,7 @@ export default class GetFriendMsgHistory extends OneBotAction<Payload, Response>
     actionName = ActionName.GetFriendMsgHistory;
     payloadSchema = SchemaData;
 
-    async _handle(payload: Payload, adapter: string): Promise<Response> {
+    async _handle(payload: Payload, adapter: string, config: NetworkAdapterConfig): Promise<Response> {
         //处理参数
         const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
 
@@ -42,10 +43,9 @@ export default class GetFriendMsgHistory extends OneBotAction<Payload, Response>
         await Promise.all(msgList.map(async msg => {
             msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
         }));
-        const network = Object.values(this.obContext.configLoader.configData.network) as Array<AdapterConfigWrap>;
         //烘焙消息
         const ob11MsgList = (await Promise.all(
-            msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg, network.flat().find(e => e.name === adapter)?.messagePostFormat ?? 'array')))
+            msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg, config.messagePostFormat)))
         ).filter(msg => msg !== undefined);
         return { 'messages': ob11MsgList };
     }

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

@@ -3,8 +3,8 @@ import { OB11Message } from '@/onebot';
 import { ActionName } from '@/onebot/action/router';
 import { ChatType, Peer } from '@/core/types';
 import { MessageUnique } from '@/common/message-unique';
-import { AdapterConfigWrap } from '@/onebot/config/config';
 import { Static, Type } from '@sinclair/typebox';
+import { NetworkAdapterConfig } from '@/onebot/config/config';
 
 interface Response {
     messages: OB11Message[];
@@ -25,7 +25,7 @@ export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction<Payload, Re
     actionName = ActionName.GoCQHTTP_GetGroupMsgHistory;
     payloadSchema = SchemaData;
 
-    async _handle(payload: Payload, adapter: string): Promise<Response> {
+    async _handle(payload: Payload, adapter: string, config: NetworkAdapterConfig): Promise<Response> {
         //处理参数
         const isReverseOrder = typeof payload.reverseOrder === 'string' ? payload.reverseOrder === 'true' : !!payload.reverseOrder;
         const peer: Peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: payload.group_id.toString() };
@@ -41,11 +41,9 @@ export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction<Payload, Re
         await Promise.all(msgList.map(async msg => {
             msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
         }));
-        const network = Object.values(this.obContext.configLoader.configData.network) as Array<AdapterConfigWrap>;
         //烘焙消息
-        const msgFormat = network.flat().find(e => e.name === adapter)?.messagePostFormat ?? 'array';
         const ob11MsgList = (await Promise.all(
-            msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg, msgFormat)))
+            msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg, config.messagePostFormat)))
         ).filter(msg => msg !== undefined);
         return { 'messages': ob11MsgList };
     }

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

@@ -13,7 +13,7 @@ type Payload = Static<typeof SchemaData>;
 
 export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11User> {
     actionName = ActionName.GoCQHTTP_GetStrangerInfo;
-
+    payloadSchema = SchemaData;
     async _handle(payload: Payload): Promise<OB11User> {
         const user_id = payload.user_id.toString();
         const extendData = await this.core.apis.UserApi.getUserDetailInfoByUin(user_id);

src/onebot/action/group/GetGroupEssence.ts

@@ -3,8 +3,8 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { MessageUnique } from '@/common/message-unique';
 import crypto from 'crypto';
-import { AdapterConfigWrap } from '@/onebot/config/config';
 import { Static, Type } from '@sinclair/typebox';
+import { NetworkAdapterConfig } from '@/onebot/config/config';
 
 const SchemaData = Type.Object({
     group_id: Type.Union([Type.Number(), Type.String()]),
@@ -27,9 +27,7 @@ export class GetGroupEssence extends OneBotAction<Payload, any> {
         };
     }
 
-    async _handle(payload: Payload, adapter: string) {
-        const network = Object.values(this.obContext.configLoader.configData.network) as Array<AdapterConfigWrap>;
-        const msgFormat = network.flat().find(e => e.name === adapter)?.messagePostFormat ?? 'array';
+    async _handle(payload: Payload, adapter: string, config: NetworkAdapterConfig) {
         const msglist = (await this.core.apis.WebApi.getGroupEssenceMsgAll(payload.group_id.toString())).flatMap((e) => e.data.msg_list);
         if (!msglist) {
             throw new Error('获取失败');
@@ -50,7 +48,7 @@ export class GetGroupEssence extends OneBotAction<Payload, any> {
                     operator_nick: msg.add_digest_nick,
                     message_id: message_id,
                     operator_time: msg.add_digest_time,
-                    content: (await this.obContext.apis.MsgApi.parseMessage(rawMessage, msgFormat))?.message
+                    content: (await this.obContext.apis.MsgApi.parseMessage(rawMessage, config.messagePostFormat))?.message
                 };
             }
             const msgTempData = JSON.stringify({

src/onebot/action/group/GetGroupInfo.ts

@@ -24,7 +24,7 @@ class GetGroupInfo extends OneBotAction<Payload, OB11Group> {
                 group_name: data.groupName,
                 member_count: data.memberNum,
                 max_member_count: data.maxMemberNum,
-            }
+            };
         }
         return OB11Construct.group(group);
     }

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -26,20 +26,29 @@ class GetGroupMemberInfo extends OneBotAction<Payload, OB11GroupMember> {
         return uid;
     }
 
-    async _handle(payload: Payload) {
-        const isNocache = this.parseBoolean(payload.no_cache ?? true);
-        const uid = await this.getUid(payload.user_id);
-        const groupMember = this.core.apis.GroupApi.groupMemberCache.get(payload.group_id.toString())?.get(uid);
-        let [member, info] = await Promise.all([
+    private async getGroupMemberInfo(payload: Payload, uid: string, isNocache: boolean) {
+        const groupMemberCache = this.core.apis.GroupApi.groupMemberCache.get(payload.group_id.toString());
+        const groupMember = groupMemberCache?.get(uid);
+
+        const [member, info] = await Promise.all([
             this.core.apis.GroupApi.getGroupMemberEx(payload.group_id.toString(), uid, isNocache),
             this.core.apis.UserApi.getUserDetailInfo(uid),
         ]);
+
         if (!member || !groupMember) throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在`);
-        if (info) {
-            member = { ...groupMember, ...member, ...info };
-        } else {
+
+        return info ? { ...groupMember, ...member, ...info } : member;
+    }
+
+    async _handle(payload: Payload) {
+        const isNocache = this.parseBoolean(payload.no_cache ?? true);
+        const uid = await this.getUid(payload.user_id);
+        const member = await this.getGroupMemberInfo(payload, uid, isNocache);
+
+        if (!member) {
             this.core.context.logger.logDebug(`获取群成员详细信息失败, 只能返回基础信息`);
         }
+
         return OB11Construct.groupMember(payload.group_id.toString(), member);
     }
 }

src/onebot/action/group/GetGroupMemberList.ts

@@ -3,6 +3,7 @@ import { OB11Construct } from '@/onebot/helper/data';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
+import { GroupMember } from '@/core';
 
 const SchemaData = Type.Object({
     group_id: Type.Union([Type.Number(), Type.String()]),
@@ -17,25 +18,32 @@ export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]>
 
     async _handle(payload: Payload) {
         const groupIdStr = payload.group_id.toString();
-        const noCache = payload.no_cache ? this.stringToBoolean(payload.no_cache) : false;
+        const noCache = this.parseBoolean(payload.no_cache ?? false);
+        const groupMembers = await this.getGroupMembers(groupIdStr, noCache);
+        const _groupMembers = await Promise.all(
+            Array.from(groupMembers.values()).map(item =>
+                OB11Construct.groupMember(groupIdStr, item)
+            )
+        );
+        return Array.from(new Map(_groupMembers.map(member => [member.user_id, member])).values());
+    }
+
+    private parseBoolean(value: boolean | string): boolean {
+        return typeof value === 'string' ? value === 'true' : value;
+    }
+
+    private async getGroupMembers(groupIdStr: string, noCache: boolean): Promise<Map<string, GroupMember>> {
         const memberCache = this.core.apis.GroupApi.groupMemberCache;
         let groupMembers = memberCache.get(groupIdStr);
+
         if (noCache || !groupMembers) {
-            this.core.apis.GroupApi.refreshGroupMemberCache(groupIdStr).then().catch();
-            //下次刷新
-            groupMembers = memberCache.get(groupIdStr);
+            const data = this.core.apis.GroupApi.refreshGroupMemberCache(groupIdStr, true).then().catch();
+            groupMembers = memberCache.get(groupIdStr) || (await data);
             if (!groupMembers) {
                 throw new Error(`Failed to get group member list for group ${groupIdStr}`);
             }
         }
-        const memberPromises = Array.from(groupMembers.values()).map(item =>
-            OB11Construct.groupMember(groupIdStr, item)
-        );
-        const _groupMembers = await Promise.all(memberPromises);
-        const MemberMap = new Map(_groupMembers.map(member => [member.user_id, member]));
-        return Array.from(MemberMap.values());
+
+        return groupMembers;
     }
-    stringToBoolean(str: string | boolean): boolean {
-        return typeof str === 'boolean' ? str : str.toLowerCase() === "true";
-    }
-}
+}

src/onebot/action/group/GroupPoke.ts

@@ -14,6 +14,6 @@ export class GroupPoke extends GetPacketStatusDepends<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.user_id, +payload.group_id);
+        await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
     }
 }

src/onebot/action/group/SendGroupAiRecord.ts

@@ -21,15 +21,9 @@ export class SendGroupAiRecord extends GetPacketStatusDepends<Payload, {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const rawRsp = await this.core.apis.PacketApi.pkt.operation.GetAiVoice(+payload.group_id, payload.character, payload.text, AIVoiceChatType.Sound);
-        const url = await this.core.apis.PacketApi.pkt.operation.GetGroupPttUrl(+payload.group_id, rawRsp.msgInfoBody[0].index);
-        const { path, errMsg, success } = (await uriToLocalFile(this.core.NapCatTempPath, url));
-        if (!success) {
-            throw new Error(errMsg);
-        }
-        const peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: payload.group_id.toString() } as Peer;
-        const element = await this.core.apis.FileApi.createValidSendPttElement(path);
-        const sendRes = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, [element], [path]);
-        return { message_id: sendRes.id ?? -1 };
+        await this.core.apis.PacketApi.pkt.operation.GetAiVoice(+payload.group_id, payload.character, payload.text, AIVoiceChatType.Sound);
+        return {
+            message_id: 0  // can't get message_id from GetAiVoice
+        };
     }
 }

src/onebot/action/group/SendGroupMsg.ts

@@ -1,9 +1,9 @@
-import SendMsg, { ContextMode } from '@/onebot/action/msg/SendMsg';
+import { ContextMode, SendMsgBase } from '@/onebot/action/msg/SendMsg';
 import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 import { OB11PostSendMsg } from '@/onebot/types';
 
 // 未检测参数
-class SendGroupMsg extends SendMsg {
+class SendGroupMsg extends SendMsgBase {
     actionName = ActionName.SendGroupMsg;
     contextMode: ContextMode = ContextMode.Group;
 

src/onebot/action/group/SetGroupAddRequest.ts

@@ -19,12 +19,11 @@ export default class SetGroupAddRequest extends OneBotAction<Payload, null> {
         const flag = payload.flag.toString();
         const approve = payload.approve?.toString() !== 'false';
         const reason = payload.reason ?? ' ';
-
-        const notify = await this.findNotify(flag);
+        const invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(flag);
+        const notify = invite_notify ?? await this.findNotify(flag);
         if (!notify) {
             throw new Error('No such request');
         }
-
         await this.core.apis.GroupApi.handleGroupRequest(
             notify,
             approve ? NTGroupRequestOperateTypes.KAGREE : NTGroupRequestOperateTypes.KREFUSE,

src/onebot/action/index.ts

@@ -102,11 +102,11 @@ import { SendGroupAiRecord } from "@/onebot/action/group/SendGroupAiRecord";
 import { GetAiCharacters } from "@/onebot/action/extends/GetAiCharacters";
 import { GetGuildList } from './guild/GetGuildList';
 import { GetGuildProfile } from './guild/GetGuildProfile';
+import { GetClientkey } from './extends/GetClientkey';
+import { SendPacket } from './extends/SendPacket';
+import { SendPoke } from "@/onebot/action/packet/SendPoke";
 
-
-export type ActionMap = Map<string, OneBotAction<any, any>>;
-
-export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore): ActionMap {
+export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
     const actionHandlers = [
         new GetGroupInfoEx(obContext, core),
@@ -126,6 +126,7 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new GetGroupRootFiles(obContext, core),
         new SetGroupSign(obContext, core),
         new SendGroupSign(obContext, core),
+        new GetClientkey(obContext, core),
         // onebot11
         new SendLike(obContext, core),
         new GetMsg(obContext, core),
@@ -219,13 +220,33 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new GetAiRecord(obContext, core),
         new SendGroupAiRecord(obContext, core),
         new GetAiCharacters(obContext, core),
+        new SendPacket(obContext, core),
+        new SendPoke(obContext, core),
     ];
-    const actionMap = new Map();
-    for (const action of actionHandlers) {
-        actionMap.set(action.actionName, action);
-        actionMap.set(action.actionName + '_async', action);
-        actionMap.set(action.actionName + '_rate_limited', action);
+
+    type HandlerUnion = typeof actionHandlers[number];
+    type MapType = {
+        [H in HandlerUnion as H['actionName']]: H;
+    } & {
+        [H in HandlerUnion as `${H['actionName']}_async`]: H;
+    } & {
+        [H in HandlerUnion as `${H['actionName']}_rate_limited`]: H;
+    };
+
+    const _map = new Map<keyof MapType, HandlerUnion>();
+
+    actionHandlers.forEach(h => {
+        _map.set(h.actionName as keyof MapType, h);
+        _map.set(`${h.actionName}_async` as keyof MapType, h);
+        _map.set(`${h.actionName}_rate_limited` as keyof MapType, h);
+    });
+
+    function get<K extends keyof MapType>(key: K): MapType[K];
+    function get<K extends keyof MapType>(key: K): null;
+    function get<K extends keyof MapType>(key: K): HandlerUnion | null | MapType[K] {
+        return _map.get(key as keyof MapType) ?? null;
     }
 
-    return actionMap;
+    return { get };
 }
+export type ActionMap = ReturnType<typeof createActionMap>

src/onebot/action/msg/GetMsg.ts

@@ -3,8 +3,8 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { MessageUnique } from '@/common/message-unique';
 import { RawMessage } from '@/core';
-import { AdapterConfigWrap } from '@/onebot/config/config';
 import { Static, Type } from '@sinclair/typebox';
+import { NetworkAdapterConfig } from '@/onebot/config/config';
 
 export type ReturnDataType = OB11Message
 
@@ -18,10 +18,8 @@ class GetMsg extends OneBotAction<Payload, OB11Message> {
     actionName = ActionName.GetMsg;
     payloadSchema = SchemaData;
 
-    async _handle(payload: Payload, adapter: string) {
+    async _handle(payload: Payload, adapter: string, config: NetworkAdapterConfig) {
         // log("history msg ids", Object.keys(msgHistory));
-        const network = Object.values(this.obContext.configLoader.configData.network) as Array<AdapterConfigWrap>;
-        const msgFormat = network.flat().find(e => e.name === adapter)?.messagePostFormat ?? 'array';
         if (!payload.message_id) {
             throw Error('参数message_id不能为空');
         }
@@ -38,7 +36,7 @@ class GetMsg extends OneBotAction<Payload, OB11Message> {
         } else {
             msg = (await this.core.apis.MsgApi.getMsgsByMsgId(peer, [msgIdWithPeer?.MsgId || payload.message_id.toString()])).msgList[0];
         }
-        const retMsg = await this.obContext.apis.MsgApi.parseMessage(msg, msgFormat);
+        const retMsg = await this.obContext.apis.MsgApi.parseMessage(msg, config.messagePostFormat);
         if (!retMsg) throw Error('消息为空');
         try {
             retMsg.message_id = MessageUnique.createUniqueMsgId(peer, msg.msgId)!;

src/onebot/action/msg/SendMsg.ts

@@ -88,8 +88,7 @@ function getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType
     return 0;
 }
 
-export class SendMsg extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
-    actionName = ActionName.SendMsg;
+export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
     contextMode = ContextMode.Normal;
 
     protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
@@ -379,4 +378,6 @@ export class SendMsg extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
     }
 }
 
-export default SendMsg;
+export default class SendMsg extends SendMsgBase {
+    actionName = ActionName.SendMsg;
+}

src/onebot/action/msg/SendPrivateMsg.ts

@@ -1,9 +1,9 @@
-import SendMsg, { ContextMode } from './SendMsg';
+import { ContextMode, SendMsgBase } from './SendMsg';
 import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 import { OB11PostSendMsg } from '@/onebot/types';
 
 // 未检测参数
-class SendPrivateMsg extends SendMsg {
+class SendPrivateMsg extends SendMsgBase {
     actionName = ActionName.SendPrivateMsg;
     contextMode: ContextMode = ContextMode.Private;
 

src/onebot/action/packet/GetPacketStatus.ts

@@ -3,8 +3,6 @@ import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 
 
 export abstract class GetPacketStatusDepends<PT, RT> extends OneBotAction<PT, RT> {
-    actionName = ActionName.GetPacketStatus;
-
     protected async check(payload: PT): Promise<BaseCheckResult>{
         if (!this.core.apis.PacketApi.available) {
             return {
@@ -18,6 +16,8 @@ export abstract class GetPacketStatusDepends<PT, RT> extends OneBotAction<PT, RT
 }
 
 export class GetPacketStatus extends GetPacketStatusDepends<any, null> {
+    actionName = ActionName.GetPacketStatus;
+
     async _handle(payload: any) {
         return null;
     }

src/onebot/action/packet/SendPoke.ts

@@ -0,0 +1,23 @@
+import { ActionName } from '@/onebot/action/router';
+import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus";
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
+    user_id: Type.Union([Type.Number(), Type.String()]),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class SendPoke extends GetPacketStatusDepends<Payload, any> {
+    actionName = ActionName.SendPoke;
+    payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        if (payload.group_id) {
+            await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
+        } else {
+            await this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id);
+        }
+    }
+}

src/onebot/action/router.ts

@@ -13,134 +13,138 @@ export interface InvalidCheckResult {
     [k: string | number]: any;
 }
 
-export enum ActionName {
+export const ActionName = {
     // onebot 11
-    SendPrivateMsg = 'send_private_msg',
-    SendGroupMsg = 'send_group_msg',
-    SendMsg = 'send_msg',
-    DeleteMsg = 'delete_msg',
-    GetMsg = 'get_msg',
-    GoCQHTTP_GetForwardMsg = 'get_forward_msg',
-    SendLike = 'send_like',
-    SetGroupKick = 'set_group_kick',
-    SetGroupBan = 'set_group_ban',
-    // SetGroupAnoymousBan = 'set_group_anonymous_ban',
-    SetGroupWholeBan = 'set_group_whole_ban',
-    SetGroupAdmin = 'set_group_admin',
-    // SetGroupAnoymous = 'set_group_anonymous',
-    SetGroupCard = 'set_group_card',
-    SetGroupName = 'set_group_name',
-    SetGroupLeave = 'set_group_leave',
-    SetSpecialTittle = 'set_group_special_title',
-    SetFriendAddRequest = 'set_friend_add_request',
-    SetGroupAddRequest = 'set_group_add_request',
-    GetLoginInfo = 'get_login_info',
-    GoCQHTTP_GetStrangerInfo = 'get_stranger_info',
-    GetFriendList = 'get_friend_list',
-    GetGroupInfo = 'get_group_info',
-    GetGroupList = 'get_group_list',
-    GetGroupMemberInfo = 'get_group_member_info',
-    GetGroupMemberList = 'get_group_member_list',
-    GetGroupHonorInfo = 'get_group_honor_info',
-    GetCookies = 'get_cookies',
-    GetCSRF = 'get_csrf_token',
-    GetCredentials = 'get_credentials',
-    GetRecord = 'get_record',
-    GetImage = 'get_image',
-    CanSendImage = 'can_send_image',
-    CanSendRecord = 'can_send_record',
-    GetStatus = 'get_status',
-    GetVersionInfo = 'get_version_info',
-    // Reboot = 'set_restart',
-    // CleanCache = 'clean_cache',
+    SendPrivateMsg: 'send_private_msg',
+    SendGroupMsg: 'send_group_msg',
+    SendMsg: 'send_msg',
+    DeleteMsg: 'delete_msg',
+    GetMsg: 'get_msg',
+    GoCQHTTP_GetForwardMsg: 'get_forward_msg',
+    SendLike: 'send_like',
+    SetGroupKick: 'set_group_kick',
+    SetGroupBan: 'set_group_ban',
+    // SetGroupAnoymousBan : 'set_group_anonymous_ban',
+    SetGroupWholeBan: 'set_group_whole_ban',
+    SetGroupAdmin: 'set_group_admin',
+    // SetGroupAnoymous : 'set_group_anonymous',
+    SetGroupCard: 'set_group_card',
+    SetGroupName: 'set_group_name',
+    SetGroupLeave: 'set_group_leave',
+    SetSpecialTittle: 'set_group_special_title',
+    SetFriendAddRequest: 'set_friend_add_request',
+    SetGroupAddRequest: 'set_group_add_request',
+    GetLoginInfo: 'get_login_info',
+    GoCQHTTP_GetStrangerInfo: 'get_stranger_info',
+    GetFriendList: 'get_friend_list',
+    GetGroupInfo: 'get_group_info',
+    GetGroupList: 'get_group_list',
+    GetGroupMemberInfo: 'get_group_member_info',
+    GetGroupMemberList: 'get_group_member_list',
+    GetGroupHonorInfo: 'get_group_honor_info',
+    GetCookies: 'get_cookies',
+    GetCSRF: 'get_csrf_token',
+    GetCredentials: 'get_credentials',
+    GetRecord: 'get_record',
+    GetImage: 'get_image',
+    CanSendImage: 'can_send_image',
+    CanSendRecord: 'can_send_record',
+    GetStatus: 'get_status',
+    GetVersionInfo: 'get_version_info',
+    // Reboot : 'set_restart',
+    // CleanCache : 'clean_cache',
 
     // go-cqhttp
-    SetQQProfile = 'set_qq_profile',
-    // QidianGetAccountInfo = 'qidian_get_account_info',
-    GoCQHTTP_GetModelShow = '_get_model_show',
-    GoCQHTTP_SetModelShow = '_set_model_show',
-    GetOnlineClient = 'get_online_clients',
-    // GetUnidirectionalFriendList = 'get_unidirectional_friend_list',
-    GoCQHTTP_DeleteFriend = 'delete_friend',
-    // DeleteUnidirectionalFriendList = 'delete_unidirectional_friend',
-    GoCQHTTP_MarkMsgAsRead = 'mark_msg_as_read',
-    GoCQHTTP_SendGroupForwardMsg = 'send_group_forward_msg',
-    GoCQHTTP_SendPrivateForwardMsg = 'send_private_forward_msg',
-    GoCQHTTP_GetGroupMsgHistory = 'get_group_msg_history',
-    OCRImage = 'ocr_image',
-    IOCRImage = '.ocr_image',
-    GetGroupSystemMsg = 'get_group_system_msg',
-    GoCQHTTP_GetEssenceMsg = 'get_essence_msg_list',
-    GoCQHTTP_GetGroupAtAllRemain = 'get_group_at_all_remain',
-    SetGroupPortrait = 'set_group_portrait',
-    SetEssenceMsg = 'set_essence_msg',
-    DelEssenceMsg = 'delete_essence_msg',
-    GoCQHTTP_SendGroupNotice = '_send_group_notice',
-    GoCQHTTP_GetGroupNotice = '_get_group_notice',
-    GoCQHTTP_UploadGroupFile = 'upload_group_file',
-    GOCQHTTP_DeleteGroupFile = 'delete_group_file',
-    GoCQHTTP_CreateGroupFileFolder = 'create_group_file_folder',
-    GoCQHTTP_DeleteGroupFileFolder = 'delete_group_folder',
-    GoCQHTTP_GetGroupFileSystemInfo = 'get_group_file_system_info',
-    GoCQHTTP_GetGroupRootFiles = 'get_group_root_files',
-    GoCQHTTP_GetGroupFilesByFolder = 'get_group_files_by_folder',
-    GOCQHTTP_GetGroupFileUrl = 'get_group_file_url',
-    GOCQHTTP_UploadPrivateFile = 'upload_private_file',
-    // GOCQHTTP_ReloadEventFilter = 'reload_event_filter',
-    GoCQHTTP_DownloadFile = 'download_file',
-    GoCQHTTP_CheckUrlSafely = 'check_url_safely',
-    GoCQHTTP_GetWordSlices = '.get_word_slices',
-    GoCQHTTP_HandleQuickAction = '.handle_quick_operation',
+    SetQQProfile: 'set_qq_profile',
+    // QidianGetAccountInfo : 'qidian_get_account_info',
+    GoCQHTTP_GetModelShow: '_get_model_show',
+    GoCQHTTP_SetModelShow: '_set_model_show',
+    GetOnlineClient: 'get_online_clients',
+    // GetUnidirectionalFriendList : 'get_unidirectional_friend_list',
+    GoCQHTTP_DeleteFriend: 'delete_friend',
+    // DeleteUnidirectionalFriendList : 'delete_unidirectional_friend',
+    GoCQHTTP_MarkMsgAsRead: 'mark_msg_as_read',
+    GoCQHTTP_SendGroupForwardMsg: 'send_group_forward_msg',
+    GoCQHTTP_SendPrivateForwardMsg: 'send_private_forward_msg',
+    GoCQHTTP_GetGroupMsgHistory: 'get_group_msg_history',
+    OCRImage: 'ocr_image',
+    IOCRImage: '.ocr_image',
+    GetGroupSystemMsg: 'get_group_system_msg',
+    GoCQHTTP_GetEssenceMsg: 'get_essence_msg_list',
+    GoCQHTTP_GetGroupAtAllRemain: 'get_group_at_all_remain',
+    SetGroupPortrait: 'set_group_portrait',
+    SetEssenceMsg: 'set_essence_msg',
+    DelEssenceMsg: 'delete_essence_msg',
+    GoCQHTTP_SendGroupNotice: '_send_group_notice',
+    GoCQHTTP_GetGroupNotice: '_get_group_notice',
+    GoCQHTTP_UploadGroupFile: 'upload_group_file',
+    GOCQHTTP_DeleteGroupFile: 'delete_group_file',
+    GoCQHTTP_CreateGroupFileFolder: 'create_group_file_folder',
+    GoCQHTTP_DeleteGroupFileFolder: 'delete_group_folder',
+    GoCQHTTP_GetGroupFileSystemInfo: 'get_group_file_system_info',
+    GoCQHTTP_GetGroupRootFiles: 'get_group_root_files',
+    GoCQHTTP_GetGroupFilesByFolder: 'get_group_files_by_folder',
+    GOCQHTTP_GetGroupFileUrl: 'get_group_file_url',
+    GOCQHTTP_UploadPrivateFile: 'upload_private_file',
+    // GOCQHTTP_ReloadEventFilter : 'reload_event_filter',
+    GoCQHTTP_DownloadFile: 'download_file',
+    GoCQHTTP_CheckUrlSafely: 'check_url_safely',
+    GoCQHTTP_GetWordSlices: '.get_word_slices',
+    GoCQHTTP_HandleQuickAction: '.handle_quick_operation',
 
     // 以下为扩展napcat扩展
-    Unknown = 'unknown',
-    SharePeer = 'ArkSharePeer',
-    ShareGroupEx = 'ArkShareGroup',
-    // RebootNormal = 'reboot_normal', //无快速登录重新启动
-    GetRobotUinRange = 'get_robot_uin_range',
-    SetOnlineStatus = 'set_online_status',
-    GetFriendsWithCategory = 'get_friends_with_category',
-    SetQQAvatar = 'set_qq_avatar',
-    GetFile = 'get_file',
-    ForwardFriendSingleMsg = 'forward_friend_single_msg',
-    ForwardGroupSingleMsg = 'forward_group_single_msg',
-    TranslateEnWordToZn = 'translate_en2zh',
-    SetMsgEmojiLike = 'set_msg_emoji_like',
-    GoCQHTTP_SendForwardMsg = 'send_forward_msg',
-    MarkPrivateMsgAsRead = 'mark_private_msg_as_read',
-    MarkGroupMsgAsRead = 'mark_group_msg_as_read',
-    GetFriendMsgHistory = 'get_friend_msg_history',
-    CreateCollection = 'create_collection',
-    GetCollectionList = 'get_collection_list',
-    SetLongNick = 'set_self_longnick',
-    GetRecentContact = 'get_recent_contact',
-    _MarkAllMsgAsRead = '_mark_all_as_read',
-    GetProfileLike = 'get_profile_like',
-    FetchCustomFace = 'fetch_custom_face',
-    FetchEmojiLike = 'fetch_emoji_like',
-    SetInputStatus = 'set_input_status',
-    GetGroupInfoEx = 'get_group_info_ex',
-    GetGroupIgnoreAddRequest = 'get_group_ignore_add_request',
-    DelGroupNotice = '_del_group_notice',
-    FetchUserProfileLike = 'fetch_user_profile_like',
-    FriendPoke = 'friend_poke',
-    GroupPoke = 'group_poke',
-    GetPacketStatus = 'nc_get_packet_status',
-    GetUserStatus = 'nc_get_user_status',
-    GetRkey = 'nc_get_rkey',
-    GetGroupShutList = 'get_group_shut_list',
+    Unknown: 'unknown',
+    SharePeer: 'ArkSharePeer',
+    ShareGroupEx: 'ArkShareGroup',
+    // RebootNormal : 'reboot_normal', //无快速登录重新启动
+    GetRobotUinRange: 'get_robot_uin_range',
+    SetOnlineStatus: 'set_online_status',
+    GetFriendsWithCategory: 'get_friends_with_category',
+    SetQQAvatar: 'set_qq_avatar',
+    GetFile: 'get_file',
+    ForwardFriendSingleMsg: 'forward_friend_single_msg',
+    ForwardGroupSingleMsg: 'forward_group_single_msg',
+    TranslateEnWordToZn: 'translate_en2zh',
+    SetMsgEmojiLike: 'set_msg_emoji_like',
+    GoCQHTTP_SendForwardMsg: 'send_forward_msg',
+    MarkPrivateMsgAsRead: 'mark_private_msg_as_read',
+    MarkGroupMsgAsRead: 'mark_group_msg_as_read',
+    GetFriendMsgHistory: 'get_friend_msg_history',
+    CreateCollection: 'create_collection',
+    GetCollectionList: 'get_collection_list',
+    SetLongNick: 'set_self_longnick',
+    GetRecentContact: 'get_recent_contact',
+    _MarkAllMsgAsRead: '_mark_all_as_read',
+    GetProfileLike: 'get_profile_like',
+    FetchCustomFace: 'fetch_custom_face',
+    FetchEmojiLike: 'fetch_emoji_like',
+    SetInputStatus: 'set_input_status',
+    GetGroupInfoEx: 'get_group_info_ex',
+    GetGroupIgnoreAddRequest: 'get_group_ignore_add_request',
+    DelGroupNotice: '_del_group_notice',
+    FetchUserProfileLike: 'fetch_user_profile_like',
+    FriendPoke: 'friend_poke',
+    GroupPoke: 'group_poke',
+    GetPacketStatus: 'nc_get_packet_status',
+    GetUserStatus: 'nc_get_user_status',
+    GetRkey: 'nc_get_rkey',
+    GetGroupShutList: 'get_group_shut_list',
 
-    GetGuildList = 'get_guild_list',
-    GetGuildProfile = 'get_guild_service_profile',
+    GetGuildList: 'get_guild_list',
+    GetGuildProfile: 'get_guild_service_profile',
 
-    GetGroupIgnoredNotifies = 'get_group_ignored_notifies',
+    GetGroupIgnoredNotifies: 'get_group_ignored_notifies',
 
-    SetGroupSign = "set_group_sign",
-    SendGroupSign = "send_group_sign",
+    SetGroupSign: "set_group_sign",
+    SendGroupSign: "send_group_sign",
+    SendPacket: "send_packet",
+    GetMiniAppArk: "get_mini_app_ark",
+    // UploadForwardMsg : "upload_forward_msg",
+    GetAiRecord: "get_ai_record",
+    GetAiCharacters: "get_ai_characters",
+    SendGroupAiRecord: "send_group_ai_record",
+
+    GetClientkey: "get_clientkey",
     
-    GetMiniAppArk = "get_mini_app_ark",
-    // UploadForwardMsg = "upload_forward_msg",
-    GetAiRecord = "get_ai_record",
-    GetAiCharacters = "get_ai_characters",
-    SendGroupAiRecord = "send_group_ai_record",
-}
+    SendPoke: 'send_poke',
+} as const;

src/onebot/action/system/CanSendImage.ts

@@ -1,10 +1,10 @@
 import { ActionName } from '@/onebot/action/router';
-import CanSendRecord from './CanSendRecord';
+import CanSendRecord, { CanSend } from './CanSendRecord';
 
 interface ReturnType {
     yes: boolean;
 }
 
-export default class CanSendImage extends CanSendRecord {
+export default class CanSendImage extends CanSend {
     actionName = ActionName.CanSendImage;
 }

src/onebot/action/system/CanSendRecord.ts

@@ -5,12 +5,15 @@ interface ReturnType {
     yes: boolean;
 }
 
-export default class CanSendRecord extends OneBotAction<any, ReturnType> {
-    actionName = ActionName.CanSendRecord;
-
+export class CanSend extends OneBotAction<any, ReturnType> {
     async _handle(_payload: void): Promise<ReturnType> {
         return {
             yes: true,
         };
     }
 }
+
+
+export default class CanSendRecord extends CanSend{
+    actionName = ActionName.CanSendRecord;
+}

src/onebot/action/user/GetRecentContact.ts

@@ -1,7 +1,7 @@
 
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { AdapterConfigWrap } from '@/onebot/config/config';
+import { NetworkAdapterConfig } from '@/onebot/config/config';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
@@ -14,16 +14,14 @@ export default class GetRecentContact extends OneBotAction<Payload, any> {
     actionName = ActionName.GetRecentContact;
     payloadSchema = SchemaData;
 
-    async _handle(payload: Payload, adapter: string) {
+    async _handle(payload: Payload, adapter: string, config: NetworkAdapterConfig) {
         const ret = await this.core.apis.UserApi.getRecentContactListSnapShot(+payload.count);
-        const network = Object.values(this.obContext.configLoader.configData.network) as Array<AdapterConfigWrap>;
         //烘焙消息
-        const msgFormat = network.flat().find(e => e.name === adapter)?.messagePostFormat ?? 'array';
         return await Promise.all(ret.info.changedList.map(async (t) => {
             const FastMsg = await this.core.apis.MsgApi.getMsgsByMsgId({ chatType: t.chatType, peerUid: t.peerUid }, [t.msgId]);
             if (FastMsg.msgList.length > 0) {
                 //扩展ret.info.changedList
-                const lastestMsg = await this.obContext.apis.MsgApi.parseMessage(FastMsg.msgList[0], msgFormat);
+                const lastestMsg = await this.obContext.apis.MsgApi.parseMessage(FastMsg.msgList[0], config.messagePostFormat);
                 return {
                     lastestMsg: lastestMsg,
                     peerUin: t.peerUin,

src/onebot/api/friend.ts

@@ -12,16 +12,17 @@ export class OneBotFriendApi {
     }
 
     //使用前预先判断 busiId 1061
-    async parsePrivatePokeEvent(grayTipElement: GrayTipElement) {
+    async parsePrivatePokeEvent(grayTipElement: GrayTipElement, uin: number) {
         const json = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr);
-        let pokedetail: Array<{ uid: string }> = json.items;
+        const pokedetail: Array<{ uid: string }> = json.items;
         //筛选item带有uid的元素
-        pokedetail = pokedetail.filter(item => item.uid);
-        if (pokedetail.length == 2) {
+        const poke_uid = pokedetail.filter(item => item.uid);
+        if (poke_uid.length == 2) {
             return new OB11FriendPokeEvent(
                 this.core,
-                parseInt((await this.core.apis.UserApi.getUinByUidV2(pokedetail[0].uid))),
-                parseInt((await this.core.apis.UserApi.getUinByUidV2(pokedetail[1].uid))),
+                uin,
+                parseInt((await this.core.apis.UserApi.getUinByUidV2(poke_uid[0].uid))),
+                parseInt((await this.core.apis.UserApi.getUinByUidV2(poke_uid[1].uid))),
                 pokedetail,
             );
         }

src/onebot/api/group.ts

@@ -8,6 +8,8 @@ import {
     NapCatCore,
     NTGrayTipElementSubTypeV2,
     RawMessage,
+    TipGroupElement,
+    TipGroupElementType,
 } from '@/core';
 import { NapCatOneBot11Adapter } from '@/onebot';
 import { OB11GroupBanEvent } from '@/onebot/event/notice/OB11GroupBanEvent';
@@ -19,8 +21,10 @@ import { OB11GroupPokeEvent } from '@/onebot/event/notice/OB11PokeEvent';
 import { OB11GroupEssenceEvent } from '@/onebot/event/notice/OB11GroupEssenceEvent';
 import { OB11GroupTitleEvent } from '@/onebot/event/notice/OB11GroupTitleEvent';
 import { OB11GroupUploadNoticeEvent } from '../event/notice/OB11GroupUploadNoticeEvent';
+import { OB11GroupNameEvent } from '../event/notice/OB11GroupNameEvent';
 import { pathToFileURL } from 'node:url';
-import { FileNapCatOneBotUUID } from '@/common/helper';
+import { FileNapCatOneBotUUID } from '@/common/file-uuid';
+import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent';
 
 export class OneBotGroupApi {
     obContext: NapCatOneBot11Adapter;
@@ -195,7 +199,7 @@ export class OneBotGroupApi {
                 id: FileNapCatOneBotUUID.encode({
                     chatType: ChatType.KCHATTYPEGROUP,
                     peerUid: msg.peerUid,
-                }, msg.msgId, elementWrapper.elementId, elementWrapper?.fileElement?.fileUuid, "." + element.fileName),
+                }, msg.msgId, elementWrapper.elementId, elementWrapper?.fileElement?.fileUuid, element.fileName),
                 url: pathToFileURL(element.filePath).href,
                 name: element.fileName,
                 size: parseInt(element.fileSize),
@@ -204,13 +208,63 @@ export class OneBotGroupApi {
         );
     }
 
+    async parseGroupElement(msg: RawMessage, element: TipGroupElement, elementWrapper: GrayTipElement) {
+        if (element.type === TipGroupElementType.KGROUPNAMEMODIFIED) {
+            this.core.context.logger.logDebug('收到群名称变更事件', element);
+            return new OB11GroupNameEvent(
+                this.core,
+                parseInt(msg.peerUid),
+                parseInt(await this.core.apis.UserApi.getUinByUidV2(element.memberUid)),
+                element.groupName,
+            );
+        } else if (element.type === TipGroupElementType.KSHUTUP) {
+            const event = await this.parseGroupBanEvent(msg.peerUid, elementWrapper);
+            return event;
+        } else if (element.type === TipGroupElementType.KMEMBERADD) {
+            // 自己的通知 协议推送为type->85 在这里实现为了避免邀请出现问题
+            if (element.memberUid == this.core.selfInfo.uid) {
+                await this.core.apis.GroupApi.refreshGroupMemberCache(msg.peerUid, true);
+                return new OB11GroupIncreaseEvent(
+                    this.core,
+                    parseInt(msg.peerUid),
+                    +this.core.selfInfo.uin,
+                    element.adminUid ? +await this.core.apis.UserApi.getUinByUidV2(element.adminUid) : 0,
+                    'approve'
+                );
+            }
+        }
+    }
+
+    async parseSelfInviteEvent(msg: RawMessage, inviterUin: string, inviteeUin: string) {
+        return new OB11GroupIncreaseEvent(
+            this.core,
+            parseInt(msg.peerUid),
+            +inviteeUin,
+            +inviterUin,
+            'invite'
+        );
+    }
+
     async parseGrayTipElement(msg: RawMessage, grayTipElement: GrayTipElement) {
         if (grayTipElement.subElementType === NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_GROUP) {
             // 解析群组事件 由sysmsg解析
-            // return await this.parseGroupElement(msg, grayTipElement.groupElement, grayTipElement);
-
+            return await this.parseGroupElement(msg, grayTipElement.groupElement, grayTipElement);
         } else if (grayTipElement.subElementType === NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
-            // 筛选出表情回应 事件
+            // 筛选自身入群情况
+            // if (grayTipElement.xmlElement.busiId === '10145') {
+            //     const inviteData = new fastXmlParser.XMLParser({
+            //         ignoreAttributes: false,
+            //         attributeNamePrefix: '',
+            //     }).parse(grayTipElement.xmlElement.content);
+
+            //     const inviterUin: string = inviteData.gtip.qq[0].jp;
+            //     const inviteeUin: string = inviteData.gtip.qq[1].jp;
+            //     //刷新群缓存
+            //     if (inviteeUin === this.core.selfInfo.uin) {
+            //         this.core.apis.GroupApi.refreshGroupMemberCache(msg.peerUid).then().catch();
+            //         return this.parseSelfInviteEvent(msg, inviterUin, inviteeUin);
+            //     }
+            // } else 
             if (grayTipElement.xmlElement?.templId === '10382') {
                 return await this.obContext.apis.GroupApi.parseGroupEmojiLikeEventByGrayTip(msg.peerUid, grayTipElement);
             } else {

src/onebot/api/index.ts

@@ -1,19 +1,5 @@
-import type { OneBotFriendApi } from '@/onebot/api/friend';
-import type { OneBotUserApi } from '@/onebot/api/user';
-import type { OneBotGroupApi } from '@/onebot/api/group';
-import type { OneBotMsgApi } from '@/onebot/api/msg';
-import type { OneBotQuickActionApi } from '@/onebot/api/quick-action';
-
 export * from './friend';
 export * from './group';
 export * from './user';
 export * from './msg';
-export * from './quick-action';
-
-export interface StableOneBotApiWrapper {
-    FriendApi: OneBotFriendApi;
-    UserApi: OneBotUserApi;
-    GroupApi: OneBotGroupApi;
-    MsgApi: OneBotMsgApi;
-    QuickActionApi: OneBotQuickActionApi,
-}
+export * from './quick-action';

src/onebot/api/msg.ts

@@ -1,4 +1,4 @@
-import { FileNapCatOneBotUUID } from '@/common/helper';
+import { FileNapCatOneBotUUID } from '@/common/file-uuid';
 import { MessageUnique } from '@/common/message-unique';
 import { pathToFileURL } from 'node:url';
 import {
@@ -17,9 +17,10 @@ import {
     SendTextElement,
     FaceType,
     GrayTipElement,
+    GroupNotify,
 } from '@/core';
 import faceConfig from '@/core/external/face_config.json';
-import { NapCatOneBot11Adapter, OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageFileBase, OB11MessageForward, } from '@/onebot';
+import { NapCatOneBot11Adapter, OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageFileBase, OB11MessageForward, OB11MessageImage, OB11MessageVideo, } from '@/onebot';
 import { OB11Construct } from '@/onebot/helper/data';
 import { EventType } from '@/onebot/event/OneBotEvent';
 import { encodeCQCode } from '@/onebot/helper/cqcode';
@@ -33,7 +34,9 @@ import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent';
 import { OB11GroupDecreaseEvent, GroupDecreaseSubType } from '../event/notice/OB11GroupDecreaseEvent';
 import { GroupAdmin } from '@/core/packet/transformer/proto/message/groupAdmin';
 import { OB11GroupAdminNoticeEvent } from '../event/notice/OB11GroupAdminNoticeEvent';
-import { GroupChange, GroupChangeInfo, PushMsgBody } from '@/core/packet/transformer/proto';
+import { GroupChange, GroupChangeInfo, GroupInvite, PushMsgBody } from '@/core/packet/transformer/proto';
+import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest';
+import { LRUCache } from '@/common/lru-cache';
 
 type RawToOb11Converters = {
     [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: (
@@ -67,7 +70,8 @@ function keyCanBeParsed(key: string, parser: RawToOb11Converters): key is keyof
 export class OneBotMsgApi {
     obContext: NapCatOneBot11Adapter;
     core: NapCatCore;
-
+    notifyGroupInvite: LRUCache<string, GroupNotify> = new LRUCache(50);
+    // seq -> notify
     rawToOb11Converters: RawToOb11Converters = {
         textElement: async element => {
             if (element.atType === NTMsgAtType.ATTYPEUNKNOWN) {
@@ -112,18 +116,22 @@ export class OneBotMsgApi {
                     peerUid: msg.peerUid,
                     guildId: '',
                 };
-                const encodedFileId = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, "." + element.fileName);
+                FileNapCatOneBotUUID.encode(
+                    peer,
+                    msg.msgId,
+                    elementWrapper.elementId,
+                    element.fileUuid,
+                    element.fileName
+                );
                 return {
                     type: OB11MessageDataType.image,
                     data: {
                         summary: element.summary,
-                        file: encodedFileId,
+                        file: element.fileName,
                         sub_type: element.picSubType,
-                        file_id: encodedFileId,
                         url: await this.core.apis.FileApi.getImageUrl(element),
                         path: element.filePath,
                         file_size: element.fileSize,
-                        file_unique: element.md5HexStr ?? element.fileName,
                     },
                 };
             } catch (e: any) {
@@ -138,15 +146,15 @@ export class OneBotMsgApi {
                 peerUid: msg.peerUid,
                 guildId: '',
             };
+            const file = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileName);
             return {
                 type: OB11MessageDataType.file,
                 data: {
-                    file: element.fileName,
+                    file: file,
                     path: element.filePath,
                     url: pathToFileURL(element.filePath).href,
-                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, "." + element.fileName),
+                    file_id: file,
                     file_size: element.fileSize,
-                    file_unique: element.fileMd5 ?? element.fileSha ?? element.fileName,
                 },
             };
         },
@@ -182,7 +190,10 @@ export class OneBotMsgApi {
                 return {
                     type: OB11MessageDataType.face,
                     data: {
-                        id: element.faceIndex.toString()
+                        id: element.faceIndex.toString(),
+                        raw: element,
+                        resultId: element.resultId,
+                        chainCount: element.chainCount,
                     },
                 };
             }
@@ -197,18 +208,18 @@ export class OneBotMsgApi {
             const { emojiId } = _;
             const dir = emojiId.substring(0, 2);
             const url = `https://gxh.vip.qq.com/club/item/parcel/item/${dir}/${emojiId}/raw300.gif`;
+            const filename = `${dir}-${emojiId}.gif`;
+            FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "", filename);
             return {
                 type: OB11MessageDataType.image,
                 data: {
                     summary: _.faceName, // 商城表情名称
-                    file: 'marketface',
-                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "", "." + _.key + ".jpg"),
+                    file: filename,
                     path: url,
                     url: url,
                     key: _.key,
                     emoji_id: _.emojiId,
                     emoji_package_id: _.emojiPackageId,
-                    file_unique: _.key
                 },
             };
         },
@@ -323,16 +334,14 @@ export class OneBotMsgApi {
             if (!videoDownUrl) {
                 videoDownUrl = element.filePath;
             }
-            const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "", "." + element.fileName);
+            const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileName);
             return {
                 type: OB11MessageDataType.video,
                 data: {
                     file: fileCode,
                     path: videoDownUrl,
                     url: videoDownUrl ?? pathToFileURL(element.filePath).href,
-                    file_id: fileCode,
                     file_size: element.fileSize,
-                    file_unique: element.videoMd5 ?? element.thumbMd5 ?? element.fileName,
                 },
             };
         },
@@ -343,16 +352,14 @@ export class OneBotMsgApi {
                 peerUid: msg.peerUid,
                 guildId: '',
             };
-            const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "", "." + element.fileName);
+            const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "", element.fileName);
             return {
                 type: OB11MessageDataType.voice,
                 data: {
                     file: fileCode,
                     path: element.filePath,
                     url: pathToFileURL(element.filePath).href,
-                    file_id: fileCode,
                     file_size: element.fileSize,
-                    file_unique: element.fileUuid
                 },
             };
         },
@@ -460,7 +467,7 @@ export class OneBotMsgApi {
                 undefined;
         },
 
-        [OB11MessageDataType.face]: async ({ data: { id } }) => {
+        [OB11MessageDataType.face]: async ({ data: { id, resultId, chainCount } }) => {
             const parsedFaceId = +id;
             // 从face_config.json中获取表情名称
             const sysFaces = faceConfig.sysface;
@@ -487,6 +494,8 @@ export class OneBotMsgApi {
                     stickerType: face.AniStickerType,
                     packId: face.AniStickerPackId,
                     sourceType: 1,
+                    resultId: resultId?.toString(),
+                    chainCount,
                 },
             };
         },
@@ -679,7 +688,7 @@ export class OneBotMsgApi {
     async parsePrivateMsgEvent(msg: RawMessage, grayTipElement: GrayTipElement) {
         if (grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
             if (grayTipElement.jsonGrayTipElement.busiId == 1061) {
-                const PokeEvent = await this.obContext.apis.FriendApi.parsePrivatePokeEvent(grayTipElement);
+                const PokeEvent = await this.obContext.apis.FriendApi.parsePrivatePokeEvent(grayTipElement, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
                 if (PokeEvent) { return PokeEvent; };
             } else if (grayTipElement.jsonGrayTipElement.busiId == 19324 && msg.peerUid !== '') {
                 return new OB11FriendAddNoticeEvent(this.core, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
@@ -793,6 +802,13 @@ export class OneBotMsgApi {
 
     private async handlePrivateMessage(resMsg: OB11Message, msg: RawMessage) {
         resMsg.sub_type = 'friend';
+        if (await this.core.apis.FriendApi.isBuddy(msg.senderUid)) {
+            const nickname = (await this.core.apis.UserApi.getCoreAndBaseInfo([msg.senderUid])).get(msg.senderUid)?.coreInfo.nick;
+            if (nickname) {
+                resMsg.sender.nickname = nickname;
+                return;
+            }
+        }
         resMsg.sender.nickname = (await this.core.apis.UserApi.getUserDetailInfo(msg.senderUid)).nick;
     }
 
@@ -895,16 +911,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);
@@ -945,48 +961,104 @@ export class OneBotMsgApi {
 
     private async handleOb11FileLikeMessage(
         { data: inputdata }: OB11MessageFileBase,
-        { deleteAfterSentFiles }: SendMessageContext,
+        { deleteAfterSentFiles }: SendMessageContext
     ) {
-        const realUri = inputdata.url ?? inputdata.file ?? inputdata.path ?? '';
-        if (realUri.length === 0) {
+        let realUri = [inputdata.url, inputdata.file, inputdata.path].find(uri => uri && uri.trim()) ?? '';
+        if (!realUri) {
             this.core.context.logger.logError('文件消息缺少参数', inputdata);
-            throw Error('文件消息缺少参数');
-        }
-        const {
-            path,
-            fileName,
-            errMsg,
-            success,
-        } = (await uriToLocalFile(this.core.NapCatTempPath, realUri));
-
-        if (!success) {
-            this.core.context.logger.logError('文件下载失败', errMsg);
-            throw Error('文件下载失败' + errMsg);
+            throw new Error('文件消息缺少参数');
         }
 
-        deleteAfterSentFiles.push(path);
-
-        return { path, fileName: inputdata.name ?? fileName };
+        const downloadFile = async (uri: string) => {
+            const { path, fileName, errMsg, success } = await uriToLocalFile(this.core.NapCatTempPath, uri);
+            if (!success) {
+                this.core.context.logger.logError('文件下载失败', errMsg);
+                throw new Error('文件下载失败: ' + errMsg);
+            }
+            return { path, fileName };
+        };
+        try {
+            const { path, fileName } = await downloadFile(realUri);
+            deleteAfterSentFiles.push(path);
+            return { path, fileName: inputdata.name ?? fileName };
+        } catch {
+            realUri = await this.handleObfuckName(realUri);
+            const { path, fileName } = await downloadFile(realUri);
+            deleteAfterSentFiles.push(path);
+            return { path, fileName: inputdata.name ?? fileName };
+        }
+    }
+    async handleObfuckName(name: string) {
+        const contextMsgFile = FileNapCatOneBotUUID.decode(name);
+        if (contextMsgFile && contextMsgFile.msgId && contextMsgFile.elementId) {
+            const { peer, msgId, elementId } = contextMsgFile;
+            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');
+            let url = '';
+            if (mixElement?.picElement && rawMessage) {
+                const tempData =
+                    await this.obContext.apis.MsgApi.rawToOb11Converters.picElement?.(mixElement?.picElement, rawMessage, mixElement, { parseMultMsg: 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;
+                url = tempData?.data.url ?? '';
+            }
+            return url !== '' ? url : await this.core.apis.FileApi.downloadMedia(msgId, peer.chatType, peer.peerUid, elementId, '', '');
+        }
+        throw new Error('文件名解析失败');
     }
     groupChangDecreseType2String(type: number): GroupDecreaseSubType {
         switch (type) {
-            case 130:
-                return 'leave';
-            case 131:
-                return 'kick';
-            case 3:
-                return 'kick_me';
-            default:
-                return 'kick';
+        case 130:
+            return 'leave';
+        case 131:
+            return 'kick';
+        case 3:
+            return 'kick_me';
+        default:
+            return 'kick';
         }
     }
 
+    async waitGroupNotify(groupUin: string, memberUid?: string, operatorUid?: string) {
+        const groupRole = this.core.apis.GroupApi.groupMemberCache.get(groupUin)?.get(this.core.selfInfo.uid.toString())?.role;
+        const isAdminOrOwner = groupRole === 3 || groupRole === 4;
+
+        if (isAdminOrOwner && !operatorUid) {
+            let dataNotify: GroupNotify | undefined;
+            await this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onGroupNotifiesUpdated',
+                (doubt, notifies) => {
+                    for (const notify of notifies) {
+                        if (notify.group.groupCode === groupUin && notify.user1.uid === memberUid) {
+                            dataNotify = notify;
+                            return true;
+                        }
+                    }
+                    return false;
+                }, 1, 1000).catch(undefined);
+            if (dataNotify) {
+                return !dataNotify.actionUser.uid ? dataNotify.user2.uid : dataNotify.actionUser.uid;
+            }
+        }
+
+        return operatorUid;
+    }
+
     async parseSysMessage(msg: number[]) {
         const SysMessage = new NapProtoMsg(PushMsgBody).decode(Uint8Array.from(msg));
+        // 邀请需要解grayTipElement
         if (SysMessage.contentHead.type == 33 && SysMessage.body?.msgContent) {
             const groupChange = new NapProtoMsg(GroupChange).decode(SysMessage.body.msgContent);
-            this.core.apis.GroupApi.refreshGroupMemberCache(groupChange.groupUin.toString()).then().catch();
-            const operatorUid = groupChange.operatorInfo?.toString();
+            await this.core.apis.GroupApi.refreshGroupMemberCache(groupChange.groupUin.toString(), true);
+            const operatorUid = await this.waitGroupNotify(
+                groupChange.groupUin.toString(),
+                groupChange.memberUid,
+                groupChange.operatorInfo ? Buffer.from(groupChange.operatorInfo).toString() : ''
+            );
             return new OB11GroupIncreaseEvent(
                 this.core,
                 groupChange.groupUin,
@@ -994,19 +1066,24 @@ export class OneBotMsgApi {
                 operatorUid ? +await this.core.apis.UserApi.getUinByUidV2(operatorUid) : 0,
                 groupChange.decreaseType == 131 ? 'invite' : 'approve',
             );
+
         } else if (SysMessage.contentHead.type == 34 && SysMessage.body?.msgContent) {
             const groupChange = new NapProtoMsg(GroupChange).decode(SysMessage.body.msgContent);
             // 自身被踢出时operatorInfo会是一个protobuf 否则大多数情况为一个string
-            const operatorUid = groupChange.decreaseType === 3 && groupChange.operatorInfo ?
-                new NapProtoMsg(GroupChangeInfo).decode(groupChange.operatorInfo).operator?.operatorUid :
-                groupChange.operatorInfo?.toString();
+            const operatorUid = await this.waitGroupNotify(
+                groupChange.groupUin.toString(),
+                groupChange.memberUid,
+                groupChange.decreaseType === 3 && groupChange.operatorInfo ?
+                    new NapProtoMsg(GroupChangeInfo).decode(groupChange.operatorInfo).operator?.operatorUid :
+                    groupChange.operatorInfo?.toString()
+            );
             if (groupChange.memberUid === this.core.selfInfo.uid) {
                 setTimeout(() => {
                     this.core.apis.GroupApi.groupMemberCache.delete(groupChange.groupUin.toString());
                 }, 5000);
                 // 自己被踢了 5S后回收
             } else {
-                this.core.apis.GroupApi.refreshGroupMemberCache(groupChange.groupUin.toString()).then().catch();
+                await this.core.apis.GroupApi.refreshGroupMemberCache(groupChange.groupUin.toString(), true);
             }
             return new OB11GroupDecreaseEvent(
                 this.core,
@@ -1017,7 +1094,7 @@ export class OneBotMsgApi {
             );
         } else if (SysMessage.contentHead.type == 44 && SysMessage.body?.msgContent) {
             const groupAmin = new NapProtoMsg(GroupAdmin).decode(SysMessage.body.msgContent);
-            this.core.apis.GroupApi.refreshGroupMemberCache(groupAmin.groupUin.toString()).then().catch();
+            await this.core.apis.GroupApi.refreshGroupMemberCache(groupAmin.groupUin.toString(), true);
             let enabled = false;
             let uid = '';
             if (groupAmin.body.extraEnable != null) {
@@ -1033,6 +1110,72 @@ export class OneBotMsgApi {
                 +await this.core.apis.UserApi.getUinByUidV2(uid),
                 enabled ? 'set' : 'unset'
             );
+        } else if (SysMessage.contentHead.type == 87 && SysMessage.body?.msgContent) {
+            const groupInvite = new NapProtoMsg(GroupInvite).decode(SysMessage.body.msgContent);
+            let request_seq = '';
+            try {
+                await this.core.eventWrapper.registerListen('NodeIKernelMsgListener/onRecvMsg', (msgs) => {
+                    for (const msg of msgs) {
+                        if (msg.senderUid === groupInvite.invitorUid && msg.msgType === 11) {
+                            const jumpUrl = JSON.parse(msg.elements.find(e => e.elementType === 10)?.arkElement?.bytesData ?? '').meta?.news?.jumpUrl;
+                            const jumpUrlParams = new URLSearchParams(jumpUrl);
+                            const groupcode = jumpUrlParams.get('groupcode');
+                            const receiveruin = jumpUrlParams.get('receiveruin');
+                            const msgseq = jumpUrlParams.get('msgseq');
+                            request_seq = msgseq ?? '';
+                            if (groupcode === groupInvite.groupUin.toString() && receiveruin === this.core.selfInfo.uin) {
+                                return true;
+                            }
+                        }
+                    }
+                    return false;
+                }, 1, 1000);
+            } catch (error) {
+                request_seq = '';
+            }
+            // 未拉取到seq
+            if (request_seq === '') {
+                return;
+            }
+            // 创建个假的
+            this.notifyGroupInvite.put(request_seq, {
+                seq: request_seq,
+                type: 1,
+                group: {
+                    groupCode: groupInvite.groupUin.toString(),
+                    groupName: '',
+                },
+                user1: {
+                    uid: groupInvite.invitorUid,
+                    nickName: '',
+                },
+                user2: {
+                    uid: this.core.selfInfo.uid,
+                    nickName: '',
+                },
+                actionUser: {
+                    uid: groupInvite.invitorUid,
+                    nickName: '',
+                },
+                actionTime: Date.now().toString(),
+                postscript: '',
+                repeatSeqs: [],
+                warningTips: '',
+                invitationExt: {
+                    srcType: 1,
+                    groupCode: groupInvite.groupUin.toString(),
+                    waitStatus: 1,
+                },
+                status: 1
+            });
+            return new OB11GroupRequestEvent(
+                this.core,
+                +groupInvite.groupUin,
+                +await this.core.apis.UserApi.getUinByUidV2(groupInvite.invitorUid),
+                'invite',
+                '',
+                request_seq
+            );
         } else if (SysMessage.contentHead.type == 528 && SysMessage.contentHead.subType == 39 && SysMessage.body?.msgContent) {
             return await this.obContext.apis.UserApi.parseLikeEvent(SysMessage.body?.msgContent);
         }

src/onebot/api/quick-action.ts

@@ -18,8 +18,8 @@ import { ContextMode, createContext, normalize } from '@/onebot/action/msg/SendM
 import { isNull } from '@/common/helper';
 
 export class OneBotQuickActionApi {
-    private obContext: NapCatOneBot11Adapter;
-    private core: NapCatCore;
+    obContext: NapCatOneBot11Adapter;
+    core: NapCatCore;
     constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
         this.obContext = obContext;
         this.core = core;
@@ -82,11 +82,22 @@ export class OneBotQuickActionApi {
             this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, sendElements, deleteAfterSentFiles, false).then().catch(e => this.core.context.logger.logError(e));
         }
     }
+    async findNotify(flag: string) {
+        let notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(false, 100)).find(e => e.seq == flag);
+        if (!notify) {
+            notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(true, 100)).find(e => e.seq == flag);
+        }
+        return notify;
+    }
 
     async handleGroupRequest(request: OB11GroupRequestEvent, quickAction: QuickActionGroupRequest) {
-        if (!isNull(quickAction.approve)) {
+        
+        const invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(request.flag);
+        const notify = invite_notify ?? await this.findNotify(request.flag);
+
+        if (!isNull(quickAction.approve) && notify) {
             this.core.apis.GroupApi.handleGroupRequest(
-                request.flag,
+                notify,
                 quickAction.approve ? NTGroupRequestOperateTypes.KAGREE : NTGroupRequestOperateTypes.KREFUSE,
                 quickAction.reason,
             ).catch(e => this.core.context.logger.logError(e));
@@ -94,8 +105,9 @@ export class OneBotQuickActionApi {
     }
 
     async handleFriendRequest(request: OB11FriendRequestEvent, quickAction: QuickActionFriendRequest) {
-        if (!isNull(quickAction.approve)) {
-            this.core.apis.FriendApi.handleFriendRequest(request.flag, !!quickAction.approve).then().catch(e => this.core.context.logger.logError(e));
+        const notify = (await this.core.apis.FriendApi.getBuddyReq()).buddyReqs.find(e => e.reqTime == request.flag.toString());
+        if (!isNull(quickAction.approve) && notify) {
+            this.core.apis.FriendApi.handleFriendRequest(notify, !!quickAction.approve).then().catch(e => this.core.context.logger.logError(e));
         }
     }
 }