Merge branch 'main' of https://github.com/NapNeko/NapCatQQ

fix: wrong notice_type sub_type

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",
-  "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,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.2.33",
+  "version": "4.2.45",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.2.33",
+  "version": "4.2.45",
   "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/umami.ts

@@ -0,0 +1,49 @@
+import https from 'node:https';
+import { napCatVersion } from './version';
+
+export class umamiTrace {
+    static napcatVersion = napCatVersion;
+    static qqversion = '1.0.0';
+
+    static init(qqversion: string) {
+        this.qqversion = qqversion;
+        setInterval(() => {
+            this.trackEvent('heartbeat');
+        }, 5 * 60 * 1000);
+    }
+
+    static trackEvent(eventName: string, info?: string) {
+        const StatesData = {
+            type: 'event',
+            payload: {
+                'website': '596cbbb2-1740-4373-a807-cf3d0637bfa7',
+                'hostname': 'trace.napneko.icu',
+                'title': 'NapCat ' + umamiTrace.napcatVersion,
+                'url': '/' + umamiTrace.qqversion + '/' + umamiTrace.napcatVersion + '/' + eventName,
+                'referrer': 'https://napcat.onebot.napneko.icu/' + umamiTrace.qqversion + '/' + umamiTrace.napcatVersion + '/' + info,
+            }
+        };
+
+        let request = https.request({
+            hostname: '104.19.42.72',// 固定 IP
+            port: 443,
+            path: '/api/send',
+            method: 'POST',
+            headers: {
+                "Host": "umami.napneko.icu",
+                "Content-Type": "application/json",
+                "User-Agent": `Mozilla/5.0 Umami/${process.version}`
+            }
+        }, (res) => {
+            res.on('error', (error) => {
+
+            });
+            res.on('data', (data) => {
+
+            });
+        });
+
+        request.write(JSON.stringify(StatesData));
+        request.end();
+    }
+}

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.33';
+export const napCatVersion = '4.2.45';

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],

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

@@ -30,6 +30,7 @@ import os from 'node:os';
 import { NodeIKernelMsgListener, NodeIKernelProfileListener } from '@/core/listeners';
 import { proxiedListenerOf } from '@/common/proxy-handler';
 import { NTQQPacketApi } from './apis/packet';
+import { umamiTrace } from '@/common/umami';
 export * from './wrapper';
 export * from './types';
 export * from './services';
