refactor: packet

src/core/apis/packet.ts

@@ -2,13 +2,14 @@ import {InstanceContext, NapCatCore} from '..';
 import * as os from 'os';
 import offset from '@/core/external/offset.json';
 import * as crypto from 'crypto';
-import {PacketClient} from '../helper/packet/client';
+import {PacketClient} from '@/core/packet/packetClient';
-import {PacketHexStr, PacketPacker} from "@/core/helper/packet/packer";
+import {PacketHexStr, PacketPacker} from "@/core/packet/packetPacker";
-import {NapProtoMsg} from '../proto/NapProto';
+import {NapProtoMsg} from '@/core/packet/proto/NapProto';
-import {OidbSvcTrpcTcp0X9067_202_Rsp_Body} from '../proto/oidb/Oidb.0x9067_202';
+import {OidbSvcTrpcTcp0X9067_202_Rsp_Body} from '@/core/packet/proto/oidb/Oidb.0x9067_202';
-import {OidbSvcTrpcTcpBase, OidbSvcTrpcTcpBaseRsp} from '../proto/oidb/OidbBase';
+import {OidbSvcTrpcTcpBase, OidbSvcTrpcTcpBaseRsp} from '@/core/packet/proto/oidb/OidbBase';
-import {OidbSvcTrpcTcp0XFE1_2RSP} from '../proto/oidb/Oidb.fe1_2';
+import {OidbSvcTrpcTcp0XFE1_2RSP} from '@/core/packet/proto/oidb/Oidb.fe1_2';
-import {PacketForwardNode} from "@/core/helper/packet/msg/builder";
+
+import {PacketForwardNode} from "@/core/packet/msg/entity/forward";
 
 interface OffsetType {
     [key: string]: {

src/core/packet/msg/builder.ts

@@ -1,16 +1,7 @@
-import {PushMsgBody} from "@/core/proto/message/message";
+import {PushMsgBody} from "@/core/packet/proto/message/message";
-import {NapProtoEncodeStructType} from "@/core/proto/NapProto";
+import {NapProtoEncodeStructType} from "@/core/packet/proto/NapProto";
-import {SendMessageElement} from "@/core";
 import * as crypto from "crypto";
-import {IPacketMsgElement} from "@/core/helper/packet/msg/element";
+import {PacketForwardNode} from "@/core/packet/msg/entity/forward";
-
-export interface PacketForwardNode {
-    groupId?: number
-    senderId: number
-    senderName: string
-    time: number
-    msg: IPacketMsgElement<SendMessageElement>[]
-}
 
 export class PacketMsgBuilder {
     buildFakeMsg(selfUid: string, element: PacketForwardNode[]): NapProtoEncodeStructType<typeof PushMsgBody>[] {

src/core/packet/msg/element.ts

@@ -1,5 +1,5 @@
-import {NapProtoEncodeStructType, NapProtoMsg} from "@/core/proto/NapProto";
+import {NapProtoEncodeStructType, NapProtoMsg} from "@/core/packet/proto/NapProto";
-import {Elem, MentionExtra} from "@/core/proto/message/element";
+import {Elem, MentionExtra} from "@/core/packet/proto/message/element";
 import {
     AtType,
     SendArkElement,

src/core/packet/msg/entity/forward.ts

@@ -0,0 +1,10 @@
+import {IPacketMsgElement} from "@/core/packet/msg/element";
+import {SendMessageElement} from "@/core";
+
+export interface PacketForwardNode {
+    groupId?: number
+    senderId: number
+    senderName: string
+    time: number
+    msg: IPacketMsgElement<SendMessageElement>[]
+}

src/core/packet/packetPacker.ts

@@ -1,12 +1,13 @@
 import * as zlib from "node:zlib";
-import { NapProtoMsg } from "@/core/proto/NapProto";
+import { NapProtoMsg } from "@/core/packet/proto/NapProto";
-import { OidbSvcTrpcTcpBase } from "@/core/proto/oidb/OidbBase";
+import { OidbSvcTrpcTcpBase } from "@/core/packet/proto/oidb/OidbBase";
-import { OidbSvcTrpcTcp0X9067_202 } from "@/core/proto/oidb/Oidb.0x9067_202";
+import { OidbSvcTrpcTcp0X9067_202 } from "@/core/packet/proto/oidb/Oidb.0x9067_202";
-import { OidbSvcTrpcTcp0X8FC_2, OidbSvcTrpcTcp0X8FC_2_Body } from "@/core/proto/oidb/Oidb.0x8FC_2";
+import { OidbSvcTrpcTcp0X8FC_2, OidbSvcTrpcTcp0X8FC_2_Body } from "@/core/packet/proto/oidb/Oidb.0x8FC_2";
-import { OidbSvcTrpcTcp0XFE1_2 } from "@/core/proto/oidb/Oidb.fe1_2";
+import { OidbSvcTrpcTcp0XFE1_2 } from "@/core/packet/proto/oidb/Oidb.fe1_2";
-import { OidbSvcTrpcTcp0XED3_1 } from "@/core/proto/oidb/Oidb.ed3_1";
+import { OidbSvcTrpcTcp0XED3_1 } from "@/core/packet/proto/oidb/Oidb.ed3_1";
-import {LongMsgResult, SendLongMsgReq} from "@/core/proto/message/action";
+import {LongMsgResult, SendLongMsgReq} from "@/core/packet/proto/message/action";
-import {PacketForwardNode, PacketMsgBuilder} from "@/core/helper/packet/msg/builder";
+import {PacketMsgBuilder} from "@/core/packet/msg/builder";
+import {PacketForwardNode} from "@/core/packet/msg/entity/forward";
 
 export type PacketHexStr = string & { readonly hexNya: unique symbol };
 

src/core/packet/proto/message/action.ts

@@ -1,6 +1,6 @@
 import {ScalarType} from "@protobuf-ts/runtime";
 import {ProtoField} from "../NapProto";
-import {PushMsgBody} from "@/core/proto/message/message";
+import {PushMsgBody} from "@/core/packet/proto/message/message";
 
 export const LongMsgResult = {
     action: ProtoField(2, () => LongMsgAction)

src/core/packet/proto/message/component.ts

@@ -1,6 +1,6 @@
 import { ScalarType } from "@protobuf-ts/runtime";
 import { ProtoField } from "../NapProto";
-import { Elem } from "@/core/proto/message/element";
+import { Elem } from "@/core/packet/proto/message/element";
 
 export const Attr = {
     codePage: ProtoField(1, ScalarType.INT32),

src/core/packet/proto/message/message.ts

@@ -1,8 +1,8 @@
 import { ScalarType } from "@protobuf-ts/runtime";
 import { ProtoField } from "../NapProto";
-import {ForwardHead, Grp, GrpTmp, ResponseForward, ResponseGrp, Trans0X211, WPATmp} from "@/core/proto/message/routing";
+import {ForwardHead, Grp, GrpTmp, ResponseForward, ResponseGrp, Trans0X211, WPATmp} from "@/core/packet/proto/message/routing";
-import {RichText} from "@/core/proto/message/component";
+import {RichText} from "@/core/packet/proto/message/component";
-import {C2C} from "@/core/proto/message/c2c";
+import {C2C} from "@/core/packet/proto/message/c2c";
 
 export const ContentHead = {
     type: ProtoField(1, ScalarType.UINT32),

src/onebot/action/extends/UploadForwardMsg.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import {PacketMsgTextElement} from "@/core/helper/packet/msg/element";
+import {PacketMsgTextElement} from "@/core/packet/msg/element";
 import {SendTextElement} from "@/core";
 
 

src/onebot/api/msg.ts

@@ -34,7 +34,7 @@ import { RequestUtil } from '@/common/request';
 import fs from 'node:fs';
 import fsPromise from 'node:fs/promises';
 import { OB11FriendAddNoticeEvent } from '@/onebot/event/notice/OB11FriendAddNoticeEvent';
-import { decodeSysMessage } from '@/core/proto/old/ProfileLike';
+import { decodeSysMessage } from '@/core/packet/proto/old/ProfileLike';
 
 type RawToOb11Converters = {
     [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: (

src/onebot/api/user.ts

@@ -1,5 +1,5 @@
 import { NapCatCore } from '@/core';
-import { decodeProfileLikeTip } from '@/core/proto/old/ProfileLike';
+import { decodeProfileLikeTip } from '@/core/packet/proto/old/ProfileLike';
 
 import { NapCatOneBot11Adapter } from '@/onebot';
 import { OB11ProfileLikeEvent } from '../event/notice/OB11ProfileLikeEvent';

src/onebot/index.ts

@@ -45,7 +45,7 @@ import { OB11GroupRecallNoticeEvent } from '@/onebot/event/notice/OB11GroupRecal
 import { LRUCache } from '@/common/lru-cache';
 import { NodeIKernelRecentContactListener } from '@/core/listeners/NodeIKernelRecentContactListener';
 import { Native } from '@/native';
-import { decodeMessage, decodeRecallGroup, Message, RecallGroup } from '@/core/proto/old/Message';
+import { decodeMessage, decodeRecallGroup, Message, RecallGroup } from '@/core/packet/proto/old/Message';
 import { OB11MessageDataType } from './types';
 
 //OneBot实现类
@@ -547,7 +547,7 @@ export class NapCatOneBot11Adapter {
             //             this.core.apis.PacketApi.sendSetSpecialTittlePacket(message.peerUin, uid, '测试');
             //             console.log('set', message.peerUin, uid);
             //         }
-                  
+
             //     });
 
             // }