QQ/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-11-16 13:01:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: optimised code

Browse Source
This commit is contained in:
pk5ls20 2024-10-17 03:29:36 +08:00
parent b1157f60f5
commit 0ab61bac12
No known key found for this signature in database
GPG Key ID: 6370ED7A169F493A
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/packet/highway/client.ts
View File

@ -1,8 +1,8 @@
import * as stream from 'node:stream';
import {ReadStream} from "node:fs";
import {PacketHighwaySig} from "@/core/packet/highway/session";
import {HighwayHttpUploader} from "@/core/packet/highway/uploader";
import {LogWrapper} from "@/common/log";
import {ReadStream} from "fs";
import {HighwayHttpUploader, HighwayTcpUploader} from "@/core/packet/highway/uploader";
export interface PacketHighwayTrans {
uin: string;

2
src/core/packet/highway/session.ts
View File

@ -1,11 +1,11 @@
import * as fs from "node:fs";
import {ChatType, Peer} from "@/core";
import {LogWrapper} from "@/common/log";
import {PacketClient} from "@/core/packet/client";
import {PacketPacker} from "@/core/packet/packer";
import {NapProtoMsg} from "@/core/packet/proto/NapProto";
import {HttpConn0x6ff_501Response} from "@/core/packet/proto/action/action";
import {PacketHighwayClient} from "@/core/packet/highway/client";
import {ChatType, Peer} from "@/core";
import {NTV2RichMediaResp} from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp";
import {OidbSvcTrpcTcpBaseRsp} from "@/core/packet/proto/oidb/OidbBase";
import {PacketMsgPicElement} from "@/core/packet/msg/element";

34
src/core/packet/highway/uploader.ts
View File

@ -1,19 +1,18 @@
import stream from "node:stream";
import * as net from "node:net";
import * as crypto from "node:crypto";
import * as http from "node:http";
import * as stream from "node:stream";
import {LogWrapper} from "@/common/log";
import * as tea from "@/core/packet/utils/crypto/tea";
import {NapProtoMsg} from "@/core/packet/proto/NapProto";
import {ReqDataHighwayHead, RespDataHighwayHead} from "@/core/packet/proto/highway/highway";
import {BlockSize} from "@/core/packet/highway/session";
import {createHash} from "crypto";
import {PacketHighwayTrans} from "@/core/packet/highway/client";
import net from "node:net";
import {Frame} from "@/core/packet/highway/frame";
import crypto from "node:crypto";
import http from "node:http";
abstract class HighwayUploader {
readonly trans: PacketHighwayTrans;
readonly logger : LogWrapper;
readonly logger: LogWrapper;
constructor(trans: PacketHighwayTrans, logger: LogWrapper) {
this.trans = trans;
@ -75,8 +74,8 @@ class HighwayTcpUploaderTransform extends stream.Transform {
this.uploader.logger.log(`[Highway] _transform offset = ${offset}, data.length = ${data.length}`);
const chunkSize = data.length > BlockSize ? BlockSize : data.length;
this.uploader.logger.log(`[Highway] _transform calced chunkSize = ${chunkSize}`);
const chunk = data.slice(offset, offset + chunkSize);
const chunkMd5 = createHash('md5').update(chunk).digest();
const chunk = data.subarray(offset, offset + chunkSize);
const chunkMd5 = crypto.createHash('md5').update(chunk).digest();
const head = this.uploader.buildHead(offset, chunk.length, chunkMd5);
this.uploader.logger.log(`[Highway] _transform: ${offset} | ${data.length} | ${chunkMd5.toString('hex')}`);
offset += chunk.length;
@ -97,14 +96,13 @@ export class HighwayTcpUploader extends HighwayUploader {
const rsp = new NapProtoMsg(RespDataHighwayHead).decode(header);
if (rsp.errorCode !== 0) {
this.logger.logWarn(`highway upload failed (code: ${rsp.errorCode})`);
} else {
const percent = ((Number(rsp.msgSegHead?.dataOffset) + Number(rsp.msgSegHead?.dataLength)) / Number(rsp.msgSegHead?.filesize)).toFixed(2);
this.logger.log(`[Highway] ${rsp.errorCode} | ${percent} | ${Buffer.from(header).toString('hex')}`);
if (Number(rsp.msgSegHead?.dataOffset) + Number(rsp.msgSegHead?.dataLength) >= Number(rsp.msgSegHead?.filesize)) {
this.logger.log('[Highway] tcpUpload finished.');
socket.end();
resolve();
}
}
const percent = ((Number(rsp.msgSegHead?.dataOffset) + Number(rsp.msgSegHead?.dataLength)) / Number(rsp.msgSegHead?.filesize)).toFixed(2);
this.logger.log(`[Highway] ${rsp.errorCode} | ${percent} | ${Buffer.from(header).toString('hex')}`);
if (Number(rsp.msgSegHead?.dataOffset) + Number(rsp.msgSegHead?.dataLength) >= Number(rsp.msgSegHead?.filesize)) {
this.logger.log('[Highway] tcpUpload finished.');
socket.end();
resolve();
}
};
socket.on('data', (chunk: Buffer) => {
@ -158,7 +156,7 @@ export class HighwayHttpUploader extends HighwayUploader {
const isEnd = offset + block.length === this.trans.size;
const chunkMD5 = crypto.createHash('md5').update(block).digest();
const payload = this.buildHead(offset, block.length, chunkMD5);
this.logger.log(`[Highway] httpUploadBlock: payload = ${Buffer.from(payload).toString('hex')}`);
// this.logger.log(`[Highway] httpUploadBlock: payload = ${Buffer.from(payload).toString('hex')}`);
const frame = Frame.pack(Buffer.from(payload), block)
this.logger.log(`[Highway] httpUploadBlock: ${offset} | ${block.length} | ${Buffer.from(chunkMD5).toString('hex')}`);
const resp = await this.httpPostHighwayContent(frame, `http://${this.trans.ip}:${this.trans.port}/cgi-bin/httpconn?htcmd=0x6FF0087&uin=${this.trans.uin}`, isEnd);
@ -188,7 +186,7 @@ export class HighwayHttpUploader extends HighwayUploader {
data = Buffer.concat([data, chunk]);
});
res.on('end', () => {
console.log(`[Highway] postHighwayContent: ${data.toString('hex')}`);
// console.log(`[Highway] postHighwayContent: ${data.toString('hex')}`);
resolve(data);
});
});