@@ -152,7 +153,13 @@ export class NapCatCore {
     // Renamed from 'InitDataListener'
     async initNapCatCoreListeners() {
         const msgListener = new NodeIKernelMsgListener();
+
         msgListener.onKickedOffLine = (Info: KickedOffLineInfo) => {
+            if (this.context.workingEnv === NapCatCoreWorkingEnv.Framework) {
+                umamiTrace.trackEvent('framework/kickoff');
+            } else {
+                umamiTrace.trackEvent('shell/kickoff');
+            }
             // 下线通知
             this.context.logger.logError('[KickedOffLine] [' + Info.tipsTitle + '] ' + Info.tipsDesc);
             this.selfInfo.online = false;

src/core/packet/clientSession.ts

@@ -23,7 +23,9 @@ export class PacketClientSession {
     get operation() {
         return this.context.operation;
     }
-
+    get client() {
+        return this.context.client;
+    }
     // TODO: global message element adapter (?
     get msgConverter() {
         return this.context.msgConverter;

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/framework/napcat.ts

@@ -9,6 +9,7 @@ import { NodeIKernelLoginService } from '@/core/services';
 import { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper';
 import { InitWebUi, WebUiConfig } from '@/webui';
 import { NapCatOneBot11Adapter } from '@/onebot';
+import { umamiTrace } from '@/common/umami';
 
 //Framework ES入口文件
 export async function getWebUiUrl() {
@@ -25,16 +26,24 @@ export async function NCoreInitFramework(
     console.log('NapCat Framework App Loading...');
 
     process.on('uncaughtException', (err) => {
+        umamiTrace.trackEvent('framework/error', err.message);
         console.log('[NapCat] [Error] Unhandled Exception:', err.message);
     });
+    
     process.on('unhandledRejection', (reason, promise) => {
         console.log('[NapCat] [Error] unhandledRejection:', reason);
     });
 
+    process.on('exit', (code: number) => {
+        umamiTrace.trackEvent('framework/exit', code.toString());
+    });
+
     const pathWrapper = new NapCatPathWrapper();
     const logger = new LogWrapper(pathWrapper.logsPath);
     const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
     const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
+    umamiTrace.init(basicInfoWrapper.getFullQQVesion());
+    umamiTrace.trackEvent('framework/login');
     //直到登录成功后，执行下一步
     const selfInfo = await new Promise<SelfInfo>((resolveSelfInfo) => {
         const loginListener = new NodeIKernelLoginListener();

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/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.client.sendOidbPacket({ cmd: payload.cmd, data: payload.data as any }, rsp);
+        return typeof data === 'object' ? data.toString('hex') : undefined;
+    }
+}

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

@@ -1,4 +1,4 @@
-import {ContextMode, SendMsgBase} 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';
 

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);
+        let 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,6 +102,9 @@ 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 function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
@@ -123,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),
@@ -216,6 +220,8 @@ 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),
     ];
 
     type HandlerUnion = typeof actionHandlers[number];

src/onebot/action/msg/SendPrivateMsg.ts

@@ -1,4 +1,4 @@
-import {ContextMode, SendMsgBase} from './SendMsg';
+import { ContextMode, SendMsgBase } from './SendMsg';
 import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 import { OB11PostSendMsg } from '@/onebot/types';
 

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) {
+            this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
+        } else {
+            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 const 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',
+    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',
+    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',
+    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',
+    SetQQProfile: 'set_qq_profile',
     // QidianGetAccountInfo : 'qidian_get_account_info',
-    GoCQHTTP_GetModelShow : '_get_model_show',
-    GoCQHTTP_SetModelShow : '_set_model_show',
-    GetOnlineClient : 'get_online_clients',
+    GoCQHTTP_GetModelShow: '_get_model_show',
+    GoCQHTTP_SetModelShow: '_set_model_show',
+    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_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_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',
+    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',
+    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',
+    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",
-
-    GetMiniAppArk : "get_mini_app_ark",
+    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",
+    GetAiRecord: "get_ai_record",
+    GetAiCharacters: "get_ai_characters",
+    SendGroupAiRecord: "send_group_ai_record",
+
+    GetClientkey: "get_clientkey",
+    
+    SendPoke: 'send_poke',
 } as const;

src/onebot/action/system/CanSendImage.ts

@@ -1,5 +1,5 @@
 import { ActionName } from '@/onebot/action/router';
-import CanSendRecord, {CanSend} from './CanSendRecord';
+import CanSendRecord, { CanSend } from './CanSendRecord';
 
 interface ReturnType {
     yes: boolean;

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,6 +21,7 @@ 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';
 
@@ -204,11 +207,25 @@ 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) {
+            let event = await this.parseGroupBanEvent(msg.peerUid, elementWrapper);
+            return event;
+        }
+    }
+
     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?.templId === '10382') {

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

@@ -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)));
@@ -986,7 +990,7 @@ export class OneBotMsgApi {
         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();
+            const operatorUid = groupChange.operatorInfo ? Buffer.from(groupChange.operatorInfo).toString() : '';
             return new OB11GroupIncreaseEvent(
                 this.core,
                 groupChange.groupUin,
@@ -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) {
-        let 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/config/config.ts

@@ -38,6 +38,14 @@ export interface AdapterConfig extends AdapterConfigInner {
 
 const createDefaultAdapterConfig = <T extends AdapterConfig>(config: T): T => config;
 
+export interface PluginConfig extends AdapterConfig {
+    name: string;
+    enable: boolean;
+    messagePostFormat: string;
+    reportSelfMessage: boolean;
+    debug: boolean;
+}
+
 export const httpServerDefaultConfigs = createDefaultAdapterConfig({
     name: 'http-server',
     enable: false as boolean,
@@ -128,7 +136,7 @@ export const mergeNetworkDefaultConfig = {
     websocketClients: websocketClientDefaultConfigs,
 } as const;
 
-export type NetworkConfigAdapter = HttpServerConfig | HttpClientConfig | WebsocketServerConfig | WebsocketClientConfig | AdapterConfig;
+export type NetworkConfigAdapter = HttpServerConfig | HttpClientConfig | WebsocketServerConfig | WebsocketClientConfig | PluginConfig;
 type NetworkConfigKeys = keyof typeof mergeNetworkDefaultConfig;
 
 export function mergeOneBotConfigs(
@@ -234,4 +242,4 @@ export function getConfigBoolKey(
         }
     });
     return result;
-}
+}

src/onebot/event/notice/OB11GroupNameEvent.ts

@@ -0,0 +1,13 @@
+import { OB11GroupNoticeEvent } from './OB11GroupNoticeEvent';
+import { NapCatCore } from '@/core';
+
+export class OB11GroupNameEvent extends OB11GroupNoticeEvent {
+    notice_type = 'notify';
+    sub_type = 'group_name';
+    name_new: string;
+
+    constructor(core: NapCatCore, groupId: number, userId: number, nameNew: string) {
+        super(core, groupId, userId);
+        this.name_new = nameNew;
+    }
+}

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

@@ -16,7 +16,6 @@ import {
 } from '@/core';
 import { OB11ConfigLoader } from '@/onebot/config';
 import {
-    IOB11NetworkAdapter,
     OB11ActiveHttpAdapter,
     OB11ActiveWebSocketAdapter,
     OB11NetworkManager,
@@ -31,7 +30,6 @@ import {
     OneBotMsgApi,
     OneBotQuickActionApi,
     OneBotUserApi,
-    StableOneBotApiWrapper,
 } from '@/onebot/api';
 import { ActionMap, createActionMap } from '@/onebot/action';
 import { WebUiDataRuntime } from '@/webui/src/helper/Data';
@@ -45,9 +43,16 @@ import { OB11GroupRecallNoticeEvent } from '@/onebot/event/notice/OB11GroupRecal
 import { LRUCache } from '@/common/lru-cache';
 import { NodeIKernelRecentContactListener } from '@/core/listeners/NodeIKernelRecentContactListener';
 import { BotOfflineEvent } from './event/notice/BotOfflineEvent';
-import { AdapterConfigWrap, mergeOneBotConfigs, migrateOneBotConfigsV1, NetworkConfigAdapter, OneBotConfig } from './config/config';
+import {
+    AdapterConfigWrap,
+    mergeOneBotConfigs,
+    migrateOneBotConfigsV1,
+    NetworkConfigAdapter,
+    OneBotConfig,
+} from './config/config';
 import { OB11Message } from './types';
 import { OB11PluginAdapter } from './network/plugin';
+import { IOB11NetworkAdapter } from "@/onebot/network/adapter";
 
 //OneBot实现类
 export class NapCatOneBot11Adapter {
@@ -55,7 +60,7 @@ export class NapCatOneBot11Adapter {
     readonly context: InstanceContext;
 
     configLoader: OB11ConfigLoader;
-    public readonly apis: StableOneBotApiWrapper;
+    public readonly apis;
     networkManager: OB11NetworkManager;
     actions: ActionMap;
     private readonly bootTime = Date.now() / 1000;
@@ -72,7 +77,7 @@ export class NapCatOneBot11Adapter {
             UserApi: new OneBotUserApi(this, core),
             FriendApi: new OneBotFriendApi(this, core),
             MsgApi: new OneBotMsgApi(this, core),
-            QuickActionApi: new OneBotQuickActionApi(this, core),
+            QuickActionApi: new OneBotQuickActionApi(this, core)
         } as const;
         this.actions = createActionMap(this, core);
         this.networkManager = new OB11NetworkManager();
@@ -111,12 +116,12 @@ export class NapCatOneBot11Adapter {
 
         // 注册Plugin 如果需要基于NapCat进行快速开发
         // this.networkManager.registerAdapter(
-        //     new OB11PluginAdapter('plugin', this.core, this,this.actions)
+        //     new OB11PluginAdapter('myPlugin', this.core, this,this.actions)
         // );
         for (const key of ob11Config.network.httpServers) {
             if (key.enable) {
                 this.networkManager.registerAdapter(
-                    new OB11PassiveHttpAdapter(key.name, key, this.core, this.actions)
+                    new OB11PassiveHttpAdapter(key.name, key, this.core, this, this.actions)
                 );
             }
         }
@@ -134,6 +139,7 @@ export class NapCatOneBot11Adapter {
                         key.name,
                         key,
                         this.core,
+                        this,
                         this.actions
                     )
                 );
@@ -146,6 +152,7 @@ export class NapCatOneBot11Adapter {
                         key.name,
                         key,
                         this.core,
+                        this,
                         this.actions
                     )
                 );
@@ -157,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) => {
@@ -192,10 +200,12 @@ export class NapCatOneBot11Adapter {
         await this.handleConfigChange(prev.network.websocketClients, now.network.websocketClients, OB11ActiveWebSocketAdapter);
     }
 
-    private async handleConfigChange(
+    private async handleConfigChange<CT extends NetworkConfigAdapter>(
         prevConfig: NetworkConfigAdapter[],
         nowConfig: NetworkConfigAdapter[],
-        adapterClass: new (...args: any[]) => IOB11NetworkAdapter
+        adapterClass: new (
+            ...args: ConstructorParameters<typeof IOB11NetworkAdapter<CT>>
+        ) => IOB11NetworkAdapter<CT>
     ): Promise<void> {
         // 比较旧的在新的找不到的回收
         for (const adapterConfig of prevConfig) {
@@ -216,7 +226,7 @@ export class NapCatOneBot11Adapter {
                     await this.networkManager.closeSomeAdaterWhenOpen([existingAdapter]);
                 }
             } else if (adapterConfig.enable) {
-                const newAdapter = new adapterClass(adapterConfig.name, adapterConfig, this.core, this.actions);
+                const newAdapter = new adapterClass(adapterConfig.name, adapterConfig as CT, this.core, this, this.actions);
                 await this.networkManager.registerAdapterAndOpen(newAdapter);
             }
         }
@@ -301,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 {
@@ -458,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/active-http.ts

@@ -1,27 +1,18 @@
-import { IOB11NetworkAdapter, OB11EmitEventContent, OB11NetworkReloadType } from '@/onebot/network/index';
+import { OB11EmitEventContent, OB11NetworkReloadType } from '@/onebot/network/index';
 import { createHmac } from 'crypto';
-import { LogWrapper } from '@/common/log';
 import { QuickAction, QuickActionEvent } from '@/onebot/types';
 import { NapCatCore } from '@/core';
 import { NapCatOneBot11Adapter } from '..';
 import { RequestUtil } from '@/common/request';
 import { HttpClientConfig } from '@/onebot/config/config';
 import { ActionMap } from '@/onebot/action';
+import { IOB11NetworkAdapter } from "@/onebot/network/adapter";
 
-export class OB11ActiveHttpAdapter implements IOB11NetworkAdapter {
-    logger: LogWrapper;
-    isEnable: boolean = false;
-    config: HttpClientConfig;
-
+export class OB11ActiveHttpAdapter extends IOB11NetworkAdapter<HttpClientConfig> {
     constructor(
-        public name: string,
-        config: HttpClientConfig,
-        public core: NapCatCore,
-        public obContext: NapCatOneBot11Adapter,
-        public actions: ActionMap,
+        name: string, config: HttpClientConfig, core: NapCatCore, obContext: NapCatOneBot11Adapter, actions: ActionMap
     ) {
-        this.logger = core.context.logger;
-        this.config = structuredClone(config);
+        super(name, config, core, obContext, actions);
     }
 
     onEvent<T extends OB11EmitEventContent>(event: T) {
@@ -30,7 +21,6 @@ export class OB11ActiveHttpAdapter implements IOB11NetworkAdapter {
 
     async emitEventAsync<T extends OB11EmitEventContent>(event: T) {
         if (!this.isEnable) return;
-
         const headers: Record<string, string> = {
             'Content-Type': 'application/json',
             'x-self-id': this.core.selfInfo.uin,
@@ -46,10 +36,6 @@ export class OB11ActiveHttpAdapter implements IOB11NetworkAdapter {
         const data = await RequestUtil.HttpGetText(this.config.url, 'POST', msgStr, headers);
         const resJson: QuickAction = data ? JSON.parse(data) : {};
 
-        if (!this.obContext.apis.QuickActionApi.handleQuickOperation) {
-            throw new Error('apis.QuickActionApi.handleQuickOperation 异常');
-        }
-
         await this.obContext.apis.QuickActionApi.handleQuickOperation(event as QuickActionEvent, resJson);
     }
 
@@ -80,4 +66,4 @@ export class OB11ActiveHttpAdapter implements IOB11NetworkAdapter {
 
         return OB11NetworkReloadType.Normal;
     }
-}
+}

src/onebot/network/active-websocket.ts

@@ -1,29 +1,21 @@
-import { IOB11NetworkAdapter, OB11EmitEventContent, OB11NetworkReloadType } from '@/onebot/network/index';
+import { OB11EmitEventContent, OB11NetworkReloadType } from '@/onebot/network/index';
 import { WebSocket } from 'ws';
 import { OB11HeartbeatEvent } from '@/onebot/event/meta/OB11HeartbeatEvent';
 import { NapCatCore } from '@/core';
-import {  ActionName } from '@/onebot/action/router';
+import { ActionName } from '@/onebot/action/router';
 import { OB11Response } from '@/onebot/action/OneBotAction';
-import { LogWrapper } from '@/common/log';
 import { ActionMap } from '@/onebot/action';
 import { LifeCycleSubType, OB11LifeCycleEvent } from '@/onebot/event/meta/OB11LifeCycleEvent';
 import { WebsocketClientConfig } from '@/onebot/config/config';
+import { NapCatOneBot11Adapter } from "@/onebot";
+import { IOB11NetworkAdapter } from "@/onebot/network/adapter";
 
-export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
-    isEnable: boolean = false;
-    logger: LogWrapper;
+export class OB11ActiveWebSocketAdapter extends IOB11NetworkAdapter<WebsocketClientConfig> {
     private connection: WebSocket | null = null;
     private heartbeatRef: NodeJS.Timeout | null = null;
-    public config: WebsocketClientConfig;
 
-    constructor(
-        public name: string,
-        confg: WebsocketClientConfig,
-        public core: NapCatCore,
-        public actions: ActionMap,
-    ) {
-        this.logger = core.context.logger;
-        this.config = structuredClone(confg);
+    constructor(name: string, config: WebsocketClientConfig, core: NapCatCore, obContext: NapCatOneBot11Adapter, actions: ActionMap) {
+        super(name, config, core, obContext, actions);
     }
 
     onEvent<T extends OB11EmitEventContent>(event: T) {

src/onebot/network/adapter.ts

@@ -0,0 +1,33 @@
+import { NetworkConfigAdapter } from "@/onebot/config/config";
+import { LogWrapper } from "@/common/log";
+import { NapCatCore } from "@/core";
+import { NapCatOneBot11Adapter } from "@/onebot";
+import { ActionMap } from "@/onebot/action";
+import { OB11EmitEventContent, OB11NetworkReloadType } from "@/onebot/network/index";
+
+export abstract class IOB11NetworkAdapter<CT extends NetworkConfigAdapter> {
+    name: string;
+    isEnable: boolean = false;
+    config: CT;
+    readonly logger: LogWrapper;
+    readonly core: NapCatCore;
+    readonly obContext: NapCatOneBot11Adapter;
+    readonly actions: ActionMap;
+
+    constructor(name: string, config: CT, core: NapCatCore, obContext: NapCatOneBot11Adapter, actions: ActionMap) {
+        this.name = name;
+        this.config = structuredClone(config);
+        this.core = core;
+        this.obContext = obContext;
+        this.actions = actions;
+        this.logger = core.context.logger;
+    }
+
+    abstract onEvent<T extends OB11EmitEventContent>(event: T): void;
+
+    abstract open(): void | Promise<void>;
+
+    abstract close(): void | Promise<void>;
+
+    abstract reload(config: any): OB11NetworkReloadType | Promise<OB11NetworkReloadType>;
+}

src/onebot/network/index.ts

@@ -1,7 +1,7 @@
 import { OneBotEvent } from '@/onebot/event/OneBotEvent';
 import { OB11Message } from '@/onebot';
-import { ActionMap } from '@/onebot/action';
 import { NetworkConfigAdapter } from '@/onebot/config/config';
+import { IOB11NetworkAdapter } from "@/onebot/network/adapter";
 
 export type OB11EmitEventContent = OneBotEvent | OB11Message;
 export enum OB11NetworkReloadType {
@@ -11,23 +11,9 @@ export enum OB11NetworkReloadType {
     NetWorkClose = 3,
     NetWorkOpen = 4
 }
-export interface IOB11NetworkAdapter {
-    actions: ActionMap;
-    name: string;
-    isEnable: boolean;
-    config: NetworkConfigAdapter;
-
-    onEvent<T extends OB11EmitEventContent>(event: T): void;
-
-    open(): void | Promise<void>;
-
-    close(): void | Promise<void>;
-
-    reload(config: any): OB11NetworkReloadType | Promise<OB11NetworkReloadType>;
-}
 
 export class OB11NetworkManager {
-    adapters: Map<string, IOB11NetworkAdapter> = new Map();
+    adapters: Map<string, IOB11NetworkAdapter<NetworkConfigAdapter>> = new Map();
 
     async openAllAdapters() {
         return Promise.all(Array.from(this.adapters.values()).map(adapter => adapter.open()));
@@ -63,22 +49,22 @@ export class OB11NetworkManager {
         }));
     }
 
-    registerAdapter(adapter: IOB11NetworkAdapter) {
+    registerAdapter<CT extends NetworkConfigAdapter>(adapter: IOB11NetworkAdapter<CT>) {
         this.adapters.set(adapter.name, adapter);
     }
 
-    async registerAdapterAndOpen(adapter: IOB11NetworkAdapter) {
+    async registerAdapterAndOpen<CT extends NetworkConfigAdapter>(adapter: IOB11NetworkAdapter<CT>) {
         this.registerAdapter(adapter);
         await adapter.open();
     }
 
-    async closeSomeAdapters(adaptersToClose: IOB11NetworkAdapter[]) {
+    async closeSomeAdapters<CT extends NetworkConfigAdapter>(adaptersToClose: IOB11NetworkAdapter<CT>[]) {
         for (const adapter of adaptersToClose) {
             this.adapters.delete(adapter.name);
             await adapter.close();
         }
     }
-    async closeSomeAdaterWhenOpen(adaptersToClose: IOB11NetworkAdapter[]) {
+    async closeSomeAdaterWhenOpen<CT extends NetworkConfigAdapter>(adaptersToClose: IOB11NetworkAdapter<CT>[]) {
         for (const adapter of adaptersToClose) {
             this.adapters.delete(adapter.name);
             if (adapter.isEnable) {
@@ -91,7 +77,7 @@ export class OB11NetworkManager {
         return this.adapters.get(name);
     }
 
-    async closeAdapterByPredicate(closeFilter: (adapter: IOB11NetworkAdapter) => boolean) {
+    async closeAdapterByPredicate(closeFilter: (adapter: IOB11NetworkAdapter<NetworkConfigAdapter>) => boolean) {
         const adaptersToClose = Array.from(this.adapters.values()).filter(closeFilter);
         await this.closeSomeAdapters(adaptersToClose);
     }
@@ -118,4 +104,4 @@ export class OB11NetworkManager {
 export * from './active-http';
 export * from './active-websocket';
 export * from './passive-http';
-export * from './passive-websocket';
+export * from './passive-websocket';

src/onebot/network/passive-http.ts

@@ -1,4 +1,4 @@
-import { IOB11NetworkAdapter, OB11NetworkReloadType } from './index';
+import { OB11NetworkReloadType } from './index';
 import express, { Express, Request, Response } from 'express';
 import http from 'http';
 import { NapCatCore } from '@/core';
@@ -6,20 +6,15 @@ import { OB11Response } from '@/onebot/action/OneBotAction';
 import { ActionMap } from '@/onebot/action';
 import cors from 'cors';
 import { HttpServerConfig } from '@/onebot/config/config';
+import { NapCatOneBot11Adapter } from "@/onebot";
+import { IOB11NetworkAdapter } from "@/onebot/network/adapter";
 
-export class OB11PassiveHttpAdapter implements IOB11NetworkAdapter {
+export class OB11PassiveHttpAdapter extends IOB11NetworkAdapter<HttpServerConfig> {
     private app: Express | undefined;
     private server: http.Server | undefined;
-    isEnable: boolean = false;
-    public config: HttpServerConfig;
 
-    constructor(
-        public name: string,
-        config: HttpServerConfig,
-        public core: NapCatCore,
-        public actions: ActionMap,
-    ) {
-        this.config = structuredClone(config);
+    constructor(name: string, config: HttpServerConfig, core: NapCatCore, obContext: NapCatOneBot11Adapter, actions: ActionMap) {
+        super(name, config, core, obContext, actions);
     }
 
     onEvent() {

src/onebot/network/passive-websocket.ts

@@ -1,36 +1,29 @@
-import { IOB11NetworkAdapter, OB11EmitEventContent, OB11NetworkReloadType } from './index';
+import { OB11EmitEventContent, OB11NetworkReloadType } from './index';
 import urlParse from 'url';
 import { WebSocket, WebSocketServer } from 'ws';
 import { Mutex } from 'async-mutex';
 import { OB11Response } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { NapCatCore } from '@/core';
-import { LogWrapper } from '@/common/log';
 import { OB11HeartbeatEvent } from '@/onebot/event/meta/OB11HeartbeatEvent';
 import { IncomingMessage } from 'http';
 import { ActionMap } from '@/onebot/action';
 import { LifeCycleSubType, OB11LifeCycleEvent } from '@/onebot/event/meta/OB11LifeCycleEvent';
 import { WebsocketServerConfig } from '@/onebot/config/config';
+import { NapCatOneBot11Adapter } from "@/onebot";
+import { IOB11NetworkAdapter } from "@/onebot/network/adapter";
 
-export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
+export class OB11PassiveWebSocketAdapter extends IOB11NetworkAdapter<WebsocketServerConfig> {
     wsServer: WebSocketServer;
     wsClients: WebSocket[] = [];
     wsClientsMutex = new Mutex();
-    isEnable: boolean = false;
-    heartbeatInterval: number = 0;
-    logger: LogWrapper;
-    public config: WebsocketServerConfig;
     private heartbeatIntervalId: NodeJS.Timeout | null = null;
     wsClientWithEvent: WebSocket[] = [];
 
     constructor(
-        public name: string,
-        config: WebsocketServerConfig,
-        public core: NapCatCore,
-        public actions: ActionMap,
+        name: string, config: WebsocketServerConfig, core: NapCatCore, obContext: NapCatOneBot11Adapter, actions: ActionMap
     ) {
-        this.config = structuredClone(config);
-        this.logger = core.context.logger;
+        super(name, config, core, obContext, actions);
         this.wsServer = new WebSocketServer({
             port: this.config.port,
             host: this.config.host === '0.0.0.0' ? '' : this.config.host,
@@ -106,7 +99,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
         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();
         }
 
@@ -140,11 +133,11 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
             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) {
@@ -191,7 +184,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
         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) {
@@ -220,7 +213,6 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
                 clearInterval(this.heartbeatIntervalId);
                 this.heartbeatIntervalId = null;
             }
-            this.heartbeatInterval = newConfig.heartInterval;
             if (newConfig.heartInterval > 0 && this.isEnable) {
                 this.registerHeartBeat();
             }

src/onebot/network/plugin.ts

@@ -1,42 +1,37 @@
-import { IOB11NetworkAdapter, OB11EmitEventContent, OB11NetworkReloadType } from './index';
+import { OB11EmitEventContent, OB11NetworkReloadType } from './index';
 import { NapCatOneBot11Adapter, OB11Message } from '@/onebot';
 import { NapCatCore } from '@/core';
-import { AdapterConfig } from '../config/config';
+import { PluginConfig } from '../config/config';
 import { plugin_onmessage } from '@/plugin';
 import { ActionMap } from '../action';
+import { IOB11NetworkAdapter } from "@/onebot/network/adapter";
 
-export class OB11PluginAdapter implements IOB11NetworkAdapter {
-    isEnable: boolean = true;
-    public config: AdapterConfig;
-
+export class OB11PluginAdapter extends IOB11NetworkAdapter<PluginConfig> {
     constructor(
-        public name: string,
-        public core: NapCatCore,
-        public obCore: NapCatOneBot11Adapter,
-        public actions: ActionMap,
+        name: string, core: NapCatCore, obContext: NapCatOneBot11Adapter, actions: ActionMap
     ) {
-        // 基础配置
-        this.config = {
+        const config = {
             name: name,
             messagePostFormat: 'array',
             reportSelfMessage: false,
             enable: true,
             debug: false,
-        }
+        };
+        super(name, config, core, obContext, actions);
     }
 
     onEvent<T extends OB11EmitEventContent>(event: T) {
         if (event.post_type === 'message') {
-             plugin_onmessage(this.config.name, this.core, this.obCore, event as OB11Message,this.actions).then().catch();
+            plugin_onmessage(this.config.name, this.core, this.obContext, event as OB11Message,this.actions).then().catch();
         }
     }
 
     open() {
-
+        this.isEnable = true;
     }
 
     async close() {
-
+        this.isEnable = false;
     }
 
     async reload() {

src/plugin/index.ts

@@ -1,10 +1,10 @@
 import { NapCatOneBot11Adapter, OB11Message } from "@/onebot";
-import { NapCatCore } from "../core";
+import { NapCatCore } from "@/core";
 import { ActionMap } from "@/onebot/action";
 
-export const plugin_onmessage = async (adapter: string, core: NapCatCore, obCore: NapCatOneBot11Adapter, message: OB11Message, action: ActionMap) => {
+export const plugin_onmessage = async (adapter: string, core: NapCatCore, obCtx: NapCatOneBot11Adapter, message: OB11Message, action: ActionMap) => {
     if (message.raw_message === 'ping') {
         const ret = await action.get('send_group_msg')?.handle({ group_id: String(message.group_id), message: 'pong' }, adapter);
         console.log(ret);
     }
-}
+};

src/shell/base.ts

@@ -29,9 +29,11 @@ import { InitWebUi } from '@/webui';
 import { WebUiDataRuntime } from '@/webui/src/helper/Data';
 import { napCatVersion } from '@/common/version';
 import { NodeIO3MiscListener } from '@/core/listeners/NodeIO3MiscListener';
+import { umamiTrace } from '@/common/umami';
 // NapCat Shell App ES 入口文件
 async function handleUncaughtExceptions(logger: LogWrapper) {
     process.on('uncaughtException', (err) => {
+        umamiTrace.trackEvent('framework/error', err.message);
         logger.logError('[NapCat] [Error] Unhandled Exception:', err.message);
     });
     process.on('unhandledRejection', (reason, promise) => {
@@ -151,6 +153,7 @@ async function handleLogin(
         };
 
         loginListener.onQRCodeSessionFailed = (errType: number, errCode: number, errMsg: string) => {
+            umamiTrace.trackEvent('shell/login/error/' + errType.toString() + '-' + errCode.toString(), errMsg);
             if (!isLogined) {
                 logger.logError('[Core] [Login] Login Error,ErrCode: ', errCode, ' ErrMsg:', errMsg);
                 if (errType == 1 && errCode == 3) {
@@ -161,7 +164,8 @@ async function handleLogin(
         };
 
         loginListener.onLoginFailed = (args) => {
-            logger.logError('[Core] [Login] Login Error , ErrInfo: ', args);
+            umamiTrace.trackEvent('shell/login/error/' + args.toString(), args.toString());
+            logger.logError('[Core] [Login] Login Error , ErrInfo: ', args.toString());
         };
 
         loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger));
@@ -222,7 +226,7 @@ async function handleLogin(
                 logger.log(`可用于快速登录的 QQ：\n${historyLoginList
                     .map((u, index) => `${index + 1}. ${u.uin} ${u.nickName}`)
                     .join('\n')
-                }`);
+                    }`);
             }
             loginService.getQRCodePicture();
         }
@@ -266,10 +270,13 @@ export async function NCoreInitShell() {
     const pathWrapper = new NapCatPathWrapper();
     const logger = new LogWrapper(pathWrapper.logsPath);
     handleUncaughtExceptions(logger);
-
+    process.on('exit', (code: number) => {
+        umamiTrace.trackEvent('shell/exit', code.toString());
+    });
     const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
     const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
-
+    umamiTrace.init(basicInfoWrapper.getFullQQVesion());
+    umamiTrace.trackEvent('shell/boot');
     const o3Service = wrapper.NodeIO3MiscService.get();
     o3Service.addO3MiscListener(new NodeIO3MiscListener());
 
@@ -297,7 +304,7 @@ export async function NCoreInitShell() {
     o3Service.reportAmgomWeather('login', 'a1', [dataTimestape, '0', '0']);
 
     const selfInfo = await handleLogin(loginService, logger, pathWrapper, quickLoginUin, historyLoginList);
-
+    umamiTrace.trackEvent('shell/login');
     const amgomDataPiece = 'eb1fd6ac257461580dc7438eb099f23aae04ca679f4d88f53072dc56e3bb1129';
     o3Service.setAmgomDataPiece(basicInfoWrapper.QQVersionAppid, new Uint8Array(Buffer.from(amgomDataPiece, 'hex')));
 

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/helper/config.ts

@@ -90,7 +90,7 @@ export class WebUiConfigWrapper {
         try {
             const configPath = resolve(webUiPathWrapper.configPath, './webui.json');
 
-            if (!await fs.access(configPath, constants.R_OK | constants.W_OK).then(() => true).catch(() => false)) {
+            if (!await fs.access(configPath, constants.R_OK).then(() => true).catch(() => false)) {
                 await fs.writeFile(configPath, JSON.stringify(defaultconfig, null, 4));
             }
 

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