From 5cca8457e7518ba5a2c7ae4e496da28d063bf7a2 Mon Sep 17 00:00:00 2001 From: pk5ls20 Date: Wed, 23 Oct 2024 16:33:05 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9C=89=E7=AC=A8=E8=9B=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/apis/packet.ts | 3 ++- src/core/packet/highway/uploader.ts | 2 ++ src/core/packet/packer.ts | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/apis/packet.ts b/src/core/apis/packet.ts index 114b0d59..7e65f930 100644 --- a/src/core/apis/packet.ts +++ b/src/core/apis/packet.ts @@ -111,6 +111,7 @@ export class NTQQPacketApi { await this.sendPacket('OidbSvcTrpcTcp.0x8fc_2', data!, true); } + // TODO: can simplify this async uploadResources(msg: PacketMsg[], groupUin: number = 0) { const reqList = []; for (const m of msg) { @@ -135,7 +136,7 @@ export class NTQQPacketApi { } } } - return Promise.all(reqList); + return Promise.all(reqList); // TODO: use promise.allSettled } async sendUploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) { diff --git a/src/core/packet/highway/uploader.ts b/src/core/packet/highway/uploader.ts index 4b4a864f..d19dd2f7 100644 --- a/src/core/packet/highway/uploader.ts +++ b/src/core/packet/highway/uploader.ts @@ -94,6 +94,7 @@ export class HighwayTcpUploader extends HighwayUploader { const handleRspHeader = (header: Buffer) => { const rsp = new NapProtoMsg(RespDataHighwayHead).decode(header); if (rsp.errorCode !== 0) { + // TODO: immediately reject promise if error code is not 0 this.logger.logWarn(`[Highway] tcpUpload failed (code: ${rsp.errorCode})`); } const percent = ((Number(rsp.msgSegHead?.dataOffset) + Number(rsp.msgSegHead?.dataLength)) / Number(rsp.msgSegHead?.filesize)).toFixed(2); @@ -159,6 +160,7 @@ export class HighwayHttpUploader extends HighwayUploader { const headData = new NapProtoMsg(RespDataHighwayHead).decode(head); this.logger.logDebug(`[Highway] httpUploadBlock: ${headData.errorCode} | ${headData.msgSegHead?.retCode} | ${headData.bytesRspExtendInfo} | ${head.toString('hex')} | ${body.toString('hex')}`); if (headData.errorCode !== 0) { + // TODO: immediately throw error if error code is not 0 this.logger.logError(`[Highway] httpUploadBlock failed (code=${headData.errorCode})`); } } diff --git a/src/core/packet/packer.ts b/src/core/packet/packer.ts index 13e40846..b3f8dd74 100644 --- a/src/core/packet/packer.ts +++ b/src/core/packet/packer.ts @@ -34,6 +34,7 @@ export class PacketPacker { this.packetConverter = new PacketMsgConverter(logger); } + // TODO: 一步到位多好ww private toHexStr(byteArray: Uint8Array): PacketHexStr { return Buffer.from(byteArray).toString('hex') as PacketHexStr; }