Merge pull request #652 from JerryZRF/main

feat: add `get_clientkey`

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,6 +32,8 @@ NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
 [Server.Other](https://docs.napcat.cyou/)
 
+[Qbot.News](https://neko.qbot.news)
+
 ## 回家旅途
 [QQ Group#1](https://qm.qq.com/q/I6LU87a0Yq)
 

launcher/qqnt.json

@@ -1,9 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.16-29927",
+  "version": "9.9.17-30899",
-  "verHash": "3e273e30",
+  "verHash": "ececf273",
-  "linuxVersion": "3.2.13-29927",
+  "linuxVersion": "3.2.15-30899",
-  "linuxVerHash": "833d113c",
+  "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,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.2.35",
+  "version": "4.2.40",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.2.35",
+  "version": "4.2.40",
   "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,6 +17,7 @@
     "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",
@@ -60,4 +61,4 @@
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   }
-}
+}

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.35';
+export const napCatVersion = '4.2.40';

src/core/external/appid.json

@@ -134,5 +134,29 @@
     "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"
     }
 }

src/core/external/offset.json

@@ -162,5 +162,45 @@
     "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"
     }
 }

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/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/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/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/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/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 ?? ' ';
-
+        let invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(flag);
-        const notify = await this.findNotify(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,7 +102,8 @@ 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';
+ 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
     const actionHandlers = [
@@ -123,6 +124,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),

src/onebot/action/router.ts

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

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);
+        const poke_uid = pokedetail.filter(item => item.uid);
-        if (pokedetail.length == 2) {
+        if (poke_uid.length == 2) {
             return new OB11FriendPokeEvent(
                 this.core,
-                parseInt((await this.core.apis.UserApi.getUinByUidV2(pokedetail[0].uid))),
+                uin,
-                parseInt((await this.core.apis.UserApi.getUinByUidV2(pokedetail[1].uid))),
+                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/msg.ts

@@ -17,6 +17,7 @@ import {
     SendTextElement,
     FaceType,
     GrayTipElement,
+    GroupNotify,
 } from '@/core';
 import faceConfig from '@/core/external/face_config.json';
 import { NapCatOneBot11Adapter, OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageFileBase, OB11MessageForward, } from '@/onebot';
@@ -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) {
@@ -679,7 +683,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)));
@@ -895,16 +899,16 @@ export class OneBotMsgApi {
         const calculateTotalSize = async (elements: SendMessageElement[]): Promise<number> => {
             const sizePromises = elements.map(async element => {
                 switch (element.elementType) {
-                case ElementType.PTT:
+                    case ElementType.PTT:
-                    return (await fsPromise.stat(element.pttElement.filePath)).size;
+                        return (await fsPromise.stat(element.pttElement.filePath)).size;
-                case ElementType.FILE:
+                    case ElementType.FILE:
-                    return (await fsPromise.stat(element.fileElement.filePath)).size;
+                        return (await fsPromise.stat(element.fileElement.filePath)).size;
-                case ElementType.VIDEO:
+                    case ElementType.VIDEO:
-                    return (await fsPromise.stat(element.videoElement.filePath)).size;
+                        return (await fsPromise.stat(element.videoElement.filePath)).size;
-                case ElementType.PIC:
+                    case ElementType.PIC:
-                    return (await fsPromise.stat(element.picElement.sourcePath)).size;
+                        return (await fsPromise.stat(element.picElement.sourcePath)).size;
-                default:
+                    default:
-                    return 0;
+                        return 0;
                 }
             });
             const sizes = await Promise.all(sizePromises);
@@ -970,14 +974,14 @@ export class OneBotMsgApi {
     }
     groupChangDecreseType2String(type: number): GroupDecreaseSubType {
         switch (type) {
-        case 130:
+            case 130:
-            return 'leave';
+                return 'leave';
-        case 131:
+            case 131:
-            return 'kick';
+                return 'kick';
-        case 3:
+            case 3:
-            return 'kick_me';
+                return 'kick_me';
-        default:
+            default:
-            return 'kick';
+                return 'kick';
         }
     }
 
@@ -1033,7 +1037,74 @@ export class OneBotMsgApi {
                 +await this.core.apis.UserApi.getUinByUidV2(uid),
                 enabled ? 'set' : 'unset'
             );
-        } else if (SysMessage.contentHead.type == 528 && SysMessage.contentHead.subType == 39 && SysMessage.body?.msgContent) {
+        } else if (SysMessage.contentHead.type == 87 && SysMessage.body?.msgContent) {
+            let 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) {
+                            let jumpUrl = JSON.parse(msg.elements.find(e => e.elementType === 10)?.arkElement?.bytesData ?? '').meta?.news?.jumpUrl;
+                            let jumpUrlParams = new URLSearchParams(jumpUrl);
+                            let groupcode = jumpUrlParams.get('groupcode');
+                            let receiveruin = jumpUrlParams.get('receiveruin');
+                            let 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

@@ -91,11 +91,13 @@ export class OneBotQuickActionApi {
     }
 
     async handleGroupRequest(request: OB11GroupRequestEvent, quickAction: QuickActionGroupRequest) {
-        const noify = await this.findNotify(request.flag);
+        
+        let invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(request.flag);
+        const notify = invite_notify ?? await this.findNotify(request.flag);
 
-        if (!isNull(quickAction.approve) && noify) {
+        if (!isNull(quickAction.approve) && notify) {
             this.core.apis.GroupApi.handleGroupRequest(
-                noify,
+                notify,
                 quickAction.approve ? NTGroupRequestOperateTypes.KAGREE : NTGroupRequestOperateTypes.KREFUSE,
                 quickAction.reason,
             ).catch(e => this.core.context.logger.logError(e));

src/onebot/event/notice/OB11PokeEvent.ts

@@ -10,12 +10,14 @@ class OB11PokeEvent extends OB11BaseNoticeEvent {
 
 export class OB11FriendPokeEvent extends OB11PokeEvent {
     raw_info: any;
+    sender_id: number;
 
     //raw_message nb等框架标准为string
-    constructor(core: NapCatCore, user_id: number, target_id: number, raw_message: any) {
+    constructor(core: NapCatCore, user_id: number, sender_id: number, target_id: number, raw_message: any) {
         super(core);
         this.target_id = target_id;
         this.user_id = user_id;
+        this.sender_id = sender_id;
         this.raw_info = raw_message;
     }
 }

src/onebot/index.ts

@@ -164,6 +164,7 @@ export class NapCatOneBot11Adapter {
         this.initBuddyListener();
         this.initGroupListener();
 
+        WebUiDataRuntime.setQQVersion(this.core.context.basicInfoWrapper.getFullQQVesion());
         WebUiDataRuntime.setQQLoginInfo(selfInfo);
         WebUiDataRuntime.setQQLoginStatus(true);
         WebUiDataRuntime.setOnOB11ConfigChanged(async (newConfig) => {
@@ -310,7 +311,7 @@ export class NapCatOneBot11Adapter {
                 guildId: ''
             };
             const msg = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeq(peer, msgSeq)).msgList.find(e => e.msgType == NTMsgType.KMSGTYPEGRAYTIPS);
-            const element = msg?.elements[0];
+            const element = msg?.elements.find(e => !!e.grayTipElement?.revokeElement);
             if (msg && element) {
                 const recallEvent = await this.emitRecallMsg(msg, element);
                 try {
@@ -467,6 +468,10 @@ export class NapCatOneBot11Adapter {
     }
 
     private async handleMsg(message: RawMessage, network: Array<AdapterConfigWrap>) {
+        // 过滤无效消息
+        if (message.msgType === NTMsgType.KMSGTYPENULL) {
+            return;
+        }
         try {
             const ob11Msg = await this.apis.MsgApi.parseMessageV2(message, this.configLoader.configData.parseMultMsg);
             if (ob11Msg) {

src/onebot/network/passive-websocket.ts

@@ -17,7 +17,6 @@ export class OB11PassiveWebSocketAdapter extends IOB11NetworkAdapter<WebsocketSe
     wsServer: WebSocketServer;
     wsClients: WebSocket[] = [];
     wsClientsMutex = new Mutex();
-    heartbeatInterval: number = 0;
     private heartbeatIntervalId: NodeJS.Timeout | null = null;
     wsClientWithEvent: WebSocket[] = [];
 
@@ -100,7 +99,7 @@ export class OB11PassiveWebSocketAdapter extends IOB11NetworkAdapter<WebsocketSe
         this.logger.log('[OneBot] [WebSocket Server] Server Started', typeof (addressInfo) === 'string' ? addressInfo : addressInfo?.address + ':' + addressInfo?.port);
 
         this.isEnable = true;
-        if (this.heartbeatInterval > 0) {
+        if (this.config.heartInterval > 0) {
             this.registerHeartBeat();
         }
 
@@ -134,11 +133,11 @@ export class OB11PassiveWebSocketAdapter extends IOB11NetworkAdapter<WebsocketSe
             this.wsClientsMutex.runExclusive(async () => {
                 this.wsClientWithEvent.forEach((wsClient) => {
                     if (wsClient.readyState === WebSocket.OPEN) {
-                        wsClient.send(JSON.stringify(new OB11HeartbeatEvent(this.core, this.heartbeatInterval, this.core.selfInfo.online ?? true, true)));
+                        wsClient.send(JSON.stringify(new OB11HeartbeatEvent(this.core, this.config.heartInterval, this.core.selfInfo.online ?? true, true)));
                     }
                 });
             });
-        }, this.heartbeatInterval);
+        }, this.config.heartInterval);
     }
 
     private authorize(token: string | undefined, wsClient: WebSocket, wsReq: IncomingMessage) {
@@ -185,7 +184,7 @@ export class OB11PassiveWebSocketAdapter extends IOB11NetworkAdapter<WebsocketSe
         const wasEnabled = this.isEnable;
         const oldPort = this.config.port;
         const oldHost = this.config.host;
-        const oldHeartbeatInterval = this.heartbeatInterval;
+        const oldHeartbeatInterval = this.config.heartInterval;
         this.config = newConfig;
 
         if (newConfig.enable && !wasEnabled) {
@@ -214,7 +213,6 @@ export class OB11PassiveWebSocketAdapter extends IOB11NetworkAdapter<WebsocketSe
                 clearInterval(this.heartbeatIntervalId);
                 this.heartbeatIntervalId = null;
             }
-            this.heartbeatInterval = newConfig.heartInterval;
             if (newConfig.heartInterval > 0 && this.isEnable) {
                 this.registerHeartBeat();
             }

src/webui/src/api/BaseInfo.ts

@@ -7,3 +7,9 @@ export const PackageInfoHandler: RequestHandler = (_, res) => {
     const data = WebUiDataRuntime.getPackageJson();
     sendSuccess(res, data);
 };
+
+
+export const QQVersionHandler: RequestHandler = (_, res) => {
+    const data = WebUiDataRuntime.getQQVersion();
+    sendSuccess(res, data);
+};

src/webui/src/api/Status.ts

@@ -0,0 +1,19 @@
+import { RequestHandler } from 'express';
+import { SystemStatus, statusHelperSubscription } from "@/core/helper/status";
+
+export const StatusRealTimeHandler: RequestHandler = async (req, res) => {
+    res.setHeader('Content-Type', 'text/event-stream');
+    res.setHeader('Connection', 'keep-alive');
+    const sendStatus = (status: SystemStatus) => {
+        try{
+            res.write(`data: ${JSON.stringify(status)}\n\n`);
+        } catch (e) {
+            console.error(`An error occurred when writing sendStatus data to client: ${e}`);
+        }
+    };
+    statusHelperSubscription.on('statusUpdate', sendStatus);
+    req.on('close', () => {
+        statusHelperSubscription.off('statusUpdate', sendStatus);
+        res.end();
+    });
+};

src/webui/src/helper/Data.ts

@@ -11,6 +11,7 @@ const LoginRuntime: LoginRuntimeType = {
         uin: '',
         nick: '',
     },
+    QQVersion: 'unknown',
     NapCatHelper: {
         onOB11ConfigChanged: async () => {
             return;
@@ -100,4 +101,12 @@ export const WebUiDataRuntime = {
     getPackageJson() {
         return LoginRuntime.packageJson;
     },
+
+    setQQVersion(version: string) {
+        LoginRuntime.QQVersion = version;
+    },
+
+    getQQVersion() {
+        return LoginRuntime.QQVersion;
+    }
 };

src/webui/src/router/Base.ts

@@ -1,8 +1,11 @@
 import { Router } from 'express';
-import { PackageInfoHandler } from '../api/BaseInfo';
+import { PackageInfoHandler, QQVersionHandler } from '../api/BaseInfo';
+import { StatusRealTimeHandler } from "@webapi/api/Status";
 
 const router = Router();
 // router: 获取nc的package.json信息
+router.get('/QQVersion', QQVersionHandler);
 router.get('/PackageInfo', PackageInfoHandler);
+router.get('/GetSysStatusRealTime', StatusRealTimeHandler);
 
 export { router as BaseRouter };

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

@@ -1,4 +1,5 @@
 import type { LoginListItem, SelfInfo } from '@/core';
+import type { OneBotConfig } from "@/onebot/config/config";
 
 interface LoginRuntimeType {
     LoginCurrentTime: number;
@@ -7,6 +8,7 @@ interface LoginRuntimeType {
     QQQRCodeURL: string;
     QQLoginUin: string;
     QQLoginInfo: SelfInfo;
+    QQVersion: string;
     NapCatHelper: {
         onQuickLoginRequested: (uin: string) => Promise<{ result: boolean; message: string }>;
         onOB11ConfigChanged: (ob11: OneBotConfig) => Promise<void>;