From 9b448b17e6c48132d57a55b0b174629e7338aafe Mon Sep 17 00:00:00 2001 From: pk5ls20 Date: Tue, 5 Nov 2024 12:47:28 +0800 Subject: [PATCH] refactor: NapProto -> https://github.com/NapNeko/NapProto --- package.json | 1 + src/core/apis/packet.ts | 2 +- src/core/packet/highway/session.ts | 2 +- src/core/packet/highway/uploader.ts | 2 +- src/core/packet/highway/utils.ts | 2 +- src/core/packet/message/builder.ts | 2 +- src/core/packet/message/element.ts | 2 +- src/core/packet/packer.ts | 2 +- src/core/packet/proto/NapProto.ts | 161 ------------------ src/core/packet/proto/action/action.ts | 2 +- .../proto/action/miniAppAdaptShareInfo.ts | 2 +- src/core/packet/proto/highway/highway.ts | 2 +- src/core/packet/proto/message/action.ts | 2 +- src/core/packet/proto/message/c2c.ts | 2 +- src/core/packet/proto/message/component.ts | 2 +- src/core/packet/proto/message/element.ts | 2 +- src/core/packet/proto/message/group.ts | 2 +- src/core/packet/proto/message/message.ts | 2 +- src/core/packet/proto/message/notify.ts | 2 +- src/core/packet/proto/message/routing.ts | 2 +- src/core/packet/proto/oidb/Oidb.0XE37_800.ts | 2 +- src/core/packet/proto/oidb/Oidb.0XFE1_2.ts | 2 +- src/core/packet/proto/oidb/Oidb.0x6D6.ts | 2 +- src/core/packet/proto/oidb/Oidb.0x8FC_2.ts | 4 +- src/core/packet/proto/oidb/Oidb.0x9067_202.ts | 2 +- src/core/packet/proto/oidb/Oidb.0x929.ts | 2 +- src/core/packet/proto/oidb/Oidb.0xE37_1200.ts | 2 +- src/core/packet/proto/oidb/Oidb.0xE37_1700.ts | 2 +- src/core/packet/proto/oidb/Oidb.0xEB7.ts | 4 +- src/core/packet/proto/oidb/Oidb.0xED3_1.ts | 2 +- src/core/packet/proto/oidb/OidbBase.ts | 2 +- .../proto/oidb/common/Ntv2.RichMediaReq.ts | 2 +- .../proto/oidb/common/Ntv2.RichMediaResp.ts | 2 +- 33 files changed, 34 insertions(+), 194 deletions(-) delete mode 100644 src/core/packet/proto/NapProto.ts diff --git a/package.json b/package.json index 446b9961..95af5bdc 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "devDependencies": { "@babel/preset-typescript": "^7.24.7", "@log4js-node/log4js-api": "^1.0.2", + "@napneko/nap-proto-core": "^0.0.2", "@protobuf-ts/runtime": "^2.9.4", "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-typescript": "^11.1.6", diff --git a/src/core/apis/packet.ts b/src/core/apis/packet.ts index 3d743ad4..23b6ef73 100644 --- a/src/core/apis/packet.ts +++ b/src/core/apis/packet.ts @@ -4,7 +4,7 @@ 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 { NapProtoEncodeStructType, NapProtoDecodeStructType, NapProtoMsg } from '@/core/packet/proto/NapProto'; +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'; diff --git a/src/core/packet/highway/session.ts b/src/core/packet/highway/session.ts index bb870164..c1c5b1d1 100644 --- a/src/core/packet/highway/session.ts +++ b/src/core/packet/highway/session.ts @@ -2,7 +2,7 @@ import * as fs from "node:fs"; import { ChatType, Peer } from "@/core"; import { LogWrapper } from "@/common/log"; import { PacketPacker } from "@/core/packet/packer"; -import { NapProtoMsg } from "@/core/packet/proto/NapProto"; +import { NapProtoMsg } from "@napneko/nap-proto-core"; import { HttpConn0x6ff_501Response } from "@/core/packet/proto/action/action"; import { PacketHighwayClient } from "@/core/packet/highway/client"; import { NTV2RichMediaResp } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp"; diff --git a/src/core/packet/highway/uploader.ts b/src/core/packet/highway/uploader.ts index 49ee5fe7..34822df4 100644 --- a/src/core/packet/highway/uploader.ts +++ b/src/core/packet/highway/uploader.ts @@ -4,7 +4,7 @@ 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 { NapProtoMsg } from "@napneko/nap-proto-core"; import { ReqDataHighwayHead, RespDataHighwayHead } from "@/core/packet/proto/highway/highway"; import { BlockSize } from "@/core/packet/highway/session"; import { PacketHighwayTrans } from "@/core/packet/highway/client"; diff --git a/src/core/packet/highway/utils.ts b/src/core/packet/highway/utils.ts index e786afbd..383155d3 100644 --- a/src/core/packet/highway/utils.ts +++ b/src/core/packet/highway/utils.ts @@ -1,4 +1,4 @@ -import { NapProtoEncodeStructType } from "@/core/packet/proto/NapProto"; +import { NapProtoEncodeStructType } from "@napneko/nap-proto-core"; import { IPv4 } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp"; import { NTHighwayIPv4 } from "@/core/packet/proto/highway/highway"; diff --git a/src/core/packet/message/builder.ts b/src/core/packet/message/builder.ts index 63f92593..12fa374b 100644 --- a/src/core/packet/message/builder.ts +++ b/src/core/packet/message/builder.ts @@ -1,6 +1,6 @@ import * as crypto from "crypto"; import { PushMsgBody } from "@/core/packet/proto/message/message"; -import { NapProtoEncodeStructType } from "@/core/packet/proto/NapProto"; +import { NapProtoEncodeStructType } from "@napneko/nap-proto-core"; import { LogWrapper } from "@/common/log"; import { PacketMsg, PacketSendMsgElement } from "@/core/packet/message/message"; import { IPacketMsgElement, PacketMsgTextElement } from "@/core/packet/message/element"; diff --git a/src/core/packet/message/element.ts b/src/core/packet/message/element.ts index 6086fb31..9deb598d 100644 --- a/src/core/packet/message/element.ts +++ b/src/core/packet/message/element.ts @@ -1,5 +1,5 @@ import * as zlib from "node:zlib"; -import { NapProtoEncodeStructType, NapProtoMsg } from "@/core/packet/proto/NapProto"; +import { NapProtoEncodeStructType, NapProtoMsg } from "@napneko/nap-proto-core"; import { CustomFace, Elem, diff --git a/src/core/packet/packer.ts b/src/core/packet/packer.ts index 4e738306..039cf11e 100644 --- a/src/core/packet/packer.ts +++ b/src/core/packet/packer.ts @@ -1,7 +1,7 @@ import * as zlib from "node:zlib"; import * as crypto from "node:crypto"; import { computeMd5AndLengthWithLimit } from "@/core/packet/utils/crypto/hash"; -import { NapProtoEncodeStructType, NapProtoMsg } from "@/core/packet/proto/NapProto"; +import { NapProtoEncodeStructType, NapProtoMsg } from "@napneko/nap-proto-core"; import { OidbSvcTrpcTcpBase } from "@/core/packet/proto/oidb/OidbBase"; import { OidbSvcTrpcTcp0X9067_202 } from "@/core/packet/proto/oidb/Oidb.0x9067_202"; import { OidbSvcTrpcTcp0X8FC_2, OidbSvcTrpcTcp0X8FC_2_Body } from "@/core/packet/proto/oidb/Oidb.0x8FC_2"; diff --git a/src/core/packet/proto/NapProto.ts b/src/core/packet/proto/NapProto.ts deleted file mode 100644 index 06593487..00000000 --- a/src/core/packet/proto/NapProto.ts +++ /dev/null @@ -1,161 +0,0 @@ -import { MessageType, PartialMessage, RepeatType, ScalarType } from '@protobuf-ts/runtime'; -import { PartialFieldInfo } from "@protobuf-ts/runtime/build/types/reflection-info"; - -type LowerCamelCase = CamelCaseHelper; - -type CamelCaseHelper< - S extends string, - CapNext extends boolean, - IsFirstChar extends boolean -> = S extends `${infer F}${infer R}` - ? F extends '_' - ? CamelCaseHelper - : F extends `${number}` - ? `${F}${CamelCaseHelper}` - : CapNext extends true - ? `${Uppercase}${CamelCaseHelper}` - : IsFirstChar extends true - ? `${Lowercase}${CamelCaseHelper}` - : `${F}${CamelCaseHelper}` - : ''; - -type ScalarTypeToTsType = - T extends ScalarType.DOUBLE | ScalarType.FLOAT | ScalarType.INT32 | ScalarType.FIXED32 | ScalarType.UINT32 | ScalarType.SFIXED32 | ScalarType.SINT32 ? number : - T extends ScalarType.INT64 | ScalarType.UINT64 | ScalarType.FIXED64 | ScalarType.SFIXED64 | ScalarType.SINT64 ? bigint : - T extends ScalarType.BOOL ? boolean : - T extends ScalarType.STRING ? string : - T extends ScalarType.BYTES ? Uint8Array : - never; - -interface BaseProtoFieldType { - kind: 'scalar' | 'message'; - no: number; - type: T; - optional: O; - repeat: R; -} - -interface ScalarProtoFieldType extends BaseProtoFieldType { - kind: 'scalar'; -} - -interface MessageProtoFieldType ProtoMessageType, O extends boolean, R extends O extends true ? false : boolean> extends BaseProtoFieldType { - kind: 'message'; -} - -type ProtoFieldType = - | ScalarProtoFieldType - | MessageProtoFieldType<() => ProtoMessageType, boolean, boolean>; - -type ProtoMessageType = { - [key: string]: ProtoFieldType; -}; - -export function ProtoField(no: number, type: T, optional?: O, repeat?: R): ScalarProtoFieldType; -export function ProtoField ProtoMessageType, O extends boolean = false, R extends O extends true ? false : boolean = false>(no: number, type: T, optional?: O, repeat?: R): MessageProtoFieldType; -export function ProtoField(no: number, type: ScalarType | (() => ProtoMessageType), optional?: boolean, repeat?: boolean): ProtoFieldType { - if (typeof type === 'function') { - return { kind: 'message', no: no, type: type, optional: optional ?? false, repeat: repeat ?? false }; - } else { - return { kind: 'scalar', no: no, type: type, optional: optional ?? false, repeat: repeat ?? false }; - } -} - -type ProtoFieldReturnType = NonNullable extends ScalarProtoFieldType - ? ScalarTypeToTsType - : T extends NonNullable> - ? NonNullable, E>> - : never; - -type RequiredFieldsBaseType = { - [K in keyof T as T[K] extends { optional: true } ? never : LowerCamelCase]: - T[K] extends { repeat: true } - ? ProtoFieldReturnType[] - : ProtoFieldReturnType -} - -type OptionalFieldsBaseType = { - [K in keyof T as T[K] extends { optional: true } ? LowerCamelCase : never]?: - T[K] extends { repeat: true } - ? ProtoFieldReturnType[] - : ProtoFieldReturnType -} - -type RequiredFieldsType = E extends true ? Partial> : RequiredFieldsBaseType; - -type OptionalFieldsType = E extends true ? Partial> : OptionalFieldsBaseType; - -type NapProtoStructType = RequiredFieldsType & OptionalFieldsType; - -export type NapProtoEncodeStructType = NapProtoStructType; - -export type NapProtoDecodeStructType = NapProtoStructType; - -class NapProtoRealMsg { - private readonly _field: PartialFieldInfo[]; - private readonly _proto_msg: MessageType>; - private static cache = new WeakMap>(); - - private constructor(fields: T) { - this._field = Object.keys(fields).map(key => { - const field = fields[key]; - if (field.kind === 'scalar') { - const repeatType = field.repeat - ? [ScalarType.STRING, ScalarType.BYTES].includes(field.type) - ? RepeatType.UNPACKED - : RepeatType.PACKED - : RepeatType.NO; - return { - no: field.no, - name: key, - kind: 'scalar', - T: field.type, - opt: field.optional, - repeat: repeatType, - }; - } else if (field.kind === 'message') { - return { - no: field.no, - name: key, - kind: 'message', - repeat: field.repeat ? RepeatType.PACKED : RepeatType.NO, - T: () => NapProtoRealMsg.getInstance(field.type())._proto_msg, - }; - } - }) as PartialFieldInfo[]; - this._proto_msg = new MessageType>('nya', this._field); - } - - static getInstance(fields: T): NapProtoRealMsg { - let instance = this.cache.get(fields); - if (!instance) { - instance = new NapProtoRealMsg(fields); - this.cache.set(fields, instance); - } - return instance; - } - - encode(data: NapProtoEncodeStructType): Uint8Array { - return this._proto_msg.toBinary(this._proto_msg.create(data as PartialMessage>)); - } - - decode(data: Uint8Array): NapProtoDecodeStructType { - return this._proto_msg.fromBinary(data) as NapProtoDecodeStructType; - } -} - -export class NapProtoMsg { - private realMsg: NapProtoRealMsg; - - constructor(fields: T) { - this.realMsg = NapProtoRealMsg.getInstance(fields); - } - - encode(data: NapProtoEncodeStructType): Uint8Array { - return this.realMsg.encode(data); - } - - decode(data: Uint8Array): NapProtoDecodeStructType { - return this.realMsg.decode(data); - } -} diff --git a/src/core/packet/proto/action/action.ts b/src/core/packet/proto/action/action.ts index af6b45d6..78452bbc 100644 --- a/src/core/packet/proto/action/action.ts +++ b/src/core/packet/proto/action/action.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; import { ContentHead, MessageBody, MessageControl, RoutingHead } from "@/core/packet/proto/message/message"; export const FaceRoamRequest = { diff --git a/src/core/packet/proto/action/miniAppAdaptShareInfo.ts b/src/core/packet/proto/action/miniAppAdaptShareInfo.ts index 76bb2829..0c137253 100644 --- a/src/core/packet/proto/action/miniAppAdaptShareInfo.ts +++ b/src/core/packet/proto/action/miniAppAdaptShareInfo.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; export const MiniAppAdaptShareInfoReq = { appId: ProtoField(2, ScalarType.STRING), diff --git a/src/core/packet/proto/highway/highway.ts b/src/core/packet/proto/highway/highway.ts index f69b9e4b..1e96074d 100644 --- a/src/core/packet/proto/highway/highway.ts +++ b/src/core/packet/proto/highway/highway.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; import { MsgInfo, MsgInfoBody } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq"; export const DataHighwayHead = { diff --git a/src/core/packet/proto/message/action.ts b/src/core/packet/proto/message/action.ts index 29d7945f..df26d42f 100644 --- a/src/core/packet/proto/message/action.ts +++ b/src/core/packet/proto/message/action.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; import { PushMsgBody } from "@/core/packet/proto/message/message"; export const LongMsgResult = { diff --git a/src/core/packet/proto/message/c2c.ts b/src/core/packet/proto/message/c2c.ts index 2a93e5eb..6db5b646 100644 --- a/src/core/packet/proto/message/c2c.ts +++ b/src/core/packet/proto/message/c2c.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; export const C2C = { uin: ProtoField(1, ScalarType.UINT32, true), diff --git a/src/core/packet/proto/message/component.ts b/src/core/packet/proto/message/component.ts index 0981a73e..04d0468d 100644 --- a/src/core/packet/proto/message/component.ts +++ b/src/core/packet/proto/message/component.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; import { Elem } from "@/core/packet/proto/message/element"; export const Attr = { diff --git a/src/core/packet/proto/message/element.ts b/src/core/packet/proto/message/element.ts index 3ed728e3..ed6a237f 100644 --- a/src/core/packet/proto/message/element.ts +++ b/src/core/packet/proto/message/element.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; export const Elem = { text: ProtoField(1, () => Text, true), diff --git a/src/core/packet/proto/message/group.ts b/src/core/packet/proto/message/group.ts index 3416f1e5..2c8ef617 100644 --- a/src/core/packet/proto/message/group.ts +++ b/src/core/packet/proto/message/group.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; export const GroupRecallMsg = { type: ProtoField(1, ScalarType.UINT32), diff --git a/src/core/packet/proto/message/message.ts b/src/core/packet/proto/message/message.ts index 5203f285..11a43665 100644 --- a/src/core/packet/proto/message/message.ts +++ b/src/core/packet/proto/message/message.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; import { ForwardHead, Grp, GrpTmp, ResponseForward, ResponseGrp, Trans0X211, WPATmp } from "@/core/packet/proto/message/routing"; import { RichText } from "@/core/packet/proto/message/component"; import { C2C } from "@/core/packet/proto/message/c2c"; diff --git a/src/core/packet/proto/message/notify.ts b/src/core/packet/proto/message/notify.ts index e739e151..efedfd45 100644 --- a/src/core/packet/proto/message/notify.ts +++ b/src/core/packet/proto/message/notify.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; export const FriendRecall = { info: ProtoField(1, () => FriendRecallInfo), diff --git a/src/core/packet/proto/message/routing.ts b/src/core/packet/proto/message/routing.ts index 7de44012..b8d539b0 100644 --- a/src/core/packet/proto/message/routing.ts +++ b/src/core/packet/proto/message/routing.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; export const ForwardHead = { field1: ProtoField(1, ScalarType.UINT32, true), diff --git a/src/core/packet/proto/oidb/Oidb.0XE37_800.ts b/src/core/packet/proto/oidb/Oidb.0XE37_800.ts index dc708071..a8418e76 100644 --- a/src/core/packet/proto/oidb/Oidb.0XE37_800.ts +++ b/src/core/packet/proto/oidb/Oidb.0XE37_800.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; import { OidbSvcTrpcTcp0XE37_800_1200Metadata } from "@/core/packet/proto/oidb/Oidb.0xE37_1200"; export const OidbSvcTrpcTcp0XE37_800 = { diff --git a/src/core/packet/proto/oidb/Oidb.0XFE1_2.ts b/src/core/packet/proto/oidb/Oidb.0XFE1_2.ts index 7c6b37be..13d7f428 100644 --- a/src/core/packet/proto/oidb/Oidb.0XFE1_2.ts +++ b/src/core/packet/proto/oidb/Oidb.0XFE1_2.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; export const OidbSvcTrpcTcp0XFE1_2 = { uin: ProtoField(1, ScalarType.UINT32), diff --git a/src/core/packet/proto/oidb/Oidb.0x6D6.ts b/src/core/packet/proto/oidb/Oidb.0x6D6.ts index be16da98..2824035a 100644 --- a/src/core/packet/proto/oidb/Oidb.0x6D6.ts +++ b/src/core/packet/proto/oidb/Oidb.0x6D6.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; export const OidbSvcTrpcTcp0x6D6 = { file: ProtoField(1, () => OidbSvcTrpcTcp0x6D6Upload, true), diff --git a/src/core/packet/proto/oidb/Oidb.0x8FC_2.ts b/src/core/packet/proto/oidb/Oidb.0x8FC_2.ts index 3721ee8b..c39cdbbe 100644 --- a/src/core/packet/proto/oidb/Oidb.0x8FC_2.ts +++ b/src/core/packet/proto/oidb/Oidb.0x8FC_2.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; //设置群头衔 OidbSvcTrpcTcp.0x8fc_2 @@ -13,4 +13,4 @@ export const OidbSvcTrpcTcp0X8FC_2_Body = { export const OidbSvcTrpcTcp0X8FC_2 = { groupUin: ProtoField(1, ScalarType.UINT32), body: ProtoField(3, ScalarType.BYTES), -}; \ No newline at end of file +}; diff --git a/src/core/packet/proto/oidb/Oidb.0x9067_202.ts b/src/core/packet/proto/oidb/Oidb.0x9067_202.ts index 2ee31688..c72fceef 100644 --- a/src/core/packet/proto/oidb/Oidb.0x9067_202.ts +++ b/src/core/packet/proto/oidb/Oidb.0x9067_202.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; import { MultiMediaReqHead } from "./common/Ntv2.RichMediaReq"; //Req diff --git a/src/core/packet/proto/oidb/Oidb.0x929.ts b/src/core/packet/proto/oidb/Oidb.0x929.ts index cc04e64b..b401d13d 100644 --- a/src/core/packet/proto/oidb/Oidb.0x929.ts +++ b/src/core/packet/proto/oidb/Oidb.0x929.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; import { MsgInfo } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq"; export const OidbSvcTrpcTcp0X929D_0 = { diff --git a/src/core/packet/proto/oidb/Oidb.0xE37_1200.ts b/src/core/packet/proto/oidb/Oidb.0xE37_1200.ts index ba2b0f16..969b36f2 100644 --- a/src/core/packet/proto/oidb/Oidb.0xE37_1200.ts +++ b/src/core/packet/proto/oidb/Oidb.0xE37_1200.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; export const OidbSvcTrpcTcp0XE37_1200 = { subCommand: ProtoField(1, ScalarType.UINT32, true), diff --git a/src/core/packet/proto/oidb/Oidb.0xE37_1700.ts b/src/core/packet/proto/oidb/Oidb.0xE37_1700.ts index 046dff8f..4c800f4e 100644 --- a/src/core/packet/proto/oidb/Oidb.0xE37_1700.ts +++ b/src/core/packet/proto/oidb/Oidb.0xE37_1700.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; export const OidbSvcTrpcTcp0XE37_1700 = { command: ProtoField(1, ScalarType.UINT32, true), diff --git a/src/core/packet/proto/oidb/Oidb.0xEB7.ts b/src/core/packet/proto/oidb/Oidb.0xEB7.ts index 27cf8cee..947a2268 100644 --- a/src/core/packet/proto/oidb/Oidb.0xEB7.ts +++ b/src/core/packet/proto/oidb/Oidb.0xEB7.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; export const OidbSvcTrpcTcp0XEB7_Body = { uin: ProtoField(1, ScalarType.STRING), @@ -9,4 +9,4 @@ export const OidbSvcTrpcTcp0XEB7_Body = { export const OidbSvcTrpcTcp0XEB7 = { body: ProtoField(2, () => OidbSvcTrpcTcp0XEB7_Body), -}; \ No newline at end of file +}; diff --git a/src/core/packet/proto/oidb/Oidb.0xED3_1.ts b/src/core/packet/proto/oidb/Oidb.0xED3_1.ts index 5e644c50..c8d6af21 100644 --- a/src/core/packet/proto/oidb/Oidb.0xED3_1.ts +++ b/src/core/packet/proto/oidb/Oidb.0xED3_1.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; // Send Poke export const OidbSvcTrpcTcp0XED3_1 = { diff --git a/src/core/packet/proto/oidb/OidbBase.ts b/src/core/packet/proto/oidb/OidbBase.ts index 49e9e5cd..fe1d1fab 100644 --- a/src/core/packet/proto/oidb/OidbBase.ts +++ b/src/core/packet/proto/oidb/OidbBase.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; export const OidbSvcTrpcTcpBase = { command: ProtoField(1, ScalarType.UINT32), diff --git a/src/core/packet/proto/oidb/common/Ntv2.RichMediaReq.ts b/src/core/packet/proto/oidb/common/Ntv2.RichMediaReq.ts index 2f117520..e279de3d 100644 --- a/src/core/packet/proto/oidb/common/Ntv2.RichMediaReq.ts +++ b/src/core/packet/proto/oidb/common/Ntv2.RichMediaReq.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; export const NTV2RichMediaReq = { ReqHead: ProtoField(1, () => MultiMediaReqHead), diff --git a/src/core/packet/proto/oidb/common/Ntv2.RichMediaResp.ts b/src/core/packet/proto/oidb/common/Ntv2.RichMediaResp.ts index e1d16556..fe7ac659 100644 --- a/src/core/packet/proto/oidb/common/Ntv2.RichMediaResp.ts +++ b/src/core/packet/proto/oidb/common/Ntv2.RichMediaResp.ts @@ -1,5 +1,5 @@ import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "../../NapProto"; +import { ProtoField } from "@napneko/nap-proto-core"; import { CommonHead, MsgInfo, PicUrlExtInfo, VideoExtInfo } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq"; export const NTV2RichMediaResp = {