refactor: 大幅度调整send

src/core/packet/client/baseClient.ts

@@ -0,0 +1,79 @@
+import { OidbPacket, PacketBuf } from '@/core/packet/transformer/base';
+import { LogStack } from '@/core/packet/context/clientContext';
+import { NapCoreContext } from '@/core/packet/context/napCoreContext';
+import { PacketLogger } from '@/core/packet/context/loggerContext';
+import { CancelableTask } from '@/common/cancel-task';
+
+export interface RecvPacket {
+    type: string, // 仅recv
+    data: RecvPacketData
+}
+
+export interface RecvPacketData {
+    seq: number
+    cmd: string
+    data: Buffer
+}
+
+
+export class PacketClient {
+    protected readonly napcore: NapCoreContext;
+    protected readonly logger: PacketLogger;
+    protected readonly cb = new Map<string, (json: RecvPacketData) => Promise<any> | any>(); // hash-type callback
+    logStack: LogStack;
+    available: boolean = false;
+
+    constructor(napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) {
+        this.napcore = napCore;
+        this.logger = logger;
+        this.logStack = logStack;
+    }
+
+    check(): boolean {
+        return true;
+    }
+
+    init(_pid: number, _recv: string, _send: string): Promise<void> {
+        return Promise.resolve();
+    }
+
+    async sendPacket(cmd: string, data: PacketBuf, rsp = false, timeout = 5000): Promise<RecvPacketData> {
+        if (!rsp) {
+            this.napcore.sendSsoCmdReqByContend(cmd, data).catch(err => {
+                this.logger.error(`[PacketClient] sendPacket 无响应命令发送失败 cmd=${cmd} err=${err}`);
+            });
+            return { seq: 0, cmd: cmd, data: Buffer.alloc(0) };
+        }
+
+        const task = new CancelableTask<RecvPacketData>((resolve, reject, onCancel) => {
+            const timeoutId = setTimeout(() => {
+                reject(new Error(`[PacketClient] sendPacket 超时 cmd=${cmd} timeout=${timeout}ms`));
+            }, timeout);
+
+            onCancel(() => {
+                clearTimeout(timeoutId);
+            });
+
+            this.napcore.sendSsoCmdReqByContend(cmd, data)
+                .then(ret => {
+                    clearTimeout(timeoutId);
+                    const result = ret as { rspbuffer: Buffer };
+                    resolve({
+                        seq: 0,
+                        cmd: cmd,
+                        data: result.rspbuffer
+                    });
+                })
+                .catch(err => {
+                    clearTimeout(timeoutId);
+                    reject(err);
+                });
+        });
+
+        return await task;
+    }
+
+    async sendOidbPacket(pkt: OidbPacket, rsp = false, timeout = 5000): Promise<RecvPacketData> {
+        return await this.sendPacket(pkt.cmd, pkt.data, rsp, timeout);
+    }
+}

src/core/packet/client/nativeClient.ts

@@ -5,9 +5,7 @@ import { constants } from 'node:os';
 import { LogStack } from '@/core/packet/context/clientContext';
 import { NapCoreContext } from '@/core/packet/context/napCoreContext';
 import { PacketLogger } from '@/core/packet/context/loggerContext';
