diff --git a/src/onebot/main.ts b/src/onebot/main.ts index 8ed760c2..9160487f 100644 --- a/src/onebot/main.ts +++ b/src/onebot/main.ts @@ -1,7 +1,7 @@ import { InstanceContext, MsgListener, NapCatCore, RawMessage } from '@/core'; import { OB11Config } from './helper/config'; import { NapCatPathWrapper } from '@/common/framework/napcat'; -import { OneBotApiContextType } from './types/adapter'; +import { OneBotApiContextType } from '@/onebot/types'; import { OneBotFriendApi, OneBotGroupApi, OneBotUserApi } from './api'; import { OB11ActiveHttpAdapter, OB11ActiveWebSocketAdapter, OB11NetworkManager, OB11PassiveHttpAdapter, OB11PassiveWebSocketAdapter } from '@/onebot/network'; import { OB11InputStatusEvent } from '@/onebot/event/notice/OB11InputStatusEvent'; @@ -55,28 +55,28 @@ export class NapCatOneBot11Adapter { this.context.logger.log(`[Notice] [OneBot11] ${serviceInfo}`); //创建NetWork服务 - let actions = createActionMap(this, this.core); + const actions = createActionMap(this, this.core); if (ob11Config.http.enable) { await this.networkManager.registerAdapter(new OB11PassiveHttpAdapter( ob11Config.http.port, ob11Config.token, this.core, this )); } if (ob11Config.http.enablePost) { - ob11Config.http.postUrls.forEach(async url => { - await this.networkManager.registerAdapter(new OB11ActiveHttpAdapter( + ob11Config.http.postUrls.forEach(url => { + this.networkManager.registerAdapter(new OB11ActiveHttpAdapter( url, ob11Config.heartInterval, ob11Config.token, this.core, this )); }); } if (ob11Config.ws.enable) { - let OBPassiveWebSocketAdapter = new OB11PassiveWebSocketAdapter( + const OBPassiveWebSocketAdapter = new OB11PassiveWebSocketAdapter( ob11Config.ws.host, ob11Config.ws.port, ob11Config.heartInterval, ob11Config.token, this.core, this - ) + ); await this.networkManager.registerAdapter(OBPassiveWebSocketAdapter); } if (ob11Config.reverseWs.enable) { - ob11Config.reverseWs.urls.forEach(async url => { - await this.networkManager.registerAdapter(new OB11ActiveWebSocketAdapter( + ob11Config.reverseWs.urls.forEach(url => { + this.networkManager.registerAdapter(new OB11ActiveWebSocketAdapter( url, 5000, ob11Config.heartInterval, this.core, this )); });