From 0d84e3b99e85a1f40b5ac039f5ec44fb5d7858c8 Mon Sep 17 00:00:00 2001 From: H3CoF6 <1707889225@qq.com> Date: Thu, 7 May 2026 05:49:13 +0800 Subject: [PATCH 01/11] feat: implemented mark msg as read --- .gitignore | 1 + packages/core/src/bridge/bridge-actions.ts | 50 ++++++++++++++++- packages/core/src/bridge/bridge.ts | 4 ++ packages/core/src/bridge/proto/oidb-action.ts | 19 +++++++ packages/core/src/onebot/actions/extended.ts | 54 ++++++++++++++++--- packages/core/src/onebot/api-handler.ts | 2 + packages/core/src/onebot/instance-context.ts | 2 + 7 files changed, 123 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 750ac362..87914d35 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ node_modules/ dist/ **/dist/ .vscode/ +.idea/ # macOS metadata .DS_Store diff --git a/packages/core/src/bridge/bridge-actions.ts b/packages/core/src/bridge/bridge-actions.ts index 29b2da33..153adf8f 100644 --- a/packages/core/src/bridge/bridge-actions.ts +++ b/packages/core/src/bridge/bridge-actions.ts @@ -42,7 +42,7 @@ import { NTV2RichMediaReqSchema, NTV2RichMediaRespSchema, GroupRecallRequestSchema, - C2CRecallRequestSchema, + C2CRecallRequestSchema, SsoReadedReportReqSchema, } from './proto/oidb-action'; import { FileUploadExtSchema } from './proto/highway'; import { @@ -1242,3 +1242,51 @@ export async function recallPrivateMessage( const result = await bridge.sendRawPacket('trpc.msg.msg_svc.MsgService.SsoC2CRecallMsg', request); if (!result.success) throw new Error(result.errorMessage || 'recall private message failed'); } + +// --- Mark message as read --- + +export async function markPrivateMessageRead( + bridge: Bridge, + userId: number, + msgSeq: number, + timestamp: number = Math.floor(Date.now() / 1000) +): Promise { + const uid = await resolveUserUid(bridge, userId); + + const request = protoEncode({ + c2cList: [ + { + uid, + lastReadTime: BigInt(timestamp), + lastReadSeq: BigInt(msgSeq), + } + ] + }, SsoReadedReportReqSchema); + + const result = await bridge.sendRawPacket('trpc.msg.msg_svc.MsgService.SsoReadedReport', request); + + if (!result.success) { + throw new Error(result.errorMessage || 'mark private message read failed'); + } +} + +export async function markGroupMessageRead( + bridge: Bridge, + groupId: number, + msgSeq: number +): Promise { + const request = protoEncode({ + groupList: [ + { + groupUin: BigInt(groupId), + lastReadSeq: BigInt(msgSeq), + } + ] + }, SsoReadedReportReqSchema); + + const result = await bridge.sendRawPacket('trpc.msg.msg_svc.MsgService.SsoReadedReport', request); + + if (!result.success) { + throw new Error(result.errorMessage || 'mark group message read failed'); + } +} \ No newline at end of file diff --git a/packages/core/src/bridge/bridge.ts b/packages/core/src/bridge/bridge.ts index 9c919c65..744043c4 100644 --- a/packages/core/src/bridge/bridge.ts +++ b/packages/core/src/bridge/bridge.ts @@ -60,6 +60,8 @@ import { setGroupReaction as setGroupReaction_, recallGroupMessage as recallGroupMessage_, recallPrivateMessage as recallPrivateMessage_, + markPrivateMessageRead as markGroupMsgAsRead_, + markGroupMessageRead as markPrivateMsgAsRead_, setFriendRemark as setFriendRemark_, fetchGroupFileCount as fetchGroupFileCount_, } from './bridge-actions'; @@ -445,6 +447,8 @@ export class Bridge { async setGroupReaction(groupId: number, sequence: number, code: string, isSet: boolean): Promise { return setGroupReaction_(this, groupId, sequence, code, isSet); } async recallGroupMessage(groupId: number, sequence: number): Promise { return recallGroupMessage_(this, groupId, sequence); } async recallPrivateMessage(userUin: number, clientSeq: number, msgSeq: number, random: number, timestamp: number): Promise { return recallPrivateMessage_(this, userUin, clientSeq, msgSeq, random, timestamp); } + async markGroupMsgAsRead(groupId: number, sequence: number): Promise { return markGroupMsgAsRead_(this, groupId, sequence); } + async markPrivateMsgAsRead(userId: number, sequence: number): Promise { return markPrivateMsgAsRead_(this, userId, sequence); } async setFriendRemark(userId: number, remark: string): Promise { return setFriendRemark_(this, userId, remark); } async fetchGroupFileCount(groupId: number): Promise<{ fileCount: number; maxCount: number }> { return fetchGroupFileCount_(this, groupId); } } diff --git a/packages/core/src/bridge/proto/oidb-action.ts b/packages/core/src/bridge/proto/oidb-action.ts index 970de8fe..7f79d0f0 100644 --- a/packages/core/src/bridge/proto/oidb-action.ts +++ b/packages/core/src/bridge/proto/oidb-action.ts @@ -786,3 +786,22 @@ export const OidbGroupFileCountViewReqSchema = { export const OidbGroupFileCountViewRespSchema = { count: { field: 3, type: 'message' as const, schema: OidbGroupFileCountRespSchema }, } satisfies ProtoSchema; + + +// --- trpc.msg.msg_svc.MsgService.SsoReadedReport --- + +export const GroupReadedReportItemSchema = { + groupUin: { field: 1, type: 'uint64' as const }, + lastReadSeq: { field: 2, type: 'uint64' as const }, +} satisfies ProtoSchema; + +export const C2CReadedReportItemSchema = { + uid: { field: 2, type: 'string' as const }, + lastReadTime: { field: 3, type: 'uint64' as const }, + lastReadSeq: { field: 4, type: 'uint64' as const }, +} satisfies ProtoSchema; + +export const SsoReadedReportReqSchema = { + groupList: { field: 1, type: 'repeated_message' as const, schema: GroupReadedReportItemSchema }, + c2cList: { field: 2, type: 'repeated_message' as const, schema: C2CReadedReportItemSchema }, +} satisfies ProtoSchema; \ No newline at end of file diff --git a/packages/core/src/onebot/actions/extended.ts b/packages/core/src/onebot/actions/extended.ts index 82e944bc..22547dca 100644 --- a/packages/core/src/onebot/actions/extended.ts +++ b/packages/core/src/onebot/actions/extended.ts @@ -124,10 +124,55 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { return okResponse({ messages }); }); - h.registerAction('mark_msg_as_read', async () => { + h.registerAction('mark_group_msg_as_read', async (params) => { + const messageId = asNumber(params.message_id); + const groupId = asNumber(params.group_id); + + if (!Number.isInteger(messageId) || messageId === 0) { + return failedResponse(RETCODE.BAD_REQUEST, 'message_id is required'); + } + const meta = ctx.getMessageMeta(messageId); + if (!meta) return failedResponse(RETCODE.ACTION_FAILED, 'message not found'); + + if (!meta || !meta.isGroup) { + return failedResponse(RETCODE.ACTION_FAILED, 'message not found or not a group message'); + } + + if (groupId && groupId !== meta.targetId) { + return failedResponse(RETCODE.BAD_REQUEST, 'group_id does not match message session'); + } + + if (!ctx.markGroupMsgAsRead) return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + + await ctx.markGroupMsgAsRead(groupId, meta.sequence); return okResponse(); }); + h.registerAction('mark_private_msg_as_read', async (params) => { + const messageId = asNumber(params.message_id); + const userId = asNumber(params.user_id); + + if (!Number.isInteger(messageId) || messageId === 0) { + return failedResponse(RETCODE.BAD_REQUEST, 'message_id is required'); + } + const meta = ctx.getMessageMeta(messageId); + if (!meta) return failedResponse(RETCODE.ACTION_FAILED, 'message not found'); + + if (!meta || meta.isGroup) { + return failedResponse(RETCODE.ACTION_FAILED, 'message not found or not a private message'); + } + + if (userId && userId !== meta.targetId) { + return failedResponse(RETCODE.BAD_REQUEST, 'user_id does not match message session'); + } + + if (!ctx.markPrivateMsgAsRead) return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + + await ctx.markPrivateMsgAsRead(userId, meta.sequence); + return okResponse(); + }); + + // --- RKey --- h.registerAction('get_rkey', async () => { @@ -347,13 +392,6 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { return okResponse(); }); - h.registerAction('mark_private_msg_as_read', async () => { - return okResponse(); - }); - - h.registerAction('mark_group_msg_as_read', async () => { - return okResponse(); - }); h.registerAction('_mark_all_as_read', async () => { return okResponse(); diff --git a/packages/core/src/onebot/api-handler.ts b/packages/core/src/onebot/api-handler.ts index 2ea3f563..0266d6e3 100644 --- a/packages/core/src/onebot/api-handler.ts +++ b/packages/core/src/onebot/api-handler.ts @@ -78,6 +78,8 @@ export interface ApiActionContext { setFriendRemark?: (userId: number, remark: string) => Promise; getGroupFileCount?: (groupId: number) => Promise<{ fileCount: number; maxCount: number }>; setMsgEmojiLike?: (messageId: number, emojiId: string, set: boolean) => Promise; + markGroupMsgAsRead?: (groupId: number, sequence: number) => Promise; + markPrivateMsgAsRead?: (userId: number, sequence: number) => Promise; } type ActionHandler = (params: JsonObject) => Promise; diff --git a/packages/core/src/onebot/instance-context.ts b/packages/core/src/onebot/instance-context.ts index c8b06140..057b1b4c 100644 --- a/packages/core/src/onebot/instance-context.ts +++ b/packages/core/src/onebot/instance-context.ts @@ -116,6 +116,8 @@ export function buildApiContext(ref: InstanceRef): ApiActionContext { if (!meta || !meta.isGroup) throw new Error('message not found or not a group message'); await bridge.setGroupReaction(meta.targetId, meta.sequence, emojiId, set); }, + markGroupMsgAsRead: (groupId: number, sequence: number) => bridge.markGroupMsgAsRead(groupId, sequence), + markPrivateMsgAsRead: (userId: number, sequence: number) => bridge.markPrivateMsgAsRead(userId, sequence), }; } From 4a51e3d6861cd74061b84e57a5acf0e631f600b0 Mon Sep 17 00:00:00 2001 From: H3CoF6 <1707889225@qq.com> Date: Fri, 8 May 2026 01:56:23 +0800 Subject: [PATCH 02/11] =?UTF-8?q?feat:=20=E5=BC=95=E5=85=A5web=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=AE=9E=E7=8E=B0group=20honor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/src/bridge/bridge-actions.ts | 118 +++++++++++++++++- packages/core/src/bridge/bridge.ts | 5 + packages/core/src/bridge/proto/oidb-action.ts | 32 ++++- packages/core/src/bridge/web/group-honor.ts | 55 ++++++++ packages/core/src/bridge/web/request-util.ts | 111 ++++++++++++++++ .../core/src/onebot/actions/group-info.ts | 29 ++++- packages/core/src/onebot/api-handler.ts | 4 + packages/core/src/onebot/instance-context.ts | 3 + 8 files changed, 349 insertions(+), 8 deletions(-) create mode 100644 packages/core/src/bridge/web/group-honor.ts create mode 100644 packages/core/src/bridge/web/request-util.ts diff --git a/packages/core/src/bridge/bridge-actions.ts b/packages/core/src/bridge/bridge-actions.ts index 153adf8f..91147557 100644 --- a/packages/core/src/bridge/bridge-actions.ts +++ b/packages/core/src/bridge/bridge-actions.ts @@ -10,6 +10,8 @@ import { buildSendElems } from './builders/element-builder'; import { parseMsgPush } from './handlers/msg-push-handler'; import type { ForwardNodePayload, MessageElement } from './events'; import { PushMsgSchema } from './proto/message'; +import { RequestUtil } from './web/request-util'; +import { getHonorListWebAPI, WebHonorType } from './web/group-honor'; import { OidbMuteMemberSchema, OidbMuteAllSchema, @@ -42,7 +44,12 @@ import { NTV2RichMediaReqSchema, NTV2RichMediaRespSchema, GroupRecallRequestSchema, - C2CRecallRequestSchema, SsoReadedReportReqSchema, + C2CRecallRequestSchema, + SsoReadedReportReqSchema, + OidbClientKeyRespSchema, + OidbClientKeyReqSchema, + OidbGetPskeyReqSchema, + OidbGetPskeyRespSchema } from './proto/oidb-action'; import { FileUploadExtSchema } from './proto/highway'; import { @@ -1289,4 +1296,113 @@ export async function markGroupMessageRead( if (!result.success) { throw new Error(result.errorMessage || 'mark group message read failed'); } +} + +export async function forceFetchClientKey(bridge: Bridge) { + const resp = await sendOidbAndDecode( + bridge, + 'OidbSvcTrpcTcp.0x102a_1', + 0x102A, + 1, + {}, + OidbClientKeyReqSchema, + OidbClientKeyRespSchema + ); + + const clientKey = resp?.clientKey || ''; + const keyIndex = String(resp?.keyIndex || '19'); // 不知道是什么 + + return { + clientKey, + keyIndex, + expireTime: String(resp?.expireTime || '1800') + }; +} + +export async function getPSkey(bridge: Bridge, domainList: string[]) { + const resp = await sendOidbAndDecode( + bridge, + 'OidbSvcTrpcTcp.0x102a_0', + 0x102A, + 0, + { domainList }, + OidbGetPskeyReqSchema, + OidbGetPskeyRespSchema + ); + + const domainPskeyMap = new Map(); + + if (resp?.pskeyItems && Array.isArray(resp.pskeyItems)) { + for (const item of resp.pskeyItems) { + if (item.domain && item.pskey) { + domainPskeyMap.set(item.domain, item.pskey); + } + } + } + + return { + domainPskeyMap, + }; +} + +export async function getCookies(bridge: Bridge, domain: string) { + const ClientKeyData = await forceFetchClientKey(bridge); + + // 构造 ptlogin2 跳转 URL + const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + bridge.qqInfo.uin + + '&clientkey=' + ClientKeyData.clientKey + + '&u1=https%3A%2F%2F' + domain + '%2F' + bridge.qqInfo.uin + '%2Finfocenter&keyindex=' + ClientKeyData.keyIndex; + + const data = await RequestUtil.HttpsGetCookies(requestUrl); + + if (!data['p_skey'] || data['p_skey'].length === 0) { + try { + const pskeyData = await getPSkey(bridge, [domain]); + const pskey = pskeyData.domainPskeyMap.get(domain); + if (pskey) { + data['p_skey'] = pskey; + } + } catch { + return data; + } + } + + return data; +} + +export async function getGroupHonorInfo(bridge: Bridge, groupId: number, type: WebHonorType | string) { + const groupCode = groupId.toString(); + const cookieObject = await getCookies(bridge, 'qun.qq.com'); + + const honorInfo: any = { + group_id: groupId, + current_talkative: null, + talkative_list: [], + performer_list: [], + legend_list: [], + emotion_list: [], + strong_newbie_list: [], + }; + + if (type === WebHonorType.TALKATIVE || type === WebHonorType.ALL) { + const talkativeList = await getHonorListWebAPI(cookieObject, groupCode, 1); + if (talkativeList.length > 0) { + honorInfo.current_talkative = talkativeList[0]; + honorInfo.talkative_list = talkativeList; + } + } + + if (type === WebHonorType.PERFORMER || type === WebHonorType.ALL) { + honorInfo.performer_list = await getHonorListWebAPI(cookieObject, groupCode, 2); + } + + if (type === WebHonorType.LEGEND || type === WebHonorType.ALL) { + honorInfo.legend_list = await getHonorListWebAPI(cookieObject, groupCode, 3); + } + + if (type === WebHonorType.EMOTION || type === WebHonorType.ALL) { + honorInfo.emotion_list = await getHonorListWebAPI(cookieObject, groupCode, 6); + } + + return honorInfo; } \ No newline at end of file diff --git a/packages/core/src/bridge/bridge.ts b/packages/core/src/bridge/bridge.ts index bda7155d..c8973cee 100644 --- a/packages/core/src/bridge/bridge.ts +++ b/packages/core/src/bridge/bridge.ts @@ -26,6 +26,7 @@ import { fetchGroupRequests as fetchGroupRequests_, fetchDownloadRKeys as fetchDownloadRKeys_, } from './bridge-contacts'; +import { WebHonorType } from './web/group-honor'; import { muteGroupMember as muteGroupMember_, muteGroupAll as muteGroupAll_, @@ -64,6 +65,7 @@ import { markGroupMessageRead as markPrivateMsgAsRead_, setFriendRemark as setFriendRemark_, fetchGroupFileCount as fetchGroupFileCount_, + getGroupHonorInfo as getGroupHonorInfo_, } from './bridge-actions'; import type { GroupFilesResult } from './bridge-actions'; import type { MediaIndexNode } from './bridge-actions'; @@ -450,6 +452,9 @@ export class Bridge { async markGroupMsgAsRead(groupId: number, sequence: number): Promise { return markGroupMsgAsRead_(this, groupId, sequence); } async markPrivateMsgAsRead(userId: number, sequence: number): Promise { return markPrivateMsgAsRead_(this, userId, sequence); } async setFriendRemark(userId: number, remark: string): Promise { return setFriendRemark_(this, userId, remark); } + async getGroupHonorInfo(groupId: number, type: WebHonorType | string): Promise { + return getGroupHonorInfo_(this, groupId, type); + } async fetchGroupFileCount(groupId: number): Promise<{ fileCount: number; maxCount: number }> { return fetchGroupFileCount_(this, groupId); } } diff --git a/packages/core/src/bridge/proto/oidb-action.ts b/packages/core/src/bridge/proto/oidb-action.ts index 7f79d0f0..981a5627 100644 --- a/packages/core/src/bridge/proto/oidb-action.ts +++ b/packages/core/src/bridge/proto/oidb-action.ts @@ -804,4 +804,34 @@ export const C2CReadedReportItemSchema = { export const SsoReadedReportReqSchema = { groupList: { field: 1, type: 'repeated_message' as const, schema: GroupReadedReportItemSchema }, c2cList: { field: 2, type: 'repeated_message' as const, schema: C2CReadedReportItemSchema }, -} satisfies ProtoSchema; \ No newline at end of file +} satisfies ProtoSchema; + + +// --- 0x102A_1: Get Client Key --- + +export const OidbClientKeyReqSchema = { +} satisfies ProtoSchema; + +export const OidbClientKeyRespSchema = { + keyIndex: { field: 2, type: 'uint32' as const }, + clientKey: { field: 3, type: 'string' as const }, + expireTime: { field: 4, type: 'uint32' as const }, +} satisfies ProtoSchema; + + +// --- 0x102A_0: Get PSKey --- + +export const OidbGetPskeyReqSchema = { + domainList: { field: 1, type: 'repeated_string' as const }, +} satisfies ProtoSchema; + +export const OidbPskeyItemSchema = { + domain: { field: 1, type: 'string' as const }, + pskey: { field: 2, type: 'string' as const }, + expireTime: { field: 3, type: 'uint64' as const }, +} satisfies ProtoSchema; + +export const OidbGetPskeyRespSchema = { + pskeyItems: { field: 1, type: 'repeated_message' as const, schema: OidbPskeyItemSchema }, +} satisfies ProtoSchema; + diff --git a/packages/core/src/bridge/web/group-honor.ts b/packages/core/src/bridge/web/group-honor.ts new file mode 100644 index 00000000..231969d4 --- /dev/null +++ b/packages/core/src/bridge/web/group-honor.ts @@ -0,0 +1,55 @@ +import { RequestUtil } from './request-util'; + +export enum WebHonorType { + TALKATIVE = 'talkative', + PERFORMER = 'performer', + LEGEND = 'legend', + EMOTION = 'emotion', + ALL = 'all', +} + +// 将 Cookie 对象转换为字符串的工具函数 +function cookieToString(cookieObject: Record): string { + return Object.entries(cookieObject) + .map(([key, value]) => `${key}=${value}`) + .join('; '); +} + +async function fetchHonorData(cookieObject: Record, groupCode: string, type: number) { + let resJson; + try { + const res = await RequestUtil.HttpGetText( + `https://qun.qq.com/interactive/honorlist?${new URLSearchParams({ + gc: groupCode, + type: type.toString(), + }).toString()}`, + 'GET', + '', + { Cookie: cookieToString(cookieObject) } + ); + const match = /window\.__INITIAL_STATE__=(.*?);/.exec(res); + if (match?.[1]) { + resJson = JSON.parse(match[1].trim()); + } + return type === 1 ? resJson?.talkativeList : resJson?.actorList; + } catch (e) { + throw new Error(`获取群 ${groupCode} 类型 ${type} 的荣誉信息失败: ${e}`); + } +} + +export async function getHonorListWebAPI(cookieObject: Record, groupCode: string, type: number) { + try { + const data = await fetchHonorData(cookieObject, groupCode, type); + if (!data) return []; + + return data.map((item: any) => ({ + user_id: item?.uin, + nickname: item?.name, + avatar: item?.avatar, + description: item?.desc, + })); + } catch (e) { + // console.error(e); + return []; + } +} \ No newline at end of file diff --git a/packages/core/src/bridge/web/request-util.ts b/packages/core/src/bridge/web/request-util.ts new file mode 100644 index 00000000..b70a62ca --- /dev/null +++ b/packages/core/src/bridge/web/request-util.ts @@ -0,0 +1,111 @@ +import https from 'node:https'; +import http from 'node:http'; + +export class RequestUtil { + static async HttpsGetCookies(url: string): Promise<{ [key: string]: string; }> { + const client = url.startsWith('https') ? https : http; + return new Promise((resolve, reject) => { + const req = client.get(url, (res) => { + const cookies: { [key: string]: string; } = {}; + + res.on('data', () => { }); // 必须消耗流 + res.on('end', () => { + this.handleRedirect(res, url, cookies) + .then(resolve) + .catch(reject); + }); + + if (res.headers['set-cookie']) { + this.extractCookies(res.headers['set-cookie'], cookies); + } + }); + + req.on('error', (error: Error) => { + reject(error); + }); + }); + } + + private static async handleRedirect(res: http.IncomingMessage, url: string, cookies: { [key: string]: string; }): Promise<{ [key: string]: string; }> { + if (res.statusCode === 301 || res.statusCode === 302) { + if (res.headers.location) { + const redirectUrl = new URL(res.headers.location, url); + const redirectCookies = await this.HttpsGetCookies(redirectUrl.href); + return { ...cookies, ...redirectCookies }; + } + } + return cookies; + } + + private static extractCookies(setCookieHeaders: string[], cookies: { [key: string]: string; }) { + setCookieHeaders.forEach((cookie) => { + const parts = cookie.split(';')[0]?.split('='); + if (parts) { + const key = parts[0]; + const value = parts[1]; + if (key && value && key.length > 0 && value.length > 0) { + cookies[key] = value; + } + } + }); + } + + static async HttpGetJson(url: string, method: string = 'GET', data?: any, headers: { + [key: string]: string; + } = {}, isJsonRet: boolean = true, isArgJson: boolean = true, maxRedirects: number = 5): Promise { + const option = new URL(url); + const protocol = url.startsWith('https://') ? https : http; + const options = { + hostname: option.hostname, + port: option.port, + path: option.pathname + option.search, + method, + headers, + }; + + return new Promise((resolve, reject) => { + const req = protocol.request(options, (res: http.IncomingMessage) => { + if ((res.statusCode === 301 || res.statusCode === 302 || res.statusCode === 307 || res.statusCode === 308) && res.headers.location) { + if (maxRedirects <= 0) { + reject(new Error('Too many redirects')); + return; + } + const redirectUrl = new URL(res.headers.location, url).href; + this.HttpGetJson(redirectUrl, method, data, headers, isJsonRet, isArgJson, maxRedirects - 1) + .then(resolve) + .catch(reject); + return; + } + + let responseBody = ''; + res.on('data', (chunk: string | Buffer) => { responseBody += chunk.toString(); }); + + res.on('end', () => { + try { + if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) { + if (isJsonRet) { + resolve(JSON.parse(responseBody) as T); + } else { + resolve(responseBody as T); + } + } else { + reject(new Error(`Unexpected status code: ${res.statusCode}`)); + } + } catch (parseError: any) { + reject(new Error(parseError.message)); + } + }); + }); + + req.on('error', (error: Error) => reject(error)); + if (method === 'POST' || method === 'PUT' || method === 'PATCH') { + req.write(isArgJson ? JSON.stringify(data) : data); + } + req.end(); + }); + } + + static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: { [key: string]: string; } = {}) { + return this.HttpGetJson(url, method, data, headers, false, false); + } +} \ No newline at end of file diff --git a/packages/core/src/onebot/actions/group-info.ts b/packages/core/src/onebot/actions/group-info.ts index 3f5efd9e..bbe79a03 100644 --- a/packages/core/src/onebot/actions/group-info.ts +++ b/packages/core/src/onebot/actions/group-info.ts @@ -1,6 +1,7 @@ import type { ApiHandler, ApiActionContext } from '../api-handler'; -import { asNumber, asBoolean } from '../api-handler'; +import { asNumber, asBoolean, asString } from '../api-handler'; import { RETCODE, failedResponse, okResponse } from '../types'; +import { WebHonorType } from '@/bridge/web/group-honor'; export function register(h: ApiHandler, ctx: ApiActionContext): void { h.registerAction('get_group_list', async (params) => { @@ -54,11 +55,27 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { h.registerAction('get_group_honor_info', async (params) => { const groupId = asNumber(params.group_id); - if (!groupId) return failedResponse(RETCODE.BAD_REQUEST, 'group_id is required'); - return okResponse({ - group_id: groupId, current_talkative: null, talkative_list: [], - performer_list: [], legend_list: [], strong_newbie_list: [], emotion_list: [], - }); + const typeStr = asString(params.type) || 'all'; + + if (!groupId) { + return failedResponse(RETCODE.BAD_REQUEST, 'group_id is required'); + } + + if (!ctx.getGroupHonorInfo) { + return failedResponse(RETCODE.ACTION_FAILED, 'not yet implemented'); + } + + const typeValues = Object.values(WebHonorType) as string[]; + if (!typeValues.includes(typeStr)) { + return failedResponse(RETCODE.BAD_REQUEST, `invalid type, must be one of ${typeValues.join(', ')}`); + } + + try { + const honorInfo = await ctx.getGroupHonorInfo(groupId, typeStr as WebHonorType); + return okResponse(honorInfo); + } catch (e) { + return failedResponse(RETCODE.ACTION_FAILED, `failed to get group honor info: ${(e as Error).message}`); + } }); h.registerAction('get_group_system_msg', async () => { diff --git a/packages/core/src/onebot/api-handler.ts b/packages/core/src/onebot/api-handler.ts index 0266d6e3..fe9cdea4 100644 --- a/packages/core/src/onebot/api-handler.ts +++ b/packages/core/src/onebot/api-handler.ts @@ -10,6 +10,8 @@ import { register as registerGroupFile } from './actions/group-file'; import { register as registerRequest } from './actions/request'; import { register as registerExtended } from './actions/extended'; +import { WebHonorType } from '@/bridge/web/group-honor'; + export interface MessageSendResult { messageId: number; meta?: MessageMeta; @@ -80,6 +82,8 @@ export interface ApiActionContext { setMsgEmojiLike?: (messageId: number, emojiId: string, set: boolean) => Promise; markGroupMsgAsRead?: (groupId: number, sequence: number) => Promise; markPrivateMsgAsRead?: (userId: number, sequence: number) => Promise; + // Web + getGroupHonorInfo?: (groupId: number, type: WebHonorType | string) => Promise; } type ActionHandler = (params: JsonObject) => Promise; diff --git a/packages/core/src/onebot/instance-context.ts b/packages/core/src/onebot/instance-context.ts index 00320639..baf6d2bd 100644 --- a/packages/core/src/onebot/instance-context.ts +++ b/packages/core/src/onebot/instance-context.ts @@ -8,6 +8,7 @@ import { parseMessage } from './message-parser'; import { GROUP_MESSAGE_EVENT, PRIVATE_MESSAGE_EVENT, hashMessageIdInt32 } from './message-id'; import type { JsonObject, JsonValue, MessageMeta } from './types'; import { createLogger } from '../utils/logger'; +import {WebHonorType} from "@/bridge/web/group-honor"; const log = createLogger('OneBot'); @@ -121,6 +122,8 @@ export function buildApiContext(ref: InstanceRef): ApiActionContext { }, markGroupMsgAsRead: (groupId: number, sequence: number) => bridge.markGroupMsgAsRead(groupId, sequence), markPrivateMsgAsRead: (userId: number, sequence: number) => bridge.markPrivateMsgAsRead(userId, sequence), + // web + getGroupHonorInfo: (groupId: number, type: WebHonorType | string)=> bridge.getGroupHonorInfo(groupId, type) }; } From 7e2ba60073beb168c97a1dfc3a497907ec9a0b0d Mon Sep 17 00:00:00 2001 From: H3CoF6 <1707889225@qq.com> Date: Fri, 8 May 2026 16:42:19 +0800 Subject: [PATCH 03/11] feat: implement default mark msg as read and add get clientkey onebot api --- .gitignore | 3 ++ packages/core/src/bridge/bridge.ts | 12 +++++-- packages/core/src/onebot/actions/extended.ts | 34 +++++++++++++++++++- packages/core/src/onebot/api-handler.ts | 2 ++ packages/core/src/onebot/instance-context.ts | 2 ++ 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 87914d35..d72959a4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,8 @@ dist/ .vscode/ .idea/ +/config/ +/data/ + # macOS metadata .DS_Store diff --git a/packages/core/src/bridge/bridge.ts b/packages/core/src/bridge/bridge.ts index c8973cee..afe129da 100644 --- a/packages/core/src/bridge/bridge.ts +++ b/packages/core/src/bridge/bridge.ts @@ -26,7 +26,7 @@ import { fetchGroupRequests as fetchGroupRequests_, fetchDownloadRKeys as fetchDownloadRKeys_, } from './bridge-contacts'; -import { WebHonorType } from './web/group-honor'; +import type { WebHonorType } from './web/group-honor'; import { muteGroupMember as muteGroupMember_, muteGroupAll as muteGroupAll_, @@ -65,7 +65,8 @@ import { markGroupMessageRead as markPrivateMsgAsRead_, setFriendRemark as setFriendRemark_, fetchGroupFileCount as fetchGroupFileCount_, - getGroupHonorInfo as getGroupHonorInfo_, + getGroupHonorInfo as getGroupHonorInfo_, + forceFetchClientKey as forceFetchClientKey_, } from './bridge-actions'; import type { GroupFilesResult } from './bridge-actions'; import type { MediaIndexNode } from './bridge-actions'; @@ -90,6 +91,12 @@ export interface DownloadRKeyInfo { type: number; } +export interface ClientKeyInfo { + clientKey: string; + expireTime: string; + keyIndex: string +} + const log = createLogger('Bridge'); const eventLog = createLogger('Event'); @@ -455,6 +462,7 @@ export class Bridge { async getGroupHonorInfo(groupId: number, type: WebHonorType | string): Promise { return getGroupHonorInfo_(this, groupId, type); } + async forceFetchClientKey(): Promise { return forceFetchClientKey_(this)} async fetchGroupFileCount(groupId: number): Promise<{ fileCount: number; maxCount: number }> { return fetchGroupFileCount_(this, groupId); } } diff --git a/packages/core/src/onebot/actions/extended.ts b/packages/core/src/onebot/actions/extended.ts index 22547dca..46141d79 100644 --- a/packages/core/src/onebot/actions/extended.ts +++ b/packages/core/src/onebot/actions/extended.ts @@ -172,6 +172,31 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { return okResponse(); }); + h.registerAction('mark_msg_as_read', async (params) => { + const messageId = asNumber(params.message_id); + const targetId = asNumber(params.target_id); + + if (!Number.isInteger(messageId) || messageId === 0) { + return failedResponse(RETCODE.BAD_REQUEST, 'message_id is required'); + } + const meta = ctx.getMessageMeta(messageId); + if (!meta) return failedResponse(RETCODE.ACTION_FAILED, 'message not found'); + + + if (targetId && targetId !== meta.targetId) { + return failedResponse(RETCODE.BAD_REQUEST, 'target_id does not match message session'); + } + + if (!(ctx.markPrivateMsgAsRead && ctx.markGroupMsgAsRead)) return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + + if (meta.isGroup) { + await ctx.markGroupMsgAsRead(targetId, meta.sequence); + } else { + await ctx.markPrivateMsgAsRead(targetId, meta.sequence); + } + return okResponse(); + }); + // --- RKey --- @@ -542,7 +567,14 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { }); h.registerAction('get_clientkey', async () => { - return failedResponse(RETCODE.ACTION_FAILED, 'not yet implemented'); + if (!ctx.forceFetchClientKey) { + return failedResponse(RETCODE.ACTION_FAILED, 'not yet implemented'); + } + const clientKeyInfo = await ctx.forceFetchClientKey(); + if (!clientKeyInfo.clientKey) { + return failedResponse(RETCODE.ACTION_FAILED, 'get clientkey error'); + } + return okResponse(clientKeyInfo); }); h.registerAction('get_mini_app_ark', async () => { diff --git a/packages/core/src/onebot/api-handler.ts b/packages/core/src/onebot/api-handler.ts index fe9cdea4..7ecbd170 100644 --- a/packages/core/src/onebot/api-handler.ts +++ b/packages/core/src/onebot/api-handler.ts @@ -11,6 +11,7 @@ import { register as registerRequest } from './actions/request'; import { register as registerExtended } from './actions/extended'; import { WebHonorType } from '@/bridge/web/group-honor'; +import {ClientKeyInfo} from "@/bridge/bridge"; export interface MessageSendResult { messageId: number; @@ -64,6 +65,7 @@ export interface ApiActionContext { sendGroupPoke?: (groupId: number, userId: number) => Promise; setEssenceMsg?: (messageId: number) => Promise; deleteEssenceMsg?: (messageId: number) => Promise; + forceFetchClientKey? : () => Promise<{clientKey: string, keyIndex: string, expireTime: string}>; // New context methods setGroupReaction?: (groupId: number, sequence: number, code: string, isSet: boolean) => Promise; handleDeleteFriend?: (userId: number, block?: boolean) => Promise; diff --git a/packages/core/src/onebot/instance-context.ts b/packages/core/src/onebot/instance-context.ts index baf6d2bd..875614c6 100644 --- a/packages/core/src/onebot/instance-context.ts +++ b/packages/core/src/onebot/instance-context.ts @@ -112,6 +112,8 @@ export function buildApiContext(ref: InstanceRef): ApiActionContext { getForwardMsg: async (resId) => { return handleGetForward(ref, resId); }, + forceFetchClientKey: async () => bridge.forceFetchClientKey(), + // Extended NapCat-compatible setFriendRemark: (userId, remark) => bridge.setFriendRemark(userId, remark), getGroupFileCount: (groupId) => bridge.fetchGroupFileCount(groupId), From 3791addb4344a1f3a4b6d8897a11296b9f73c4da Mon Sep 17 00:00:00 2001 From: H3CoF6 <1707889225@qq.com> Date: Fri, 8 May 2026 20:41:47 +0800 Subject: [PATCH 04/11] feat: implement get all essence msg --- packages/core/src/bridge/bridge-actions.ts | 49 +++++++++++ packages/core/src/bridge/bridge.ts | 9 +++ packages/core/src/bridge/web/group-essence.ts | 81 +++++++++++++++++++ packages/core/src/onebot/actions/extended.ts | 17 +++- packages/core/src/onebot/api-handler.ts | 14 +++- packages/core/src/onebot/instance-context.ts | 4 +- 6 files changed, 169 insertions(+), 5 deletions(-) create mode 100644 packages/core/src/bridge/web/group-essence.ts diff --git a/packages/core/src/bridge/bridge-actions.ts b/packages/core/src/bridge/bridge-actions.ts index 91147557..05f921b7 100644 --- a/packages/core/src/bridge/bridge-actions.ts +++ b/packages/core/src/bridge/bridge-actions.ts @@ -12,6 +12,7 @@ import type { ForwardNodePayload, MessageElement } from './events'; import { PushMsgSchema } from './proto/message'; import { RequestUtil } from './web/request-util'; import { getHonorListWebAPI, WebHonorType } from './web/group-honor'; +import { getGroupEssenceMsg, getGroupEssenceMsgAll } from './web/group-essence'; import { OidbMuteMemberSchema, OidbMuteAllSchema, @@ -1405,4 +1406,52 @@ export async function getGroupHonorInfo(bridge: Bridge, groupId: number, type: W } return honorInfo; +} + +export async function getSKey(bridge: Bridge): Promise { + const ClientKeyData = await forceFetchClientKey(bridge); + + if (!ClientKeyData.clientKey) { + throw new Error('getClientKey Error: clientKey is empty'); + } + + const u1 = encodeURIComponent('https://h5.qzone.qq.com/qqnt/qzoneinpcqq/friend?refresh=0&clientuin=0&darkMode=0'); + const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033' + + '&clientuin=' + bridge.qqInfo.uin + + '&clientkey=' + ClientKeyData.clientKey + + '&u1=' + u1 + + '&keyindex=' + ClientKeyData.keyIndex; + + const cookies: { [key: string]: string } = await RequestUtil.HttpsGetCookies(requestUrl); + const skey = cookies['skey']; + + if (!skey) { + throw new Error('SKey is Empty'); + } + + return skey; +} + +/** + * 分页获取群精华消息 + */ +export async function getGroupEssence(bridge: Bridge, groupId: number, pageStart: number = 0, pageLimit: number = 50) { + const groupCode = groupId.toString(); + const cookieObject = await getCookies(bridge, 'qun.qq.com'); + + const essenceData = await getGroupEssenceMsg(cookieObject, groupCode, pageStart, pageLimit); + + return essenceData || { retcode: -1, data: { is_end: true, msg_list: [] } }; +} + +/** + * 获取所有群精华消息 + */ +export async function getGroupEssenceAll(bridge: Bridge, groupId: number) { + const groupCode = groupId.toString(); + const cookieObject = await getCookies(bridge, 'qun.qq.com'); + + const essenceDataAll = await getGroupEssenceMsgAll(cookieObject, groupCode); + + return essenceDataAll; } \ No newline at end of file diff --git a/packages/core/src/bridge/bridge.ts b/packages/core/src/bridge/bridge.ts index afe129da..c149e2b7 100644 --- a/packages/core/src/bridge/bridge.ts +++ b/packages/core/src/bridge/bridge.ts @@ -67,6 +67,8 @@ import { fetchGroupFileCount as fetchGroupFileCount_, getGroupHonorInfo as getGroupHonorInfo_, forceFetchClientKey as forceFetchClientKey_, + getGroupEssence as getGroupEssence_, + getGroupEssenceAll as getGroupEssenceAll_, } from './bridge-actions'; import type { GroupFilesResult } from './bridge-actions'; import type { MediaIndexNode } from './bridge-actions'; @@ -463,6 +465,13 @@ export class Bridge { return getGroupHonorInfo_(this, groupId, type); } async forceFetchClientKey(): Promise { return forceFetchClientKey_(this)} + async getGroupEssence(groupId: number, pageStart: number = 0, pageLimit: number = 50): Promise { + return getGroupEssence_(this, groupId, pageStart, pageLimit); + } + + async getGroupEssenceAll(groupId: number): Promise { + return getGroupEssenceAll_(this, groupId); + } async fetchGroupFileCount(groupId: number): Promise<{ fileCount: number; maxCount: number }> { return fetchGroupFileCount_(this, groupId); } } diff --git a/packages/core/src/bridge/web/group-essence.ts b/packages/core/src/bridge/web/group-essence.ts new file mode 100644 index 00000000..d78c5233 --- /dev/null +++ b/packages/core/src/bridge/web/group-essence.ts @@ -0,0 +1,81 @@ +import { RequestUtil } from './request-util'; + +// 定义接口返回类型 +export interface GroupEssenceMsgRet { + retcode: number; + data: { + is_end: boolean; + msg_list: any[]; // 具体结构视需要补充 + [key: string]: any; + }; + [key: string]: any; +} + +function cookieToString(cookieObject: Record): string { + return Object.entries(cookieObject) + .map(([key, value]) => `${key}=${value}`) + .join('; '); +} + +// 获取 QQ Web 接口必需的 bkn (或 gtk) 鉴权参数 +function getBknFromCookie(cookieObject: Record): string { + const skey = cookieObject['p_skey'] || cookieObject['skey'] || ''; + let hash = 5381; + for (let i = 0; i < skey.length; i++) { + hash += (hash << 5) + skey.charCodeAt(i); + } + return (hash & 2147483647).toString(); +} + +/** + * 分页获取群精华消息 + */ +export async function getGroupEssenceMsg( + cookieObject: Record, + groupCode: string, + pageStart: number = 0, + pageLimit: number = 50 +): Promise { + const bkn = getBknFromCookie(cookieObject); + + const url = `https://qun.qq.com/cgi-bin/group_digest/digest_list?${new URLSearchParams({ + bkn: bkn, + page_start: pageStart.toString(), + page_limit: pageLimit.toString(), + group_code: groupCode, + }).toString()}`; + + try { + const ret = await RequestUtil.HttpGetJson( + url, + 'GET', + '', + { Cookie: cookieToString(cookieObject) } + ); + return ret.retcode === 0 ? ret : undefined; + } catch (e) { + return undefined; + } +} + +/** + * 获取所有群精华消息 (最多循环 20 页) + */ +export async function getGroupEssenceMsgAll( + cookieObject: Record, + groupCode: string +): Promise { + const ret: GroupEssenceMsgRet[] = []; + + for (let i = 0; i < 20; i++) { + const data = await getGroupEssenceMsg(cookieObject, groupCode, i, 50); + + if (!data) break; + + ret.push(data); + + if (data.data?.is_end) break; + } + + return ret; +} \ No newline at end of file diff --git a/packages/core/src/onebot/actions/extended.ts b/packages/core/src/onebot/actions/extended.ts index 46141d79..bdc193b4 100644 --- a/packages/core/src/onebot/actions/extended.ts +++ b/packages/core/src/onebot/actions/extended.ts @@ -71,9 +71,20 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { h.registerAction('get_essence_msg_list', async (params) => { const groupId = asNumber(params.group_id); if (!groupId) return failedResponse(RETCODE.BAD_REQUEST, 'group_id is required'); - // Essence list fetch requires web ticket/cookie flow not wired yet. - // Keep API-compatible output shape for callers. - return okResponse([]); + + if (!ctx.getGroupEssenceAll) { + return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + } + + try { + const essenceDataAll = await ctx.getGroupEssenceAll(groupId); + + const allMsgs = essenceDataAll.flatMap(res => res.data?.msg_list || []); + + return okResponse(allMsgs); + } catch (e) { + return failedResponse(RETCODE.ACTION_FAILED, `获取精华消息失败: ${e}`); + } }); // --- Reactions --- diff --git a/packages/core/src/onebot/api-handler.ts b/packages/core/src/onebot/api-handler.ts index 7ecbd170..b90f6db8 100644 --- a/packages/core/src/onebot/api-handler.ts +++ b/packages/core/src/onebot/api-handler.ts @@ -11,7 +11,7 @@ import { register as registerRequest } from './actions/request'; import { register as registerExtended } from './actions/extended'; import { WebHonorType } from '@/bridge/web/group-honor'; -import {ClientKeyInfo} from "@/bridge/bridge"; +// import {ClientKeyInfo} from "@/bridge/bridge"; export interface MessageSendResult { messageId: number; @@ -19,6 +19,16 @@ export interface MessageSendResult { echoEvent?: JsonObject; } +export interface GroupEssenceMsgRet { + retcode: number; + data: { + is_end: boolean; + msg_list: any[]; + [key: string]: any; + }; + [key: string]: any; +} + export interface ApiActionContext { getLoginInfo: () => { userId: number; nickname: string }; isOnline: () => boolean; @@ -86,6 +96,8 @@ export interface ApiActionContext { markPrivateMsgAsRead?: (userId: number, sequence: number) => Promise; // Web getGroupHonorInfo?: (groupId: number, type: WebHonorType | string) => Promise; + getGroupEssence?: (groupId: number, pageStart?: number, pageLimit?: number) => Promise; + getGroupEssenceAll?: (groupId: number) => Promise; } type ActionHandler = (params: JsonObject) => Promise; diff --git a/packages/core/src/onebot/instance-context.ts b/packages/core/src/onebot/instance-context.ts index 875614c6..441f07c1 100644 --- a/packages/core/src/onebot/instance-context.ts +++ b/packages/core/src/onebot/instance-context.ts @@ -125,7 +125,9 @@ export function buildApiContext(ref: InstanceRef): ApiActionContext { markGroupMsgAsRead: (groupId: number, sequence: number) => bridge.markGroupMsgAsRead(groupId, sequence), markPrivateMsgAsRead: (userId: number, sequence: number) => bridge.markPrivateMsgAsRead(userId, sequence), // web - getGroupHonorInfo: (groupId: number, type: WebHonorType | string)=> bridge.getGroupHonorInfo(groupId, type) + getGroupHonorInfo: (groupId: number, type: WebHonorType | string)=> bridge.getGroupHonorInfo(groupId, type), + getGroupEssence: (groupId: number, pageStart: number = 0, pageLimit: number = 50) => bridge.getGroupEssence(groupId, pageStart, pageLimit), + getGroupEssenceAll: (groupId: number) => bridge.getGroupEssenceAll(groupId), }; } From d708be46274deabb1bbab7a352410057a400e7fa Mon Sep 17 00:00:00 2001 From: H3CoF6 <1707889225@qq.com> Date: Fri, 8 May 2026 21:03:28 +0800 Subject: [PATCH 05/11] fix(webui): password strength indicators not updating MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复密码强度指示器不亮起的问题,将后端返回字段从 met 改为 ok 以匹配前端期望 Co-Authored-By: Claude Sonnet 4.6 --- packages/core/src/webui/auth.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/webui/auth.ts b/packages/core/src/webui/auth.ts index 099ee3d4..725d9981 100644 --- a/packages/core/src/webui/auth.ts +++ b/packages/core/src/webui/auth.ts @@ -43,8 +43,8 @@ export const PASSWORD_RULES: PasswordRule[] = [ { id: 'no-space', label: '不包含空格', test: (p) => !/\s/.test(p) && p.length > 0 }, ]; -export function evaluatePasswordRules(password: string): { id: string; label: string; met: boolean }[] { - return PASSWORD_RULES.map((r) => ({ id: r.id, label: r.label, met: r.test(password) })); +export function evaluatePasswordRules(password: string): { id: string; label: string; ok: boolean }[] { + return PASSWORD_RULES.map((r) => ({ id: r.id, label: r.label, ok: r.test(password) })); } export function isStrongPassword(password: string): boolean { From c862a157dbfbadba67b238425de5f734e8129ef4 Mon Sep 17 00:00:00 2001 From: H3CoF6 <1707889225@qq.com> Date: Sat, 9 May 2026 03:44:08 +0800 Subject: [PATCH 06/11] feat: implement send group notice --- packages/core/src/bridge/bridge-actions.ts | 48 +++++++++++++++ packages/core/src/bridge/bridge.ts | 6 ++ packages/core/src/bridge/web-actions.ts | 0 packages/core/src/bridge/web/group-essence.ts | 17 +----- packages/core/src/bridge/web/group-honor.ts | 8 +-- packages/core/src/bridge/web/group-notice.ts | 59 +++++++++++++++++++ packages/core/src/bridge/web/request-util.ts | 18 +++++- packages/core/src/onebot/actions/extended.ts | 26 +++++++- packages/core/src/onebot/api-handler.ts | 1 + packages/core/src/onebot/instance-context.ts | 1 + 10 files changed, 158 insertions(+), 26 deletions(-) create mode 100644 packages/core/src/bridge/web-actions.ts create mode 100644 packages/core/src/bridge/web/group-notice.ts diff --git a/packages/core/src/bridge/bridge-actions.ts b/packages/core/src/bridge/bridge-actions.ts index 05f921b7..7cb0efdf 100644 --- a/packages/core/src/bridge/bridge-actions.ts +++ b/packages/core/src/bridge/bridge-actions.ts @@ -13,6 +13,7 @@ import { PushMsgSchema } from './proto/message'; import { RequestUtil } from './web/request-util'; import { getHonorListWebAPI, WebHonorType } from './web/group-honor'; import { getGroupEssenceMsg, getGroupEssenceMsgAll } from './web/group-essence'; +import { setGroupNoticeWebAPI } from './web/group-notice' import { OidbMuteMemberSchema, OidbMuteAllSchema, @@ -1454,4 +1455,51 @@ export async function getGroupEssenceAll(bridge: Bridge, groupId: number) { const essenceDataAll = await getGroupEssenceMsgAll(cookieObject, groupCode); return essenceDataAll; +} + +export async function sendGroupNotice( + bridge: Bridge, + groupId: number, + content: string, + options?: { + image?: string; // 未来如果要发图片,传路径进来 + pinned?: number; + type?: number; + confirm_required?: number; + } +) { + const groupCode = groupId.toString(); + const cookieObject = await getCookies(bridge, 'qun.qq.com'); + + let picId = ''; + let imgWidth = 540; + let imgHeight = 300; + + // 📝 预留的图片上传逻辑: + // if (options?.image) { + // const picInfo = await bridge.uploadGroupBulletinPic(groupCode, options.image); + // picId = picInfo.id; + // imgWidth = picInfo.width; + // imgHeight = picInfo.height; + // } + + const ret = await setGroupNoticeWebAPI( + cookieObject, + groupCode, + content, + options?.pinned ?? 0, + options?.type ?? 1, + 1, + 1, + options?.confirm_required ?? 1, + picId, + imgWidth, + imgHeight + ); + + if (!ret || ret.ec !== 0) { + throw new Error(`设置群公告失败: ${ret?.em || '未知错误(Cookie过期或权限不足)'}`); + } + + return ret; } \ No newline at end of file diff --git a/packages/core/src/bridge/bridge.ts b/packages/core/src/bridge/bridge.ts index c149e2b7..ba095316 100644 --- a/packages/core/src/bridge/bridge.ts +++ b/packages/core/src/bridge/bridge.ts @@ -69,6 +69,7 @@ import { forceFetchClientKey as forceFetchClientKey_, getGroupEssence as getGroupEssence_, getGroupEssenceAll as getGroupEssenceAll_, + sendGroupNotice as sendGroupNotice_, } from './bridge-actions'; import type { GroupFilesResult } from './bridge-actions'; import type { MediaIndexNode } from './bridge-actions'; @@ -472,6 +473,11 @@ export class Bridge { async getGroupEssenceAll(groupId: number): Promise { return getGroupEssenceAll_(this, groupId); } + + async sendGroupNotice(groupId: number, content: string, options?: any) { + return sendGroupNotice_(this, groupId, content, options); + } + async fetchGroupFileCount(groupId: number): Promise<{ fileCount: number; maxCount: number }> { return fetchGroupFileCount_(this, groupId); } } diff --git a/packages/core/src/bridge/web-actions.ts b/packages/core/src/bridge/web-actions.ts new file mode 100644 index 00000000..e69de29b diff --git a/packages/core/src/bridge/web/group-essence.ts b/packages/core/src/bridge/web/group-essence.ts index d78c5233..d942dedf 100644 --- a/packages/core/src/bridge/web/group-essence.ts +++ b/packages/core/src/bridge/web/group-essence.ts @@ -1,4 +1,4 @@ -import { RequestUtil } from './request-util'; +import { RequestUtil, cookieToString, getBknFromCookie } from './request-util'; // 定义接口返回类型 export interface GroupEssenceMsgRet { @@ -11,21 +11,6 @@ export interface GroupEssenceMsgRet { [key: string]: any; } -function cookieToString(cookieObject: Record): string { - return Object.entries(cookieObject) - .map(([key, value]) => `${key}=${value}`) - .join('; '); -} - -// 获取 QQ Web 接口必需的 bkn (或 gtk) 鉴权参数 -function getBknFromCookie(cookieObject: Record): string { - const skey = cookieObject['p_skey'] || cookieObject['skey'] || ''; - let hash = 5381; - for (let i = 0; i < skey.length; i++) { - hash += (hash << 5) + skey.charCodeAt(i); - } - return (hash & 2147483647).toString(); -} /** * 分页获取群精华消息 diff --git a/packages/core/src/bridge/web/group-honor.ts b/packages/core/src/bridge/web/group-honor.ts index 231969d4..f77fdc3a 100644 --- a/packages/core/src/bridge/web/group-honor.ts +++ b/packages/core/src/bridge/web/group-honor.ts @@ -1,4 +1,4 @@ -import { RequestUtil } from './request-util'; +import { RequestUtil, cookieToString } from './request-util'; export enum WebHonorType { TALKATIVE = 'talkative', @@ -8,12 +8,6 @@ export enum WebHonorType { ALL = 'all', } -// 将 Cookie 对象转换为字符串的工具函数 -function cookieToString(cookieObject: Record): string { - return Object.entries(cookieObject) - .map(([key, value]) => `${key}=${value}`) - .join('; '); -} async function fetchHonorData(cookieObject: Record, groupCode: string, type: number) { let resJson; diff --git a/packages/core/src/bridge/web/group-notice.ts b/packages/core/src/bridge/web/group-notice.ts new file mode 100644 index 00000000..11b35fd7 --- /dev/null +++ b/packages/core/src/bridge/web/group-notice.ts @@ -0,0 +1,59 @@ +import { RequestUtil, cookieToString, getBknFromCookie } from './request-util'; + +export interface SetNoticeRetSuccess { + ec?: number; + em?: string; + [key: string]: any; +} + + +/** + * 发送群公告 Web API + */ +export async function setGroupNoticeWebAPI( + cookieObject: Record, + groupCode: string, + content: string, + pinned: number = 0, + type: number = 1, + isShowEditCard: number = 1, + tipWindowType: number = 1, + confirmRequired: number = 1, + picId: string = '', + imgWidth: number = 540, + imgHeight: number = 300 +): Promise { + try { + const settings = JSON.stringify({ + is_show_edit_card: isShowEditCard, + tip_window_type: tipWindowType, + confirm_required: confirmRequired, + }); + + const externalParam = { + pic: picId, + imgWidth: imgWidth.toString(), + imgHeight: imgHeight.toString(), + }; + + const url = `https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?${new URLSearchParams({ + bkn: getBknFromCookie(cookieObject), + qid: groupCode, + text: content, + pinned: pinned.toString(), + type: type.toString(), + settings, + ...(picId === '' ? {} : externalParam), + }).toString()}`; + + const ret = await RequestUtil.HttpGetJson( + url, + 'POST', // 注意这里必须是 POST + '', + { Cookie: cookieToString(cookieObject) } + ); + return ret; + } catch (e) { + return undefined; + } +} \ No newline at end of file diff --git a/packages/core/src/bridge/web/request-util.ts b/packages/core/src/bridge/web/request-util.ts index b70a62ca..0c880a48 100644 --- a/packages/core/src/bridge/web/request-util.ts +++ b/packages/core/src/bridge/web/request-util.ts @@ -108,4 +108,20 @@ export class RequestUtil { static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: { [key: string]: string; } = {}) { return this.HttpGetJson(url, method, data, headers, false, false); } -} \ No newline at end of file +} + +export function cookieToString(cookieObject: Record): string { + return Object.entries(cookieObject) + .map(([key, value]) => `${key}=${value}`) + .join('; '); +} + + +export function getBknFromCookie(cookieObject: Record): string { + const skey = cookieObject['p_skey'] || cookieObject['skey'] || ''; + let hash = 5381; + for (let i = 0; i < skey.length; i++) { + hash += (hash << 5) + skey.charCodeAt(i); + } + return (hash & 2147483647).toString(); +} diff --git a/packages/core/src/onebot/actions/extended.ts b/packages/core/src/onebot/actions/extended.ts index bdc193b4..0d09a3c9 100644 --- a/packages/core/src/onebot/actions/extended.ts +++ b/packages/core/src/onebot/actions/extended.ts @@ -230,8 +230,30 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { // --- Group notice stubs --- - h.registerAction('_send_group_notice', async () => { - return failedResponse(RETCODE.ACTION_FAILED, 'not yet implemented'); + h.registerAction('send_group_notice', async (params) => { + const groupId = asNumber(params.group_id); + const content = asString(params.content); + + if (!groupId || !content) { + return failedResponse(RETCODE.BAD_REQUEST, 'group_id and content are required'); + } + if (!ctx.sendGroupNotice) { + return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + } + + try { + const options = { + image: asString(params.image), + pinned: params.pinned !== undefined ? Number(params.pinned) : 0, + type: params.type !== undefined ? Number(params.type) : 1, + confirm_required: params.confirm_required !== undefined ? Number(params.confirm_required) : 1, + }; + + await ctx.sendGroupNotice(groupId, content, options); + return okResponse(); + } catch (e) { + return failedResponse(RETCODE.ACTION_FAILED, String(e)); + } }); h.registerAction('_get_group_notice', async () => { diff --git a/packages/core/src/onebot/api-handler.ts b/packages/core/src/onebot/api-handler.ts index b90f6db8..36be910f 100644 --- a/packages/core/src/onebot/api-handler.ts +++ b/packages/core/src/onebot/api-handler.ts @@ -98,6 +98,7 @@ export interface ApiActionContext { getGroupHonorInfo?: (groupId: number, type: WebHonorType | string) => Promise; getGroupEssence?: (groupId: number, pageStart?: number, pageLimit?: number) => Promise; getGroupEssenceAll?: (groupId: number) => Promise; + sendGroupNotice?: (groupId: number, content: string, options?: any) => Promise; } type ActionHandler = (params: JsonObject) => Promise; diff --git a/packages/core/src/onebot/instance-context.ts b/packages/core/src/onebot/instance-context.ts index 441f07c1..e4d7cfb9 100644 --- a/packages/core/src/onebot/instance-context.ts +++ b/packages/core/src/onebot/instance-context.ts @@ -128,6 +128,7 @@ export function buildApiContext(ref: InstanceRef): ApiActionContext { getGroupHonorInfo: (groupId: number, type: WebHonorType | string)=> bridge.getGroupHonorInfo(groupId, type), getGroupEssence: (groupId: number, pageStart: number = 0, pageLimit: number = 50) => bridge.getGroupEssence(groupId, pageStart, pageLimit), getGroupEssenceAll: (groupId: number) => bridge.getGroupEssenceAll(groupId), + sendGroupNotice: (groupId: number, content: string, options?: any) => bridge.sendGroupNotice(groupId, content, options), }; } From 51c2fa285a2c03596f7b05de0cf205dc9d7efbb2 Mon Sep 17 00:00:00 2001 From: H3CoF6 <1707889225@qq.com> Date: Sat, 9 May 2026 04:08:52 +0800 Subject: [PATCH 07/11] refactor: move web action into web-actions from bridge-actions --- packages/core/src/bridge/bridge-actions.ts | 212 ------------------ packages/core/src/bridge/bridge.ts | 4 +- packages/core/src/bridge/web-actions.ts | 221 +++++++++++++++++++ packages/core/src/onebot/actions/extended.ts | 9 +- 4 files changed, 231 insertions(+), 215 deletions(-) diff --git a/packages/core/src/bridge/bridge-actions.ts b/packages/core/src/bridge/bridge-actions.ts index 7cb0efdf..a3c85aae 100644 --- a/packages/core/src/bridge/bridge-actions.ts +++ b/packages/core/src/bridge/bridge-actions.ts @@ -10,10 +10,6 @@ import { buildSendElems } from './builders/element-builder'; import { parseMsgPush } from './handlers/msg-push-handler'; import type { ForwardNodePayload, MessageElement } from './events'; import { PushMsgSchema } from './proto/message'; -import { RequestUtil } from './web/request-util'; -import { getHonorListWebAPI, WebHonorType } from './web/group-honor'; -import { getGroupEssenceMsg, getGroupEssenceMsgAll } from './web/group-essence'; -import { setGroupNoticeWebAPI } from './web/group-notice' import { OidbMuteMemberSchema, OidbMuteAllSchema, @@ -48,10 +44,6 @@ import { GroupRecallRequestSchema, C2CRecallRequestSchema, SsoReadedReportReqSchema, - OidbClientKeyRespSchema, - OidbClientKeyReqSchema, - OidbGetPskeyReqSchema, - OidbGetPskeyRespSchema } from './proto/oidb-action'; import { FileUploadExtSchema } from './proto/highway'; import { @@ -1298,208 +1290,4 @@ export async function markGroupMessageRead( if (!result.success) { throw new Error(result.errorMessage || 'mark group message read failed'); } -} - -export async function forceFetchClientKey(bridge: Bridge) { - const resp = await sendOidbAndDecode( - bridge, - 'OidbSvcTrpcTcp.0x102a_1', - 0x102A, - 1, - {}, - OidbClientKeyReqSchema, - OidbClientKeyRespSchema - ); - - const clientKey = resp?.clientKey || ''; - const keyIndex = String(resp?.keyIndex || '19'); // 不知道是什么 - - return { - clientKey, - keyIndex, - expireTime: String(resp?.expireTime || '1800') - }; -} - -export async function getPSkey(bridge: Bridge, domainList: string[]) { - const resp = await sendOidbAndDecode( - bridge, - 'OidbSvcTrpcTcp.0x102a_0', - 0x102A, - 0, - { domainList }, - OidbGetPskeyReqSchema, - OidbGetPskeyRespSchema - ); - - const domainPskeyMap = new Map(); - - if (resp?.pskeyItems && Array.isArray(resp.pskeyItems)) { - for (const item of resp.pskeyItems) { - if (item.domain && item.pskey) { - domainPskeyMap.set(item.domain, item.pskey); - } - } - } - - return { - domainPskeyMap, - }; -} - -export async function getCookies(bridge: Bridge, domain: string) { - const ClientKeyData = await forceFetchClientKey(bridge); - - // 构造 ptlogin2 跳转 URL - const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + bridge.qqInfo.uin + - '&clientkey=' + ClientKeyData.clientKey + - '&u1=https%3A%2F%2F' + domain + '%2F' + bridge.qqInfo.uin + '%2Finfocenter&keyindex=' + ClientKeyData.keyIndex; - - const data = await RequestUtil.HttpsGetCookies(requestUrl); - - if (!data['p_skey'] || data['p_skey'].length === 0) { - try { - const pskeyData = await getPSkey(bridge, [domain]); - const pskey = pskeyData.domainPskeyMap.get(domain); - if (pskey) { - data['p_skey'] = pskey; - } - } catch { - return data; - } - } - - return data; -} - -export async function getGroupHonorInfo(bridge: Bridge, groupId: number, type: WebHonorType | string) { - const groupCode = groupId.toString(); - const cookieObject = await getCookies(bridge, 'qun.qq.com'); - - const honorInfo: any = { - group_id: groupId, - current_talkative: null, - talkative_list: [], - performer_list: [], - legend_list: [], - emotion_list: [], - strong_newbie_list: [], - }; - - if (type === WebHonorType.TALKATIVE || type === WebHonorType.ALL) { - const talkativeList = await getHonorListWebAPI(cookieObject, groupCode, 1); - if (talkativeList.length > 0) { - honorInfo.current_talkative = talkativeList[0]; - honorInfo.talkative_list = talkativeList; - } - } - - if (type === WebHonorType.PERFORMER || type === WebHonorType.ALL) { - honorInfo.performer_list = await getHonorListWebAPI(cookieObject, groupCode, 2); - } - - if (type === WebHonorType.LEGEND || type === WebHonorType.ALL) { - honorInfo.legend_list = await getHonorListWebAPI(cookieObject, groupCode, 3); - } - - if (type === WebHonorType.EMOTION || type === WebHonorType.ALL) { - honorInfo.emotion_list = await getHonorListWebAPI(cookieObject, groupCode, 6); - } - - return honorInfo; -} - -export async function getSKey(bridge: Bridge): Promise { - const ClientKeyData = await forceFetchClientKey(bridge); - - if (!ClientKeyData.clientKey) { - throw new Error('getClientKey Error: clientKey is empty'); - } - - const u1 = encodeURIComponent('https://h5.qzone.qq.com/qqnt/qzoneinpcqq/friend?refresh=0&clientuin=0&darkMode=0'); - const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033' + - '&clientuin=' + bridge.qqInfo.uin + - '&clientkey=' + ClientKeyData.clientKey + - '&u1=' + u1 + - '&keyindex=' + ClientKeyData.keyIndex; - - const cookies: { [key: string]: string } = await RequestUtil.HttpsGetCookies(requestUrl); - const skey = cookies['skey']; - - if (!skey) { - throw new Error('SKey is Empty'); - } - - return skey; -} - -/** - * 分页获取群精华消息 - */ -export async function getGroupEssence(bridge: Bridge, groupId: number, pageStart: number = 0, pageLimit: number = 50) { - const groupCode = groupId.toString(); - const cookieObject = await getCookies(bridge, 'qun.qq.com'); - - const essenceData = await getGroupEssenceMsg(cookieObject, groupCode, pageStart, pageLimit); - - return essenceData || { retcode: -1, data: { is_end: true, msg_list: [] } }; -} - -/** - * 获取所有群精华消息 - */ -export async function getGroupEssenceAll(bridge: Bridge, groupId: number) { - const groupCode = groupId.toString(); - const cookieObject = await getCookies(bridge, 'qun.qq.com'); - - const essenceDataAll = await getGroupEssenceMsgAll(cookieObject, groupCode); - - return essenceDataAll; -} - -export async function sendGroupNotice( - bridge: Bridge, - groupId: number, - content: string, - options?: { - image?: string; // 未来如果要发图片,传路径进来 - pinned?: number; - type?: number; - confirm_required?: number; - } -) { - const groupCode = groupId.toString(); - const cookieObject = await getCookies(bridge, 'qun.qq.com'); - - let picId = ''; - let imgWidth = 540; - let imgHeight = 300; - - // 📝 预留的图片上传逻辑: - // if (options?.image) { - // const picInfo = await bridge.uploadGroupBulletinPic(groupCode, options.image); - // picId = picInfo.id; - // imgWidth = picInfo.width; - // imgHeight = picInfo.height; - // } - - const ret = await setGroupNoticeWebAPI( - cookieObject, - groupCode, - content, - options?.pinned ?? 0, - options?.type ?? 1, - 1, - 1, - options?.confirm_required ?? 1, - picId, - imgWidth, - imgHeight - ); - - if (!ret || ret.ec !== 0) { - throw new Error(`设置群公告失败: ${ret?.em || '未知错误(Cookie过期或权限不足)'}`); - } - - return ret; } \ No newline at end of file diff --git a/packages/core/src/bridge/bridge.ts b/packages/core/src/bridge/bridge.ts index ba095316..19b9618d 100644 --- a/packages/core/src/bridge/bridge.ts +++ b/packages/core/src/bridge/bridge.ts @@ -65,12 +65,14 @@ import { markGroupMessageRead as markPrivateMsgAsRead_, setFriendRemark as setFriendRemark_, fetchGroupFileCount as fetchGroupFileCount_, +} from './bridge-actions'; +import { getGroupHonorInfo as getGroupHonorInfo_, forceFetchClientKey as forceFetchClientKey_, getGroupEssence as getGroupEssence_, getGroupEssenceAll as getGroupEssenceAll_, sendGroupNotice as sendGroupNotice_, -} from './bridge-actions'; +} from './web-actions'; import type { GroupFilesResult } from './bridge-actions'; import type { MediaIndexNode } from './bridge-actions'; diff --git a/packages/core/src/bridge/web-actions.ts b/packages/core/src/bridge/web-actions.ts index e69de29b..f427bf57 100644 --- a/packages/core/src/bridge/web-actions.ts +++ b/packages/core/src/bridge/web-actions.ts @@ -0,0 +1,221 @@ +// Web API operations extracted from Bridge. + +import type { Bridge } from './bridge'; +import { sendOidbAndDecode } from './bridge-oidb'; +import { resolveUserUid } from './bridge-oidb'; +import { + OidbClientKeyRespSchema, + OidbClientKeyReqSchema, + OidbGetPskeyReqSchema, + OidbGetPskeyRespSchema +} from './proto/oidb-action'; +import { RequestUtil } from './web/request-util'; +import { getHonorListWebAPI, WebHonorType } from './web/group-honor'; +import { getGroupEssenceMsg, getGroupEssenceMsgAll } from './web/group-essence'; +import { setGroupNoticeWebAPI } from './web/group-notice'; + +export async function forceFetchClientKey(bridge: Bridge) { + const resp = await sendOidbAndDecode( + bridge, + 'OidbSvcTrpcTcp.0x102a_1', + 0x102A, + 1, + {}, + OidbClientKeyReqSchema, + OidbClientKeyRespSchema + ); + + const clientKey = resp?.clientKey || ''; + const keyIndex = String(resp?.keyIndex || '19'); // 不知道是什么 + + return { + clientKey, + keyIndex, + expireTime: String(resp?.expireTime || '1800') + }; +} + +export async function getPSkey(bridge: Bridge, domainList: string[]) { + const resp = await sendOidbAndDecode( + bridge, + 'OidbSvcTrpcTcp.0x102a_0', + 0x102A, + 0, + { domainList }, + OidbGetPskeyReqSchema, + OidbGetPskeyRespSchema + ); + + const domainPskeyMap = new Map(); + + if (resp?.pskeyItems && Array.isArray(resp.pskeyItems)) { + for (const item of resp.pskeyItems) { + if (item.domain && item.pskey) { + domainPskeyMap.set(item.domain, item.pskey); + } + } + } + + return { + domainPskeyMap, + }; +} + +export async function getCookies(bridge: Bridge, domain: string) { + const ClientKeyData = await forceFetchClientKey(bridge); + + // 构造 ptlogin2 跳转 URL + const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + bridge.qqInfo.uin + + '&clientkey=' + ClientKeyData.clientKey + + '&u1=https%3A%2F%2F' + domain + '%2F' + bridge.qqInfo.uin + '%2Finfocenter&keyindex=' + ClientKeyData.keyIndex; + + const data = await RequestUtil.HttpsGetCookies(requestUrl); + + if (!data['p_skey'] || data['p_skey'].length === 0) { + try { + const pskeyData = await getPSkey(bridge, [domain]); + const pskey = pskeyData.domainPskeyMap.get(domain); + if (pskey) { + data['p_skey'] = pskey; + } + } catch { + return data; + } + } + + return data; +} + +export async function getGroupHonorInfo(bridge: Bridge, groupId: number, type: WebHonorType | string) { + const groupCode = groupId.toString(); + const cookieObject = await getCookies(bridge, 'qun.qq.com'); + + const honorInfo: any = { + group_id: groupId, + current_talkative: null, + talkative_list: [], + performer_list: [], + legend_list: [], + emotion_list: [], + strong_newbie_list: [], + }; + + if (type === WebHonorType.TALKATIVE || type === WebHonorType.ALL) { + const talkativeList = await getHonorListWebAPI(cookieObject, groupCode, 1); + if (talkativeList.length > 0) { + honorInfo.current_talkative = talkativeList[0]; + honorInfo.talkative_list = talkativeList; + } + } + + if (type === WebHonorType.PERFORMER || type === WebHonorType.ALL) { + honorInfo.performer_list = await getHonorListWebAPI(cookieObject, groupCode, 2); + } + + if (type === WebHonorType.LEGEND || type === WebHonorType.ALL) { + honorInfo.legend_list = await getHonorListWebAPI(cookieObject, groupCode, 3); + } + + if (type === WebHonorType.EMOTION || type === WebHonorType.ALL) { + honorInfo.emotion_list = await getHonorListWebAPI(cookieObject, groupCode, 6); + } + + return honorInfo; +} + +export async function getSKey(bridge: Bridge): Promise { + const ClientKeyData = await forceFetchClientKey(bridge); + + if (!ClientKeyData.clientKey) { + throw new Error('getClientKey Error: clientKey is empty'); + } + + const u1 = encodeURIComponent('https://h5.qzone.qq.com/qqnt/qzoneinpcqq/friend?refresh=0&clientuin=0&darkMode=0'); + const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033' + + '&clientuin=' + bridge.qqInfo.uin + + '&clientkey=' + ClientKeyData.clientKey + + '&u1=' + u1 + + '&keyindex=' + ClientKeyData.keyIndex; + + const cookies: { [key: string]: string } = await RequestUtil.HttpsGetCookies(requestUrl); + const skey = cookies['skey']; + + if (!skey) { + throw new Error('SKey is Empty'); + } + + return skey; +} + +/** + * 分页获取群精华消息 + */ +export async function getGroupEssence(bridge: Bridge, groupId: number, pageStart: number = 0, pageLimit: number = 50) { + const groupCode = groupId.toString(); + const cookieObject = await getCookies(bridge, 'qun.qq.com'); + + const essenceData = await getGroupEssenceMsg(cookieObject, groupCode, pageStart, pageLimit); + + return essenceData || { retcode: -1, data: { is_end: true, msg_list: [] } }; +} + +/** + * 获取所有群精华消息 + */ +export async function getGroupEssenceAll(bridge: Bridge, groupId: number) { + const groupCode = groupId.toString(); + const cookieObject = await getCookies(bridge, 'qun.qq.com'); + + const essenceDataAll = await getGroupEssenceMsgAll(cookieObject, groupCode); + + return essenceDataAll; +} + +export async function sendGroupNotice( + bridge: Bridge, + groupId: number, + content: string, + options?: { + image?: string; // 未来如果要发图片,传路径进来 + pinned?: number; + type?: number; + confirm_required?: number; + } +) { + const groupCode = groupId.toString(); + const cookieObject = await getCookies(bridge, 'qun.qq.com'); + + let picId = ''; + let imgWidth = 540; + let imgHeight = 300; + + + // 暂时不知道怎么实现,后面有空再看看 + + // if (options?.image) { + // const picInfo = await bridge.uploadGroupBulletinPic(groupCode, options.image); + // picId = picInfo.id; + // imgWidth = picInfo.width; + // imgHeight = picInfo.height; + // } + + const ret = await setGroupNoticeWebAPI( + cookieObject, + groupCode, + content, + options?.pinned ?? 0, + options?.type ?? 1, + 1, + 1, + options?.confirm_required ?? 1, + picId, + imgWidth, + imgHeight + ); + + if (!ret || ret.ec !== 0) { + throw new Error(`设置群公告失败: ${ret?.em || '未知错误(Cookie过期或权限不足)'}`); + } + + return ret; +} diff --git a/packages/core/src/onebot/actions/extended.ts b/packages/core/src/onebot/actions/extended.ts index 0d09a3c9..0d37f2a7 100644 --- a/packages/core/src/onebot/actions/extended.ts +++ b/packages/core/src/onebot/actions/extended.ts @@ -230,20 +230,25 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { // --- Group notice stubs --- - h.registerAction('send_group_notice', async (params) => { + h.registerAction('_send_group_notice', async (params) => { const groupId = asNumber(params.group_id); const content = asString(params.content); + const image = asString(params.image); if (!groupId || !content) { return failedResponse(RETCODE.BAD_REQUEST, 'group_id and content are required'); } + + if (image) { + return failedResponse(RETCODE.ACTION_FAILED, 'not implemented: image upload for group notice is not supported yet'); + } + if (!ctx.sendGroupNotice) { return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); } try { const options = { - image: asString(params.image), pinned: params.pinned !== undefined ? Number(params.pinned) : 0, type: params.type !== undefined ? Number(params.type) : 1, confirm_required: params.confirm_required !== undefined ? Number(params.confirm_required) : 1, From a0d584375a92b32c6253b8d44b2d157f1a1f5af0 Mon Sep 17 00:00:00 2001 From: H3CoF6 <1707889225@qq.com> Date: Sat, 9 May 2026 04:24:03 +0800 Subject: [PATCH 08/11] feat: implement get group notice --- packages/core/src/bridge/bridge.ts | 5 ++ packages/core/src/bridge/web-actions.ts | 43 +++++++++++++++- packages/core/src/bridge/web/group-notice.ts | 53 ++++++++++++++++++++ packages/core/src/onebot/actions/extended.ts | 16 +++++- packages/core/src/onebot/api-handler.ts | 1 + packages/core/src/onebot/instance-context.ts | 1 + 6 files changed, 116 insertions(+), 3 deletions(-) diff --git a/packages/core/src/bridge/bridge.ts b/packages/core/src/bridge/bridge.ts index 19b9618d..9f38a686 100644 --- a/packages/core/src/bridge/bridge.ts +++ b/packages/core/src/bridge/bridge.ts @@ -72,6 +72,7 @@ import { getGroupEssence as getGroupEssence_, getGroupEssenceAll as getGroupEssenceAll_, sendGroupNotice as sendGroupNotice_, + getGroupNotice as getGroupNotice_, } from './web-actions'; import type { GroupFilesResult } from './bridge-actions'; import type { MediaIndexNode } from './bridge-actions'; @@ -480,6 +481,10 @@ export class Bridge { return sendGroupNotice_(this, groupId, content, options); } + async getGroupNotice(groupId: number) { + return getGroupNotice_(this, groupId); + } + async fetchGroupFileCount(groupId: number): Promise<{ fileCount: number; maxCount: number }> { return fetchGroupFileCount_(this, groupId); } } diff --git a/packages/core/src/bridge/web-actions.ts b/packages/core/src/bridge/web-actions.ts index f427bf57..2677a5de 100644 --- a/packages/core/src/bridge/web-actions.ts +++ b/packages/core/src/bridge/web-actions.ts @@ -12,7 +12,7 @@ import { import { RequestUtil } from './web/request-util'; import { getHonorListWebAPI, WebHonorType } from './web/group-honor'; import { getGroupEssenceMsg, getGroupEssenceMsgAll } from './web/group-essence'; -import { setGroupNoticeWebAPI } from './web/group-notice'; +import { setGroupNoticeWebAPI, getGroupNoticeWebAPI } from './web/group-notice'; export async function forceFetchClientKey(bridge: Bridge) { const resp = await sendOidbAndDecode( @@ -219,3 +219,44 @@ export async function sendGroupNotice( return ret; } + + +export async function getGroupNotice(bridge: Bridge, groupId: number) { + const groupCode = groupId.toString(); + const cookieObject = await getCookies(bridge, 'qun.qq.com'); + + const ret = await getGroupNoticeWebAPI(cookieObject, groupCode); + if (!ret) { + throw new Error('获取公告失败'); + } + + const retNotices: any[] = []; + + if (ret.feeds) { + for (const key in ret.feeds) { + const feed = ret.feeds[key]; + if (!feed) continue; + + const image = feed.msg?.pics?.map((pic) => ({ + id: pic.id, + height: pic.h, + width: pic.w, + })) || []; + + retNotices.push({ + notice_id: feed.fid, + sender_id: feed.u, + publish_time: feed.pubt, + message: { + text: feed.msg?.text || '', + image: image, + images: image, + }, + settings: feed.settings, + read_num: feed.read_num, + }); + } + } + + return retNotices; +} \ No newline at end of file diff --git a/packages/core/src/bridge/web/group-notice.ts b/packages/core/src/bridge/web/group-notice.ts index 11b35fd7..94123635 100644 --- a/packages/core/src/bridge/web/group-notice.ts +++ b/packages/core/src/bridge/web/group-notice.ts @@ -6,6 +6,26 @@ export interface SetNoticeRetSuccess { [key: string]: any; } +export interface WebApiGroupNoticeFeed { + fid: string; + u: number; + pubt: number; + msg: { + text: string; + pics?: Array<{ id: string; w: number; h: number }>; + }; + settings: any; + read_num: number; + [key: string]: any; +} + +export interface WebApiGroupNoticeRet { + ec: number; + em?: string; + feeds?: Record; + [key: string]: any; +} + /** * 发送群公告 Web API @@ -56,4 +76,37 @@ export async function setGroupNoticeWebAPI( } catch (e) { return undefined; } +} + +export async function getGroupNoticeWebAPI( + cookieObject: Record, + groupCode: string +): Promise { + const bkn = getBknFromCookie(cookieObject); + + + const params = new URLSearchParams({ + bkn: bkn, + qid: groupCode, + ft: '23', + ni: '1', + i: '1', + log_read: '1', + platform: '1', + s: '-1', + }).toString(); + + const url = `https://web.qun.qq.com/cgi-bin/announce/get_t_list?${params}&n=20`; + + try { + const ret = await RequestUtil.HttpGetJson( + url, + 'GET', + '', + { Cookie: cookieToString(cookieObject) } + ); + return ret?.ec === 0 ? ret : undefined; + } catch { + return undefined; + } } \ No newline at end of file diff --git a/packages/core/src/onebot/actions/extended.ts b/packages/core/src/onebot/actions/extended.ts index 0d37f2a7..0d25e58e 100644 --- a/packages/core/src/onebot/actions/extended.ts +++ b/packages/core/src/onebot/actions/extended.ts @@ -261,8 +261,20 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { } }); - h.registerAction('_get_group_notice', async () => { - return failedResponse(RETCODE.ACTION_FAILED, 'not yet implemented'); + h.registerAction('_get_group_notice', async (params) => { + const groupId = asNumber(params.group_id); + if (!groupId) return failedResponse(RETCODE.BAD_REQUEST, 'group_id is required'); + + if (!ctx.getGroupNotice) { + return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + } + + try { + const notices = await ctx.getGroupNotice(groupId); + return okResponse(notices); + } catch (e) { + return failedResponse(RETCODE.ACTION_FAILED, String(e)); + } }); h.registerAction('_del_group_notice', async () => { diff --git a/packages/core/src/onebot/api-handler.ts b/packages/core/src/onebot/api-handler.ts index 36be910f..320a061d 100644 --- a/packages/core/src/onebot/api-handler.ts +++ b/packages/core/src/onebot/api-handler.ts @@ -99,6 +99,7 @@ export interface ApiActionContext { getGroupEssence?: (groupId: number, pageStart?: number, pageLimit?: number) => Promise; getGroupEssenceAll?: (groupId: number) => Promise; sendGroupNotice?: (groupId: number, content: string, options?: any) => Promise; + getGroupNotice?: (groupId: number) => Promise; } type ActionHandler = (params: JsonObject) => Promise; diff --git a/packages/core/src/onebot/instance-context.ts b/packages/core/src/onebot/instance-context.ts index e4d7cfb9..6fb1fc71 100644 --- a/packages/core/src/onebot/instance-context.ts +++ b/packages/core/src/onebot/instance-context.ts @@ -129,6 +129,7 @@ export function buildApiContext(ref: InstanceRef): ApiActionContext { getGroupEssence: (groupId: number, pageStart: number = 0, pageLimit: number = 50) => bridge.getGroupEssence(groupId, pageStart, pageLimit), getGroupEssenceAll: (groupId: number) => bridge.getGroupEssenceAll(groupId), sendGroupNotice: (groupId: number, content: string, options?: any) => bridge.sendGroupNotice(groupId, content, options), + getGroupNotice: (groupId: number) => bridge.getGroupNotice(groupId), }; } From 049ef2960c26448b198301c55b2679f136b09ef0 Mon Sep 17 00:00:00 2001 From: H3CoF6 <1707889225@qq.com> Date: Sat, 9 May 2026 04:57:00 +0800 Subject: [PATCH 09/11] feat: implement set online status --- packages/core/src/bridge/bridge-actions.ts | 31 +++++++++++++++++++ packages/core/src/bridge/bridge.ts | 6 ++++ packages/core/src/bridge/proto/oidb-action.ts | 11 +++++++ packages/core/src/onebot/actions/extended.ts | 23 ++++++++++++-- packages/core/src/onebot/api-handler.ts | 1 + packages/core/src/onebot/instance-context.ts | 1 + 6 files changed, 71 insertions(+), 2 deletions(-) diff --git a/packages/core/src/bridge/bridge-actions.ts b/packages/core/src/bridge/bridge-actions.ts index a3c85aae..62294a5e 100644 --- a/packages/core/src/bridge/bridge-actions.ts +++ b/packages/core/src/bridge/bridge-actions.ts @@ -44,6 +44,8 @@ import { GroupRecallRequestSchema, C2CRecallRequestSchema, SsoReadedReportReqSchema, + SetStatusReqSchema, + SetStatusRespSchema, } from './proto/oidb-action'; import { FileUploadExtSchema } from './proto/highway'; import { @@ -1290,4 +1292,33 @@ export async function markGroupMessageRead( if (!result.success) { throw new Error(result.errorMessage || 'mark group message read failed'); } +} + +export async function setOnlineStatus( + bridge: Bridge, + status: number, + extStatus: number = 0, + batteryStatus: number = 100 +): Promise { + const request = protoEncode({ + status, + extStatus, + batteryStatus, + }, SetStatusReqSchema); + + const result = await bridge.sendRawPacket('trpc.qq_new_tech.status_svc.StatusService.SetStatus', request); + + if (!result.success) { + throw new Error(result.errorMessage || 'set online status failed (network/timeout)'); + } + + if (result.responseData && result.responseData.length > 0) { + const resp = protoDecode(result.responseData, SetStatusRespSchema); + if (!resp) { + throw new Error(result.errorMessage || 'set online status failed (network/timeout)'); + } + if (resp.errCode !== undefined && resp.errCode !== 0) { + throw new Error(resp.errMsg || `set online status failed with errCode: ${resp.errCode}`); + } + } } \ No newline at end of file diff --git a/packages/core/src/bridge/bridge.ts b/packages/core/src/bridge/bridge.ts index 9f38a686..77e55d79 100644 --- a/packages/core/src/bridge/bridge.ts +++ b/packages/core/src/bridge/bridge.ts @@ -65,6 +65,7 @@ import { markGroupMessageRead as markPrivateMsgAsRead_, setFriendRemark as setFriendRemark_, fetchGroupFileCount as fetchGroupFileCount_, + setOnlineStatus as setOnlineStatus_, } from './bridge-actions'; import { getGroupHonorInfo as getGroupHonorInfo_, @@ -486,6 +487,11 @@ export class Bridge { } async fetchGroupFileCount(groupId: number): Promise<{ fileCount: number; maxCount: number }> { return fetchGroupFileCount_(this, groupId); } + + // extend + async setOnlineStatus(status: number, extStatus: number = 0, batteryStatus: number = 100): Promise { + return setOnlineStatus_(this, status, extStatus, batteryStatus); + } } // --- Module-level helper functions --- diff --git a/packages/core/src/bridge/proto/oidb-action.ts b/packages/core/src/bridge/proto/oidb-action.ts index 981a5627..6f750980 100644 --- a/packages/core/src/bridge/proto/oidb-action.ts +++ b/packages/core/src/bridge/proto/oidb-action.ts @@ -835,3 +835,14 @@ export const OidbGetPskeyRespSchema = { pskeyItems: { field: 1, type: 'repeated_message' as const, schema: OidbPskeyItemSchema }, } satisfies ProtoSchema; + +export const SetStatusReqSchema = { + status: { field: 1, type: 'int32' as const }, + extStatus: { field: 2, type: 'int32' as const }, + batteryStatus: { field: 3, type: 'int32' as const }, +} satisfies ProtoSchema; + +export const SetStatusRespSchema = { + errCode: { field: 1, type: 'int32' as const }, // 盲猜字段 1 是错误码(虽然成功时没下发,默认 0) + errMsg: { field: 2, type: 'string' as const }, // 返回的 "set status success" +} satisfies ProtoSchema; diff --git a/packages/core/src/onebot/actions/extended.ts b/packages/core/src/onebot/actions/extended.ts index 0d25e58e..7edc8404 100644 --- a/packages/core/src/onebot/actions/extended.ts +++ b/packages/core/src/onebot/actions/extended.ts @@ -531,8 +531,27 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { return failedResponse(RETCODE.ACTION_FAILED, 'not yet implemented'); }); - h.registerAction('set_online_status', async () => { - return failedResponse(RETCODE.ACTION_FAILED, 'not yet implemented'); + h.registerAction('set_online_status', async (params) => { + // 按 OneBot/NapCat 习惯提取参数,状态码默认为 11 + const status = asNumber(params.status); + const extStatus = asNumber(params.ext_status) || 0; + const batteryStatus = asNumber(params.battery_status) || 100; + + // 参数校验 + if (status === undefined || status === 0) { + return failedResponse(RETCODE.BAD_REQUEST, 'status is required'); + } + + if (!ctx.setOnlineStatus) { + return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + } + + try { + await ctx.setOnlineStatus(status, extStatus, batteryStatus); + return okResponse(); + } catch (e) { + return failedResponse(RETCODE.ACTION_FAILED, String(e)); + } }); h.registerAction('get_group_ignored_notifies', async () => { diff --git a/packages/core/src/onebot/api-handler.ts b/packages/core/src/onebot/api-handler.ts index 320a061d..1f6a15cf 100644 --- a/packages/core/src/onebot/api-handler.ts +++ b/packages/core/src/onebot/api-handler.ts @@ -76,6 +76,7 @@ export interface ApiActionContext { setEssenceMsg?: (messageId: number) => Promise; deleteEssenceMsg?: (messageId: number) => Promise; forceFetchClientKey? : () => Promise<{clientKey: string, keyIndex: string, expireTime: string}>; + setOnlineStatus?: (status: number, extStatus?: number, batteryStatus?: number) => Promise; // New context methods setGroupReaction?: (groupId: number, sequence: number, code: string, isSet: boolean) => Promise; handleDeleteFriend?: (userId: number, block?: boolean) => Promise; diff --git a/packages/core/src/onebot/instance-context.ts b/packages/core/src/onebot/instance-context.ts index 6fb1fc71..be9546c2 100644 --- a/packages/core/src/onebot/instance-context.ts +++ b/packages/core/src/onebot/instance-context.ts @@ -124,6 +124,7 @@ export function buildApiContext(ref: InstanceRef): ApiActionContext { }, markGroupMsgAsRead: (groupId: number, sequence: number) => bridge.markGroupMsgAsRead(groupId, sequence), markPrivateMsgAsRead: (userId: number, sequence: number) => bridge.markPrivateMsgAsRead(userId, sequence), + setOnlineStatus: (status: number, extStatus?: number, batteryStatus?: number) => bridge.setOnlineStatus(status, extStatus, batteryStatus), // web getGroupHonorInfo: (groupId: number, type: WebHonorType | string)=> bridge.getGroupHonorInfo(groupId, type), getGroupEssence: (groupId: number, pageStart: number = 0, pageLimit: number = 50) => bridge.getGroupEssence(groupId, pageStart, pageLimit), From 8b313fe088293eed8e4b611fda6de58e9a6ddea9 Mon Sep 17 00:00:00 2001 From: H3CoF6 <1707889225@qq.com> Date: Sat, 9 May 2026 05:08:03 +0800 Subject: [PATCH 10/11] feat: implement set qq profile --- packages/core/src/bridge/bridge-actions.ts | 37 +++++++++++++++++++ packages/core/src/bridge/bridge.ts | 5 +++ packages/core/src/bridge/proto/oidb-action.ts | 17 +++++++++ packages/core/src/onebot/actions/extended.ts | 17 ++++++++- packages/core/src/onebot/api-handler.ts | 1 + packages/core/src/onebot/instance-context.ts | 1 + 6 files changed, 76 insertions(+), 2 deletions(-) diff --git a/packages/core/src/bridge/bridge-actions.ts b/packages/core/src/bridge/bridge-actions.ts index 62294a5e..2f65ab2e 100644 --- a/packages/core/src/bridge/bridge-actions.ts +++ b/packages/core/src/bridge/bridge-actions.ts @@ -46,6 +46,7 @@ import { SsoReadedReportReqSchema, SetStatusReqSchema, SetStatusRespSchema, + OidbSetProfileSchema, } from './proto/oidb-action'; import { FileUploadExtSchema } from './proto/highway'; import { @@ -1321,4 +1322,40 @@ export async function setOnlineStatus( throw new Error(resp.errMsg || `set online status failed with errCode: ${resp.errCode}`); } } +} + +export async function setProfile( + bridge: Bridge, + nickname?: string, + personalNote?: string +): Promise { + const uin = BigInt(bridge.qqInfo.uin); + const stringProfiles: any[] = []; + const intProfiles: any[] = []; + + if (nickname !== undefined) { + stringProfiles.push({ fieldId: 20002, value: nickname }); + } + + if (personalNote !== undefined) { + stringProfiles.push({ fieldId: 102, value: personalNote }); + } + + if (stringProfiles.length === 0 && intProfiles.length === 0) { + return; + } + + const req = { + uin, + stringProfiles, + }; + + await sendOidbAndCheck( + bridge, + 'OidbSvcTrpcTcp.0x112a_2', + 0x112A, + 2, + req, + OidbSetProfileSchema + ); } \ No newline at end of file diff --git a/packages/core/src/bridge/bridge.ts b/packages/core/src/bridge/bridge.ts index 77e55d79..9b957a50 100644 --- a/packages/core/src/bridge/bridge.ts +++ b/packages/core/src/bridge/bridge.ts @@ -66,6 +66,7 @@ import { setFriendRemark as setFriendRemark_, fetchGroupFileCount as fetchGroupFileCount_, setOnlineStatus as setOnlineStatus_, + setProfile as setProfile_, } from './bridge-actions'; import { getGroupHonorInfo as getGroupHonorInfo_, @@ -492,6 +493,10 @@ export class Bridge { async setOnlineStatus(status: number, extStatus: number = 0, batteryStatus: number = 100): Promise { return setOnlineStatus_(this, status, extStatus, batteryStatus); } + async setProfile(nickname?: string, personalNote?: string): Promise { + return setProfile_(this, nickname, personalNote); + } + } // --- Module-level helper functions --- diff --git a/packages/core/src/bridge/proto/oidb-action.ts b/packages/core/src/bridge/proto/oidb-action.ts index 6f750980..587be943 100644 --- a/packages/core/src/bridge/proto/oidb-action.ts +++ b/packages/core/src/bridge/proto/oidb-action.ts @@ -846,3 +846,20 @@ export const SetStatusRespSchema = { errCode: { field: 1, type: 'int32' as const }, // 盲猜字段 1 是错误码(虽然成功时没下发,默认 0) errMsg: { field: 2, type: 'string' as const }, // 返回的 "set status success" } satisfies ProtoSchema; + + +export const OidbProfileStringItemSchema = { + fieldId: { field: 1, type: 'uint32' as const }, + value: { field: 2, type: 'string' as const }, +} satisfies ProtoSchema; + +export const OidbProfileIntItemSchema = { + fieldId: { field: 1, type: 'uint32' as const }, + value: { field: 2, type: 'uint64' as const }, +} satisfies ProtoSchema; + +export const OidbSetProfileSchema = { + uin: { field: 1, type: 'uint64' as const }, + stringProfiles: { field: 2, type: 'repeated_message' as const, schema: OidbProfileStringItemSchema }, + intProfiles: { field: 3, type: 'repeated_message' as const, schema: OidbProfileIntItemSchema }, +} satisfies ProtoSchema; \ No newline at end of file diff --git a/packages/core/src/onebot/actions/extended.ts b/packages/core/src/onebot/actions/extended.ts index 7edc8404..c4edf99f 100644 --- a/packages/core/src/onebot/actions/extended.ts +++ b/packages/core/src/onebot/actions/extended.ts @@ -527,8 +527,21 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { return okResponse({ file: pathMod.resolve(filePath) }); }); - h.registerAction('set_qq_profile', async () => { - return failedResponse(RETCODE.ACTION_FAILED, 'not yet implemented'); + h.registerAction('set_qq_profile', async (params) => { + + const nickname = params.nickname !== undefined ? asString(params.nickname) : undefined; + const personalNote = params.personal_note !== undefined ? asString(params.personal_note) : undefined; + + if (!ctx.setProfile) { + return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + } + + try { + await ctx.setProfile(nickname, personalNote); + return okResponse(); + } catch (e) { + return failedResponse(RETCODE.ACTION_FAILED, String(e)); + } }); h.registerAction('set_online_status', async (params) => { diff --git a/packages/core/src/onebot/api-handler.ts b/packages/core/src/onebot/api-handler.ts index 1f6a15cf..52f71a2c 100644 --- a/packages/core/src/onebot/api-handler.ts +++ b/packages/core/src/onebot/api-handler.ts @@ -77,6 +77,7 @@ export interface ApiActionContext { deleteEssenceMsg?: (messageId: number) => Promise; forceFetchClientKey? : () => Promise<{clientKey: string, keyIndex: string, expireTime: string}>; setOnlineStatus?: (status: number, extStatus?: number, batteryStatus?: number) => Promise; + setProfile?: (nickname?: string, personalNote?: string) => Promise; // New context methods setGroupReaction?: (groupId: number, sequence: number, code: string, isSet: boolean) => Promise; handleDeleteFriend?: (userId: number, block?: boolean) => Promise; diff --git a/packages/core/src/onebot/instance-context.ts b/packages/core/src/onebot/instance-context.ts index be9546c2..34b01dac 100644 --- a/packages/core/src/onebot/instance-context.ts +++ b/packages/core/src/onebot/instance-context.ts @@ -125,6 +125,7 @@ export function buildApiContext(ref: InstanceRef): ApiActionContext { markGroupMsgAsRead: (groupId: number, sequence: number) => bridge.markGroupMsgAsRead(groupId, sequence), markPrivateMsgAsRead: (userId: number, sequence: number) => bridge.markPrivateMsgAsRead(userId, sequence), setOnlineStatus: (status: number, extStatus?: number, batteryStatus?: number) => bridge.setOnlineStatus(status, extStatus, batteryStatus), + setProfile: (nickname?: string, personalNote?: string) => bridge.setProfile(nickname, personalNote), // web getGroupHonorInfo: (groupId: number, type: WebHonorType | string)=> bridge.getGroupHonorInfo(groupId, type), getGroupEssence: (groupId: number, pageStart: number = 0, pageLimit: number = 50) => bridge.getGroupEssence(groupId, pageStart, pageLimit), From c8dd520d6572c528dbe983c045c0f7443daef32c Mon Sep 17 00:00:00 2001 From: H3CoF6 <1707889225@qq.com> Date: Sat, 9 May 2026 05:17:18 +0800 Subject: [PATCH 11/11] feat: implement get cookies and CSRF and credentials --- packages/core/src/bridge/bridge.ts | 6 +++ packages/core/src/bridge/web-actions.ts | 53 ++++++++++++++++++++ packages/core/src/onebot/actions/extended.ts | 36 ++++++++++--- packages/core/src/onebot/api-handler.ts | 3 ++ packages/core/src/onebot/instance-context.ts | 3 ++ 5 files changed, 95 insertions(+), 6 deletions(-) diff --git a/packages/core/src/bridge/bridge.ts b/packages/core/src/bridge/bridge.ts index 9b957a50..7da6d88e 100644 --- a/packages/core/src/bridge/bridge.ts +++ b/packages/core/src/bridge/bridge.ts @@ -75,6 +75,9 @@ import { getGroupEssenceAll as getGroupEssenceAll_, sendGroupNotice as sendGroupNotice_, getGroupNotice as getGroupNotice_, + getCookiesStr as getCookiesStr_, + getCsrfToken as getCsrfToken_, + getCredentials as getCredentials_, } from './web-actions'; import type { GroupFilesResult } from './bridge-actions'; import type { MediaIndexNode } from './bridge-actions'; @@ -496,6 +499,9 @@ export class Bridge { async setProfile(nickname?: string, personalNote?: string): Promise { return setProfile_(this, nickname, personalNote); } + async getCookiesStr(domain: string): Promise { return getCookiesStr_(this, domain); } + async getCsrfToken(): Promise { return getCsrfToken_(this); } + async getCredentials(domain: string) { return getCredentials_(this, domain); } } diff --git a/packages/core/src/bridge/web-actions.ts b/packages/core/src/bridge/web-actions.ts index 2677a5de..7fce47f2 100644 --- a/packages/core/src/bridge/web-actions.ts +++ b/packages/core/src/bridge/web-actions.ts @@ -259,4 +259,57 @@ export async function getGroupNotice(bridge: Bridge, groupId: number) { } return retNotices; +} + +/** + * 提取的公共算法:根据 skey/p_skey 计算 bkn (也就是 token / csrf_token) + */ +export function getBknFromSKey(skey: string): number { + let hash = 5381; + for (let i = 0; i < skey.length; i++) { + hash += (hash << 5) + skey.charCodeAt(i); + } + return hash & 2147483647; +} + +/** + * 获取 Cookies (字符串格式) + */ +export async function getCookiesStr(bridge: Bridge, domain: string): Promise { + const cookieObject = await getCookies(bridge, domain); + return Object.entries(cookieObject) + .map(([key, value]) => `${key}=${value}`) + .join('; '); +} + +/** + * 获取 CSRF Token (即 BKN) + */ +export async function getCsrfToken(bridge: Bridge): Promise { + + const skey = await getSKey(bridge); + if (!skey) { + throw new Error('SKey is Empty'); + } + return getBknFromSKey(skey); +} + +/** + * 获取凭证 (Cookies 字符串 + Token) + */ +export async function getCredentials(bridge: Bridge, domain: string) { + const cookieObject = await getCookies(bridge, domain); + const cookiesStr = Object.entries(cookieObject) + .map(([key, value]) => `${key}=${value}`) + .join('; '); + + + const skey = cookieObject['p_skey'] || cookieObject['skey'] || ''; + const token = skey ? getBknFromSKey(skey) : 0; + + return { + cookies: cookiesStr, + token: token, + csrf_token: token + }; } \ No newline at end of file diff --git a/packages/core/src/onebot/actions/extended.ts b/packages/core/src/onebot/actions/extended.ts index c4edf99f..b1eaa229 100644 --- a/packages/core/src/onebot/actions/extended.ts +++ b/packages/core/src/onebot/actions/extended.ts @@ -413,18 +413,42 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { // --- Credentials --- - h.registerAction('get_cookies', async () => { - return okResponse({ cookies: '' }); + h.registerAction('get_cookies', async (params) => { + const domain = asString(params.domain) || 'qun.qq.com'; + + if (!ctx.getCookiesStr) return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + + try { + const cookies = await ctx.getCookiesStr(domain); + return okResponse({ cookies }); + } catch (e) { + return failedResponse(RETCODE.ACTION_FAILED, String(e)); + } }); h.registerAction('get_csrf_token', async () => { - return okResponse({ token: 0 }); + if (!ctx.getCsrfToken) return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + + try { + const token = await ctx.getCsrfToken(); + return okResponse({ token }); + } catch (e) { + return failedResponse(RETCODE.ACTION_FAILED, String(e)); + } }); - h.registerAction('get_credentials', async () => { - return okResponse({ cookies: '', csrf_token: 0 }); - }); + h.registerAction('get_credentials', async (params) => { + const domain = asString(params.domain) || 'qun.qq.com'; + if (!ctx.getCredentials) return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + + try { + const creds = await ctx.getCredentials(domain); + return okResponse(creds); + } catch (e) { + return failedResponse(RETCODE.ACTION_FAILED, String(e)); + } + }); // --- Utility --- h.registerAction('set_restart', async () => { diff --git a/packages/core/src/onebot/api-handler.ts b/packages/core/src/onebot/api-handler.ts index 52f71a2c..407096e1 100644 --- a/packages/core/src/onebot/api-handler.ts +++ b/packages/core/src/onebot/api-handler.ts @@ -102,6 +102,9 @@ export interface ApiActionContext { getGroupEssenceAll?: (groupId: number) => Promise; sendGroupNotice?: (groupId: number, content: string, options?: any) => Promise; getGroupNotice?: (groupId: number) => Promise; + getCookiesStr?: (domain: string) => Promise; + getCsrfToken?: () => Promise; + getCredentials?: (domain: string) => Promise<{ cookies: string; token: number; csrf_token: number }>; } type ActionHandler = (params: JsonObject) => Promise; diff --git a/packages/core/src/onebot/instance-context.ts b/packages/core/src/onebot/instance-context.ts index 34b01dac..7800e5b1 100644 --- a/packages/core/src/onebot/instance-context.ts +++ b/packages/core/src/onebot/instance-context.ts @@ -132,6 +132,9 @@ export function buildApiContext(ref: InstanceRef): ApiActionContext { getGroupEssenceAll: (groupId: number) => bridge.getGroupEssenceAll(groupId), sendGroupNotice: (groupId: number, content: string, options?: any) => bridge.sendGroupNotice(groupId, content, options), getGroupNotice: (groupId: number) => bridge.getGroupNotice(groupId), + getCookiesStr: (domain: string) => bridge.getCookiesStr(domain), + getCsrfToken: () => bridge.getCsrfToken(), + getCredentials: (domain: string) => bridge.getCredentials(domain), }; }