-import { OidbPacket, PacketHexStr } from '@/core/packet/transformer/base';
+import { OidbPacket, PacketBuf } from '@/core/packet/transformer/base';
-import { CancelableTask } from '@/common/cancel-task';
-
 export interface RecvPacket {
     type: string, // 仅recv
     data: RecvPacketData
@@ -66,13 +64,13 @@ export class NativePacketClient {
 
     async sendPacket(
         cmd: string,
-        data: PacketHexStr,
+        data: PacketBuf,
         rsp = false,
         timeout = 5000
     ): Promise<RecvPacketData> {
         if (!rsp) {
             this.napcore
-                .sendSsoCmdReqByContend(cmd, Buffer.from(data, 'hex'))
+                .sendSsoCmdReqByContend(cmd, data)
                 .catch(err =>
                     this.logger.error(
                         `[PacketClient] sendPacket 无响应命令发送失败 cmd=${cmd} err=${err}`
@@ -82,7 +80,7 @@ export class NativePacketClient {
         }
 
         const sendPromise = this.napcore
-            .sendSsoCmdReqByContend(cmd, Buffer.from(data, 'hex'))
+            .sendSsoCmdReqByContend(cmd, data)
             .then(ret => ({
                 seq: 0,
                 cmd,

src/core/packet/transformer/action/GetMiniAppAdaptShareInfo.ts

@@ -1,6 +1,6 @@
 import * as proto from '@/core/packet/transformer/proto';
 import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
+import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/core/packet/transformer/base';
 import { MiniAppReqParams } from '@/core/packet/entities/miniApp';
 
 class GetMiniAppAdaptShareInfo extends PacketTransformer<typeof proto.MiniAppAdaptShareInfoResp> {
@@ -41,7 +41,7 @@ class GetMiniAppAdaptShareInfo extends PacketTransformer<typeof proto.MiniAppAda
         });
         return {
             cmd: 'LightAppSvc.mini_app_share.AdaptShareInfo',
-            data: PacketHexStrBuilder(data)
+            data: PacketBufBuilder(data)
         };
     }
 

src/core/packet/transformer/base.ts

@@ -1,15 +1,15 @@
 import { NapProtoDecodeStructType } from '@napneko/nap-proto-core';
 import { PacketMsgBuilder } from '@/core/packet/message/builder';
 
-export type PacketHexStr = string & { readonly hexNya: unique symbol };
+export type PacketBuf = Buffer & { readonly hexNya: unique symbol };
 
-export const PacketHexStrBuilder = (str: Uint8Array): PacketHexStr => {
+export const PacketBufBuilder = (str: Uint8Array): PacketBuf => {
-    return Buffer.from(str).toString('hex') as PacketHexStr;
+    return Buffer.from(str) as PacketBuf;
 };
 
 export interface OidbPacket {
     cmd: string;
-    data: PacketHexStr
+    data: PacketBuf
 }
 
 export abstract class PacketTransformer<T> {

src/core/packet/transformer/highway/FetchSessionKey.ts

@@ -1,6 +1,6 @@
 import * as proto from '@/core/packet/transformer/proto';
 import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
+import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/core/packet/transformer/base';
 
 class FetchSessionKey extends PacketTransformer<typeof proto.HttpConn0x6ff_501Response> {
     constructor() {
@@ -25,7 +25,7 @@ class FetchSessionKey extends PacketTransformer<typeof proto.HttpConn0x6ff_501Re
         });
         return {
             cmd: 'HttpConn.0x6ff_501',
-            data: PacketHexStrBuilder(req)
+            data: PacketBufBuilder(req)
         };
     }
 

src/core/packet/transformer/message/DownloadForwardMsg.ts

@@ -1,6 +1,6 @@
 import * as proto from '@/core/packet/transformer/proto';
 import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
+import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/core/packet/transformer/base';
 
 class DownloadForwardMsg extends PacketTransformer<typeof proto.RecvLongMsgResp> {
     constructor() {
@@ -25,7 +25,7 @@ class DownloadForwardMsg extends PacketTransformer<typeof proto.RecvLongMsgResp>
         });
         return {
             cmd: 'trpc.group.long_msg_interface.MsgService.SsoRecvLongMsg',
-            data: PacketHexStrBuilder(req)
+            data: PacketBufBuilder(req)
         };
     }
 

src/core/packet/transformer/message/FetchC2CMessage.ts

@@ -1,6 +1,6 @@
 import * as proto from '@/core/packet/transformer/proto';
 import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
+import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/core/packet/transformer/base';
 
 class FetchC2CMessage extends PacketTransformer<typeof proto.SsoGetC2cMsgResponse> {
     constructor() {
@@ -15,7 +15,7 @@ class FetchC2CMessage extends PacketTransformer<typeof proto.SsoGetC2cMsgRespons
         });
         return {
             cmd: 'trpc.msg.register_proxy.RegisterProxy.SsoGetC2cMsg',
-            data: PacketHexStrBuilder(req)
+            data: PacketBufBuilder(req)
         };
     }
 

src/core/packet/transformer/message/FetchGroupMessage.ts

@@ -1,6 +1,6 @@
 import * as proto from '@/core/packet/transformer/proto';
 import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
+import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/core/packet/transformer/base';
 
 class FetchGroupMessage extends PacketTransformer<typeof proto.SsoGetGroupMsgResponse> {
     constructor() {
@@ -18,7 +18,7 @@ class FetchGroupMessage extends PacketTransformer<typeof proto.SsoGetGroupMsgRes
         });
         return {
             cmd: 'trpc.msg.register_proxy.RegisterProxy.SsoGetGroupMsg',
-            data: PacketHexStrBuilder(req)
+            data: PacketBufBuilder(req)
         };
     }
 

src/core/packet/transformer/message/UploadForwardMsg.ts

@@ -1,7 +1,7 @@
 import zlib from 'node:zlib';
 import * as proto from '@/core/packet/transformer/proto';
 import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
+import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/core/packet/transformer/base';
 import { PacketMsg } from '@/core/packet/message/message';
 
 class UploadForwardMsg extends PacketTransformer<typeof proto.SendLongMsgResp> {
@@ -39,7 +39,7 @@ class UploadForwardMsg extends PacketTransformer<typeof proto.SendLongMsgResp> {
         );
         return {
             cmd: 'trpc.group.long_msg_interface.MsgService.SsoSendLongMsg',
-            data: PacketHexStrBuilder(req)
+            data: PacketBufBuilder(req)
         };
     }
 

src/core/packet/transformer/oidb/oidbBase.ts

@@ -1,6 +1,6 @@
 import * as proto from '@/core/packet/transformer/proto';
 import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
+import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/core/packet/transformer/base';
 
 class OidbBase extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase> {
     constructor() {
@@ -16,7 +16,7 @@ class OidbBase extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase> {
         });
         return {
             cmd: `OidbSvcTrpcTcp.0x${cmd.toString(16).toUpperCase()}_${subCmd}`,
-            data: PacketHexStrBuilder(data),
+            data: PacketBufBuilder(data),
         };
     }
 

src/onebot/action/extends/GetUnidirectionalFriendList.ts

@@ -1,4 +1,4 @@
-import { PacketHexStr } from '@/core/packet/transformer/base';
+import { PacketBuf } from '@/core/packet/transformer/base';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { ProtoBuf, ProtoBufBase, PBUint32, PBString } from 'napcat.protobuf';
@@ -39,8 +39,8 @@ export class GetUnidirectionalFriendList extends OneBotAction<void, Friend[]> {
             bytes_cookies: ""
         };
         const packed_data = await this.pack_data(JSON.stringify(req_json));
-        const data = Buffer.from(packed_data).toString('hex');
+        const data = Buffer.from(packed_data);
-        const rsq = { cmd: 'MQUpdateSvc_com_qq_ti.web.OidbSvc.0xe17_0', data: data as PacketHexStr };
+        const rsq = { cmd: 'MQUpdateSvc_com_qq_ti.web.OidbSvc.0xe17_0', data: data as PacketBuf };
         const rsp_data = await this.core.apis.PacketApi.pkt.operation.sendPacket(rsq, true);
         const block_json = ProtoBuf(class extends ProtoBufBase { data = PBString(4); }).decode(rsp_data);
         const block_list: Block[] = JSON.parse(block_json.data).rpt_block_list;

src/onebot/action/extends/SendPacket.ts

@@ -1,4 +1,4 @@
-import { PacketHexStr } from '@/core/packet/transformer/base';
+import { PacketBuf } from '@/core/packet/transformer/base';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
@@ -16,7 +16,7 @@ export class SendPacket extends GetPacketStatusDepends<Payload, string | undefin
     override actionName = ActionName.SendPacket;
     async _handle(payload: Payload) {
         const rsp = typeof payload.rsp === 'boolean' ? payload.rsp : payload.rsp === 'true';
-        const data = await this.core.apis.PacketApi.pkt.operation.sendPacket({ cmd: payload.cmd, data: payload.data as PacketHexStr }, rsp);
+        const data = await this.core.apis.PacketApi.pkt.operation.sendPacket({ cmd: payload.cmd, data: Buffer.from(payload.data, 'hex') as PacketBuf }, rsp);
         return typeof data === 'object' ? data.toString('hex') : undefined;
     }
 }