fix: 更精确的筛选

see https://github.com/evanw/esbuild/issues/4010

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.2.34",
+  "version": "4.2.37",
   "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",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.34';
+export const napCatVersion = '4.2.37';

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

@@ -33,7 +33,8 @@ 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';
 
 type RawToOb11Converters = {
     [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: (
@@ -679,7 +680,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)));
@@ -1033,7 +1034,35 @@ 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 = '';
+            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);
+            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,7 +91,7 @@ export class OneBotQuickActionApi {
     }
 
     async handleGroupRequest(request: OB11GroupRequestEvent, quickAction: QuickActionGroupRequest) {
-        let noify = await this.findNotify(request.flag);
+        const noify = await this.findNotify(request.flag);
 
         if (!isNull(quickAction.approve) && noify) {
             this.core.apis.GroupApi.handleGroupRequest(

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/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,
@@ -44,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 {
@@ -110,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)
                 );
             }
         }
@@ -133,6 +139,7 @@ export class NapCatOneBot11Adapter {
                         key.name,
                         key,
                         this.core,
+                        this,
                         this.actions
                     )
                 );
@@ -145,6 +152,7 @@ export class NapCatOneBot11Adapter {
                         key.name,
                         key,
                         this.core,
+                        this,
                         this.actions
                     )
                 );
@@ -191,10 +199,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) {
@@ -215,7 +225,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);
             }
         }
@@ -300,7 +310,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 {
@@ -457,6 +467,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) {
@@ -45,9 +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 || !this.obContext.apis.QuickActionApi.handleQuickOperation) {
-            throw new Error('apis.QuickActionApi.handleQuickOperation 异常');
-        }
         await this.obContext.apis.QuickActionApi.handleQuickOperation(event as QuickActionEvent, resJson);
     }
 
@@ -78,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);
     }
-}
+};