From d3062de5f9f2004508b8bd3ab979aab218019338 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 08:43:46 +0000 Subject: [PATCH 1/3] chore(deps-dev): bump @rollup/plugin-node-resolve from 15.3.1 to 16.0.0 Bumps [@rollup/plugin-node-resolve](https://github.com/rollup/plugins/tree/HEAD/packages/node-resolve) from 15.3.1 to 16.0.0. - [Changelog](https://github.com/rollup/plugins/blob/master/packages/node-resolve/CHANGELOG.md) - [Commits](https://github.com/rollup/plugins/commits/commonjs-v16.0.0/packages/node-resolve) --- updated-dependencies: - dependency-name: "@rollup/plugin-node-resolve" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2345a369..c7342b9f 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@eslint/js": "^9.14.0", "@log4js-node/log4js-api": "^1.0.2", "@napneko/nap-proto-core": "^0.0.4", - "@rollup/plugin-node-resolve": "^15.2.3", + "@rollup/plugin-node-resolve": "^16.0.0", "@rollup/plugin-typescript": "^11.1.6", "@types/cors": "^2.8.17", "@sinclair/typebox": "^0.34.9", From f75213628354f619cad19f7fb6c42f92447b7cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Mon, 16 Dec 2024 21:06:51 +0800 Subject: [PATCH 2/3] fix: #631 --- src/onebot/network/active-http.ts | 5 +++++ src/onebot/network/active-websocket.ts | 6 +++--- src/onebot/network/passive-websocket.ts | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/onebot/network/active-http.ts b/src/onebot/network/active-http.ts index 42e34e02..57a7b799 100644 --- a/src/onebot/network/active-http.ts +++ b/src/onebot/network/active-http.ts @@ -45,6 +45,11 @@ 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); } diff --git a/src/onebot/network/active-websocket.ts b/src/onebot/network/active-websocket.ts index 47d75a6e..b73e95e5 100644 --- a/src/onebot/network/active-websocket.ts +++ b/src/onebot/network/active-websocket.ts @@ -2,7 +2,7 @@ import { IOB11NetworkAdapter, OB11EmitEventContent, OB11NetworkReloadType } from 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'; @@ -133,7 +133,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter { } private async handleMessage(message: any) { - let receiveData: { action: ActionName, params?: any, echo?: any } = { action: ActionName.Unknown, params: {} }; + let receiveData: { action: typeof ActionName[keyof typeof ActionName], params?: any, echo?: any } = { action: ActionName.Unknown, params: {} }; let echo = undefined; try { @@ -145,7 +145,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter { return; } receiveData.params = (receiveData?.params) ? receiveData.params : {};// 兼容类型验证 - const action = this.actions.get(receiveData.action); + const action = this.actions.get(receiveData.action as any); if (!action) { this.logger.logError('[OneBot] [WebSocket Client] 发生错误', '不支持的Api ' + receiveData.action); this.checkStateAndReply(OB11Response.error('不支持的Api ' + receiveData.action, 1404, echo)); diff --git a/src/onebot/network/passive-websocket.ts b/src/onebot/network/passive-websocket.ts index 85a73a94..a5b7cb1f 100644 --- a/src/onebot/network/passive-websocket.ts +++ b/src/onebot/network/passive-websocket.ts @@ -166,7 +166,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter { } private async handleMessage(wsClient: WebSocket, message: any) { - let receiveData: { action: ActionName, params?: any, echo?: any } = { action: ActionName.Unknown, params: {} }; + let receiveData: { action: typeof ActionName[keyof typeof ActionName], params?: any, echo?: any } = { action: ActionName.Unknown, params: {} }; let echo = undefined; try { receiveData = JSON.parse(message.toString()); @@ -177,7 +177,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter { return; } receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证 不然类型校验爆炸 - const action = this.actions.get(receiveData.action); + const action = this.actions.get(receiveData.action as any); if (!action) { this.logger.logError('[OneBot] [WebSocket Client] 发生错误', '不支持的API ' + receiveData.action); this.checkStateAndReply(OB11Response.error('不支持的API ' + receiveData.action, 1404, echo), wsClient); From f87a5434062a0a1b635b87471b345aefefca3e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Mon, 16 Dec 2024 21:14:14 +0800 Subject: [PATCH 3/3] fix: #631 --- src/onebot/api/quick-action.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/onebot/api/quick-action.ts b/src/onebot/api/quick-action.ts index 9fc61eb4..5a66c858 100644 --- a/src/onebot/api/quick-action.ts +++ b/src/onebot/api/quick-action.ts @@ -18,8 +18,8 @@ import { ContextMode, createContext, normalize } from '@/onebot/action/msg/SendM import { isNull } from '@/common/helper'; export class OneBotQuickActionApi { - private obContext: NapCatOneBot11Adapter; - private core: NapCatCore; + obContext: NapCatOneBot11Adapter; + core: NapCatCore; constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore) { this.obContext = obContext; this.core = core;