Merge pull request #512 from NapNeko/refactor/packet-2

refactor: packet
NapNeko · Nov 13, 2024 · 92d720c · 92d720c
2 parents 60a0539 + 2ea0250
commit 92d720c
Show file tree

Hide file tree

Showing 109 changed files with 2,409 additions and 1,979 deletions.
diff --git a/package.json b/package.json
@@ -16,8 +16,7 @@
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.14.0",
     "@log4js-node/log4js-api": "^1.0.2",
-    "@napneko/nap-proto-core": "^0.0.2",
-    "@protobuf-ts/runtime": "^2.9.4",
+    "@napneko/nap-proto-core": "^0.0.4",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/cors": "^2.8.17",

diff --git a/src/common/forward-msg-builder.ts b/src/common/forward-msg-builder.ts
@@ -1,5 +1,5 @@
-import { PacketMsg } from "@/core/packet/message/message";
 import * as crypto from "node:crypto";
+import { PacketMsg } from "@/core/packet/message/message";
 
 interface ForwardMsgJson {
     app: string

diff --git a/src/common/log.ts b/src/common/log.ts
@@ -148,6 +148,7 @@ export class LogWrapper {
         } else if (this.consoleLogEnabled) {
             this.logger.log(level, message);
         } else if (this.fileLogEnabled) {
+            // eslint-disable-next-line no-control-regex
             this.logger.log(level, message.replace(/\x1B[@-_][0-?]*[ -/]*[@-~]/g, ''));
         }
     }
@@ -226,7 +227,7 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
                 ?
                 rawMessageToText(recordMsgOrNull, recursiveLevel + 1) :
                 `未找到消息记录 (MsgId = ${element.replyElement.sourceMsgIdInRecords})`
-                }]`;
+            }]`;
         }
 
         if (element.picElement) {
@@ -277,4 +278,4 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
     }
 
     return tokens.join(' ');
