Merge remote-tracking branch 'origin/msg-encode'

# Conflicts:
#	package-lock.json
#	package.json

.gitignore

@@ -37,3 +37,4 @@ ehthumbs.db
 Desktop.ini
 $RECYCLE.BIN/
 .DS_Store
+/scripts

YGOProMessages.js

@@ -3,17 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.YGOProMessagesHelper = void 0;
-const struct_1 = require("./struct");
+exports.YGOProMessagesHelper = exports.LegacyStruct = exports.LegacyStructInst = void 0;
 const underscore_1 = __importDefault(require("underscore"));
-const structs_json_1 = __importDefault(require("./data/structs.json"));
-const typedefs_json_1 = __importDefault(require("./data/typedefs.json"));
+const load_constants_1 = __importDefault(require("./load-constants"));
+const ygopro_msg_encode_1 = require("ygopro-msg-encode");
+const ygopro_msg_struct_compat_1 = require("./ygopro-msg-struct-compat");
 const proto_structs_json_1 = __importDefault(require("./data/proto_structs.json"));
-const constants_json_1 = __importDefault(require("./data/constants.json"));
+const utility_1 = require("./utility");
 class Handler {
     constructor(handler, synchronous) {
         this.handler = handler;
-        this.synchronous = synchronous || false;
+        this.synchronous = synchronous;
     }
     async handle(buffer, info, datas, params) {
         if (this.synchronous) {
@@ -27,8 +27,42 @@ class Handler {
         }
     }
 }
+class LegacyStructInst {
+    constructor(cls) {
+        this.cls = cls;
+    }
+    _setBuff(buff) {
+        this.buffer = buff;
+    }
+    set(field, value) {
+        if (!this.buffer || !this.cls)
+            return;
+        const inst = (0, ygopro_msg_struct_compat_1.applyYGOProMsgStructCompat)(new this.cls().fromPayload(this.buffer));
+        inst[field] = value;
+        (0, utility_1.overwriteBuffer)(this.buffer, inst.toPayload());
+    }
+}
+exports.LegacyStructInst = LegacyStructInst;
+class LegacyStruct {
+    constructor(helper) {
+        this.helper = helper;
+        this.protoClasses = new Map();
+        for (const [direction, list] of Object.entries(proto_structs_json_1.default)) {
+            for (const [protoStr, structName] of Object.entries(list)) {
+                if (!structName)
+                    continue;
+                this.protoClasses.set(structName, this.helper.getProtoClass(protoStr, direction));
+            }
+        }
+    }
+    get(structName) {
+        return new LegacyStructInst(this.protoClasses.get(structName));
+    }
+}
+exports.LegacyStruct = LegacyStruct;
 class YGOProMessagesHelper {
-    constructor(singleHandleLimit) {
+    constructor(singleHandleLimit = 1000) {
+        this.singleHandleLimit = singleHandleLimit;
         this.handlers = {
             STOC: [new Map(),
                 new Map(),
@@ -43,56 +77,8 @@ class YGOProMessagesHelper {
                 new Map(),
             ]
         };
-        this.initDatas();
-        this.initStructs();
-        if (singleHandleLimit) {
-            this.singleHandleLimit = singleHandleLimit;
-        }
-        else {
-            this.singleHandleLimit = 1000;
-        }
-    }
-    initDatas() {
-        this.structs_declaration = structs_json_1.default;
-        this.typedefs = typedefs_json_1.default;
-        this.proto_structs = proto_structs_json_1.default;
-        this.constants = constants_json_1.default;
-    }
-    initStructs() {
-        this.structs = new Map();
-        for (let name in this.structs_declaration) {
-            const declaration = this.structs_declaration[name];
-            let result = (0, struct_1.Struct)();
-            for (let field of declaration) {
-                if (field.encoding) {
-                    switch (field.encoding) {
-                        case "UTF-16LE":
-                            result.chars(field.name, field.length * 2, field.encoding);
-                            break;
-                        default:
-                            throw `unsupported encoding: ${field.encoding}`;
-                    }
-                }
-                else {
-                    let type = field.type;
-                    if (this.typedefs[type]) {
-                        type = this.typedefs[type];
-                    }
-                    if (field.length) {
-                        result.array(field.name, field.length, type); //不支持结构体
-                    }
-                    else {
-                        if (this.structs.has(type)) {
-                            result.struct(field.name, this.structs.get(type));
-                        }
-                        else {
-                            result[type](field.name);
-                        }
-                    }
-                }
-            }
-            this.structs.set(name, result);
-        }
+        this.constants = (0, load_constants_1.default)();
+        this.structs = new LegacyStruct(this);
     }
     getDirectionAndProto(protoStr) {
         const protoStrMatch = protoStr.match(/^(STOC|CTOS)_([_A-Z]+)$/);
@@ -117,11 +103,27 @@ class YGOProMessagesHelper {
         }
         return parseInt(translatedProto);
     }
+    getProtoClass(proto, direction) {
+        const identifier = typeof proto === 'number' ? proto : this.translateProto(proto, direction);
+        const registry = direction === 'CTOS' ? ygopro_msg_encode_1.YGOProCtos : direction === 'STOC' ? ygopro_msg_encode_1.YGOProStoc : null;
+        if (!registry) {
+            throw `Invalid direction: ${direction}`;
+        }
+        return registry.get(identifier);
+    }
+    classToProtoStr(cls) {
+        const registry = cls.prototype instanceof ygopro_msg_encode_1.YGOProCtosBase ? ygopro_msg_encode_1.YGOProCtos : cls.prototype instanceof ygopro_msg_encode_1.YGOProStocBase ? ygopro_msg_encode_1.YGOProStoc : null;
+        if (!registry) {
+            throw `Invalid class: ${cls.name}`;
+        }
+        const identifier = cls.identifier;
+        const direction = cls.prototype instanceof ygopro_msg_encode_1.YGOProCtosBase ? 'CTOS' : 'STOC';
+        return `${direction}_${this.constants[direction][identifier]}`;
+    }
     prepareMessage(protostr, info) {
         const { direction, proto } = this.getDirectionAndProto(protostr);
+        const translatedProto = this.translateProto(proto, direction);
         let buffer;
-        //console.log(proto, this.proto_structs[direction][proto]);
-        //const directionProtoList = this.constants[direction];
         if (typeof info === 'undefined') {
             buffer = null;
         }
@@ -129,12 +131,12 @@ class YGOProMessagesHelper {
             buffer = info;
         }
         else {
-            let struct = this.structs.get(this.proto_structs[direction][proto]);
-            struct.allocate();
-            struct.set(info);
-            buffer = struct.buffer();
+            const protoCls = this.getProtoClass(translatedProto, direction);
+            if (!protoCls) {
+                throw `No proto class for ${protostr}`;
+            }
+            buffer = Buffer.from((0, ygopro_msg_struct_compat_1.fromPartialCompat)(protoCls, info).toPayload());
         }
-        const translatedProto = this.translateProto(proto, direction);
         let sendBuffer = Buffer.allocUnsafe(3 + (buffer ? buffer.length : 0));
         if (buffer) {
             sendBuffer.writeUInt16LE(buffer.length + 1, 0);
@@ -231,13 +233,11 @@ class YGOProMessagesHelper {
                         }
                         const handlerCollection = this.handlers[direction][priority];
                         if (proto && handlerCollection.has(bufferProto)) {
-                            let struct = this.structs.get(this.proto_structs[direction][proto]);
                             for (const handler of handlerCollection.get(bufferProto)) {
-                                let info = null;
-                                if (struct) {
-                                    struct._setBuff(buffer);
-                                    info = underscore_1.default.clone(struct.fields);
-                                }
+                                const protoCls = this.getProtoClass(bufferProto, direction);
+                                const info = protoCls
+                                    ? (0, ygopro_msg_struct_compat_1.applyYGOProMsgStructCompat)(new protoCls().fromPayload(buffer))
+                                    : null;
                                 cancel = await handler.handle(buffer, info, datas, params);
                                 if (cancel) {
                                     if (Buffer.isBuffer(cancel)) {

YGOProMessages.ts

-import { Struct } from "./struct";
 import _ from "underscore";
-import structs_declaration from "./data/structs.json";
-import typedefs from "./data/typedefs.json";
-import proto_structs from "./data/proto_structs.json";
-import constants from "./data/constants.json";
+import loadConstants from "./load-constants";
 import net from "net";
+import { YGOProCtos, YGOProCtosBase, YGOProStoc, YGOProStocBase } from "ygopro-msg-encode";
+import { applyYGOProMsgStructCompat, fromPartialCompat } from "./ygopro-msg-struct-compat";
+import legacyProtoStructs from "./data/proto_structs.json";
+import { overwriteBuffer } from "./utility";
 
 
 class Handler {
-	private handler: (buffer: Buffer, info: any, datas: Buffer[], params: any) => Promise<boolean | string | Buffer>;
-	synchronous: boolean;
-	constructor(handler: (buffer: Buffer, info: any, datas: Buffer[], params: any) => Promise<boolean | string | Buffer>, synchronous: boolean) {
-		this.handler = handler;
-		this.synchronous = synchronous || false;
-	}
-	async handle(buffer: Buffer, info: any, datas: Buffer[], params: any): Promise<boolean | string | Buffer> {
+	constructor(
+		private handler: (buffer: Buffer, info: YGOProStocBase | YGOProCtosBase, datas: Buffer[], params: any) => Promise<boolean | string | Buffer>,
+		public synchronous: boolean
+	) {}
+	async handle(buffer: Buffer, info: YGOProStocBase | YGOProCtosBase, datas: Buffer[], params: any): Promise<boolean | string | Buffer> {
 		if (this.synchronous) {
 			return await this.handler(buffer, info, datas, params);
 		} else {
@@ -31,12 +29,21 @@ interface HandlerList {
 	CTOS: Map<number, Handler[]>[];
 }
 
+interface DirectionBase {
+	STOC: typeof YGOProStocBase;
+	CTOS: typeof YGOProCtosBase;
+}
+
+type DirectionToBase<T>
+	= T extends `${infer K extends keyof DirectionBase}_${string}` ? DirectionBase[K] : DirectionBase[keyof DirectionBase];
+
+
 interface DirectionAndProto {
-	direction: string;
+	direction: keyof HandlerList;
 	proto: string;
 }
 
-export interface Feedback{
+export interface Feedback {
 	type: string;
 	message: string;
 }
@@ -64,18 +71,41 @@ export interface Constants {
 	MSG: Record<string, string>;
 }
 
-export class YGOProMessagesHelper {
+export class LegacyStructInst {
+	buffer: Buffer;
+	constructor(private cls?: typeof YGOProCtosBase | typeof YGOProStocBase) {}
+
+	_setBuff(buff: Buffer) { 
+		this.buffer = buff;
+	}
+
+	set(field: string, value: any) { 
+		if (!this.buffer || !this.cls) return;
+		const inst = applyYGOProMsgStructCompat(new this.cls().fromPayload(this.buffer));
+		inst[field] = value;
+		overwriteBuffer(this.buffer, inst.toPayload());
+	}
+}
+
+export class LegacyStruct {
+	private protoClasses = new Map<string, typeof YGOProCtosBase | typeof YGOProStocBase>();
+	constructor(private helper: YGOProMessagesHelper) { 
+		for (const [direction, list] of Object.entries(legacyProtoStructs)) { 
+			for (const [protoStr, structName] of Object.entries(list)) { 
+				if(!structName) continue;
+				this.protoClasses.set(structName, this.helper.getProtoClass(protoStr, direction as keyof HandlerList));
+			}
+		}
+	}
+
+	get(structName: string) {
+		return new LegacyStructInst(this.protoClasses.get(structName));
+	}
+}
 
-	handlers: HandlerList;
-	structs: Map<string, Struct>;
-	structs_declaration: Record<string, Struct>;
-	typedefs: Record<string, string>;
-	proto_structs: Record<'CTOS' | 'STOC', Record<string, string>>;
-	constants: Constants;
-	singleHandleLimit: number;
+export class YGOProMessagesHelper {
 
-	constructor(singleHandleLimit?: number) {
-		this.handlers = {
+	handlers: HandlerList = {
 			STOC: [new Map(),
 			new Map(),
 			new Map(),
@@ -88,56 +118,12 @@ export class YGOProMessagesHelper {
 			new Map(),
 			new Map(),
 			]
-		}
-		this.initDatas();
-		this.initStructs();
-		if (singleHandleLimit) {
-			this.singleHandleLimit = singleHandleLimit;
-		} else {
-			this.singleHandleLimit = 1000;
-		}
-	}
+		};
+	constants = loadConstants();
 
-	initDatas() {
-		this.structs_declaration = structs_declaration;
-		this.typedefs = typedefs;
-		this.proto_structs = proto_structs;
-		this.constants = constants;
-	}
+	constructor(public singleHandleLimit = 1000) {}
 
-	initStructs() {
-		this.structs = new Map();
-		for (let name in this.structs_declaration) {
-			const declaration = this.structs_declaration[name];
-			let result = Struct();
-			for (let field of declaration) {
-				if (field.encoding) {
-					switch (field.encoding) {
-						case "UTF-16LE":
-							result.chars(field.name, field.length * 2, field.encoding);
-							break;
-						default:
-							throw `unsupported encoding: ${field.encoding}`;
-					}
-				} else {
-					let type = field.type;
-					if (this.typedefs[type]) {
-						type = this.typedefs[type];
-					}
-					if (field.length) {
-						result.array(field.name, field.length, type); //不支持结构体
-					} else {
-						if (this.structs.has(type)) {
-							result.struct(field.name, this.structs.get(type));
-						} else {
-							result[type](field.name);
-						}
-					}
-				}
-			}
-			this.structs.set(name, result);
-		}
-	}
+	structs = new LegacyStruct(this);
 
 	getDirectionAndProto(protoStr: string): DirectionAndProto {
 		const protoStrMatch = protoStr.match(/^(STOC|CTOS)_([_A-Z]+)$/);
@@ -145,13 +131,12 @@ export class YGOProMessagesHelper {
 			throw `Invalid proto string: ${protoStr}`
 		}
 		return {
-			direction: protoStrMatch[1].toUpperCase(),
+			direction: protoStrMatch[1].toUpperCase() as keyof HandlerList,
 			proto: protoStrMatch[2].toUpperCase()
 		}
 	}
 
-
-	translateProto(proto: string | number, direction: string): number {
+	translateProto(proto: string | number, direction: keyof HandlerList): number {
 		const directionProtoList = this.constants[direction];
 		if (typeof proto !== "string") {
 			return proto;
@@ -165,25 +150,43 @@ export class YGOProMessagesHelper {
 		return parseInt(translatedProto);
 	}
 
+	getProtoClass<T extends string | number>(proto: T, direction: keyof HandlerList): DirectionToBase<T> {
+		const identifier = typeof proto === 'number' ? proto : this.translateProto(proto, direction);
+		const registry = direction === 'CTOS' ? YGOProCtos : direction === 'STOC' ? YGOProStoc : null;
+		if (!registry) {
+			throw `Invalid direction: ${direction}`;
+		}
+		return registry.get(identifier) as DirectionToBase<T>;
+	}
+
+	classToProtoStr(cls: typeof YGOProCtosBase | typeof YGOProStocBase): string { 
+		const registry = cls.prototype instanceof YGOProCtosBase ? YGOProCtos : cls.prototype instanceof YGOProStocBase ? YGOProStoc : null;
+		if (!registry) { 
+			throw `Invalid class: ${cls.name}`;
+		}
+		const identifier = cls.identifier;
+		const direction = cls.prototype instanceof YGOProCtosBase ? 'CTOS' : 'STOC';
+		return `${direction}_${this.constants[direction][identifier]}`;
+	}
+
 	prepareMessage(protostr: string, info?: string | Buffer | any): Buffer {
 		const {
 			direction,
 			proto
 		} = this.getDirectionAndProto(protostr);
+		const translatedProto = this.translateProto(proto, direction);
 		let buffer: Buffer;
-		//console.log(proto, this.proto_structs[direction][proto]);
-		//const directionProtoList = this.constants[direction];
 		if (typeof info === 'undefined') {
 			buffer = null;
 		} else if (Buffer.isBuffer(info)) {
 			buffer = info;
 		} else {
-			let struct = this.structs.get(this.proto_structs[direction][proto]);
-			struct.allocate();
-			struct.set(info);
-			buffer = struct.buffer();
+			const protoCls = this.getProtoClass(translatedProto, direction);
+			if (!protoCls) { 
+				throw `No proto class for ${protostr}`;
+			}
+			buffer = Buffer.from(fromPartialCompat(protoCls, info).toPayload());
 		}
-		const translatedProto = this.translateProto(proto, direction);
 		let sendBuffer = Buffer.allocUnsafe(3 + (buffer ? buffer.length : 0));
 		if (buffer) {
 			sendBuffer.writeUInt16LE(buffer.length + 1, 0);
@@ -214,7 +217,7 @@ export class YGOProMessagesHelper {
 		return this.send(socket, sendBuffer);
 	}
 
-	addHandler(protostr: string, handler: (buffer: Buffer, info: any, datas: Buffer[], params: any) => Promise<boolean | string>, synchronous: boolean, priority: number) {
+	addHandler<T extends string>(protostr: T, handler: (buffer: Buffer, info: InstanceType<DirectionToBase<T>>, datas: Buffer[], params: any) => Promise<boolean | string>, synchronous: boolean, priority: number) {
 		if (priority < 0 || priority > 4) {
 			throw "Invalid priority: " + priority;
 		}
@@ -232,7 +235,7 @@ export class YGOProMessagesHelper {
 		handlerCollection.get(translatedProto).push(handlerObj);
 	}
 
-	async handleBuffer(messageBuffer: Buffer, direction: string, protoFilter?: string[], params?: any, preconnect = false): Promise<HandleResult> {
+	async handleBuffer(messageBuffer: Buffer, direction: keyof HandlerList, protoFilter?: string[], params?: any, preconnect = false): Promise<HandleResult> {
 		let feedback: Feedback = null;
 		let messageLength = 0;
 		let bufferProto = 0;
@@ -281,13 +284,11 @@ export class YGOProMessagesHelper {
 						}
 						const handlerCollection: Map<number, Handler[]> = this.handlers[direction][priority];
 						if (proto && handlerCollection.has(bufferProto)) {
-							let struct = this.structs.get(this.proto_structs[direction][proto]);
 							for (const handler of handlerCollection.get(bufferProto)) {
-								let info = null;
-								if (struct) {
-									struct._setBuff(buffer);
-									info = _.clone(struct.fields);
-								}
+								const protoCls = this.getProtoClass(bufferProto, direction);
+								const info = protoCls
+									? applyYGOProMsgStructCompat(new protoCls().fromPayload(buffer))
+									: null;
 								cancel = await handler.handle(buffer, info, datas, params);
 								if (cancel) {
 									if (Buffer.isBuffer(cancel)) {

data/constants.json

@@ -12,52 +12,6 @@
         "5": "TYPE_PLAYER6",
         "7": "TYPE_OBSERVER"
     },
-    "CTOS": {
-        "1": "RESPONSE",
-        "2": "UPDATE_DECK",
-        "3": "HAND_RESULT",
-        "4": "TP_RESULT",
-        "16": "PLAYER_INFO",
-        "17": "CREATE_GAME",
-        "18": "JOIN_GAME",
-        "19": "LEAVE_GAME",
-        "20": "SURRENDER",
-        "21": "TIME_CONFIRM",
-        "22": "CHAT",
-        "23": "EXTERNAL_ADDRESS",
-        "32": "HS_TODUELIST",
-        "33": "HS_TOOBSERVER",
-        "34": "HS_READY",
-        "35": "HS_NOTREADY",
-        "36": "HS_KICK",
-        "37": "HS_START",
-        "48": "REQUEST_FIELD"
-    },
-    "STOC": {
-        "1": "GAME_MSG",
-        "2": "ERROR_MSG",
-        "3": "SELECT_HAND",
-        "4": "SELECT_TP",
-        "5": "HAND_RESULT",
-        "6": "TP_RESULT",
-        "7": "CHANGE_SIDE",
-        "8": "WAITING_SIDE",
-        "9": "DECK_COUNT",
-        "17": "CREATE_GAME",
-        "18": "JOIN_GAME",
-        "19": "TYPE_CHANGE",
-        "20": "LEAVE_GAME",
-        "21": "DUEL_START",
-        "22": "DUEL_END",
-        "23": "REPLAY",
-        "24": "TIME_LIMIT",
-        "25": "CHAT",
-        "32": "HS_PLAYER_ENTER",
-        "33": "HS_PLAYER_CHANGE",
-        "34": "HS_WATCH_CHANGE",
-        "35": "TEAMMATE_SURRENDER",
-        "48": "FIELD_FINISH"
-    },
     "PLAYERCHANGE":{
         "8": "OBSERVE",
         "9": "READY",
@@ -75,203 +29,6 @@
         "1": "MATCH",
         "2": "TAG"
     },
-    "MSG": {
-        "1": "RETRY",
-        "2": "HINT",
-        "3": "WAITING",
-        "4": "START",
-        "5": "WIN",
-        "6": "UPDATE_DATA",
-        "7": "UPDATE_CARD",
-        "8": "REQUEST_DECK",
-        "10": "SELECT_BATTLECMD",
-        "11": "SELECT_IDLECMD",
-        "12": "SELECT_EFFECTYN",
-        "13": "SELECT_YESNO",
-        "14": "SELECT_OPTION",
-        "15": "SELECT_CARD",
-        "16": "SELECT_CHAIN",
-        "18": "SELECT_PLACE",
-        "19": "SELECT_POSITION",
-        "20": "SELECT_TRIBUTE",
-        "21": "SORT_CHAIN",
-        "22": "SELECT_COUNTER",
-        "23": "SELECT_SUM",
-        "24": "SELECT_DISFIELD",
-        "25": "SORT_CARD",
-        "26": "SELECT_UNSELECT_CARD",
-        "30": "CONFIRM_DECKTOP",
-        "31": "CONFIRM_CARDS",
-        "32": "SHUFFLE_DECK",
-        "33": "SHUFFLE_HAND",
-        "34": "REFRESH_DECK",
-        "35": "SWAP_GRAVE_DECK",
-        "36": "SHUFFLE_SET_CARD",
-        "37": "REVERSE_DECK",
-        "38": "DECK_TOP",
-        "39": "MSG_SHUFFLE_EXTRA",
-        "40": "NEW_TURN",
-        "41": "NEW_PHASE",
-        "42": "CONFIRM_EXTRATOP",
-        "50": "MOVE",
-        "53": "POS_CHANGE",
-        "54": "SET",
-        "55": "SWAP",
-        "56": "FIELD_DISABLED",
-        "60": "SUMMONING",
-        "61": "SUMMONED",
-        "62": "SPSUMMONING",
-        "63": "SPSUMMONED",
-        "64": "FLIPSUMMONING",
-        "65": "FLIPSUMMONED",
-        "70": "CHAINING",
-        "71": "CHAINED",
-        "72": "CHAIN_SOLVING",
-        "73": "CHAIN_SOLVED",
-        "74": "CHAIN_END",
-        "75": "CHAIN_NEGATED",
-        "76": "CHAIN_DISABLED",
-        "80": "CARD_SELECTED",
-        "81": "RANDOM_SELECTED",
-        "83": "BECOME_TARGET",
-        "90": "DRAW",
-        "91": "DAMAGE",
-        "92": "RECOVER",
-        "93": "EQUIP",
-        "94": "LPUPDATE",
-        "95": "UNEQUIP",
-        "96": "CARD_TARGET",
-        "97": "CANCEL_TARGET",
-        "100": "PAY_LPCOST",
-        "101": "ADD_COUNTER",
-        "102": "REMOVE_COUNTER",
-        "110": "ATTACK",
-        "111": "BATTLE",
-        "112": "ATTACK_DISABLED",
-        "113": "DAMAGE_STEP_START",
-        "114": "DAMAGE_STEP_END",
-        "120": "MISSED_EFFECT",
-        "121": "BE_CHAIN_TARGET",
-        "122": "CREATE_RELATION",
-        "123": "RELEASE_RELATION",
-        "130": "TOSS_COIN",
-        "131": "TOSS_DICE",
-        "132": "ROCK_PAPER_SCISSORS",
-        "133": "HAND_RES",
-        "140": "ANNOUNCE_RACE",
-        "141": "ANNOUNCE_ATTRIB",
-        "142": "ANNOUNCE_CARD",
-        "143": "ANNOUNCE_NUMBER",
-        "160": "CARD_HINT",
-        "161": "TAG_SWAP",
-        "162": "RELOAD_FIELD",
-        "163": "AI_NAME",
-        "164": "SHOW_HINT",
-        "170": "MATCH_KILL",
-        "180": "CUSTOM_MSG"
-    },
-    "TIMING":{
-        "1": "DRAW_PHASE",
-        "2": "STANDBY_PHASE",
-        "4": "MAIN_END",
-        "8": "BATTLE_START",
-        "16": "BATTLE_END",
-        "32": "END_PHASE",
-        "64": "SUMMON",
-        "128": "SPSUMMON",
-        "256": "FLIPSUMMON",
-        "512": "MSET",
-        "1024": "SSET",
-        "2048": "POS_CHANGE",
-        "4096": "ATTACK",
-        "8192": "DAMAGE_STEP",
-        "16384": "DAMAGE_CAL",
-        "32768": "CHAIN_END",
-        "65536": "DRAW",
-        "131072": "DAMAGE",
-        "262144": "RECOVER",
-        "524288": "DESTROY",
-        "1048576": "REMOVE",
-        "2097152": "TOHAND",
-        "4194304": "TODECK",
-        "8388608": "TOGRAVE",
-        "16777216": "BATTLE_PHASE",
-        "33554432": "EQUIP"
-    },
-    "TYPES": {
-        "TYPE_MONSTER": 1,
-        "TYPE_SPELL": 2,
-        "TYPE_TRAP": 4,
-        "TYPE_NORMAL": 16,
-        "TYPE_EFFECT": 32,
-        "TYPE_FUSION": 64,
-        "TYPE_RITUAL": 128,
-        "TYPE_TRAPMONSTER": 256,
-        "TYPE_SPIRIT": 512,
-        "TYPE_UNION": 1024,
-        "TYPE_DUAL": 2048,
-        "TYPE_TUNER": 4096,
-        "TYPE_SYNCHRO": 8192,
-        "TYPE_TOKEN": 16384,
-        "TYPE_QUICKPLAY": 65536,
-        "TYPE_CONTINUOUS": 131072,
-        "TYPE_EQUIP": 262144,
-        "TYPE_FIELD": 524288,
-        "TYPE_COUNTER": 1048576,
-        "TYPE_FLIP": 2097152,
-        "TYPE_TOON": 4194304,
-        "TYPE_XYZ": 8388608,
-        "TYPE_PENDULUM": 16777216,
-        "TYPE_SPSUMMON": 33554432,
-        "TYPE_LINK": 67108864
-    },
-    "RACES": {
-        "RACE_WARRIOR": 1,
-        "RACE_SPELLCASTER": 2,
-        "RACE_FAIRY": 4,
-        "RACE_FIEND": 8,
-        "RACE_ZOMBIE": 16,
-        "RACE_MACHINE": 32,
-        "RACE_AQUA": 64,
-        "RACE_PYRO": 128,
-        "RACE_ROCK": 256,
-        "RACE_WINDBEAST": 512,
-        "RACE_PLANT": 1024,
-        "RACE_INSECT": 2048,
-        "RACE_THUNDER": 4096,
-        "RACE_DRAGON": 8192,
-        "RACE_BEAST": 16384,
-        "RACE_BEASTWARRIOR": 32768,
-        "RACE_DINOSAUR": 65536,
-        "RACE_FISH": 131072,
-        "RACE_SEASERPENT": 262144,
-        "RACE_REPTILE": 524288,
-        "RACE_PSYCHO": 1048576,
-        "RACE_DEVINE": 2097152,
-        "RACE_CREATORGOD": 4194304,
-        "RACE_WYRM": 8388608,
-        "RACE_CYBERS": 16777216,
-        "RACE_ILLUSION": 33554432
-    },
-    "ATTRIBUTES": {
-        "ATTRIBUTE_EARTH": 1,
-        "ATTRIBUTE_WATER": 2,
-        "ATTRIBUTE_FIRE": 4,
-        "ATTRIBUTE_WIND": 8,
-        "ATTRIBUTE_LIGHT": 16,
-        "ATTRIBUTE_DARK": 32,
-        "ATTRIBUTE_DEVINE": 64
-    },
-    "LINK_MARKERS": {
-        "LINK_MARKER_BOTTOM_LEFT": 1,
-        "LINK_MARKER_BOTTOM": 2,
-        "LINK_MARKER_BOTTOM_RIGHT": 4,
-        "LINK_MARKER_LEFT": 8,
-        "LINK_MARKER_RIGHT": 32,
-        "LINK_MARKER_TOP_LEFT": 64,
-        "LINK_MARKER_TOP": 128,
-        "LINK_MARKER_TOP_RIGHT": 256
-    },
     "DUEL_STAGE": {
         "BEGIN": 0,
         "FINGER": 1,

data/structs.json

-{
-    "HostInfo": [
-        {"name": "lflist", "type": "unsigned int"},
-        {"name": "rule", "type": "unsigned char"},
-        {"name": "mode", "type": "unsigned char"},
-        {"name": "duel_rule", "type": "unsigned char"},
-        {"name": "no_check_deck", "type": "bool"},
-        {"name": "no_shuffle_deck", "type": "bool"},
-        {"name": "start_lp", "type": "unsigned int"},
-        {"name": "start_hand", "type": "unsigned char"},
-        {"name": "draw_count", "type": "unsigned char"},
-        {"name": "time_limit", "type": "unsigned short"}
-    ],
-    "HostPacket": [
-        {"name": "identifier", "type": "unsigned short"},
-        {"name": "version", "type": "unsigned short"},
-        {"name": "port", "type": "unsigned short"},
-        {"name": "ipaddr", "type": "unsigned int"},
-        {"name": "name", "type": "unsigned short", "length": 20, "encoding": "UTF-16LE"},
-        {"name": "host", "type": "HostInfo"}
-    ],
-    "HostRequest": [
-        {"name": "identifier", "type": "unsigned short"}
-    ],
-    "CTOS_HandResult": [
-        {"name": "res", "type": "unsigned char"}
-    ],
-    "CTOS_TPResult": [
-        {"name": "res", "type": "unsigned char"}
-    ],
-    "CTOS_PlayerInfo": [
-        {"name": "name", "type": "unsigned short", "length": 20, "encoding": "UTF-16LE"}
-    ],
-    "CTOS_CreateGame": [
-        {"name": "info", "type": "HostInfo"},
-        {"name": "name", "type": "unsigned short", "length": 20, "encoding": "UTF-16LE"},
-        {"name": "pass", "type": "unsigned short", "length": 20, "encoding": "UTF-16LE"}
-    ],
-    "CTOS_JoinGame": [
-        {"name": "version", "type": "unsigned short"},
-        {"name": "align", "type": "unsigned short"},
-        {"name": "gameid", "type": "unsigned int"},
-        {"name": "pass", "type": "unsigned short", "length": 20, "encoding": "UTF-16LE"}
-    ],
-    "CTOS_ExternalAddress": [
-        {"name": "real_ip", "type": "unsigned int"},
-        {"name": "hostname", "type": "unsigned short", "length":"256", "encoding": "UTF-16LE"}
-    ],
-    "CTOS_Kick": [
-        {"name": "pos", "type": "unsigned char"}
-    ],
-    "STOC_ErrorMsg": [
-        {"name": "msg", "type": "unsigned char"},
-        {"name": "align1", "type": "unsigned char"},
-        {"name": "align2", "type": "unsigned char"},
-        {"name": "align3", "type": "unsigned char"},
-        {"name": "code", "type": "unsigned int"}
-    ],
-    "STOC_HandResult": [
-        {"name": "res1", "type": "unsigned char"},
-        {"name": "res2", "type": "unsigned char"}
-    ],
-    "STOC_CreateGame": [
-        {"name": "gameid", "type": "unsigned int"}
-    ],
-    "STOC_JoinGame": [
-        {"name": "info", "type": "HostInfo"}
-    ],
-    "STOC_TypeChange": [
-        {"name": "type", "type": "unsigned char"}
-    ],
-    "STOC_ExitGame": [
-        {"name": "pos", "type": "unsigned char"}
-    ],
-    "STOC_TimeLimit": [
-        {"name": "player", "type": "unsigned char"},
-        {"name": "left_time", "type": "unsigned short"}
-    ],
-    "STOC_Chat": [
-        {"name": "player", "type": "unsigned short"},
-        {"name": "msg", "type": "unsigned short", "length": 255, "encoding": "UTF-16LE"}
-    ],
-    "STOC_HS_PlayerEnter": [
-        {"name": "name", "type": "unsigned short", "length": 20, "encoding": "UTF-16LE"},
-        {"name": "pos", "type": "unsigned char"},
-        {"name": "padding", "type": "unsigned char"}
-    ],
-    "STOC_HS_PlayerChange": [
-        {"name": "status", "type": "unsigned char"}
-    ],
-    "STOC_HS_WatchChange": [
-        {"name": "watch_count", "type": "unsigned short"}
-    ],
-    "GameMsg_Hint_Card_only": [
-        {"name": "curmsg", "type": "word8Ule"},
-        {"name": "type", "type": "word8"},
-        {"name": "player", "type": "word8"},
-        {"name": "data", "type": "word32Ule"}
-    ],
-    "deck": [
-        {"name": "mainc", "type": "unsigned int"},
-        {"name": "sidec", "type": "unsigned int"},
-        {"name": "deckbuf", "type": "unsigned int", "length": 90}
-    ],
-    "chat": [
-        {"name": "msg", "type": "unsigned short", "length":"255", "encoding": "UTF-16LE"}
-    ],
-    "STOC_DeckCount": [
-        {"name": "mainc_s", "type": "unsigned short"},
-        {"name": "sidec_s", "type": "unsigned short"},
-        {"name": "extrac_s", "type": "unsigned short"},
-        {"name": "mainc_o", "type": "unsigned short"},
-        {"name": "sidec_o", "type": "unsigned short"},
-        {"name": "extrac_o", "type": "unsigned short"}
-    ]
-}

data/typedefs.json

-{
-    "unsigned int": "word32Ule",
-    "unsigned short": "word16Ule",
-    "unsigned char": "word8",
-    "bool": "bool2"
-}
\ No newline at end of file

load-constants.js

+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadConstants = void 0;
+const ygopro_msg_encode_1 = require("ygopro-msg-encode");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const loadConstantsJson = () => {
+    const filePath = path_1.default.join(__dirname, "data", "constants.json");
+    const raw = fs_1.default.readFileSync(filePath, "utf8");
+    return JSON.parse(raw);
+};
+const addMissingNumberEntries = (target, source, prefix) => {
+    for (const [key, value] of Object.entries(source)) {
+        if (!key.startsWith(prefix)) {
+            continue;
+        }
+        if (target[key] === undefined) {
+            target[key] = value;
+        }
+    }
+};
+const addMissingStringEntries = (target, source, prefix) => {
+    for (const [key, value] of Object.entries(source)) {
+        if (!key.startsWith(prefix)) {
+            continue;
+        }
+        const codeKey = String(value);
+        if (target[codeKey] === undefined) {
+            target[codeKey] = key.slice(prefix.length);
+        }
+    }
+};
+const legacyMsgFallback = {
+    "3": "WAITING",
+    "4": "START",
+    "6": "UPDATE_DATA",
+    "8": "REQUEST_DECK",
+    "21": "SORT_CHAIN",
+    "34": "REFRESH_DECK",
+    "39": "MSG_SHUFFLE_EXTRA",
+    "80": "CARD_SELECTED",
+    "95": "UNEQUIP",
+    "121": "BE_CHAIN_TARGET",
+    "122": "CREATE_RELATION",
+    "123": "RELEASE_RELATION",
+};
+const toConstantName = (name) => name
+    .replace(/^_+|_+$/g, "")
+    .replace(/([a-z0-9])([A-Z])/g, "$1_$2")
+    .replace(/([A-Z]+)([A-Z][a-z])/g, "$1_$2")
+    .toUpperCase();
+const normalizeProtoName = (name) => name
+    .replace("TO_OBSERVER", "TOOBSERVER")
+    .replace("TO_DUELIST", "TODUELIST")
+    .replace("HS_NOT_READY", "HS_NOTREADY")
+    .replace("KICK", "HS_KICK");
+const buildProtoMap = (registry, classPrefix) => {
+    const out = {};
+    for (const [id, cls] of registry.protos.entries()) {
+        const rawName = cls.name.startsWith(classPrefix)
+            ? cls.name.slice(classPrefix.length)
+            : cls.name;
+        const name = normalizeProtoName(toConstantName(rawName));
+        out[String(id)] = name;
+    }
+    return out;
+};
+const loadConstants = () => {
+    const result = loadConstantsJson();
+    if (!result.TYPES)
+        result.TYPES = {};
+    if (!result.RACES)
+        result.RACES = {};
+    if (!result.ATTRIBUTES)
+        result.ATTRIBUTES = {};
+    if (!result.LINK_MARKERS)
+        result.LINK_MARKERS = {};
+    if (!result.MSG)
+        result.MSG = {};
+    if (!result.TIMING)
+        result.TIMING = {};
+    if (!result.CTOS)
+        result.CTOS = {};
+    if (!result.STOC)
+        result.STOC = {};
+    if (!result.NETWORK)
+        result.NETWORK = {};
+    if (!result.NETPLAYER)
+        result.NETPLAYER = {};
+    if (!result.PLAYERCHANGE)
+        result.PLAYERCHANGE = {};
+    if (!result.ERRMSG)
+        result.ERRMSG = {};
+    if (!result.MODE)
+        result.MODE = {};
+    if (!result.DUEL_STAGE)
+        result.DUEL_STAGE = {};
+    if (!result.COLORS)
+        result.COLORS = {};
+    addMissingNumberEntries(result.TYPES, ygopro_msg_encode_1.OcgcoreCommonConstants, "TYPE_");
+    addMissingNumberEntries(result.RACES, ygopro_msg_encode_1.OcgcoreCommonConstants, "RACE_");
+    addMissingNumberEntries(result.ATTRIBUTES, ygopro_msg_encode_1.OcgcoreCommonConstants, "ATTRIBUTE_");
+    addMissingNumberEntries(result.ATTRIBUTES, ygopro_msg_encode_1.OcgcoreScriptConstants, "ATTRIBUTE_");
+    addMissingNumberEntries(result.LINK_MARKERS, ygopro_msg_encode_1.OcgcoreCommonConstants, "LINK_MARKER_");
+    addMissingStringEntries(result.MSG, ygopro_msg_encode_1.OcgcoreCommonConstants, "MSG_");
+    addMissingStringEntries(result.TIMING, ygopro_msg_encode_1.OcgcoreScriptConstants, "TIMING_");
+    for (const [code, name] of Object.entries(legacyMsgFallback)) {
+        result.MSG[code] = name;
+    }
+    const ctosMap = buildProtoMap(ygopro_msg_encode_1.YGOProCtos, "YGOProCtos");
+    const stocMap = buildProtoMap(ygopro_msg_encode_1.YGOProStoc, "YGOProStoc");
+    const mismatches = [];
+    for (const [code, name] of Object.entries(ctosMap)) {
+        if (result.CTOS[code] !== undefined && result.CTOS[code] !== name) {
+            mismatches.push(`CTOS ${code}: ${result.CTOS[code]} != ${name}`);
+        }
+        result.CTOS[code] = name;
+    }
+    for (const [code, name] of Object.entries(stocMap)) {
+        if (result.STOC[code] !== undefined && result.STOC[code] !== name) {
+            mismatches.push(`STOC ${code}: ${result.STOC[code]} != ${name}`);
+        }
+        result.STOC[code] = name;
+    }
+    if (mismatches.length) {
+        throw new Error(`CTOS/STOC name mismatch between constants.json and registry:\\n${mismatches.join("\\n")}`);
+    }
+    if (result.RACES.RACE_CYBERS === undefined &&
+        result.RACES.RACE_CYBERSE !== undefined) {
+        result.RACES.RACE_CYBERS = result.RACES.RACE_CYBERSE;
+    }
+    return result;
+};
+exports.loadConstants = loadConstants;
+exports.default = exports.loadConstants;
+if (require.main === module) {
+    console.log(JSON.stringify((0, exports.loadConstants)(), null, 2));
+}

load-constants.ts

+import {
+  OcgcoreCommonConstants,
+  OcgcoreScriptConstants,
+  YGOProCtos,
+  YGOProStoc,
+} from "ygopro-msg-encode";
+import fs from "fs";
+import path from "path";
+
+export interface ConstantsShape {
+  TYPES: Record<string, number>;
+  RACES: Record<string, number>;
+  ATTRIBUTES: Record<string, number>;
+  LINK_MARKERS: Record<string, number>;
+  DUEL_STAGE: Record<string, number>;
+  COLORS: Record<string, number>;
+  TIMING: Record<string, string>;
+  NETWORK: Record<string, string>;
+  NETPLAYER: Record<string, string>;
+  CTOS: Record<string, string>;
+  STOC: Record<string, string>;
+  PLAYERCHANGE: Record<string, string>;
+  ERRMSG: Record<string, string>;
+  MODE: Record<string, string>;
+  MSG: Record<string, string>;
+}
+
+type StringMap = Record<string, string>;
+type NumberMap = Record<string, number>;
+
+const loadConstantsJson = (): Partial<ConstantsShape> => {
+  const filePath = path.join(__dirname, "data", "constants.json");
+  const raw = fs.readFileSync(filePath, "utf8");
+  return JSON.parse(raw) as Partial<ConstantsShape>;
+};
+
+const addMissingNumberEntries = (
+  target: NumberMap,
+  source: Record<string, number>,
+  prefix: string
+) => {
+  for (const [key, value] of Object.entries(source)) {
+    if (!key.startsWith(prefix)) {
+      continue;
+    }
+    if (target[key] === undefined) {
+      target[key] = value;
+    }
+  }
+};
+
+const addMissingStringEntries = (
+  target: StringMap,
+  source: Record<string, number>,
+  prefix: string
+) => {
+  for (const [key, value] of Object.entries(source)) {
+    if (!key.startsWith(prefix)) {
+      continue;
+    }
+    const codeKey = String(value);
+    if (target[codeKey] === undefined) {
+      target[codeKey] = key.slice(prefix.length);
+    }
+  }
+};
+
+const legacyMsgFallback: Record<string, string> = {
+  "3": "WAITING",
+  "4": "START",
+  "6": "UPDATE_DATA",
+  "8": "REQUEST_DECK",
+  "21": "SORT_CHAIN",
+  "34": "REFRESH_DECK",
+  "39": "MSG_SHUFFLE_EXTRA",
+  "80": "CARD_SELECTED",
+  "95": "UNEQUIP",
+  "121": "BE_CHAIN_TARGET",
+  "122": "CREATE_RELATION",
+  "123": "RELEASE_RELATION",
+};
+
+const toConstantName = (name: string) =>
+  name
+    .replace(/^_+|_+$/g, "")
+    .replace(/([a-z0-9])([A-Z])/g, "$1_$2")
+    .replace(/([A-Z]+)([A-Z][a-z])/g, "$1_$2")
+    .toUpperCase();
+
+const normalizeProtoName = (name: string) =>
+  name
+    .replace("TO_OBSERVER", "TOOBSERVER")
+    .replace("TO_DUELIST", "TODUELIST")
+    .replace("HS_NOT_READY", "HS_NOTREADY")
+    .replace("KICK", "HS_KICK");
+
+const buildProtoMap = (
+  registry: { protos: Map<number, { name: string }> },
+  classPrefix: string
+) => {
+  const out: Record<string, string> = {};
+  for (const [id, cls] of registry.protos.entries()) {
+    const rawName = cls.name.startsWith(classPrefix)
+      ? cls.name.slice(classPrefix.length)
+      : cls.name;
+    const name = normalizeProtoName(toConstantName(rawName));
+    out[String(id)] = name;
+  }
+  return out;
+};
+
+export const loadConstants = () => {
+  const result = loadConstantsJson();
+
+  if (!result.TYPES) result.TYPES = {};
+  if (!result.RACES) result.RACES = {};
+  if (!result.ATTRIBUTES) result.ATTRIBUTES = {};
+  if (!result.LINK_MARKERS) result.LINK_MARKERS = {};
+  if (!result.MSG) result.MSG = {};
+  if (!result.TIMING) result.TIMING = {};
+  if (!result.CTOS) result.CTOS = {};
+  if (!result.STOC) result.STOC = {};
+  if (!result.NETWORK) result.NETWORK = {};
+  if (!result.NETPLAYER) result.NETPLAYER = {};
+  if (!result.PLAYERCHANGE) result.PLAYERCHANGE = {};
+  if (!result.ERRMSG) result.ERRMSG = {};
+  if (!result.MODE) result.MODE = {};
+  if (!result.DUEL_STAGE) result.DUEL_STAGE = {};
+  if (!result.COLORS) result.COLORS = {};
+
+  addMissingNumberEntries(result.TYPES, OcgcoreCommonConstants, "TYPE_");
+  addMissingNumberEntries(result.RACES, OcgcoreCommonConstants, "RACE_");
+  addMissingNumberEntries(result.ATTRIBUTES, OcgcoreCommonConstants, "ATTRIBUTE_");
+  addMissingNumberEntries(result.ATTRIBUTES, OcgcoreScriptConstants, "ATTRIBUTE_");
+  addMissingNumberEntries(result.LINK_MARKERS, OcgcoreCommonConstants, "LINK_MARKER_");
+
+  addMissingStringEntries(result.MSG, OcgcoreCommonConstants, "MSG_");
+  addMissingStringEntries(result.TIMING, OcgcoreScriptConstants, "TIMING_");
+  for (const [code, name] of Object.entries(legacyMsgFallback)) {
+    result.MSG[code] = name;
+  }
+  const ctosMap = buildProtoMap(YGOProCtos, "YGOProCtos");
+  const stocMap = buildProtoMap(YGOProStoc, "YGOProStoc");
+  const mismatches: string[] = [];
+  for (const [code, name] of Object.entries(ctosMap)) {
+    if (result.CTOS[code] !== undefined && result.CTOS[code] !== name) {
+      mismatches.push(`CTOS ${code}: ${result.CTOS[code]} != ${name}`);
+    }
+    result.CTOS[code] = name;
+  }
+  for (const [code, name] of Object.entries(stocMap)) {
+    if (result.STOC[code] !== undefined && result.STOC[code] !== name) {
+      mismatches.push(`STOC ${code}: ${result.STOC[code]} != ${name}`);
+    }
+    result.STOC[code] = name;
+  }
+  if (mismatches.length) {
+    throw new Error(
+      `CTOS/STOC name mismatch between constants.json and registry:\\n${mismatches.join("\\n")}`
+    );
+  }
+
+  if (
+    result.RACES.RACE_CYBERS === undefined &&
+    result.RACES.RACE_CYBERSE !== undefined
+  ) {
+    result.RACES.RACE_CYBERS = result.RACES.RACE_CYBERSE;
+  }
+
+  return result as ConstantsShape;
+};
+
+export default loadConstants;
+
+if (require.main === module) { 
+  console.log(JSON.stringify(loadConstants(), null, 2));
+}

package.json

@@ -12,7 +12,6 @@
   "author": "zh99998 <zh99998@gmail.com>, mercury233 <me@mercury233.me>, Nanahira <78877@qq.com>",
   "dependencies": {
     "aragami": "^1.2.5",
-    "async": "^3.2.0",
     "axios": "^0.19.2",
     "bunyan": "^1.8.14",
     "deepmerge": "^4.2.2",
@@ -25,8 +24,6 @@
     "mysql": "^2.18.1",
     "node-os-utils": "^1.3.2",
     "p-queue": "^6.6.2",
-    "pg": "^6.4.2",
-    "q": "^1.5.1",
     "querystring": "^0.2.0",
     "reflect-metadata": "^0.1.13",
     "request": "^2.88.2",
@@ -49,7 +46,6 @@
     "webhook": "node ygopro-webhook.js"
   },
   "devDependencies": {
-    "@types/async": "^3.2.25",
     "@types/bunyan": "^1.8.8",
     "@types/formidable": "^3.4.6",
     "@types/ip6addr": "^0.2.3",

struct.js

-// a special version of node-struct by xdenser
-// https://github.com/xdenser/node-struct/tree/f843487d6768cd0bf20c2ce7803dde2d92df5694
-
-function byteField(p, offset) {
-    this.length = 1;
-    this.get = function () {
-        return p.buf[offset];
-    }
-    this.set = function (val) {
-        p.buf[offset] = val;
-    }
-}
-
-function boolField(p, offset, length) {
-    this.length = length;
-    this.get = function () {
-        return (p.buf[offset] > 0 );
-    }
-    this.set = function (val) {
-        p.buf[offset] = val ? 1 : 0;
-    }
-}
-
-function intField(p, offset, length, le, signed) {
-    this.length = length;
-
-    function bec(cb) {
-        for (var i = 0; i < length; i++)
-            cb(i, length - i - 1);
-    }
-
-    function lec(cb) {
-        for (var i = 0; i < length; i++)
-            cb(i, i);
-    }
-
-    function getUVal(bor) {
-        var val = 0;
-        bor(function (i, o) {
-            val += Math.pow(256, o) * p.buf[offset + i];
-        })
-        return val;
-    }
-
-    function getSVal(bor) {
-
-        var val = getUVal(bor);
-        if ((p.buf[offset + ( le ? (length - 1) : 0)] & 0x80) == 0x80) {
-            val -= Math.pow(256, length);
-        }
-        return val;
-    }
-
-    function setVal(bor, val) {
-        bor(function (i, o) {
-            p.buf[offset + i] = Math.floor(val / Math.pow(256, o)) & 0xff;
-        });
-    }
-
-
-    this.get = function () {
-        var bor = le ? lec : bec;
-        return ( signed ? getSVal(bor) : getUVal(bor));
-    }
-    this.set = function (val) {
-        var bor = le ? lec : bec;
-        setVal(bor, val);
-    }
-}
-
-function charField(p, offset, length, encoding) {
-    this.length = length;
-    this.encoding = encoding;
-    this.get = function () {
-        var result = p.buf.toString(this.encoding, offset, offset + length);
-        var strlen = result.indexOf("\0");
-        if (strlen == -1) {
-            return result;
-        } else {
-            return result.slice(0, strlen);
-        }
-    }
-    this.set = function (val) {
-        val += "\0";
-        if (val.length > length)
-            val = val.substring(0, length);
-        p.buf.write(val, offset, this.encoding);
-    }
-}
-
-function structField(p, offset, struct) {
-    this.length = struct.length();
-    this.get = function () {
-        return struct;
-    }
-    this.set = function (val) {
-        struct.set(val);
-    }
-    this.allocate = function () {
-        struct._setBuff(p.buf.slice(offset, offset + struct.length()));
-    }
-}
-
-function arrayField(p, offset, len, type) {
-    var as = Struct();
-    var args = [].slice.call(arguments, 4);
-    args.unshift(0);
-    for (var i = 0; i < len; i++) {
-        if (type instanceof Struct) {
-            as.struct(i, type.clone());
-        } else if (type in as) {
-            args[0] = i;
-            as[type].apply(as, args);
-        }
-    }
-    this.length = as.length();
-    this.allocate = function () {
-        as._setBuff(p.buf.slice(offset, offset + as.length()));
-    }
-    this.get = function () {
-        return as;
-    }
-    this.set = function (val) {
-        as.set(val);
-    }
-}
-
-function Struct() {
-    if (!(this instanceof Struct))
-        return new Struct;
-
-    var priv = {
-        buf: {},
-        allocated: false,
-        len: 0,
-        fields: {},
-        closures: []
-    }, self = this;
-
-    function checkAllocated() {
-        if (priv.allocated)
-            throw new Error('Cant change struct after allocation');
-    }
-
-
-    this.word8 = function (key) {
-        checkAllocated();
-        priv.closures.push(function (p) {
-            p.fields[key] = new byteField(p, p.len);
-            p.len++;
-        });
-        return this;
-    };
-
-    // Create handlers for various Bool Field Variants
-    [1, 2, 3, 4].forEach(function (n) {
-        self['bool' + (n == 1 ? '' : n)] = function (key) {
-            checkAllocated();
-            priv.closures.push(function (p) {
-                p.fields[key] = new boolField(p, p.len, n);
-                p.len += n;
-            });
-            return this;
-        }
-    });
-
-    // Create handlers for various Integer Field Variants
-    [1, 2, 3, 4, 6, 8].forEach(function (n) {
-        [true, false].forEach(function (le) {
-            [true, false].forEach(function (signed) {
-                var name = 'word' + (n * 8) + ( signed ? 'S' : 'U') + ( le ? 'le' : 'be');
-                self[name] = function (key) {
-                    checkAllocated();
-                    priv.closures.push(function (p) {
-                        p.fields[key] = new intField(p, p.len, n, le, signed);
-                        p.len += n;
-                    });
-                    return this;
-                };
-            });
-        });
-    });
-
-    this.chars = function (key, length, encoding) {
-        checkAllocated();
-        priv.closures.push(function (p) {
-            p.fields[key] = new charField(p, p.len, length, encoding || 'ascii');
-            p.len += length;
-        });
-        return this;
-    }
-
-    this.struct = function (key, struct) {
-        checkAllocated();
-        priv.closures.push(function (p) {
-            p.fields[key] = new structField(p, p.len, struct.clone());
-            p.len += p.fields[key].length;
-        });
-        return this;
-    }
-    function construct(constructor, args) {
-        function F() {
-            return constructor.apply(this, args);
-        }
-
-
-        F.prototype = constructor.prototype;
-        return new F();
-    }
-
-
-    this.array = function (key, length, type) {
-        checkAllocated();
-        var args = [].slice.call(arguments, 1);
-        args.unshift(null);
-        args.unshift(null);
-        priv.closures.push(function (p) {
-            args[0] = p;
-            args[1] = p.len;
-            p.fields[key] = construct(arrayField, args);
-            p.len += p.fields[key].length;
-        });
-
-        return this;
-    }
-    var beenHere = false;
-
-    function applyClosures(p) {
-        if (beenHere)
-            return;
-        p.closures.forEach(function (el) {
-            el(p);
-        });
-        beenHere = true;
-    }
-
-    function allocateFields() {
-        for (var key in priv.fields) {
-            if ('allocate' in priv.fields[key])
-                priv.fields[key].allocate();
-        }
-    }
-
-
-    this._setBuff = function (buff) {
-        priv.buf = buff;
-        applyClosures(priv);
-        allocateFields();
-        priv.allocated = true;
-    }
-
-    this.allocate = function () {
-        applyClosures(priv);
-        priv.buf = Buffer.alloc(priv.len);
-        allocateFields();
-        priv.allocated = true;
-        return this;
-    }
-
-    this._getPriv = function () {
-        return priv;
-    }
-
-    this.clone = function () {
-        var c = new Struct;
-        var p = c._getPriv();
-        p.closures = priv.closures;
-        return c;
-    }
-
-    this.length = function () {
-        applyClosures(priv);
-        return priv.len;
-    }
-
-    this.get = function (key) {
-        if (key in priv.fields) {
-            return priv.fields[key].get();
-        } else
-            throw new Error('Can not find field ' + key);
-    }
-
-    this.set = function (key, val) {
-        if (arguments.length == 2) {
-            if (key in priv.fields) {
-                priv.fields[key].set(val);
-            } else
-                throw new Error('Can not find field ' + key);
-        } else if (Buffer.isBuffer(key)) {
-            this._setBuff(key);
-        } else {
-            for (var k in key) {
-                this.set(k, key[k]);
-            }
-        }
-    }
-    this.buffer = function () {
-        return priv.buf;
-    }
-
-    function getFields() {
-        var fields = {};
-        Object.keys(priv.fields).forEach(function (key) {
-            Object.defineProperty(fields, key, {
-                get: function () {
-                    var res = self.get(key);
-                    if (res instanceof Struct) return res.fields;
-                    else return res;
-                },
-                set: function (newVal) {
-                    self.set(key, newVal);
-                },
-                enumerable: true
-            });
-        });
-        return fields;
-    };
-
-    var _fields;
-    Object.defineProperty(this, 'fields', {
-        get: function () {
-            if (_fields) return _fields;
-            return (_fields = getFields());
-        },
-        enumerable: true,
-        configurable: true
-    });
-
-}
-exports.Struct = Struct;

utility.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.overwriteBuffer = void 0;
 exports.retry = retry;
 async function retry(fn, count, delayFn = (attempt) => Math.pow(2, attempt) * 100) {
     let lastError;
@@ -18,3 +19,13 @@ async function retry(fn, count, delayFn = (attempt) => Math.pow(2, attempt) * 10
     // 如果全部尝试失败，抛出最后一个错误
     throw lastError;
 }
+const overwriteBuffer = (buf, _input) => {
+    const input = Buffer.isBuffer(_input) ? _input : Buffer.from(_input);
+    if (input.length >= buf.length) {
+        input.copy(buf, 0, 0, buf.length);
+    }
+    else {
+        input.copy(buf, 0, 0, input.length);
+    }
+};
+exports.overwriteBuffer = overwriteBuffer;

utility.ts

@@ -20,3 +20,13 @@ export async function retry<T>(
   // 如果全部尝试失败，抛出最后一个错误
   throw lastError;
 }
+
+export const overwriteBuffer = (buf: Buffer, _input: Buffer | Uint8Array) => {
+  const input = Buffer.isBuffer(_input) ? _input : Buffer.from(_input);
+
+  if (input.length >= buf.length) { 
+    input.copy(buf, 0, 0, buf.length);
+  } else {
+    input.copy(buf, 0, 0, input.length);
+  }
+}

ygopro-deck-stats.js

@@ -10,7 +10,7 @@ var fs = require('fs');
 var initSqlJs = require('sql.js');
 var loadJSON = require('load-json-file').sync;
 var config = loadJSON('./config/deckstats.json'); //{ "deckpath": "../decks", "dbfile": "cards.cdb" }
-var constants = loadJSON('./data/constants.json');
+var constants = require('./load-constants').loadConstants();
 
 var ALL_MAIN_CARDS={};
 var ALL_SIDE_CARDS={};

ygopro-msg-struct-compat.js

+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fromPartialCompat = exports.applyYGOProMsgStructCompat = exports.defineYGOProMsgStructCompat = exports.YGOProMsgStructCompat = void 0;
+const ygopro_deck_encode_1 = __importDefault(require("ygopro-deck-encode"));
+const ygopro_msg_encode_1 = require("ygopro-msg-encode");
+exports.YGOProMsgStructCompat = new Map();
+const defineYGOProMsgStructCompat = (cls, field, getterAndSetter) => {
+    if (!exports.YGOProMsgStructCompat.has(cls)) {
+        exports.YGOProMsgStructCompat.set(cls, []);
+    }
+    exports.YGOProMsgStructCompat.get(cls).push((inst) => {
+        Object.defineProperty(inst, field, {
+            get() {
+                return getterAndSetter.get(inst);
+            },
+            set(value) {
+                getterAndSetter.set(inst, value);
+            }
+        });
+    });
+};
+exports.defineYGOProMsgStructCompat = defineYGOProMsgStructCompat;
+const applyYGOProMsgStructCompat = (inst) => {
+    const compatList = exports.YGOProMsgStructCompat.get(inst.constructor);
+    if (compatList) {
+        compatList.forEach(compat => compat(inst));
+    }
+    return inst;
+};
+exports.applyYGOProMsgStructCompat = applyYGOProMsgStructCompat;
+const fromPartialCompat = (cls, input) => {
+    const inst1 = new cls();
+    (0, exports.applyYGOProMsgStructCompat)(inst1);
+    Object.assign(inst1, input);
+    const inst2 = new cls().fromPartial(inst1);
+    (0, exports.applyYGOProMsgStructCompat)(inst2);
+    return inst2;
+};
+exports.fromPartialCompat = fromPartialCompat;
+const compatDeckState = new WeakMap();
+const getCompatDeckState = (inst) => {
+    let state = compatDeckState.get(inst);
+    if (!state) {
+        state = {};
+        compatDeckState.set(inst, state);
+    }
+    return state;
+};
+(0, exports.defineYGOProMsgStructCompat)(ygopro_msg_encode_1.YGOProStocChat, "player", {
+    get(inst) {
+        return inst.player_type;
+    },
+    set(inst, value) {
+        inst.player_type = value;
+    },
+});
+(0, exports.defineYGOProMsgStructCompat)(ygopro_msg_encode_1.YGOProStocDeckCount, "mainc_s", {
+    get(inst) {
+        return inst.player0DeckCount?.main ?? 0;
+    },
+    set(inst, value) {
+        if (!inst.player0DeckCount) {
+            inst.player0DeckCount = new ygopro_msg_encode_1.YGOProStocDeckCount_DeckInfo();
+        }
+        inst.player0DeckCount.main = value;
+    },
+});
+(0, exports.defineYGOProMsgStructCompat)(ygopro_msg_encode_1.YGOProStocDeckCount, "sidec_s", {
+    get(inst) {
+        return inst.player0DeckCount?.side ?? 0;
+    },
+    set(inst, value) {
+        if (!inst.player0DeckCount) {
+            inst.player0DeckCount = new ygopro_msg_encode_1.YGOProStocDeckCount_DeckInfo();
+        }
+        inst.player0DeckCount.side = value;
+    },
+});
+(0, exports.defineYGOProMsgStructCompat)(ygopro_msg_encode_1.YGOProStocDeckCount, "extrac_s", {
+    get(inst) {
+        return inst.player0DeckCount?.extra ?? 0;
+    },
+    set(inst, value) {
+        if (!inst.player0DeckCount) {
+            inst.player0DeckCount = new ygopro_msg_encode_1.YGOProStocDeckCount_DeckInfo();
+        }
+        inst.player0DeckCount.extra = value;
+    },
+});
+(0, exports.defineYGOProMsgStructCompat)(ygopro_msg_encode_1.YGOProStocDeckCount, "mainc_o", {
+    get(inst) {
+        return inst.player1DeckCount?.main ?? 0;
+    },
+    set(inst, value) {
+        if (!inst.player1DeckCount) {
+            inst.player1DeckCount = new ygopro_msg_encode_1.YGOProStocDeckCount_DeckInfo();
+        }
+        inst.player1DeckCount.main = value;
+    },
+});
+(0, exports.defineYGOProMsgStructCompat)(ygopro_msg_encode_1.YGOProStocDeckCount, "sidec_o", {
+    get(inst) {
+        return inst.player1DeckCount?.side ?? 0;
+    },
+    set(inst, value) {
+        if (!inst.player1DeckCount) {
+            inst.player1DeckCount = new ygopro_msg_encode_1.YGOProStocDeckCount_DeckInfo();
+        }
+        inst.player1DeckCount.side = value;
+    },
+});
+(0, exports.defineYGOProMsgStructCompat)(ygopro_msg_encode_1.YGOProStocDeckCount, "extrac_o", {
+    get(inst) {
+        return inst.player1DeckCount?.extra ?? 0;
+    },
+    set(inst, value) {
+        if (!inst.player1DeckCount) {
+            inst.player1DeckCount = new ygopro_msg_encode_1.YGOProStocDeckCount_DeckInfo();
+        }
+        inst.player1DeckCount.extra = value;
+    },
+});
+(0, exports.defineYGOProMsgStructCompat)(ygopro_msg_encode_1.YGOProCtosUpdateDeck, "mainc", {
+    get(inst) {
+        return inst.deck.main.length + inst.deck.extra.length;
+    },
+    set(inst, value) {
+        const state = getCompatDeckState(inst);
+        state.mainc = value;
+    },
+});
+(0, exports.defineYGOProMsgStructCompat)(ygopro_msg_encode_1.YGOProCtosUpdateDeck, "sidec", {
+    get(inst) {
+        return inst.deck.side.length;
+    },
+    set(inst, value) {
+        const state = getCompatDeckState(inst);
+        state.sidec = value;
+    },
+});
+(0, exports.defineYGOProMsgStructCompat)(ygopro_msg_encode_1.YGOProCtosUpdateDeck, "deckbuf", {
+    get(inst) {
+        return [...inst.deck.main, ...inst.deck.extra, ...inst.deck.side];
+    },
+    set(inst, value) {
+        const state = getCompatDeckState(inst);
+        const deckbuf = Array.isArray(value) ? value.slice() : [];
+        state.deckbuf = deckbuf;
+        if (!inst.deck) {
+            inst.deck = new ygopro_deck_encode_1.default();
+        }
+        const hasMainc = state.mainc !== undefined;
+        const hasSidec = state.sidec !== undefined;
+        if (!hasMainc && !hasSidec) {
+            inst.deck.main = deckbuf.slice();
+            inst.deck.extra = [];
+            inst.deck.side = [];
+            return;
+        }
+        if (hasMainc && !hasSidec) {
+            const mainc = Math.max(0, state.mainc | 0);
+            const mainWithExtra = deckbuf.slice(0, mainc);
+            const side = deckbuf.slice(mainc);
+            inst.deck.main = mainWithExtra.slice();
+            inst.deck.extra = [];
+            inst.deck.side = side.slice();
+            return;
+        }
+        if (!hasMainc && hasSidec) {
+            const sidec = Math.max(0, state.sidec | 0);
+            const split = Math.max(0, deckbuf.length - sidec);
+            const mainWithExtra = deckbuf.slice(0, split);
+            const side = deckbuf.slice(split);
+            inst.deck.main = mainWithExtra.slice();
+            inst.deck.extra = [];
+            inst.deck.side = side.slice();
+            return;
+        }
+        const mainc = Math.max(0, state.mainc | 0);
+        const sidec = Math.max(0, state.sidec | 0);
+        const mainWithExtra = deckbuf.slice(0, mainc);
+        const side = deckbuf.slice(mainc, mainc + sidec);
+        inst.deck.main = mainWithExtra.slice();
+        inst.deck.extra = [];
+        inst.deck.side = side.slice();
+    },
+});

ygopro-msg-struct-compat.ts

+import YGOProDeck from "ygopro-deck-encode";
+import {
+  YGOProCtosUpdateDeck,
+  YGOProCtosBase, YGOProStocBase,
+  YGOProStocChat,
+  YGOProStocDeckCount,
+  YGOProStocDeckCount_DeckInfo,
+} from "ygopro-msg-encode";
+
+export const YGOProMsgStructCompat = new Map<new (...args: any[]) => YGOProCtosBase | YGOProStocBase, ((inst: YGOProCtosBase | YGOProStocBase) => void)[]>();
+export const defineYGOProMsgStructCompat = <T extends YGOProCtosBase | YGOProStocBase>(cls: new (...args: any[]) => T, field: string, getterAndSetter: {
+  get: (inst: T) => any,
+  set: (inst: T, value: any) => void
+}) => {
+  if (!YGOProMsgStructCompat.has(cls)) { 
+    YGOProMsgStructCompat.set(cls, []);
+  }
+  YGOProMsgStructCompat.get(cls)!.push((inst: YGOProCtosBase | YGOProStocBase) => { 
+    Object.defineProperty(inst, field, {
+      get() { 
+        return getterAndSetter.get(inst as T);
+      },
+      set(value) { 
+        getterAndSetter.set(inst as T, value);
+      }
+    })
+  })
+}
+
+export const applyYGOProMsgStructCompat = (inst: YGOProCtosBase | YGOProStocBase) => { 
+  const compatList = YGOProMsgStructCompat.get(inst.constructor as typeof YGOProCtosBase | typeof YGOProStocBase);
+  if (compatList) { 
+    compatList.forEach(compat => compat(inst));
+  }
+  return inst;
+}
+
+export const fromPartialCompat = <T extends YGOProCtosBase | YGOProStocBase>(
+  cls: new (...args: any[]) => T,
+  input: Partial<T>
+): T => {
+  const inst1 = new cls();
+  applyYGOProMsgStructCompat(inst1);
+  Object.assign(inst1, input);
+  const inst2 = new cls().fromPartial(inst1 as Partial<T>) as T;
+  applyYGOProMsgStructCompat(inst2);
+  return inst2;
+};
+
+const compatDeckState = new WeakMap<
+  YGOProCtosUpdateDeck,
+  { mainc?: number; sidec?: number; deckbuf?: number[] }
+>();
+
+const getCompatDeckState = (inst: YGOProCtosUpdateDeck) => {
+  let state = compatDeckState.get(inst);
+  if (!state) {
+    state = {};
+    compatDeckState.set(inst, state);
+  }
+  return state;
+};
+
+defineYGOProMsgStructCompat(YGOProStocChat, "player", {
+  get(inst) {
+    return inst.player_type;
+  },
+  set(inst, value) {
+    inst.player_type = value;
+  },
+});
+
+defineYGOProMsgStructCompat(YGOProStocDeckCount, "mainc_s", {
+  get(inst) {
+    return inst.player0DeckCount?.main ?? 0;
+  },
+  set(inst, value) {
+    if (!inst.player0DeckCount) {
+      inst.player0DeckCount = new YGOProStocDeckCount_DeckInfo();
+    }
+    inst.player0DeckCount.main = value;
+  },
+});
+
+defineYGOProMsgStructCompat(YGOProStocDeckCount, "sidec_s", {
+  get(inst) {
+    return inst.player0DeckCount?.side ?? 0;
+  },
+  set(inst, value) {
+    if (!inst.player0DeckCount) {
+      inst.player0DeckCount = new YGOProStocDeckCount_DeckInfo();
+    }
+    inst.player0DeckCount.side = value;
+  },
+});
+
+defineYGOProMsgStructCompat(YGOProStocDeckCount, "extrac_s", {
+  get(inst) {
+    return inst.player0DeckCount?.extra ?? 0;
+  },
+  set(inst, value) {
+    if (!inst.player0DeckCount) {
+      inst.player0DeckCount = new YGOProStocDeckCount_DeckInfo();
+    }
+    inst.player0DeckCount.extra = value;
+  },
+});
+
+defineYGOProMsgStructCompat(YGOProStocDeckCount, "mainc_o", {
+  get(inst) {
+    return inst.player1DeckCount?.main ?? 0;
+  },
+  set(inst, value) {
+    if (!inst.player1DeckCount) {
+      inst.player1DeckCount = new YGOProStocDeckCount_DeckInfo();
+    }
+    inst.player1DeckCount.main = value;
+  },
+});
+
+defineYGOProMsgStructCompat(YGOProStocDeckCount, "sidec_o", {
+  get(inst) {
+    return inst.player1DeckCount?.side ?? 0;
+  },
+  set(inst, value) {
+    if (!inst.player1DeckCount) {
+      inst.player1DeckCount = new YGOProStocDeckCount_DeckInfo();
+    }
+    inst.player1DeckCount.side = value;
+  },
+});
+
+defineYGOProMsgStructCompat(YGOProStocDeckCount, "extrac_o", {
+  get(inst) {
+    return inst.player1DeckCount?.extra ?? 0;
+  },
+  set(inst, value) {
+    if (!inst.player1DeckCount) {
+      inst.player1DeckCount = new YGOProStocDeckCount_DeckInfo();
+    }
+    inst.player1DeckCount.extra = value;
+  },
+});
+
+defineYGOProMsgStructCompat(YGOProCtosUpdateDeck, "mainc", {
+  get(inst) {
+    return inst.deck.main.length + inst.deck.extra.length;
+  },
+  set(inst, value) {
+    const state = getCompatDeckState(inst);
+    state.mainc = value;
+  },
+});
+
+defineYGOProMsgStructCompat(YGOProCtosUpdateDeck, "sidec", {
+  get(inst) {
+    return inst.deck.side.length;
+  },
+  set(inst, value) {
+    const state = getCompatDeckState(inst);
+    state.sidec = value;
+  },
+});
+
+defineYGOProMsgStructCompat(YGOProCtosUpdateDeck, "deckbuf", {
+  get(inst) {
+    return [...inst.deck.main, ...inst.deck.extra, ...inst.deck.side];
+  },
+  set(inst, value) {
+    const state = getCompatDeckState(inst);
+    const deckbuf = Array.isArray(value) ? value.slice() : [];
+    state.deckbuf = deckbuf;
+    if (!inst.deck) {
+      inst.deck = new YGOProDeck();
+    }
+    const hasMainc = state.mainc !== undefined;
+    const hasSidec = state.sidec !== undefined;
+    if (!hasMainc && !hasSidec) {
+      inst.deck.main = deckbuf.slice();
+      inst.deck.extra = [];
+      inst.deck.side = [];
+      return;
+    }
+    if (hasMainc && !hasSidec) {
+      const mainc = Math.max(0, state.mainc | 0);
+      const mainWithExtra = deckbuf.slice(0, mainc);
+      const side = deckbuf.slice(mainc);
+      inst.deck.main = mainWithExtra.slice();
+      inst.deck.extra = [];
+      inst.deck.side = side.slice();
+      return;
+    }
+    if (!hasMainc && hasSidec) {
+      const sidec = Math.max(0, state.sidec | 0);
+      const split = Math.max(0, deckbuf.length - sidec);
+      const mainWithExtra = deckbuf.slice(0, split);
+      const side = deckbuf.slice(split);
+      inst.deck.main = mainWithExtra.slice();
+      inst.deck.extra = [];
+      inst.deck.side = side.slice();
+      return;
+    }
+    const mainc = Math.max(0, state.mainc | 0);
+    const sidec = Math.max(0, state.sidec | 0);
+    const mainWithExtra = deckbuf.slice(0, mainc);
+    const side = deckbuf.slice(mainc, mainc + sidec);
+    inst.deck.main = mainWithExtra.slice();
+    inst.deck.extra = [];
+    inst.deck.side = side.slice();
+  },
+});

ygopro-pre.js

@@ -22,7 +22,7 @@ var loadJSON = require('load-json-file').sync;
 
 var auth = require('./ygopro-auth.js');
 
-var constants = loadJSON('./data/constants.json');
+var constants = require('./load-constants').loadConstants();
 
 var settings = loadJSON('./config/config.json');
 config = settings.modules.pre_util;
@@ -34,7 +34,6 @@ var cardHTMLs=[];
 var responder;
 //URL里的更新时间戳
 var dataver = moment().format("YYYYMMDDHHmmss");
-const _async = require("async");
 
 var sqlJsPromise;
 var SQL = null;
@@ -53,6 +52,8 @@ function ensureSqlJs() {
     return sqlJsPromise;
 }
 
+var execAsync = util.promisify(exec);
+
 //输出反馈信息，如有http长连接则输出到http，否则输出到控制台
 var sendResponse = function(text) {
     text=""+text;
@@ -221,7 +222,8 @@ var loadDb = function(db_file, callback) {
 }
 
 //将cardHTMLs中内容更新到指定列表页，同步
-var writeToFile = function(message, callback) {
+var writeToFile = async function(message, callback) {
+    try {
         var fileContent=fs.readFileSync(config.html_path+config.html_filename, {"encoding":"utf-8"});
         var newContent=cardHTMLs.join("\n");
         fileContent=fileContent.replace(/<tbody class="auto-generated">[\w\W]*<\/tbody>/,'<tbody class="auto-generated">\n'+newContent+'\n</tbody>');
@@ -231,47 +233,44 @@ var writeToFile = function(message, callback) {
             message="<li>"+moment().format('L HH:mm')+"<ul><li>"+message.split("！换行符！").join("</li><li>")+"</li></ul></li>";
             fileContent=fileContent.replace(/<ul class="auto-generated">/,'<ul class="auto-generated">\n'+message);
         }
-    _async.auto({
-        write: (done) => { 
-            fs.writeFile(config.html_path + config.html_filename, fileContent, done)
-        },
-        copy: ["write", (results, done) => { 
+        await fs.promises.writeFile(config.html_path + config.html_filename, fileContent);
         if (!config.cdn.enabled) {
-                copyImages(done);
-            } else { 
-                done();
+            await util.promisify(copyImages)();
         }
-        }]
-    }, (err) => { 
-        if (!err) {
         sendResponse("列表更新完成。");
-        }
+        callback(null);
+    } catch (err) {
         callback(err);
-    })
+    }
 }
 
 //读取指定文件夹里所有数据库，异步
-var loadAllDbs = function(callback) {
+var loadAllDbs = async function(callback) {
+    try {
         cardHTMLs=[];
-    _async.auto({
-        files: (done) => {
-            fs.readdir(config.db_path + "expansions/", done);
-        },
-        loadDbs: ["files", (results, done) => {
-            _async.each(results.files.filter((filename) => { 
-                return filename.slice(-4) === ".cdb" && (!config.only_show_dbs || config.only_show_dbs.length == 0 || config.only_show_dbs[filename])
-            } ).map(filename => config.db_path + "expansions/" + filename), loadDb, done);
-        }]
-    }, callback);
+        var files = await fs.promises.readdir(config.db_path + "expansions/");
+        var list = files.filter((filename) => { 
+            return filename.slice(-4) === ".cdb" && (!config.only_show_dbs || config.only_show_dbs.length == 0 || config.only_show_dbs[filename]);
+        }).map(filename => config.db_path + "expansions/" + filename);
+        for (var i = 0; i < list.length; i++) {
+            await util.promisify(loadDb)(list[i]);
+        }
+        callback(null);
+    } catch (err) {
+        callback(err);
+    }
 }
 
 
-function execCommands(commands, callback) { 
-    _async.eachSeries(commands, (command, done) => {
-        exec(command, (err) => { 
-            done(err);
-        });
-    }, callback);
+async function execCommands(commands, callback) { 
+    try {
+        for (var i = 0; i < commands.length; i++) {
+            await execAsync(commands[i]);
+        }
+        callback(null);
+    } catch (err) {
+        callback(err);
+    }
 }
 
 //从远程更新数据库，异步
@@ -303,20 +302,17 @@ var fetchDatas = function() {
 }
 
 //更新本地网页到服务器，异步
-var pushDatas = function(callback) {
+var pushDatas = async function(callback) {
+    try {
         if (config.cdn.enabled) {
-        _async.auto({
-            local: (done) => {
-                uploadCDN(config.cdn.local, config.cdn.remote + "/" + dataver, done);
-            },
-            pics: ["local", (results, done) => {
-                uploadCDN(config.db_path + "pics", config.cdn.pics_remote + "pics", done);
-            }],
-            push: ["local", "pics", (results, done) => {
+            await util.promisify(uploadCDN)(config.cdn.local, config.cdn.remote + "/" + dataver);
+            await util.promisify(uploadCDN)(config.db_path + "pics", config.cdn.pics_remote + "pics");
             sendResponse("CDN上传全部完成。");
-                pushHTMLs(done);
-            }]
-        }, callback);
+            await util.promisify(pushHTMLs)();
+        }
+        callback(null);
+    } catch (err) {
+        callback(err);
     }
 }
 
@@ -429,15 +425,13 @@ function run7z(params, cwd, callback) {
 } 
 
 //生成更新包，异步
-var packDatas = function (callback) {
+var packDatas = async function (callback) {
     file_path = config.html_path;
     if (config.cdn.enabled) {
         file_path = config.cdn.local;
     }
-
-    _async.auto({
-        preCommands: (done) => {
-            execCommands([
+    try {
+        await util.promisify(execCommands)([
             'rm -rf "' + config.db_path +'expansions/' + config.ypk_name + '"',
             'rm -rf "' + config.db_path +'expansions/script"',
             'rm -rf "' + config.db_path +'expansions/pics"',
@@ -450,64 +444,40 @@ var packDatas = function (callback) {
             'cp -r "' + config.db_path + 'script" "' + config.db_path + 'expansions/script"',
             'cp -r "' + config.db_path + 'pics" "' + config.db_path + 'picture/card"',
             'cp -r "' + config.db_path + 'field" "' + config.db_path + 'picture/field"'
-            ], done);
-        },
-        run7zYPK: ["preCommands", (results, done) => {
-            run7z(["a", "-tzip", "-x!*.ypk", config.ypk_name, "*"], config.db_path + "expansions/", done);
-        }],
-        run7zPC: ["run7zYPK", (results, done) => {
-            run7z(["a", "-x!*.zip", "-x!.git", "-x!LICENSE", "-x!README.md",
-                        "-x!cdb", "-x!picture", "-x!field", "-x!script", "-x!pics",
-                        "-x!expansions/pics", "-x!expansions/script", "-x!expansions/*.cdb", "-x!expansions/*.conf",
-                        "ygosrv233-pre.zip", "*"], config.db_path, done);
-        }],
-        run7zMobile: ["run7zYPK", (results, done) => {
-            run7z(["a", "-x!*.zip", "-x!.git", "-x!LICENSE", "-x!README.md",
+        ]);
+        await util.promisify(run7z)(["a", "-tzip", "-x!*.ypk", config.ypk_name, "*"], config.db_path + "expansions/");
+        await util.promisify(run7z)(["a", "-x!*.zip", "-x!.git", "-x!LICENSE", "-x!README.md",
                     "-x!cdb", "-x!picture", "-x!field", "-x!script", "-x!pics",
                     "-x!expansions/pics", "-x!expansions/script", "-x!expansions/*.cdb", "-x!expansions/*.conf",
-                        "ygosrv233-pre-mobile.zip", "*"], config.db_path, done);
-        }],
-        run7zPro2: ["preCommands", (results, done) => {
-            run7z(["a", "-x!*.zip", "-x!.git", "-x!LICENSE", "-x!README.md",
-                        "-x!expansions", "-x!pics", "-x!field",
-                        "ygosrv233-pre-2.zip", "*"], config.db_path, done);
-        }],
-        commandsAfterPC: ["run7zPC", (results, done) => {
-            execCommands([
+                    "ygosrv233-pre.zip", "*"], config.db_path);
+        await util.promisify(execCommands)([
             'mv -f "' + config.db_path + 'ygosrv233-pre.zip" "' + file_path + '"'
-            ], (err) => { 
-                    if (!err) { 
+        ]);
         sendResponse("电脑更新包打包完成。");
-                    }
-                    done(err);
-            });
-        }],
-        commandsAfterMobile: ["run7zPC", "run7zMobile", (results, done) => {
-            execCommands([
+        await util.promisify(run7z)(["a", "-x!*.zip", "-x!.git", "-x!LICENSE", "-x!README.md",
+                    "-x!cdb", "-x!picture", "-x!field", "-x!script", "-x!pics",
+                    "-x!expansions/pics", "-x!expansions/script", "-x!expansions/*.cdb", "-x!expansions/*.conf",
+                    "ygosrv233-pre-mobile.zip", "*"], config.db_path);
+        await util.promisify(execCommands)([
             'mv -f "' + config.db_path +'ygosrv233-pre-mobile.zip" "'+ file_path +'"',
             'rm -rf "' + config.db_path +'expansions/' + config.ypk_name + '"',
             'rm -rf "' + config.db_path +'expansions/script"',
             'rm -rf "' + config.db_path +'expansions/pics"'
-            ], (err) => { 
-                    if (!err) { 
+        ]);
         sendResponse("手机更新包打包完成。");
-                    }
-                    done(err);
-            });
-        }],
-        commandsAfterPro2: ["run7zPro2", (results, done) => {
-            execCommands([
+        await util.promisify(run7z)(["a", "-x!*.zip", "-x!.git", "-x!LICENSE", "-x!README.md",
+                    "-x!expansions", "-x!pics", "-x!field",
+                    "ygosrv233-pre-2.zip", "*"], config.db_path);
+        await util.promisify(execCommands)([
             'mv -f "' + config.db_path + 'ygosrv233-pre-2.zip" "' + file_path + '"',
             'rm -rf "' + config.db_path +'cdb"',
             'rm -rf "' + config.db_path +'picture"'
-            ], (err) => { 
-                    if (!err) { 
+        ]);
         sendResponse("Pro2更新包打包完成。");
+        callback(null);
+    } catch (err) {
+        callback(err);
     }
-                    done(err);
-            });
-        }]
-    }, callback);
 }
 
 //建立一个http服务器，接收API操作

ygopro-tournament.js

@@ -51,7 +51,6 @@ const axios_1 = __importDefault(require("axios"));
 const formidable = __importStar(require("formidable"));
 const load_json_file_1 = require("load-json-file");
 const challonge_1 = require("./challonge");
-const asyncLib = __importStar(require("async"));
 const ygopro_deck_encode_1 = __importDefault(require("ygopro-deck-encode"));
 const auth = __importStar(require("./ygopro-auth"));
 const underscore_1 = __importDefault(require("underscore"));
@@ -114,27 +113,21 @@ const readDeck = async function (deck_name, deck_full_path) {
     return deck;
 };
 //读取指定文件夹中所有卡组
-const getDecks = function (callback) {
+const getDecks = async function (callback) {
+    try {
         const decks = [];
-    asyncLib.auto({
-        readDir: (done) => {
-            fs.readdir(config.deck_path, done);
-        },
-        handleDecks: [
-            "readDir",
-            (results, done) => {
-                const decks_list = results.readDir;
-                asyncLib.each(decks_list, async (deck_name) => {
+        const decks_list = await fs.promises.readdir(config.deck_path);
+        for (const deck_name of decks_list) {
             if (deck_name.endsWith(".ydk")) {
                 const deck = await readDeck(deck_name, config.deck_path + deck_name);
                 decks.push(deck);
             }
-                }, done);
-            },
-        ],
-    }, (err) => {
-        callback(err, decks);
-    });
+        }
+        callback(null, decks);
+    }
+    catch (err) {
+        callback(err, []);
+    }
 };
 const delDeck = function (deck_name, callback) {
     if (deck_name.startsWith("../") || deck_name.match(/\/\.\.\//)) {
@@ -143,19 +136,19 @@ const delDeck = function (deck_name, callback) {
     }
     fs.unlink(config.deck_path + deck_name, callback);
 };
-const clearDecks = function (callback) {
-    asyncLib.auto({
-        deckList: (done) => {
-            fs.readdir(config.deck_path, done);
-        },
-        removeAll: [
-            "deckList",
-            (results, done) => {
-                const decks_list = results.deckList;
-                asyncLib.each(decks_list, delDeck, done);
-            },
-        ],
-    }, callback);
+const clearDecks = async function (callback) {
+    try {
+        const decks_list = await fs.promises.readdir(config.deck_path);
+        for (const deck_name of decks_list) {
+            await new Promise((resolve, reject) => {
+                delDeck(deck_name, (err) => (err ? reject(err) : resolve()));
+            });
+        }
+        callback(null);
+    }
+    catch (err) {
+        callback(err);
+    }
 };
 const UploadToChallonge = async function () {
     if (!challonge_config.enabled) {
@@ -194,9 +187,10 @@ const UploadToChallonge = async function () {
     }
     return true;
 };
-const receiveDecks = function (files, callback) {
+const receiveDecks = async function (files, callback) {
+    try {
         const result = [];
-    asyncLib.eachSeries(files, async (file) => {
+        for (const file of files) {
             if (file.name.endsWith(".ydk")) {
                 const deck = await readDeck(file.name, file.path);
                 if (deck.main.length >= 40) {
@@ -219,9 +213,12 @@ const receiveDecks = function (files, callback) {
                     status: "不是卡组文件",
                 });
             }
-    }, (err) => {
-        callback(err, result);
-    });
+        }
+        callback(null, result);
+    }
+    catch (err) {
+        callback(err, []);
+    }
 };
 //建立一个http服务器，接收API操作
 async function requestListener(req, res) {

ygopro-tournament.ts

@@ -15,7 +15,6 @@ import * as formidable from "formidable";
 import { sync as loadJSON } from "load-json-file";
 import defaultConfig from "./data/default_config.json";
 import { Challonge } from "./challonge";
-import * as asyncLib from "async";
 import YGOProDeckEncode from "ygopro-deck-encode";
 import * as auth from "./ygopro-auth";
 import _ from "underscore";
@@ -82,34 +81,20 @@ const readDeck = async function (deck_name: string, deck_full_path: string) {
 };
 
 //读取指定文件夹中所有卡组
-const getDecks = function (callback: (err: Error | null, decks: any[]) => void) {
+const getDecks = async function (callback: (err: Error | null, decks: any[]) => void) {
+  try {
     const decks: any[] = [];
-  asyncLib.auto(
-    {
-      readDir: (done: (err: NodeJS.ErrnoException | null, files?: string[]) => void) => {
-        fs.readdir(config.deck_path, done);
-      },
-      handleDecks: [
-        "readDir",
-        (results: any, done: (err?: Error | null) => void) => {
-          const decks_list = results.readDir as string[];
-          asyncLib.each(
-            decks_list,
-            async (deck_name: string) => {
+    const decks_list = await fs.promises.readdir(config.deck_path);
+    for (const deck_name of decks_list) {
       if (deck_name.endsWith(".ydk")) {
         const deck = await readDeck(deck_name, config.deck_path + deck_name);
         decks.push(deck);
       }
-            },
-            done
-          );
-        },
-      ],
-    },
-    (err: Error | null) => {
-      callback(err, decks);
     }
-  );
+    callback(null, decks);
+  } catch (err) {
+    callback(err as Error, []);
+  }
 };
 
 const delDeck = function (deck_name: string, callback: (err?: NodeJS.ErrnoException | null) => void) {
@@ -120,22 +105,18 @@ const delDeck = function (deck_name: string, callback: (err?: NodeJS.ErrnoExcept
   fs.unlink(config.deck_path + deck_name, callback);
 };
 
-const clearDecks = function (callback: (err?: Error | null) => void) {
-  asyncLib.auto(
-    {
-      deckList: (done: (err: NodeJS.ErrnoException | null, files?: string[]) => void) => {
-        fs.readdir(config.deck_path, done);
-      },
-      removeAll: [
-        "deckList",
-        (results: any, done: (err?: Error | null) => void) => {
-          const decks_list = results.deckList as string[];
-          asyncLib.each(decks_list, delDeck as any, done);
-        },
-      ],
-    },
-    callback
-  );
+const clearDecks = async function (callback: (err?: Error | null) => void) {
+  try {
+    const decks_list = await fs.promises.readdir(config.deck_path);
+    for (const deck_name of decks_list) {
+      await new Promise<void>((resolve, reject) => {
+        delDeck(deck_name, (err) => (err ? reject(err) : resolve()));
+      });
+    }
+    callback(null);
+  } catch (err) {
+    callback(err as Error);
+  }
 };
 
 const UploadToChallonge = async function () {
@@ -179,14 +160,13 @@ const UploadToChallonge = async function () {
   return true;
 };
 
-const receiveDecks = function (
+const receiveDecks = async function (
   files: any,
   callback: (err: Error | null, result: Array<{ file: string; status: string }>) => void
 ) {
+  try {
     const result: Array<{ file: string; status: string }> = [];
-  asyncLib.eachSeries(
-    files,
-    async (file: any) => {
+    for (const file of files) {
       if (file.name.endsWith(".ydk")) {
         const deck = await readDeck(file.name, file.path);
         if (deck.main.length >= 40) {
@@ -207,11 +187,11 @@ const receiveDecks = function (
           status: "不是卡组文件",
         });
       }
-    },
-    (err: Error | null) => {
-      callback(err, result);
     }
-  );
+    callback(null, result);
+  } catch (err) {
+    callback(err as Error, []);
+  }
 };
 
 //建立一个http服务器，接收API操作

ygopro-update.js

@@ -21,7 +21,7 @@ var loadJSON = require('load-json-file').sync;
 
 var auth = require('./ygopro-auth.js');
 
-var constants = loadJSON('./data/constants.json');
+var constants = require('./load-constants').loadConstants();
 
 var settings = loadJSON('./config/config.json');
 config = settings.modules.update_util;

ygopro.coffee

@@ -2,7 +2,6 @@ _ = require 'underscore'
 _.str = require 'underscore.string'
 _.mixin(_.str.exports())
 
-Struct = require('./struct.js').Struct
 loadJSON = require('load-json-file').sync
 
 @i18ns = loadJSON './data/i18n.json'
@@ -23,9 +22,6 @@ YGOProMessagesHelper = require("./YGOProMessages.js").YGOProMessagesHelper # 为
 @helper = new YGOProMessagesHelper(9000)
 
 @structs = @helper.structs
-@structs_declaration = @helper.structs_declaration
-@typedefs = @helper.typedefs
-@proto_structs = @helper.proto_structs
 @constants = @helper.constants
 
 translateHandler = (handler) ->
@@ -91,26 +87,6 @@ translateHandler = (handler) ->
   room.recordChatMessage(msg, player)
   return
 
-@stoc_send_hint_card_to_room = (room, card)->
-  if !room
-    console.log "err stoc_send_hint_card_to_room"
-    return
-  for client in room.players
-    @stoc_send client, 'GAME_MSG', {
-      curmsg: 2,
-      type: 10,
-      player: 0,
-      data: card
-    } if client
-  for client in room.watchers
-    @stoc_send client, 'GAME_MSG', {
-      curmsg: 2,
-      type: 10,
-      player: 0,
-      data: card
-    } if client
-  return
-
 @stoc_die = (client, msg)->
   await @stoc_send_chat(client, msg, @constants.COLORS.RED)
   await @stoc_send client, 'ERROR_MSG', {

ygopro.js

 // Generated by CoffeeScript 2.7.0
 (function() {
-  var Struct, YGOProMessagesHelper, _, loadJSON, translateHandler;
+  var YGOProMessagesHelper, _, loadJSON, translateHandler;
 
   _ = require('underscore');
 
@@ -8,8 +8,6 @@
 
   _.mixin(_.str.exports());
 
-  Struct = require('./struct.js').Struct;
-
   loadJSON = require('load-json-file').sync;
 
   this.i18ns = loadJSON('./data/i18n.json');
@@ -47,12 +45,6 @@
 
   this.structs = this.helper.structs;
 
-  this.structs_declaration = this.helper.structs_declaration;
-
-  this.typedefs = this.helper.typedefs;
-
-  this.proto_structs = this.helper.proto_structs;
-
   this.constants = this.helper.constants;
 
   translateHandler = function(handler) {
@@ -153,38 +145,6 @@
     room.recordChatMessage(msg, player);
   };
 
-  this.stoc_send_hint_card_to_room = function(room, card) {
-    var client, i, j, len, len1, ref, ref1;
-    if (!room) {
-      console.log("err stoc_send_hint_card_to_room");
-      return;
-    }
-    ref = room.players;
-    for (i = 0, len = ref.length; i < len; i++) {
-      client = ref[i];
-      if (client) {
-        this.stoc_send(client, 'GAME_MSG', {
-          curmsg: 2,
-          type: 10,
-          player: 0,
-          data: card
-        });
-      }
-    }
-    ref1 = room.watchers;
-    for (j = 0, len1 = ref1.length; j < len1; j++) {
-      client = ref1[j];
-      if (client) {
-        this.stoc_send(client, 'GAME_MSG', {
-          curmsg: 2,
-          type: 10,
-          player: 0,
-          data: card
-        });
-      }
-    }
-  };
-
   this.stoc_die = async function(client, msg) {
     await this.stoc_send_chat(client, msg, this.constants.COLORS.RED);
     if (client) {