From 795e64a92463523a3cbe80b06fe2f6cf42bff398 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: Tue, 27 Jan 2026 15:17:58 +0800 Subject: [PATCH 1/2] Update OpenAPI version and use dynamic version from napcat-common Changed OpenAPI spec version to 3.1.0 and replaced the hardcoded API version with napCatVersion from napcat-common. Added napcat-common as a dependency in package.json. --- packages/napcat-core/apis/online.ts | 13 +++++++------ .../action/extends/ClickInlineKeyboardButton.ts | 5 +++-- packages/napcat-schema/index.ts | 5 +++-- packages/napcat-schema/package.json | 3 ++- pnpm-lock.yaml | 3 +++ 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/packages/napcat-core/apis/online.ts b/packages/napcat-core/apis/online.ts index 967ff737..4a89c61b 100644 --- a/packages/napcat-core/apis/online.ts +++ b/packages/napcat-core/apis/online.ts @@ -114,8 +114,9 @@ export class NTQQOnlineApi { fileElement: { fileName: actualFolderName, filePath: folderPath, + fileSize: "", }, - } as any; + }; const msgService = this.context.session.getMsgService(); const startTime = Math.floor(Date.now() / 1000) - 2; @@ -173,7 +174,7 @@ export class NTQQOnlineApi { * 获取好友的在线文件消息 * @param peer */ - async getOnlineFileMsg (peer: Peer) : Promise { + async getOnlineFileMsg (peer: Peer): Promise { const msgService = this.context.session.getMsgService(); return await msgService.getOnlineFileMsgs(peer); } @@ -183,7 +184,7 @@ export class NTQQOnlineApi { * @param peer * @param msgId */ - async cancelMyOnlineFileMsg (peer: Peer, msgId: string) : Promise { + async cancelMyOnlineFileMsg (peer: Peer, msgId: string): Promise { const msgService = this.context.session.getMsgService(); await msgService.cancelSendMsg(peer, msgId); } @@ -194,7 +195,7 @@ export class NTQQOnlineApi { * @param msgId * @param elementId */ - async refuseOnlineFileMsg (peer: Peer, msgId: string, elementId: string) : Promise { + async refuseOnlineFileMsg (peer: Peer, msgId: string, elementId: string): Promise { const msgService = this.context.session.getMsgService(); const arrToSend = { msgId, @@ -215,7 +216,7 @@ export class NTQQOnlineApi { * @param elementId * @constructor */ - async receiveOnlineFileOrFolder (peer: Peer, msgId: string, elementId: string) : Promise { + async receiveOnlineFileOrFolder (peer: Peer, msgId: string, elementId: string): Promise { const msgService = this.context.session.getMsgService(); const arrToSend = { msgId, @@ -233,7 +234,7 @@ export class NTQQOnlineApi { * @param peer * @param msgId */ - async switchFileToOffline (peer: Peer, msgId: string) : Promise { + async switchFileToOffline (peer: Peer, msgId: string): Promise { const msgService = this.context.session.getMsgService(); await msgService.switchToOfflineSendMsg(peer, msgId); } diff --git a/packages/napcat-onebot/action/extends/ClickInlineKeyboardButton.ts b/packages/napcat-onebot/action/extends/ClickInlineKeyboardButton.ts index 465f04b2..7da559c9 100644 --- a/packages/napcat-onebot/action/extends/ClickInlineKeyboardButton.ts +++ b/packages/napcat-onebot/action/extends/ClickInlineKeyboardButton.ts @@ -19,7 +19,8 @@ type ReturnType = Static; export class ClickInlineKeyboardButton extends OneBotAction { override actionName = ActionName.ClickInlineKeyboardButton; override payloadSchema = PayloadSchema; - override returnSchema = ReturnSchema; override actionSummary = '点击内联键盘按钮'; + override returnSchema = ReturnSchema; + override actionSummary = '点击内联键盘按钮'; override actionTags = ['消息扩展']; override payloadExample = { group_id: '123456', @@ -29,7 +30,7 @@ export class ClickInlineKeyboardButton extends OneBotAction = { - openapi: '3.0.1', + openapi: '3.1.0', info: { title: 'NapCat OneBot 11 HTTP API', description: 'NapCatOneBot11 HTTP POST 接口文档', - version: '1.0.0' + version: napCatVersion }, tags: [ { name: '消息接口', description: '发送、删除、获取消息相关接口' }, diff --git a/packages/napcat-schema/package.json b/packages/napcat-schema/package.json index 27e62dad..72098baa 100644 --- a/packages/napcat-schema/package.json +++ b/packages/napcat-schema/package.json @@ -9,7 +9,8 @@ }, "dependencies": { "@sinclair/typebox": "^0.34.38", - "napcat-onebot": "workspace:*" + "napcat-onebot": "workspace:*", + "napcat-common": "workspace:*" }, "devDependencies": { "tsx": "^4.7.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5dc9e4d0..ae94931c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -261,6 +261,9 @@ importers: '@sinclair/typebox': specifier: ^0.34.38 version: 0.34.41 + napcat-common: + specifier: workspace:* + version: link:../napcat-common napcat-onebot: specifier: workspace:* version: link:../napcat-onebot From 7b9c42cfca9f494cf3153624556de984b19c9944 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: Tue, 27 Jan 2026 15:23:12 +0800 Subject: [PATCH 2/2] Update napcat-schema build and OpenAPI version Renamed the build script from build:schema to build:openapi in napcat-schema and updated the workflow to use the new script. Changed OpenAPI version from 3.1.0 to 3.0.1 in the schema generator. Added napcat-vite as a dependency and integrated its version plugin into the Vite config. --- .github/workflows/auto-release.yml | 2 +- packages/napcat-schema/index.ts | 2 +- packages/napcat-schema/package.json | 5 +++-- packages/napcat-schema/vite.config.ts | 3 ++- pnpm-lock.yaml | 3 +++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 4358b4fc..ab68845c 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -38,7 +38,7 @@ jobs: - name: Build napcat-schema run: | cd packages/napcat-schema - pnpm run build:schema + pnpm run build:openapi - name: Checkout NapCatDocs uses: actions/checkout@v4 diff --git a/packages/napcat-schema/index.ts b/packages/napcat-schema/index.ts index 360445ea..513339bb 100644 --- a/packages/napcat-schema/index.ts +++ b/packages/napcat-schema/index.ts @@ -66,7 +66,7 @@ export function generateOpenAPI () { } const openapi: Record = { - openapi: '3.1.0', + openapi: '3.0.1', info: { title: 'NapCat OneBot 11 HTTP API', description: 'NapCatOneBot11 HTTP POST 接口文档', diff --git a/packages/napcat-schema/package.json b/packages/napcat-schema/package.json index 72098baa..3455497b 100644 --- a/packages/napcat-schema/package.json +++ b/packages/napcat-schema/package.json @@ -5,12 +5,13 @@ "type": "module", "main": "index.ts", "scripts": { - "build:schema": "vite build & node ./dist/schemas.mjs" + "build:openapi": "vite build & node ./dist/schemas.mjs" }, "dependencies": { "@sinclair/typebox": "^0.34.38", "napcat-onebot": "workspace:*", - "napcat-common": "workspace:*" + "napcat-common": "workspace:*", + "napcat-vite": "workspace:*" }, "devDependencies": { "tsx": "^4.7.1", diff --git a/packages/napcat-schema/vite.config.ts b/packages/napcat-schema/vite.config.ts index ab8d4fb9..e77ccdd4 100644 --- a/packages/napcat-schema/vite.config.ts +++ b/packages/napcat-schema/vite.config.ts @@ -2,7 +2,7 @@ import { defineConfig } from 'vite'; import path, { resolve } from 'path'; import { builtinModules } from 'module'; import nodeResolve from '@rollup/plugin-node-resolve'; - +import napcatVersion from 'napcat-vite/vite-plugin-version'; // 依赖排除 const external = [ 'ws', @@ -25,6 +25,7 @@ export default defineConfig({ }, plugins: [ nodeResolve(), + napcatVersion() ], build: { target: 'esnext', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ae94931c..bcf80996 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -267,6 +267,9 @@ importers: napcat-onebot: specifier: workspace:* version: link:../napcat-onebot + napcat-vite: + specifier: workspace:* + version: link:../napcat-vite devDependencies: tsx: specifier: ^4.7.1