From eab930c083af7390a364047f64fd10ebdd6374a7 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, 19 Aug 2024 19:33:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?doc:=20=E5=B0=8Ftip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6267acc5..c2fab0c4 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ ## To Be Continued 当前版本请使用内核构建版本（版本号最后的五位数）为 26702 至 26909 的 PC NTQQ 运行。 +高版本QQ NapCat已完成兼容 暂时不发布 直至版本2.0.x结束。 + ## 项目介绍 NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现。 From d76503995c444a32724c2cbe1b14c9801a0fc36a 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, 19 Aug 2024 20:24:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20ws=E5=BF=83=E8=B7=B3=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/onebot/network/active-websocket.ts | 6 ++++++ src/onebot/network/passive-websocket.ts | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/onebot/network/active-websocket.ts b/src/onebot/network/active-websocket.ts index 3419d9d4..b8aa4530 100644 --- a/src/onebot/network/active-websocket.ts +++ b/src/onebot/network/active-websocket.ts @@ -79,6 +79,12 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter { }, }); + this.connection.on('ping', () => { + this.connection?.pong(); + }); + this.connection.on('pong', () => { + //this.logger.logDebug('[OneBot] [WebSocket Client] 收到pong'); + }); this.connection.on('open', () => { try { this.connectEvent(this.coreContext); diff --git a/src/onebot/network/passive-websocket.ts b/src/onebot/network/passive-websocket.ts index 9823e713..0ded05a9 100644 --- a/src/onebot/network/passive-websocket.ts +++ b/src/onebot/network/passive-websocket.ts @@ -50,6 +50,12 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter { wsClient.on('message', (message) => { this.handleMessage(wsClient, message).then().catch(this.logger.logError); }); + wsClient.on('ping', () => { + wsClient.pong(); + }); + wsClient.on('pong', () => { + //this.logger.logDebug('[OneBot] [WebSocket Server] Pong received'); + }); wsClient.once('close', () => { this.wsClientsMutex.runExclusive(async () => { const index = this.wsClients.indexOf(wsClient); From d22f5d369cf4eb4927c2208488ba27209fdc7fe3 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, 19 Aug 2024 20:27:04 +0800 Subject: [PATCH 3/3] releas: v2.0.34 --- manifest.json | 2 +- package.json | 2 +- src/common/framework/napcat.ts | 2 +- src/onebot/action/msg/SendMsg/create-send-elements.ts | 4 ++-- src/onebot/helper/data.ts | 2 +- src/webui/ui/NapCat.ts | 2 +- static/assets/renderer.js | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest.json b/manifest.json index 1508f73c..d4b59a65 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "NapCatQQ", "slug": "NapCat.Framework", "description": "高性能的 OneBot 11 协议实现", - "version": "2.0.33", + "version": "2.0.34", "icon": "./logo.png", "authors": [ { diff --git a/package.json b/package.json index 072bf694..024d4dac 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "2.0.33", + "version": "2.0.34", "scripts": { "build:framework": "vite build --mode framework", "build:shell": "vite build --mode shell", diff --git a/src/common/framework/napcat.ts b/src/common/framework/napcat.ts index 27799126..d9cf1a08 100644 --- a/src/common/framework/napcat.ts +++ b/src/common/framework/napcat.ts @@ -2,7 +2,7 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import fs from 'fs'; -export const napcat_version = '2.0.33'; +export const napcat_version = '2.0.34'; export class NapCatPathWrapper { binaryPath: string; diff --git a/src/onebot/action/msg/SendMsg/create-send-elements.ts b/src/onebot/action/msg/SendMsg/create-send-elements.ts index 397542e1..d1b51405 100644 --- a/src/onebot/action/msg/SendMsg/create-send-elements.ts +++ b/src/onebot/action/msg/SendMsg/create-send-elements.ts @@ -56,7 +56,7 @@ const _handlers: { if (atQQ === 'all') return SendMsgElementConstructor.at(coreContext, atQQ, atQQ, AtType.atAll, '全体成员'); // then the qq is a group member - // Mlikiowa V2.0.33 Refactor Todo + // Mlikiowa V2.0.34 Refactor Todo const uid = await coreContext.apis.UserApi.getUidByUinV2(`${atQQ}`); if (!uid) throw new Error('Get Uid Error'); return SendMsgElementConstructor.at(coreContext, atQQ, uid, AtType.atUser, ''); @@ -161,7 +161,7 @@ const _handlers: { } else { postData = data; } - // Mlikiowa V2.0.33 Refactor Todo + // Mlikiowa V2.0.34 Refactor Todo const signUrl = obContext.configLoader.configData.musicSignUrl; if (!signUrl) { if (data.type === 'qq') { diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts index 0ffcd2e1..7cb7e9e2 100644 --- a/src/onebot/helper/data.ts +++ b/src/onebot/helper/data.ts @@ -419,7 +419,7 @@ export class OB11Constructor { return; } //log("group msg", msg); - // Mlikiowa V2.0.33 Refactor Todo + // Mlikiowa V2.0.34 Refactor Todo // if (msg.senderUin && msg.senderUin !== '0') { // const member = await getGroupMember(msg.peerUid, msg.senderUin); // if (member && member.cardName !== msg.sendMemberName) { diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts index db1dc626..1e1092e3 100644 --- a/src/webui/ui/NapCat.ts +++ b/src/webui/ui/NapCat.ts @@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) { SettingItem( 'Napcat', undefined, - SettingButton('V2.0.33', 'napcat-update-button', 'secondary'), + SettingButton('V2.0.34', 'napcat-update-button', 'secondary'), ), ]), SettingList([ diff --git a/static/assets/renderer.js b/static/assets/renderer.js index 6d3a8dac..ad2e5327 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) { SettingItem( 'Napcat', void 0, - SettingButton("V2.0.33", "napcat-update-button", "secondary") + SettingButton("V2.0.34", "napcat-update-button", "secondary") ) ]), SettingList([