-}
+}
diff --git a/src/core/apis/file.ts b/src/core/apis/file.ts
@@ -433,7 +433,7 @@ export class NTQQFileApi {
                     const rkey_expired_private = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
                     const rkey_expired_group = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
                     if (rkey_expired_private || rkey_expired_group) {
-                        this.packetRkey = await this.core.apis.PacketApi.sendRkeyPacket();
+                        this.packetRkey = await this.core.apis.PacketApi.pkt.operation.FetchRkey();
                     }
                     if (this.packetRkey && this.packetRkey.length > 0) {
                         rkeyData.group_rkey = this.packetRkey[1].rkey.slice(6);

diff --git a/src/core/apis/packet.ts b/src/core/apis/packet.ts
@@ -1,33 +1,10 @@
-import * as crypto from 'crypto';
 import * as os from 'os';
-import { ChatType, InstanceContext, NapCatCore } from '..';
 import offset from '@/core/external/offset.json';
-import { PacketSession } from "@/core/packet/session";
-import { OidbPacket, PacketHexStr } from "@/core/packet/packer";
-import { NapProtoMsg, NapProtoEncodeStructType, NapProtoDecodeStructType } from "@napneko/nap-proto-core";
-import { OidbSvcTrpcTcp0X9067_202_Rsp_Body } from '@/core/packet/proto/oidb/Oidb.0x9067_202';
-import { OidbSvcTrpcTcpBase, OidbSvcTrpcTcpBaseRsp } from '@/core/packet/proto/oidb/OidbBase';
-import { OidbSvcTrpcTcp0XFE1_2RSP } from '@/core/packet/proto/oidb/Oidb.0XFE1_2';
+import { InstanceContext, NapCatCore } from "@/core";
 import { LogWrapper } from "@/common/log";
-import { SendLongMsgResp } from "@/core/packet/proto/message/action";
-import { PacketMsg } from "@/core/packet/message/message";
-import { OidbSvcTrpcTcp0x6D6Response } from "@/core/packet/proto/oidb/Oidb.0x6D6";
-import {
-    PacketMsgFileElement,
-    PacketMsgPicElement,
-    PacketMsgPttElement,
-    PacketMsgVideoElement
-} from "@/core/packet/message/element";
-import { MiniAppReqParams, MiniAppRawData } from "@/core/packet/entities/miniApp";
-import { MiniAppAdaptShareInfoResp } from "@/core/packet/proto/action/miniAppAdaptShareInfo";
-import { AIVoiceChatType, AIVoiceItemList } from "@/core/packet/entities/aiChat";
-import { OidbSvcTrpcTcp0X929B_0Resp, OidbSvcTrpcTcp0X929D_0Resp } from "@/core/packet/proto/oidb/Oidb.0x929";
-import { IndexNode, MsgInfo } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq";
-import { NTV2RichMediaResp } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp";
-import { RecvPacketData } from "@/core/packet/client/client";
+import { PacketClientSession } from "@/core/packet/clientSession";
 import { napCatVersion } from "@/common/version";
 
-
 interface OffsetType {
     [key: string]: {
         recv: string;
@@ -42,201 +19,47 @@ export class NTQQPacketApi {
     core: NapCatCore;
     logger: LogWrapper;
     qqVersion: string | undefined;
-    packetSession: PacketSession | undefined;
+    pkt!: PacketClientSession;
+    errStack: string[] = [];
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
         this.logger = core.context.logger;
-        this.packetSession = undefined;
         this.InitSendPacket(this.context.basicInfoWrapper.getFullQQVesion())
             .then()
-            .catch(this.core.context.logger.logError.bind(this.core.context.logger));
+            .catch((err) => {
+                this.logger.logError.bind(this.core.context.logger);
+                this.errStack.push(err);
+            });
     }
 
     get available(): boolean {
-        return this.packetSession?.client.available ?? false;
+        return this.pkt?.available ?? false;
+    }
+
+    get clientLogStack() {
+        return this.pkt?.clientLogStack + '\n' + this.errStack.join('\n');
     }
 
-    async InitSendPacket(qqversion: string) {
-        this.qqVersion = qqversion;
-        const table = typedOffset[qqversion + '-' + os.arch()];
+    async InitSendPacket(qqVer: string) {
+        this.qqVersion = qqVer;
+        const table = typedOffset[qqVer + '-' + os.arch()];
         if (!table) {
-            this.logger.logError(`[Core] [Packet] PacketBackend 不支持当前QQ版本架构：${qqversion}-${os.arch()}，
-            请参照 https://github.com/NapNeko/NapCatQQ/releases/tag/v${napCatVersion} 配置正确的QQ版本！`);
+            const err = `[Core] [Packet] PacketBackend 不支持当前QQ版本架构：${qqVer}-${os.arch()}，
+            请参照 https://github.com/NapNeko/NapCatQQ/releases/tag/v${napCatVersion} 配置正确的QQ版本！`;
+            this.logger.logError(err);
+            this.errStack.push(err);
             return false;
         }
         if (this.core.configLoader.configData.packetBackend === 'disable') {
-            this.logger.logWarn('[Core] [Packet] 已禁用PacketBackend，NapCat.Packet将不会加载！');
+            const err = '[Core] [Packet] 已禁用PacketBackend，NapCat.Packet将不会加载！';
+            this.logger.logError(err);
+            this.errStack.push(err);
             return false;
         }
-        this.packetSession = new PacketSession(this.core);
-        const cb = () => {
-            if (this.packetSession && this.packetSession.client) {
-                this.packetSession.client.init(process.pid, table.recv, table.send).then().catch(this.logger.logError.bind(this.logger));
-            }
-        };
-        await this.packetSession.client.connect(cb);
+        this.pkt = new PacketClientSession(this.core);
+        await this.pkt.init(process.pid, table.recv, table.send);
         return true;
     }
-
-    async sendPacket(cmd: string, data: PacketHexStr, rsp = false): Promise<RecvPacketData> {
-        return this.packetSession!.client.sendPacket(cmd, data, rsp);
-    }
-
-    async sendOidbPacket(pkt: OidbPacket, rsp = false): Promise<RecvPacketData> {
-        return this.sendPacket(pkt.cmd, pkt.data, rsp);
-    }
-
-    async sendPokePacket(peer: number, group?: number) {
-        const data = this.packetSession?.packer.packPokePacket(peer, group);
-        await this.sendOidbPacket(data!, false);
-    }
-
-    async sendRkeyPacket() {
-        const packet = this.packetSession?.packer.packRkeyPacket();
-        const ret = await this.sendOidbPacket(packet!, true);
-        if (!ret?.hex_data) return [];
-        const body = new NapProtoMsg(OidbSvcTrpcTcpBaseRsp).decode(Buffer.from(ret.hex_data, 'hex')).body;
-        const retData = new NapProtoMsg(OidbSvcTrpcTcp0X9067_202_Rsp_Body).decode(body);
-        return retData.data.rkeyList;
-    }
-    async sendGroupSignPacket(groupCode: string) {
-        const packet = this.packetSession?.packer.packGroupSignReq(this.core.selfInfo.uin, groupCode);
-        await this.sendOidbPacket(packet!, true);
-    }
-    async sendStatusPacket(uin: number): Promise<{ status: number; ext_status: number; } | undefined> {
-        let status = 0;
-        try {
-            const packet = this.packetSession?.packer.packStatusPacket(uin);
-            const ret = await this.sendOidbPacket(packet!, true);
-            const data = Buffer.from(ret.hex_data, 'hex');
-            const ext = new NapProtoMsg(OidbSvcTrpcTcp0XFE1_2RSP).decode(new NapProtoMsg(OidbSvcTrpcTcpBase).decode(data).body).data.status.value;
-            // ext & 0xff00 + ext >> 16 & 0xff
-            const extBigInt = BigInt(ext); // 转换为 BigInt
-            if (extBigInt <= 10n) {
-                return { status: Number(extBigInt) * 10, ext_status: 0 };
-            }
-            status = Number((extBigInt & 0xff00n) + ((extBigInt >> 16n) & 0xffn)); // 使用 BigInt 操作符
-            return { status: 10, ext_status: status };
-        } catch (error) {
-            return undefined;
-        }
-    }
-
-    async sendSetSpecialTittlePacket(groupCode: string, uid: string, tittle: string) {
-        const data = this.packetSession?.packer.packSetSpecialTittlePacket(groupCode, uid, tittle);
-        await this.sendOidbPacket(data!, true);
-    }
-
-    // TODO: can simplify this
-    async uploadResources(msg: PacketMsg[], groupUin: number = 0) {
-        const reqList = [];
-        for (const m of msg) {
-            for (const e of m.msg) {
-                if (e instanceof PacketMsgPicElement) {
-                    reqList.push(this.packetSession?.highwaySession.uploadImage({
-                        chatType: groupUin ? ChatType.KCHATTYPEGROUP : ChatType.KCHATTYPEC2C,
-                        peerUid: groupUin ? String(groupUin) : this.core.selfInfo.uid
-                    }, e));
-                }
-                if (e instanceof PacketMsgVideoElement) {
-                    reqList.push(this.packetSession?.highwaySession.uploadVideo({
-                        chatType: groupUin ? ChatType.KCHATTYPEGROUP : ChatType.KCHATTYPEC2C,
-                        peerUid: groupUin ? String(groupUin) : this.core.selfInfo.uid
-                    }, e));
-                }
-                if (e instanceof PacketMsgPttElement) {
-                    reqList.push(this.packetSession?.highwaySession.uploadPtt({
-                        chatType: groupUin ? ChatType.KCHATTYPEGROUP : ChatType.KCHATTYPEC2C,
-                        peerUid: groupUin ? String(groupUin) : this.core.selfInfo.uid
-                    }, e));
-                }
-                if (e instanceof PacketMsgFileElement) {
-                    reqList.push(this.packetSession?.highwaySession.uploadFile({
-                        chatType: groupUin ? ChatType.KCHATTYPEGROUP : ChatType.KCHATTYPEC2C,
-                        peerUid: groupUin ? String(groupUin) : this.core.selfInfo.uid
-                    }, e));
-                }
-            }
-        }
-        const res = await Promise.allSettled(reqList);
-        this.logger.log(`上传资源${res.length}个，失败${res.filter(r => r.status === 'rejected').length}个`);
-        res.forEach((result, index) => {
-            if (result.status === 'rejected') {
-                this.logger.logError(`上传第${index + 1}个资源失败：${result.reason}`);
-            }
-        });
-    }
-
-    async sendUploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
-        await this.uploadResources(msg, groupUin);
-        const data = await this.packetSession?.packer.packUploadForwardMsg(this.core.selfInfo.uid, msg, groupUin);
-        const ret = await this.sendPacket('trpc.group.long_msg_interface.MsgService.SsoSendLongMsg', data!, true);
-        this.logger.logDebug('sendUploadForwardMsg', ret);
-        const resp = new NapProtoMsg(SendLongMsgResp).decode(Buffer.from(ret.hex_data, 'hex'));
-        return resp.result.resId;
-    }
-
-    async sendGroupFileDownloadReq(groupUin: number, fileUUID: string) {
-        const data = this.packetSession?.packer.packGroupFileDownloadReq(groupUin, fileUUID);
-        const ret = await this.sendOidbPacket(data!, true);
-        const body = new NapProtoMsg(OidbSvcTrpcTcpBaseRsp).decode(Buffer.from(ret.hex_data, 'hex')).body;
-        const resp = new NapProtoMsg(OidbSvcTrpcTcp0x6D6Response).decode(body);
-        if (resp.download.retCode !== 0) {
-            throw new Error(`sendGroupFileDownloadReq error: ${resp.download.clientWording}`);
-        }
-        return `https://${resp.download.downloadDns}/ftn_handler/${Buffer.from(resp.download.downloadUrl).toString('hex')}/?fname=`;
-    }
-
-    async sendGroupPttFileDownloadReq(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const data = this.packetSession?.packer.packGroupPttFileDownloadReq(groupUin, node);
-        const ret = await this.sendOidbPacket(data!, true);
-        const body = new NapProtoMsg(OidbSvcTrpcTcpBaseRsp).decode(Buffer.from(ret.hex_data, 'hex')).body;
-        const resp = new NapProtoMsg(NTV2RichMediaResp).decode(body);
-        const info = resp.download.info;
-        return `https://${info.domain}${info.urlPath}${resp.download.rKeyParam}`;
-    }
-
-    async sendMiniAppShareInfoReq(param: MiniAppReqParams) {
-        const data = this.packetSession?.packer.packMiniAppAdaptShareInfo(param);
-        const ret = await this.sendPacket("LightAppSvc.mini_app_share.AdaptShareInfo", data!, true);
-        const body = new NapProtoMsg(MiniAppAdaptShareInfoResp).decode(Buffer.from(ret.hex_data, 'hex'));
-        return JSON.parse(body.content.jsonContent) as MiniAppRawData;
-    }
-
-    async sendFetchAiVoiceListReq(groupUin: number, chatType: AIVoiceChatType) : Promise<AIVoiceItemList[] | null> {
-        const data = this.packetSession?.packer.packFetchAiVoiceListReq(groupUin, chatType);
-        const ret = await this.sendOidbPacket(data!, true);
-        const body = new NapProtoMsg(OidbSvcTrpcTcpBaseRsp).decode(Buffer.from(ret.hex_data, 'hex')).body;
-        const resp = new NapProtoMsg(OidbSvcTrpcTcp0X929D_0Resp).decode(body);
-        if (!resp.content) return null;
-        return resp.content.map((item) => {
-            return {
-                category: item.category,
-                voices: item.voices
-            };
-        });
-    }
-
-    async sendAiVoiceChatReq(groupUin: number, voiceId: string, text: string, chatType: AIVoiceChatType): Promise<NapProtoDecodeStructType<typeof MsgInfo>> {
-        let reqTime = 0;
-        const reqMaxTime = 30;
-        const sessionId = crypto.randomBytes(4).readUInt32BE(0);
-        while (true) {
-            if (reqTime >= reqMaxTime) {
-                throw new Error(`sendAiVoiceChatReq failed after ${reqMaxTime} times`);
-            }
-            reqTime++;
-            const data = this.packetSession?.packer.packAiVoiceChatReq(groupUin, voiceId, text, chatType, sessionId);
-            const ret = await this.sendOidbPacket(data!, true);
-            const body = new NapProtoMsg(OidbSvcTrpcTcpBase).decode(Buffer.from(ret.hex_data, 'hex'));
-            if (body.errorCode) {
-                throw new Error(`sendAiVoiceChatReq retCode: ${body.errorCode} error: ${body.errorMsg}`);
-            }
-            const resp = new NapProtoMsg(OidbSvcTrpcTcp0X929B_0Resp).decode(body.body);
-            if (!resp.msgInfo) continue;
-            return resp.msgInfo;
-        }
-    }
 }
diff --git a/src/core/external/proto/EmojiLikeToOthers.proto b/src/core/external/proto/EmojiLikeToOthers.proto
diff --git a/src/core/external/proto/GreyTipWrapper.proto b/src/core/external/proto/GreyTipWrapper.proto
diff --git a/src/core/external/proto/ProfileLikeTip.proto b/src/core/external/proto/ProfileLikeTip.proto