diff --git a/src/onebot/index.ts b/src/onebot/index.ts index f71d4cca..feacf3be 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -16,12 +16,12 @@ import { } from '@/core'; import { OB11ConfigLoader } from '@/onebot/config'; import { - OB11ActiveHttpAdapter, - OB11ActiveWebSocketAdapter, + OB11HttpClientAdapter, + OB11WebSocketClientAdapter, OB11NetworkManager, OB11NetworkReloadType, - OB11PassiveHttpAdapter, - OB11PassiveWebSocketAdapter, + OB11HttpServerAdapter, + OB11WebSocketServerAdapter, } from '@/onebot/network'; import { NapCatPathWrapper } from '@/common/path'; import { @@ -51,7 +51,7 @@ import { import { OB11Message } from './types'; import { OB11PluginAdapter } from './network/plugin'; import { IOB11NetworkAdapter } from "@/onebot/network/adapter"; -import { OB11ActiveHttpSSEAdapter } from './network/active-http-sse'; +import { OB11HttpSSEServerAdapter } from './network/http-server-sse'; //OneBot实现类 export class NapCatOneBot11Adapter { @@ -123,28 +123,28 @@ export class NapCatOneBot11Adapter { for (const key of ob11Config.network.httpServers) { if (key.enable) { this.networkManager.registerAdapter( - new OB11PassiveHttpAdapter(key.name, key, this.core, this, this.actions) + new OB11HttpServerAdapter(key.name, key, this.core, this, this.actions) ); } } for (const key of ob11Config.network.httpSseServers) { if (key.enable) { this.networkManager.registerAdapter( - new OB11ActiveHttpSSEAdapter(key.name, key, this.core, this, this.actions) + new OB11HttpSSEServerAdapter(key.name, key, this.core, this, this.actions) ); } } for (const key of ob11Config.network.httpClients) { if (key.enable) { this.networkManager.registerAdapter( - new OB11ActiveHttpAdapter(key.name, key, this.core, this, this.actions) + new OB11HttpClientAdapter(key.name, key, this.core, this, this.actions) ); } } for (const key of ob11Config.network.websocketServers) { if (key.enable) { this.networkManager.registerAdapter( - new OB11PassiveWebSocketAdapter( + new OB11WebSocketServerAdapter( key.name, key, this.core, @@ -157,7 +157,7 @@ export class NapCatOneBot11Adapter { for (const key of ob11Config.network.websocketClients) { if (key.enable) { this.networkManager.registerAdapter( - new OB11ActiveWebSocketAdapter( + new OB11WebSocketClientAdapter( key.name, key, this.core, @@ -206,11 +206,11 @@ export class NapCatOneBot11Adapter { this.context.logger.log(`[Notice] [OneBot11] 配置变更前:\n${prevLog}`); this.context.logger.log(`[Notice] [OneBot11] 配置变更后:\n${newLog}`); - await this.handleConfigChange(prev.network.httpServers, now.network.httpServers, OB11PassiveHttpAdapter); - await this.handleConfigChange(prev.network.httpClients, now.network.httpClients, OB11ActiveHttpAdapter); - await this.handleConfigChange(prev.network.httpSseServers, now.network.httpSseServers, OB11ActiveHttpSSEAdapter); - await this.handleConfigChange(prev.network.websocketServers, now.network.websocketServers, OB11PassiveWebSocketAdapter); - await this.handleConfigChange(prev.network.websocketClients, now.network.websocketClients, OB11ActiveWebSocketAdapter); + await this.handleConfigChange(prev.network.httpServers, now.network.httpServers, OB11HttpServerAdapter); + await this.handleConfigChange(prev.network.httpClients, now.network.httpClients, OB11HttpClientAdapter); + await this.handleConfigChange(prev.network.httpSseServers, now.network.httpSseServers, OB11HttpSSEServerAdapter); + await this.handleConfigChange(prev.network.websocketServers, now.network.websocketServers, OB11WebSocketServerAdapter); + await this.handleConfigChange(prev.network.websocketClients, now.network.websocketClients, OB11WebSocketClientAdapter); } private async handleConfigChange( diff --git a/src/onebot/network/active-http.ts b/src/onebot/network/http-client.ts similarity index 97% rename from src/onebot/network/active-http.ts rename to src/onebot/network/http-client.ts index 1a18746a..4dbc6924 100644 --- a/src/onebot/network/active-http.ts +++ b/src/onebot/network/http-client.ts @@ -8,7 +8,7 @@ import { HttpClientConfig } from '@/onebot/config/config'; import { ActionMap } from '@/onebot/action'; import { IOB11NetworkAdapter } from "@/onebot/network/adapter"; -export class OB11ActiveHttpAdapter extends IOB11NetworkAdapter { +export class OB11HttpClientAdapter extends IOB11NetworkAdapter { constructor( name: string, config: HttpClientConfig, core: NapCatCore, obContext: NapCatOneBot11Adapter, actions: ActionMap ) { diff --git a/src/onebot/network/active-http-sse.ts b/src/onebot/network/http-server-sse.ts similarity index 89% rename from src/onebot/network/active-http-sse.ts rename to src/onebot/network/http-server-sse.ts index dbe4eaf4..893dfce7 100644 --- a/src/onebot/network/active-http-sse.ts +++ b/src/onebot/network/http-server-sse.ts @@ -1,9 +1,9 @@ import { OB11EmitEventContent } from './index'; import { Request, Response } from 'express'; import { OB11Response } from '@/onebot/action/OneBotAction'; -import { OB11PassiveHttpAdapter } from './passive-http'; +import { OB11HttpServerAdapter } from './http-server'; -export class OB11ActiveHttpSSEAdapter extends OB11PassiveHttpAdapter { +export class OB11HttpSSEServerAdapter extends OB11HttpServerAdapter { private sseClients: Response[] = []; async handleRequest(req: Request, res: Response): Promise { diff --git a/src/onebot/network/passive-http.ts b/src/onebot/network/http-server.ts similarity index 98% rename from src/onebot/network/passive-http.ts rename to src/onebot/network/http-server.ts index 7ed48481..0fed9085 100644 --- a/src/onebot/network/passive-http.ts +++ b/src/onebot/network/http-server.ts @@ -9,7 +9,7 @@ import { HttpServerConfig } from '@/onebot/config/config'; import { NapCatOneBot11Adapter } from "@/onebot"; import { IOB11NetworkAdapter } from "@/onebot/network/adapter"; -export class OB11PassiveHttpAdapter extends IOB11NetworkAdapter { +export class OB11HttpServerAdapter extends IOB11NetworkAdapter { private app: Express | undefined; private server: http.Server | undefined; @@ -98,7 +98,7 @@ export class OB11PassiveHttpAdapter extends IOB11NetworkAdapter { +export class OB11WebSocketClientAdapter extends IOB11NetworkAdapter { private connection: WebSocket | null = null; private heartbeatRef: NodeJS.Timeout | null = null; @@ -143,7 +143,7 @@ export class OB11ActiveWebSocketAdapter extends IOB11NetworkAdapter(OB11Response.error('不支持的Api ' + receiveData.action, 1404, echo)); return; } - const retdata = await action.websocketHandle(receiveData.params, echo ?? '', this.name); + const retdata = await action.websocketHandle(receiveData.params, echo ?? '', this.name, this.config); this.checkStateAndReply({ ...retdata }); } async reload(newConfig: WebsocketClientConfig) { diff --git a/src/onebot/network/passive-websocket.ts b/src/onebot/network/websocket-server.ts similarity index 98% rename from src/onebot/network/passive-websocket.ts rename to src/onebot/network/websocket-server.ts index 4bb4d01a..6cd491a7 100644 --- a/src/onebot/network/passive-websocket.ts +++ b/src/onebot/network/websocket-server.ts @@ -13,7 +13,7 @@ import { WebsocketServerConfig } from '@/onebot/config/config'; import { NapCatOneBot11Adapter } from "@/onebot"; import { IOB11NetworkAdapter } from "@/onebot/network/adapter"; -export class OB11PassiveWebSocketAdapter extends IOB11NetworkAdapter { +export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter { wsServer: WebSocketServer; wsClients: WebSocket[] = []; wsClientsMutex = new Mutex(); @@ -176,7 +176,7 @@ export class OB11PassiveWebSocketAdapter extends IOB11NetworkAdapter(OB11Response.error('不支持的API ' + receiveData.action, 1404, echo), wsClient); return; } - const retdata = await action.websocketHandle(receiveData.params, echo ?? '', this.name); + const retdata = await action.websocketHandle(receiveData.params, echo ?? '', this.name, this.config); this.checkStateAndReply({ ...retdata }, wsClient); }