From 41346eb1b8bad964d462adf246e6c70f0c1ed042 Mon Sep 17 00:00:00 2001 From: TheLostTree <65834918+TheLostTree@users.noreply.github.com> Date: Sun, 31 Jul 2022 11:34:43 -0700 Subject: [PATCH] ProtoFactory PoC --- src/ProtoFactory.ts | 103 +++++++++++++++++++++++++++++++++++++++ src/index.ts | 4 +- src/server/kcp/Packet.ts | 3 +- 3 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 src/ProtoFactory.ts diff --git a/src/ProtoFactory.ts b/src/ProtoFactory.ts new file mode 100644 index 0000000..c754367 --- /dev/null +++ b/src/ProtoFactory.ts @@ -0,0 +1,103 @@ +//ts-proto generated types required, import them here +import * as types from "./data/proto/StarRail"; +import protobufjs from "protobufjs"; +import {CmdID, PacketName} from "./server/kcp/Packet" +import Logger from "./util/Logger"; + + + +var c = new Logger("ProtoFactory"); +class MessageType{ + "encode": (arg0: T) => protobufjs.Writer; + "fromPartial": (arg0: object) => T; + // "decode": (input: protobufjs.Reader | Uint8Array, length?: number)=> T; + // "fromJSON": (object: any)=>T; + // "toJSON": (message: T)=> unknown + //you can add more fields here from the generated types + //fromjson etc... +}; + +var messageTypeMap = new Map>(); + +function send,T>(type: Class, data: T){ + console.log(type.encode(data).finish()) +} + + +function isMessageType(pet: MessageType | any): pet is MessageType { + return (>pet).encode !== undefined; + } + + +export default class ProtoFactory{ + + // ONLY USE THIS IF YOU'RE DECODING SOMETHING DONT USE IT TO SEND SHIT + // BECAUSE THEN YOU FUCK YOUR TYPECHECKING + + static getType(name: PacketName){ + return messageTypeMap.get(name) as MessageType; + } + + static init() { + //iterate over everything in types and check if they are a MessageType + for (const key of Object.keys(types)) { + let value = types[key as keyof typeof types]; + if (isMessageType(value)) { + if(Object.values(CmdID).includes(key)){ + messageTypeMap.set(key as PacketName, value); + }else{ + // there are some types that are not packets, but are still MessageType + // you can figure out what you want to do with them here + } + } + } + + c.log("Initialized with " + messageTypeMap.size + " types"); + + return; + + // example usages of send function + send(types.PlayerLoginScRsp, { + retcode: 0, + isRelay: false, + basicInfo: { + exp: 0, + level: 1, + hcoin: 0, + mcoin: 0, + nickname: "test", + scoin: 0, + stamina: 100, + worldLevel: 1, + }, + isNewPlayer: true, + stamina: 100, + curTimezone: 1, + loginRandom: 0, + serverTimestampMs: Math.round(new Date().getTime() / 1000), + bsBinVersion: "" + }); + + //if you want a partial type + send(types.PlayerLoginScRsp, types.PlayerLoginScRsp.fromPartial({ + basicInfo: { + exp: 0, + level: 1, + hcoin: 0, + mcoin: 0, + nickname: "test", + scoin: 0, + stamina: 100, + worldLevel: 1, + }, + isNewPlayer: true, + stamina: 100, + curTimezone: 1, + serverTimestampMs: Math.round(new Date().getTime() / 1000), + })) + } +} + + + + diff --git a/src/index.ts b/src/index.ts index 73d69fc..307e708 100644 --- a/src/index.ts +++ b/src/index.ts @@ -7,8 +7,10 @@ import Interface from "./commands/Interface"; import HttpServer from "./http/HttpServer"; import SRServer from "./server/kcp/SRServer"; import Logger from "./util/Logger"; -const c = new Logger("CrepeSR"); +import ProtoFactory from "./protoFactory" +const c = new Logger("CrepeSR"); +ProtoFactory.init(); c.log(`Starting CrepeSR...`); Interface.start(); HttpServer.getInstance().start(); diff --git a/src/server/kcp/Packet.ts b/src/server/kcp/Packet.ts index c1f61dc..db73c45 100644 --- a/src/server/kcp/Packet.ts +++ b/src/server/kcp/Packet.ts @@ -39,7 +39,6 @@ export default class Packet { public static encode(name: PacketName, body: {}, customCmdId?: number): Packet | null { try { - // @ts-ignore - Bullshit. You can just get enums by name const cmdid = CmdID[name]; const Message = Packet.root.lookupTypeOrEnum(name); @@ -73,7 +72,7 @@ export default class Packet { export type PacketName = keyof typeof CmdID; -enum CmdID { +export enum CmdID { None = 0, PlayerLoginCsReq = 1, PlayerLoginScRsp = 2,