From a56b7ff6366b3cc4d30efa281a29874c309c5a35 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: Sat, 4 May 2024 22:26:36 +0800 Subject: [PATCH 1/5] fix --- src/core | 2 +- src/test/check_image_url.js | 52 ------------------------------------- 2 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 src/test/check_image_url.js diff --git a/src/core b/src/core index db7b4947..16ab139a 160000 --- a/src/core +++ b/src/core @@ -1 +1 @@ -Subproject commit db7b494755d82213da7884451d5c26922debe3bd +Subproject commit 16ab139ae667c573c44f7889aefc22fb0c7c4d14 diff --git a/src/test/check_image_url.js b/src/test/check_image_url.js deleted file mode 100644 index 3301b086..00000000 --- a/src/test/check_image_url.js +++ /dev/null @@ -1,52 +0,0 @@ -import http from 'http'; - -const privateRkey = ''; -function logDebug(...args) { - console.log(...args); -} - -const checkUrl = new Promise((resolve, reject) => { - const uri = new URL('https://gchat.qpic.cn/download?appid=1407&fileid=CgkzNzk0NTAzMjYSFECDMhodswV7nH5Npuf2O8dstvL1GNaGEiD_CijQycnZsuaFA1CAvaMB&spec=0&rkey=CAESKE4_cASDm1t1mbnPfSzEvPzS-iYGLyXhjXjTRIhOHeSVDKkPp6Luaao'); - const options = { - method: 'GET', - host: uri.host, - path: uri.pathname + uri.search, - headers: { - 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36', - 'Accept': '*/*', - 'Range': 'bytes=0-0' - } - }; - const req = http.request(options, (res) => { - logDebug(`Check rkey status: ${res.statusCode}`); - logDebug(`Check rkey headers: ${JSON.stringify(res.headers)}`); - if (res.statusCode == 200 || res.statusCode === 206) { - // console.log('The image URL is accessible.'); - resolve('ok'); - } else { - reject('The image URL is not accessible.'); - } - }); - - req.setTimeout(3000, () => { - req.destroy(); - reject('Check rkey request timed out'); - }); - - req.on('error', (e) => { - console.error(`Problem with rkey request: ${e.message}`); - // reject(e.message); - }); - req.end(); -}); - -const startTime = Date.now(); -checkUrl.then((result) => { - const endTime = Date.now(); - console.log(result); - console.log(`Time elapsed: ${endTime - startTime}ms`); -}).catch((error) => { - const endTime = Date.now(); - console.error(error); - console.log(`Time elapsed: ${endTime - startTime}ms`); -}); From b3c93644fdb02e08ec6770733f90a9e0b26c4cda 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: Sat, 4 May 2024 22:32:22 +0800 Subject: [PATCH 2/5] fix --- .../action/group/GetGroupMemberInfo.ts | 21 ++++++++---------- .../action/group/GetGroupMemberList.ts | 22 +++++++++---------- src/onebot11/server/ws/ReverseWebsocket.ts | 4 +--- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/onebot11/action/group/GetGroupMemberInfo.ts b/src/onebot11/action/group/GetGroupMemberInfo.ts index be70dc1f..9e013e7b 100644 --- a/src/onebot11/action/group/GetGroupMemberInfo.ts +++ b/src/onebot11/action/group/GetGroupMemberInfo.ts @@ -6,13 +6,12 @@ import { ActionName } from '../types'; import { NTQQUserApi } from '@/core/apis/user'; import { log, logDebug } from '@/common/utils/log'; import { isNull } from '../../../common/utils/helper'; -import { WebApi, WebApiGroupMember } from '@/core/apis/webapi'; +import { WebApi } from '@/core/apis/webapi'; export interface PayloadType { group_id: number; user_id: number; - no_cache?: boolean | string; } class GetGroupMemberInfo extends BaseAction { @@ -23,10 +22,7 @@ class GetGroupMemberInfo extends BaseAction { if (!group) { throw (`群(${payload.group_id})不存在`); } - const webGroupMembers: WebApiGroupMember[] = []; - if (payload.no_cache === true || payload.no_cache === 'true') { - // webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString()); - } + const WebGroupMember = await WebApi.getGroupMembers(payload.group_id.toString()); const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString()); // log(member); if (member) { @@ -39,13 +35,14 @@ class GetGroupMemberInfo extends BaseAction { logDebug('获取群成员详细信息失败, 只能返回基础信息', e); } const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member); - for (let i = 0, len = webGroupMembers.length; i < len; i++) { - if (webGroupMembers[i]?.uin && webGroupMembers[i].uin === retMember.user_id) { - retMember.join_time = webGroupMembers[i]?.join_time; - retMember.last_sent_time = webGroupMembers[i]?.last_speak_time; - retMember.qage = webGroupMembers[i]?.qage; - retMember.level = webGroupMembers[i]?.lv.level; + for (let i = 0, len = WebGroupMember.length; i < len; i++) { + if (WebGroupMember[i]?.uin && WebGroupMember[i].uin === retMember.user_id) { + retMember.join_time = WebGroupMember[i]?.join_time; + retMember.last_sent_time = WebGroupMember[i]?.last_speak_time; + retMember.qage = WebGroupMember[i]?.qage; + retMember.level = WebGroupMember[i]?.lv.level; } + } return retMember; } else { diff --git a/src/onebot11/action/group/GetGroupMemberList.ts b/src/onebot11/action/group/GetGroupMemberList.ts index a9254f3d..a1bf0cc8 100644 --- a/src/onebot11/action/group/GetGroupMemberList.ts +++ b/src/onebot11/action/group/GetGroupMemberList.ts @@ -3,7 +3,7 @@ import { OB11GroupMember } from '../../types'; import { OB11Constructor } from '../../constructor'; import BaseAction from '../BaseAction'; import { ActionName } from '../types'; -import { napCatCore, NTQQGroupApi, WebApiGroupMember } from '@/core'; +import { napCatCore, NTQQGroupApi } from '@/core'; import { WebApi } from '@/core/apis/webapi'; import { logDebug } from '@/common/utils/log'; @@ -18,13 +18,13 @@ class GetGroupMemberList extends BaseAction { protected async _handle(payload: PayloadType) { const MemberMap: Map = new Map(); - const webGroupMembers: WebApiGroupMember[] = []; + const WebGroupMember = await WebApi.getGroupMembers(payload.group_id.toString()); // await NTQQGroupApi.getGroupMembers(payload.group_id.toString()); const group = await getGroup(payload.group_id.toString()); if (!group) { throw (`群${payload.group_id}不存在`); } - if (payload.no_cache === true || payload.no_cache === 'true') { + if (payload.no_cache || payload.no_cache === 'true') { // webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString()); const _groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString()); groupMembers.set(group.groupCode, _groupMembers); @@ -36,17 +36,17 @@ class GetGroupMemberList extends BaseAction { MemberMap.set(_groupMembers[i].user_id, _groupMembers[i]); } // 合并数据 - for (let i = 0, len = webGroupMembers.length; i < len; i++) { - if (!webGroupMembers[i]?.uin) { + for (let i = 0, len = WebGroupMember.length; i < len; i++) { + if (!WebGroupMember[i]?.uin) { continue; } - const MemberData = MemberMap.get(webGroupMembers[i]?.uin); + const MemberData = MemberMap.get(WebGroupMember[i]?.uin); if (MemberData) { - MemberData.join_time = webGroupMembers[i]?.join_time; - MemberData.last_sent_time = webGroupMembers[i]?.last_speak_time; - MemberData.qage = webGroupMembers[i]?.qage; - MemberData.level = webGroupMembers[i]?.lv.level; - MemberMap.set(webGroupMembers[i]?.uin, MemberData); + MemberData.join_time = WebGroupMember[i]?.join_time; + MemberData.last_sent_time = WebGroupMember[i]?.last_speak_time; + MemberData.qage = WebGroupMember[i]?.qage; + MemberData.level = WebGroupMember[i]?.lv.level; + MemberMap.set(WebGroupMember[i]?.uin, MemberData); } } // 还原Map到Array diff --git a/src/onebot11/server/ws/ReverseWebsocket.ts b/src/onebot11/server/ws/ReverseWebsocket.ts index 9c8762fd..1fa0dedc 100644 --- a/src/onebot11/server/ws/ReverseWebsocket.ts +++ b/src/onebot11/server/ws/ReverseWebsocket.ts @@ -101,9 +101,7 @@ export class ReverseWebsocket { await this.onmessage(data.toString()); }); - this.websocket.on('error', (err) => { - logError('websocket error', err.toString()); - }); + this.websocket.on('error', log); const wsClientInterval = setInterval(() => { postWsEvent(new OB11HeartbeatEvent(!!selfInfo.online, true, heartInterval)); From e44e2fbbb7078b6458bda228a42f18e77df8b51d 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: Sat, 4 May 2024 22:41:37 +0800 Subject: [PATCH 3/5] fix --- src/core | 2 +- src/onebot11/action/group/GetGroupMemberList.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core b/src/core index 16ab139a..837aab55 160000 --- a/src/core +++ b/src/core @@ -1 +1 @@ -Subproject commit 16ab139ae667c573c44f7889aefc22fb0c7c4d14 +Subproject commit 837aab55e33487077a0299a4068ab71a9337b1e5 diff --git a/src/onebot11/action/group/GetGroupMemberList.ts b/src/onebot11/action/group/GetGroupMemberList.ts index a1bf0cc8..4281f68d 100644 --- a/src/onebot11/action/group/GetGroupMemberList.ts +++ b/src/onebot11/action/group/GetGroupMemberList.ts @@ -19,7 +19,6 @@ class GetGroupMemberList extends BaseAction { protected async _handle(payload: PayloadType) { const MemberMap: Map = new Map(); const WebGroupMember = await WebApi.getGroupMembers(payload.group_id.toString()); - // await NTQQGroupApi.getGroupMembers(payload.group_id.toString()); const group = await getGroup(payload.group_id.toString()); if (!group) { throw (`群${payload.group_id}不存在`); From 0b2c6bb6626219e12906de13e9dcdb43942dc1a2 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: Sat, 4 May 2024 23:22:21 +0800 Subject: [PATCH 4/5] style&feat: cache cookies&group member --- src/core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core b/src/core index 837aab55..08a5970f 160000 --- a/src/core +++ b/src/core @@ -1 +1 @@ -Subproject commit 837aab55e33487077a0299a4068ab71a9337b1e5 +Subproject commit 08a5970f0a632bf71fa9092a471ad79f93fbde25 From a875e6553655b3eb586eff0ec4fa1cfc9a26f4f7 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: Sat, 4 May 2024 23:23:45 +0800 Subject: [PATCH 5/5] doc: change --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59e27b72..2a23fc28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,6 @@ QQ Version: Windows 9.9.9-23361 / Linux 3.2.7-23361 ## 新增与调整 -* 支持WebUi远程配置 - +* 再一次对获取Cookies与获取群成员优化，分别添加30/60/120分钟缓存 +* 新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)