GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2025-07-19 12:03:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
手瓜一十雪
2024-10-12 15:27:58 +08:00
parent eba5900ba8
commit 968bd7a437
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/apis/group.ts
View File

@@ -56,8 +56,8 @@ export class NTQQGroupApi {
async sendPacketPoke(group: string, peer: string) { async sendPacketPoke(group: string, peer: string) {
let data = encodeGroupPoke(group, peer); let data = encodeGroupPoke(group, peer);
let hex = Buffer.from(data).toString('hex'); let hex = Buffer.from(data).toString('hex');
let retdata = await this.core.apis.PacketApi.sendPacket('OidbSvcTrpcTcp.0xed3_1', hex, true); let retdata = await this.core.apis.PacketApi.sendPacket('OidbSvcTrpcTcp.0xed3_1', hex, false);
console.log('sendPacketPoke', retdata); //console.log('sendPacketPoke', retdata);
} }
async fetchGroupEssenceList(groupCode: string) { async fetchGroupEssenceList(groupCode: string) {
const pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!; const pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!;

17
src/core/apis/packet.ts
View File

@@ -51,7 +51,22 @@ export class NTQQPacketApi {
return text; return text;
} }
async sendPacket(cmd: string, data: string, rsp = false) { async sendPacket(cmd: string, data: string, rsp = false) {
return new Promise((resolve, reject) => { // wtfk tx
// 校验失败和异常 可能返回undefined
return new Promise<undefined | {
type: string,//仅recv含有data
trace_id: string,
data: {
trace_id: string,
seq: number,
hex_data: string,
cmd: string
}
}>((resolve, reject) => {
if (!this.isInit || !this.PacketClient?.isConnected) {
this.core.context.logger.logError('PacketClient is not init');
return undefined;
}
let md5 = crypto.createHash('md5').update(data).digest('hex'); let md5 = crypto.createHash('md5').update(data).digest('hex');
let trace_id = (this.randText(4) + md5 + data).slice(0, data.length / 2); let trace_id = (this.randText(4) + md5 + data).slice(0, data.length / 2);
this.PacketClient?.sendCommand(cmd, data, trace_id, rsp, 5000, async () => { this.PacketClient?.sendCommand(cmd, data, trace_id, rsp, 5000, async () => {

2
src/core/helper/packet.ts
View File

@@ -4,7 +4,7 @@ import WebSocket from "ws";
export class PacketClient { export class PacketClient {
private websocket: WebSocket | undefined; private websocket: WebSocket | undefined;
private isConnected: boolean = false; public isConnected: boolean = false;
private reconnectAttempts: number = 0; private reconnectAttempts: number = 0;
private maxReconnectAttempts: number = 5; private maxReconnectAttempts: number = 5;
private cb = new LRUCache<string, { type: string, callback: any }>(500); private cb = new LRUCache<string, { type: string, callback: any }>(500);

8
src/onebot/index.ts
View File

@@ -540,10 +540,10 @@ export class NapCatOneBot11Adapter {
if (isSelfMsg) { if (isSelfMsg) {
ob11Msg.target_id = parseInt(message.peerUin); ob11Msg.target_id = parseInt(message.peerUin);
} }
if(ob11Msg.raw_message.startsWith('!poke')){ // if(ob11Msg.raw_message.startsWith('!poke')){
console.log('poke',message.peerUin, message.senderUin); // console.log('poke',message.peerUin, message.senderUin);
this.core.apis.GroupApi.sendPacketPoke(message.peerUin, message.senderUin); // this.core.apis.GroupApi.sendPacketPoke(message.peerUin, message.senderUin);
} // }
this.networkManager.emitEvent(ob11Msg); this.networkManager.emitEvent(ob11Msg);
}).catch(e => this.context.logger.logError.bind(this.context.logger)('constructMessage error: ', e)); }).catch(e => this.context.logger.logError.bind(this.context.logger)('constructMessage error: ', e));