mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2025-07-19 12:03:37 +00:00
style: 标准化
This commit is contained in:
@@ -45,12 +45,6 @@ export class NTQQGroupApi {
|
||||
);
|
||||
}
|
||||
|
||||
async sendPacketRkey() {
|
||||
const data = this.core.apis.PacketApi.packetPacker.packRkeyPacket();
|
||||
const ret = await this.core.apis.PacketApi.sendPacket('OidbSvcTrpcTcp.0x9067_202', data, true);
|
||||
//console.log('ret: ', ret);
|
||||
}
|
||||
|
||||
async fetchGroupEssenceList(groupCode: string) {
|
||||
const pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!;
|
||||
return this.context.session.getGroupService().fetchGroupEssenceList({
|
||||
|
@@ -61,13 +61,12 @@ export class NTQQPacketApi {
|
||||
}
|
||||
|
||||
async sendPacket(cmd: string, data: PacketHexStr, rsp = false): Promise<RecvPacketData> {
|
||||
return this.packetSession!.client!.sendPacket(cmd, data, rsp);
|
||||
return this.packetSession!.client.sendPacket(cmd, data, rsp);
|
||||
}
|
||||
|
||||
async sendPokePacket(group: number, peer: number) {
|
||||
const data = this.packetPacker.packPokePacket(group, peer);
|
||||
const ret = await this.sendPacket('OidbSvcTrpcTcp.0xed3_1', data, false);
|
||||
//console.log('ret: ', ret);
|
||||
await this.sendPacket('OidbSvcTrpcTcp.0xed3_1', data, false);
|
||||
}
|
||||
|
||||
async sendRkeyPacket() {
|
||||
@@ -102,7 +101,7 @@ export class NTQQPacketApi {
|
||||
|
||||
async sendSetSpecialTittlePacket(groupCode: string, uid: string, tittle: string) {
|
||||
const data = this.packetPacker.packSetSpecialTittlePacket(groupCode, uid, tittle);
|
||||
const ret = await this.sendPacket('OidbSvcTrpcTcp.0x8fc_2', data, true);
|
||||
await this.sendPacket('OidbSvcTrpcTcp.0x8fc_2', data, true);
|
||||
}
|
||||
|
||||
async sendUploadForwardMsg(msg: PacketForwardNode[], groupUin: number = 0) {
|
||||
|
@@ -21,8 +21,8 @@ export class PacketClient {
|
||||
private websocket: WebSocket | undefined;
|
||||
private isConnected: boolean = false;
|
||||
private reconnectAttempts: number = 0;
|
||||
private maxReconnectAttempts: number = 5;
|
||||
private cb = new LRUCache<string, (json: RecvPacketData) => Promise<void>>(500); // trace_id-type callback
|
||||
private readonly maxReconnectAttempts: number = 5;//现在暂时不可配置
|
||||
private readonly cb = new LRUCache<string, (json: RecvPacketData) => Promise<void>>(500); // trace_id-type callback
|
||||
private readonly clientUrl: string = '';
|
||||
private readonly napCatCore: NapCatCore;
|
||||
private readonly logger: LogWrapper;
|
||||
@@ -61,7 +61,7 @@ export class PacketClient {
|
||||
|
||||
this.websocket.onerror = (error) => {
|
||||
this.logger.logError.bind(this.logger)(`WebSocket error: ${error}`);
|
||||
reject(error);
|
||||
reject(new Error(`${error.message}`));
|
||||
};
|
||||
|
||||
this.websocket.onmessage = (event) => {
|
||||
@@ -172,7 +172,7 @@ export class PacketClient {
|
||||
const trace_id = (this.randText(4) + md5 + data).slice(0, data.length / 2);
|
||||
this.sendCommand(cmd, data, trace_id, rsp, 5000, async () => {
|
||||
await this.napCatCore.context.session.getMsgService().sendSsoCmdReqByContend(cmd, trace_id);
|
||||
}).then((res) => resolve(res)).catch((e) => reject(e));
|
||||
}).then((res) => resolve(res)).catch((e: Error) => reject(e));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -12,7 +12,7 @@ import { PacketForwardNode } from "@/core/packet/msg/entity/forward";
|
||||
export type PacketHexStr = string & { readonly hexNya: unique symbol };
|
||||
|
||||
export class PacketPacker {
|
||||
private packetBuilder: PacketMsgBuilder;
|
||||
private readonly packetBuilder: PacketMsgBuilder;
|
||||
|
||||
constructor() {
|
||||
this.packetBuilder = new PacketMsgBuilder();
|
||||
|
@@ -5,7 +5,7 @@ import { LogWrapper } from "@/common/log";
|
||||
export class PacketSession {
|
||||
readonly logger: LogWrapper;
|
||||
readonly client: PacketClient;
|
||||
private highwayClient: PacketHighwayClient;
|
||||
private readonly highwayClient: PacketHighwayClient;
|
||||
|
||||
constructor(logger: LogWrapper, client: PacketClient) {
|
||||
this.logger = logger;
|
||||
|
Reference in New Issue
Block a user