Skip to content

S
srvpro
Commit 6f99491a authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'mc'

parents cefd8434 3c3e3381
Hide whitespace changes
Inline Side-by-side
Showing with 563 additions and 262 deletions
YGOProMessages.js
View file @ 6f99491a
"use strict"; "use strict";
const Struct = require('./struct.js').Struct; var __importDefault = (this && this.__importDefault) || function (mod) {
const fs = require("fs"); return (mod && mod.__esModule) ? mod : { "default": mod };
const _ = require("underscore"); };
Object.defineProperty(exports, "__esModule", { value: true });
function loadJSON(path) { exports.YGOProMessagesHelper = void 0;
return JSON.parse(fs.readFileSync(path, "utf8")); const struct_1 = require("./struct");
} 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 proto_structs_json_1 = __importDefault(require("./data/proto_structs.json"));
const constants_json_1 = __importDefault(require("./data/constants.json"));
class Handler { class Handler {
constructor(handler, synchronous) { constructor(handler, synchronous) {
this.handler = handler; this.handler = handler;
this.synchronous = synchronous || false; this.synchronous = synchronous || false;
} }
async handle(buffer, info, datas, params) { async handle(buffer, info, datas, params) {
if (this.synchronous) { if (this.synchronous) {
return !!(await this.handler(buffer, info, datas, params)); return !!(await this.handler(buffer, info, datas, params));
} else { }
const newBuffer = Buffer.from(buffer); else {
const newDatas = datas.map(b => Buffer.from(b)); const newBuffer = Buffer.from(buffer);
this.handler(newBuffer, info, newDatas, params); const newDatas = datas.map(b => Buffer.from(b));
return false; this.handler(newBuffer, info, newDatas, params);
} return false;
} }
}
} }
class YGOProMessagesHelper { class YGOProMessagesHelper {
constructor() {
constructor() { this.handlers = {
this.handlers = { STOC: [new Map(),
STOC: [{}, new Map(),
{}, new Map(),
{}, new Map(),
{}, new Map(),
{}, ],
], CTOS: [new Map(),
CTOS: [{}, new Map(),
{}, new Map(),
{}, new Map(),
{}, new Map(),
{}, ]
] };
} this.initDatas();
this.initDatas(); this.initStructs();
this.initStructs(); }
} initDatas() {
this.structs_declaration = structs_json_1.default;
initDatas() { this.typedefs = typedefs_json_1.default;
this.structs_declaration = loadJSON('./data/structs.json'); this.proto_structs = proto_structs_json_1.default;
this.typedefs = loadJSON('./data/typedefs.json'); this.constants = constants_json_1.default;
this.proto_structs = loadJSON('./data/proto_structs.json'); }
this.constants = loadJSON('./data/constants.json'); initStructs() {
} this.structs = new Map();
for (let name in this.structs_declaration) {
initStructs() { const declaration = this.structs_declaration[name];
this.structs = {}; let result = struct_1.Struct();
for (let name in this.structs_declaration ) { for (let field of declaration) {
const declaration = this.structs_declaration [name]; if (field.encoding) {
let result = Struct(); switch (field.encoding) {
for (let field of declaration) { case "UTF-16LE":
if (field.encoding) { result.chars(field.name, field.length * 2, field.encoding);
switch (field.encoding) { break;
case "UTF-16LE": default:
result.chars(field.name, field.length * 2, field.encoding); throw `unsupported encoding: ${field.encoding}`;
break; }
default: }
throw `unsupported encoding: ${field.encoding}`; else {
} let type = field.type;
} else { if (this.typedefs[type]) {
let type = field.type; type = this.typedefs[type];
if (this.typedefs[type]) { }
type = this.typedefs[type]; if (field.length) {
} result.array(field.name, field.length, type); //不支持结构体
if (field.length) { }
result.array(field.name, field.length, type); //不支持结构体 else {
} else { if (this.structs.has(type)) {
if (this.structs[type]) { result.struct(field.name, this.structs.get(type));
result.struct(field.name, this.structs[type]); }
} else { else {
result[type](field.name); result[type](field.name);
} }
} }
} }
} }
this.structs[name] = result; this.structs.set(name, result);
} }
} }
getDirectionAndProto(protoStr) {
getDirectionAndProto(protoStr) { const protoStrMatch = protoStr.match(/^(STOC|CTOS)_([_A-Z]+)$/);
const protoStrMatch = protoStr.match(/^(STOC|CTOS)_([_A-Z]+)$/); if (!protoStrMatch) {
if (!protoStrMatch) { throw `Invalid proto string: ${protoStr}`;
throw `Invalid proto string: ${protoStr}` }
} return {
return { direction: protoStrMatch[1].toUpperCase(),
direction: protoStrMatch[1].toUpperCase(), proto: protoStrMatch[2].toUpperCase()
proto: protoStrMatch[2].toUpperCase() };
} }
} translateProto(proto, direction) {
const directionProtoList = this.constants[direction];
if (typeof proto !== "string") {
translateProto(proto, direction) { return proto;
const directionProtoList = this.constants[direction]; }
if (typeof proto !== "string") { const translatedProto = underscore_1.default.find(Object.keys(directionProtoList), p => {
return proto; return directionProtoList[p] === proto;
} });
let translatedProto = _.find(Object.keys(directionProtoList), p => { if (!translatedProto) {
return directionProtoList[p] === proto; throw `unknown proto ${direction} ${proto}`;
}); }
if (!translatedProto) { return parseInt(translatedProto);
throw `unknown proto ${direction} ${proto}`; }
} sendMessage(socket, protostr, info) {
return translatedProto; const { direction, proto } = this.getDirectionAndProto(protostr);
} let buffer;
if (!socket.remoteAddress) {
sendMessage(socket, protostr, info) { return;
const { }
direction, //console.log(proto, this.proto_structs[direction][proto]);
proto //const directionProtoList = this.constants[direction];
} = this.getDirectionAndProto(protostr); if (typeof info === 'undefined') {
let buffer; buffer = "";
if (socket.closed) { }
return; else if (Buffer.isBuffer(info)) {
} buffer = info;
//console.log(proto, this.proto_structs[direction][proto]); }
//const directionProtoList = this.constants[direction]; else {
if (typeof info === 'undefined') { let struct = this.structs.get(this.proto_structs[direction][proto]);
buffer = ""; struct.allocate();
} else if (Buffer.isBuffer(info)) { struct.set(info);
buffer = info; buffer = struct.buffer();
} else { }
let struct = this.structs[this.proto_structs[direction][proto]]; const translatedProto = this.translateProto(proto, direction);
struct.allocate(); let header = Buffer.allocUnsafe(3);
struct.set(info); header.writeUInt16LE(buffer.length + 1, 0);
buffer = struct.buffer(); header.writeUInt8(translatedProto, 2);
} socket.write(header);
const translatedProto = this.translateProto(proto, direction); if (buffer.length) {
let header = Buffer.allocUnsafe(3); socket.write(buffer);
header.writeUInt16LE(buffer.length + 1, 0); }
header.writeUInt8(translatedProto, 2); }
socket.write(header); addHandler(protostr, handler, synchronous, priority) {
if (buffer.length) { if (priority < 0 || priority > 4) {
socket.write(buffer); throw "Invalid priority: " + priority;
} }
} let { direction, proto } = this.getDirectionAndProto(protostr);
synchronous = synchronous || false;
addHandler(protostr, handler, synchronous, priority) { priority = priority || 1;
if (priority < 0 || priority > 4) { const handlerObj = new Handler(handler, synchronous);
throw "Invalid priority: " + priority; let handlerCollection = this.handlers[direction][priority];
} const translatedProto = this.translateProto(proto, direction);
let { if (!handlerCollection.has(translatedProto)) {
direction, handlerCollection.set(translatedProto, []);
proto }
} = this.getDirectionAndProto(protostr); handlerCollection.get(translatedProto).push(handlerObj);
synchronous = synchronous || false; }
priority = priority || 1; async handleBuffer(messageBuffer, direction, protoFilter, params) {
const handlerObj = new Handler(handler, synchronous); let feedback = null;
let handlerCollection = this.handlers[direction][priority]; let messageLength = 0;
const translatedProto = this.translateProto(proto, direction); let bufferProto = 0;
if (!handlerCollection[translatedProto]) { let datas = [];
handlerCollection[translatedProto] = []; for (let l = 0; l < 1000; ++l) {
} if (messageLength === 0) {
handlerCollection[translatedProto].push(handlerObj); if (messageBuffer.length >= 2) {
} messageLength = messageBuffer.readUInt16LE(0);
}
async handleBuffer(messageBuffer, direction, protoFilter, params) { else {
let feedback = null; if (messageBuffer.length !== 0) {
let messageLength = 0; feedback = {
let bufferProto = 0; type: "BUFFER_LENGTH",
let datas = []; message: `Bad ${direction} buffer length`
for (let l = 0; l < 1000; ++l) { };
if (messageLength === 0) { }
if (messageBuffer.length >= 2) { break;
messageLength = messageBuffer.readUInt16LE(0); }
} else { }
if (messageBuffer.length !== 0) { else if (bufferProto === 0) {
feedback = { if (messageBuffer.length >= 3) {
type: "BUFFER_LENGTH", bufferProto = messageBuffer.readUInt8(2);
message: `Bad ${direction} buffer length` }
}; else {
} feedback = {
break; type: "PROTO_LENGTH",
} message: `Bad ${direction} proto length`
} else if (bufferProto === 0) { };
if (messageBuffer.length >= 3) { break;
bufferProto = messageBuffer.readUInt8(2); }
} else { }
feedback = { else {
type: "PROTO_LENGTH", if (messageBuffer.length >= 2 + messageLength) {
message: `Bad ${direction} proto length` const proto = this.constants[direction][bufferProto];
}; let cancel = proto && protoFilter && underscore_1.default.indexOf(protoFilter, proto) === -1;
break; let buffer = messageBuffer.slice(3, 2 + messageLength);
} //console.log(l, direction, proto, cancel);
} else { for (let priority = 0; priority < 4; ++priority) {
if (messageBuffer.length >= 2 + messageLength) { if (cancel) {
const proto = this.constants[direction][bufferProto]; break;
let cancel = proto && protoFilter && _.indexOf(protoFilter, proto) === -1; }
let buffer = messageBuffer.slice(3, 2 + messageLength); const handlerCollection = this.handlers[direction][priority];
//console.log(l, direction, proto, cancel); if (proto && handlerCollection.has(bufferProto)) {
for (let priority = 0; priority < 4; ++priority) { let struct = this.structs.get(this.proto_structs[direction][proto]);
if (cancel) { let info = null;
break; if (struct) {
} struct._setBuff(buffer);
const handlerCollection = this.handlers[direction][priority]; info = underscore_1.default.clone(struct.fields);
if (proto && handlerCollection[bufferProto]) { }
let struct = this.structs[this.proto_structs[direction][proto]]; for (let handler of handlerCollection.get(bufferProto)) {
let info = null; cancel = await handler.handle(buffer, info, datas, params);
if (struct) { if (cancel) {
struct._setBuff(buffer); break;
info = _.clone(struct.fields); }
} }
for (let handler of handlerCollection[bufferProto]) { }
cancel = await handler.handle(buffer, info, datas, params); }
if (cancel) { if (!cancel) {
break; datas.push(messageBuffer.slice(0, 2 + messageLength));
} }
} messageBuffer = messageBuffer.slice(2 + messageLength);
} messageLength = 0;
} bufferProto = 0;
if (!cancel) { }
datas.push(messageBuffer.slice(0, 2 + messageLength)); else {
} if (direction === "STOC" || messageLength !== 17735) {
messageBuffer = messageBuffer.slice(2 + messageLength); feedback = {
messageLength = 0; type: "MESSAGE_LENGTH",
bufferProto = 0; message: `Bad ${direction} message length`
} else { };
if (direction === "STOC" || messageLength !== 17735) { }
feedback = { break;
type: "MESSAGE_LENGTH", }
message: `Bad ${direction} message length` }
}; if (l === 999) {
} feedback = {
break; type: "OVERSIZE",
} message: `Oversized ${direction}`
} };
if (l === 999) { }
feedback = { }
type: "OVERSIZE", return {
message: `Oversized ${direction}` datas,
}; feedback
} };
} }
return {
datas,
feedback
};
}
} }
exports.YGOProMessagesHelper = YGOProMessagesHelper;
module.exports = YGOProMessagesHelper; //# sourceMappingURL=YGOProMessages.js.map
\ No newline at end of file
YGOProMessages.ts 0 → 100644
View file @ 6f99491a
import { Struct } from "./struct";
import fs from "fs";
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 net from "net";
class Handler {
handler: (buffer: Buffer, info: any, datas: Buffer[], params: any) => Promise<boolean>;
synchronous: boolean;
constructor(handler: (buffer: Buffer, info: any, datas: Buffer[], params: any) => Promise<boolean>, synchronous: boolean) {
this.handler = handler;
this.synchronous = synchronous || false;
}
async handle(buffer: Buffer, info: any, datas: Buffer[], params: any) {
if (this.synchronous) {
return !!(await this.handler(buffer, info, datas, params));
} else {
const newBuffer = Buffer.from(buffer);
const newDatas = datas.map(b => Buffer.from(b));
this.handler(newBuffer, info, newDatas, params);
return false;
}
}
}
interface HandlerList {
STOC: Map<number, Handler[]>[];
CTOS: Map<number, Handler[]>[];
}
interface DirectionAndProto {
direction: string;
proto: string;
}
export interface Feedback{
type: string;
message: string;
}
export interface HandleResult {
datas: Buffer[];
feedback: Feedback;
}
export class YGOProMessagesHelper {
handlers: HandlerList;
structs: Map<string, Struct>;
structs_declaration: any;
typedefs: any;
proto_structs: any;
constants: any;
constructor() {
this.handlers = {
STOC: [new Map(),
new Map(),
new Map(),
new Map(),
new Map(),
],
CTOS: [new Map(),
new Map(),
new Map(),
new Map(),
new Map(),
]
}
this.initDatas();
this.initStructs();
}
initDatas() {
this.structs_declaration = structs_declaration;
this.typedefs = typedefs;
this.proto_structs = proto_structs;
this.constants = constants;
}
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);
}
}
getDirectionAndProto(protoStr: string): DirectionAndProto {
const protoStrMatch = protoStr.match(/^(STOC|CTOS)_([_A-Z]+)$/);
if (!protoStrMatch) {
throw `Invalid proto string: ${protoStr}`
}
return {
direction: protoStrMatch[1].toUpperCase(),
proto: protoStrMatch[2].toUpperCase()
}
}
translateProto(proto: string | number, direction: string): number {
const directionProtoList = this.constants[direction];
if (typeof proto !== "string") {
return proto;
}
const translatedProto = _.find(Object.keys(directionProtoList), p => {
return directionProtoList[p] === proto;
});
if (!translatedProto) {
throw `unknown proto ${direction} ${proto}`;
}
return parseInt(translatedProto);
}
sendMessage(socket: net.Socket, protostr: string, info: string | Buffer | any) {
const {
direction,
proto
} = this.getDirectionAndProto(protostr);
let buffer: string | Buffer;
if (!socket.remoteAddress) {
return;
}
//console.log(proto, this.proto_structs[direction][proto]);
//const directionProtoList = this.constants[direction];
if (typeof info === 'undefined') {
buffer = "";
} 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 translatedProto = this.translateProto(proto, direction);
let header = Buffer.allocUnsafe(3);
header.writeUInt16LE(buffer.length + 1, 0);
header.writeUInt8(translatedProto, 2);
socket.write(header);
if (buffer.length) {
socket.write(buffer);
}
}
addHandler(protostr: string, handler: (buffer: Buffer, info: any, datas: Buffer[], params: any) => Promise<boolean>, synchronous: boolean, priority: number) {
if (priority < 0 || priority > 4) {
throw "Invalid priority: " + priority;
}
let {
direction,
proto
} = this.getDirectionAndProto(protostr);
synchronous = synchronous || false;
priority = priority || 1;
const handlerObj = new Handler(handler, synchronous);
let handlerCollection: Map<number, Handler[]> = this.handlers[direction][priority];
const translatedProto = this.translateProto(proto, direction);
if (!handlerCollection.has(translatedProto)) {
handlerCollection.set(translatedProto, []);
}
handlerCollection.get(translatedProto).push(handlerObj);
}
async handleBuffer(messageBuffer: Buffer, direction: string, protoFilter: string[], params: any): Promise<HandleResult> {
let feedback: Feedback = null;
let messageLength = 0;
let bufferProto = 0;
let datas: Buffer[] = [];
for (let l = 0; l < 1000; ++l) {
if (messageLength === 0) {
if (messageBuffer.length >= 2) {
messageLength = messageBuffer.readUInt16LE(0);
} else {
if (messageBuffer.length !== 0) {
feedback = {
type: "BUFFER_LENGTH",
message: `Bad ${direction} buffer length`
};
}
break;
}
} else if (bufferProto === 0) {
if (messageBuffer.length >= 3) {
bufferProto = messageBuffer.readUInt8(2);
} else {
feedback = {
type: "PROTO_LENGTH",
message: `Bad ${direction} proto length`
};
break;
}
} else {
if (messageBuffer.length >= 2 + messageLength) {
const proto = this.constants[direction][bufferProto];
let cancel = proto && protoFilter && _.indexOf(protoFilter, proto) === -1;
let buffer = messageBuffer.slice(3, 2 + messageLength);
//console.log(l, direction, proto, cancel);
for (let priority = 0; priority < 4; ++priority) {
if (cancel) {
break;
}
const handlerCollection: Map<number, Handler[]> = this.handlers[direction][priority];
if (proto && handlerCollection.has(bufferProto)) {
let struct = this.structs.get(this.proto_structs[direction][proto]);
let info = null;
if (struct) {
struct._setBuff(buffer);
info = _.clone(struct.fields);
}
for (let handler of handlerCollection.get(bufferProto)) {
cancel = await handler.handle(buffer, info, datas, params);
if (cancel) {
break;
}
}
}
}
if (!cancel) {
datas.push(messageBuffer.slice(0, 2 + messageLength));
}
messageBuffer = messageBuffer.slice(2 + messageLength);
messageLength = 0;
bufferProto = 0;
} else {
if (direction === "STOC" || messageLength !== 17735) {
feedback = {
type: "MESSAGE_LENGTH",
message: `Bad ${direction} message length`
};
}
break;
}
}
if (l === 999) {
feedback = {
type: "OVERSIZE",
message: `Oversized ${direction}`
};
}
}
return {
datas,
feedback
};
}
}
package-lock.json
View file @ 6f99491a
...@@ -27,6 +27,16 @@ ...@@ -27,6 +27,16 @@
"js-tokens": "^4.0.0" "js-tokens": "^4.0.0"
} }
}, },
"@types/node": {
"version": "14.0.13",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.13.tgz",
"integrity": "sha512-rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA=="
},
"@types/underscore": {
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.0.tgz",
"integrity": "sha512-ZAbqul7QAKpM2h1PFGa5ETN27ulmqtj0QviYHasw9LffvXZvVHuraOx/FOsIPPDNGZN0Qo1nASxxSfMYOtSoCw=="
},
"abbrev": { "abbrev": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
......
package.json
View file @ 6f99491a
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
], ],
"author": "zh99998 <zh99998@gmail.com>, mercury233 <me@mercury233.me>, Nanahira <78877@qq.com>", "author": "zh99998 <zh99998@gmail.com>, mercury233 <me@mercury233.me>, Nanahira <78877@qq.com>",
"dependencies": { "dependencies": {
"@types/node": "^14.0.13",
"@types/underscore": "^1.10.0",
"async": "^3.2.0", "async": "^3.2.0",
"axios": "^0.19.2", "axios": "^0.19.2",
"bunyan": "latest", "bunyan": "latest",
......
tsconfig.json 0 → 100644
View file @ 6f99491a
{
"compilerOptions": {
"module": "commonjs",
"target": "esnext",
"esModuleInterop": true,
"resolveJsonModule": true,
"sourceMap": true
},
"compileOnSave": true,
"allowJs": true,
"include": [
"*.ts"
]
}
ygopro-server.coffee
View file @ 6f99491a
...@@ -1963,7 +1963,7 @@ ygopro.ctos_follow 'PLAYER_INFO', true, (buffer, info, client, server, datas)-> ...@@ -1963,7 +1963,7 @@ ygopro.ctos_follow 'PLAYER_INFO', true, (buffer, info, client, server, datas)->
log.warn "ban get bad json", banMCRequest.data log.warn "ban get bad json", banMCRequest.data
catch e catch e
log.warn 'ban get error', e.toString() log.warn 'ban get error', e.toString()
struct = ygopro.structs["CTOS_PlayerInfo"] struct = ygopro.structs.get("CTOS_PlayerInfo")
struct._setBuff(buffer) struct._setBuff(buffer)
struct.set("name", name) struct.set("name", name)
buffer = struct.buffer buffer = struct.buffer
...@@ -2083,7 +2083,7 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)-> ...@@ -2083,7 +2083,7 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
#if info.version >= 9020 and settings.version == 4927 #强行兼容23333版 #if info.version >= 9020 and settings.version == 4927 #强行兼容23333版
# info.version = settings.version # info.version = settings.version
# struct = ygopro.structs["CTOS_JoinGame"] # struct = ygopro.structs.get("CTOS_JoinGame")
# struct._setBuff(buffer) # struct._setBuff(buffer)
# struct.set("version", info.version) # struct.set("version", info.version)
# buffer = struct.buffer # buffer = struct.buffer
...@@ -2456,7 +2456,7 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)-> ...@@ -2456,7 +2456,7 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
else else
#if info.version >= 9020 and settings.version == 4927 #强行兼容23333版 #if info.version >= 9020 and settings.version == 4927 #强行兼容23333版
# info.version = settings.version # info.version = settings.version
# struct = ygopro.structs["CTOS_JoinGame"] # struct = ygopro.structs.get("CTOS_JoinGame")
# struct._setBuff(buffer) # struct._setBuff(buffer)
# struct.set("version", info.version) # struct.set("version", info.version)
# buffer = struct.buffer # buffer = struct.buffer
...@@ -2987,7 +2987,7 @@ ygopro.stoc_follow 'HS_PLAYER_ENTER', true, (buffer, info, client, server, datas ...@@ -2987,7 +2987,7 @@ ygopro.stoc_follow 'HS_PLAYER_ENTER', true, (buffer, info, client, server, datas
return false unless room and settings.modules.hide_name and room.duel_stage == ygopro.constants.DUEL_STAGE.BEGIN return false unless room and settings.modules.hide_name and room.duel_stage == ygopro.constants.DUEL_STAGE.BEGIN
pos = info.pos pos = info.pos
if pos < 4 and pos != client.pos if pos < 4 and pos != client.pos
struct = ygopro.structs["STOC_HS_PlayerEnter"] struct = ygopro.structs.get("STOC_HS_PlayerEnter")
struct._setBuff(buffer) struct._setBuff(buffer)
struct.set("name", "********") struct.set("name", "********")
buffer = struct.buffer buffer = struct.buffer
...@@ -3515,7 +3515,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server, datas)-> ...@@ -3515,7 +3515,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server, datas)->
report_to_big_brother room.name, client.name, client.ip, 1, oldmsg, RegExp.$1 report_to_big_brother room.name, client.name, client.ip, 1, oldmsg, RegExp.$1
client.abuse_count=client.abuse_count+1 client.abuse_count=client.abuse_count+1
ygopro.stoc_send_chat(client, "${chat_warn_level1}") ygopro.stoc_send_chat(client, "${chat_warn_level1}")
struct = ygopro.structs["chat"] struct = ygopro.structs.get("chat")
struct._setBuff(buffer) struct._setBuff(buffer)
struct.set("msg", msg) struct.set("msg", msg)
buffer = struct.buffer buffer = struct.buffer
...@@ -3575,7 +3575,7 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server, datas)-> ...@@ -3575,7 +3575,7 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server, datas)->
CLIENT_kick(room.dueling_players[oppo_pos - win_pos]) CLIENT_kick(room.dueling_players[oppo_pos - win_pos])
CLIENT_kick(room.dueling_players[oppo_pos - win_pos + 1]) if room.hostinfo.mode == 2 CLIENT_kick(room.dueling_players[oppo_pos - win_pos + 1]) if room.hostinfo.mode == 2
return true return true
struct = ygopro.structs["deck"] struct = ygopro.structs.get("deck")
struct._setBuff(buffer) struct._setBuff(buffer)
if room.random_type or room.arena if room.random_type or room.arena
if client.pos == 0 if client.pos == 0
......
ygopro-server.js
View file @ 6f99491a
...@@ -2658,7 +2658,7 @@ ...@@ -2658,7 +2658,7 @@
log.warn('ban get error', e.toString()); log.warn('ban get error', e.toString());
} }
} }
struct = ygopro.structs["CTOS_PlayerInfo"]; struct = ygopro.structs.get("CTOS_PlayerInfo");
struct._setBuff(buffer); struct._setBuff(buffer);
struct.set("name", name); struct.set("name", name);
buffer = struct.buffer; buffer = struct.buffer;
...@@ -2781,7 +2781,7 @@ ...@@ -2781,7 +2781,7 @@
} }
//if info.version >= 9020 and settings.version == 4927 #强行兼容23333版 //if info.version >= 9020 and settings.version == 4927 #强行兼容23333版
// info.version = settings.version // info.version = settings.version
// struct = ygopro.structs["CTOS_JoinGame"] // struct = ygopro.structs.get("CTOS_JoinGame")
// struct._setBuff(buffer) // struct._setBuff(buffer)
// struct.set("version", info.version) // struct.set("version", info.version)
// buffer = struct.buffer // buffer = struct.buffer
...@@ -3235,7 +3235,7 @@ ...@@ -3235,7 +3235,7 @@
} else { } else {
//if info.version >= 9020 and settings.version == 4927 #强行兼容23333版 //if info.version >= 9020 and settings.version == 4927 #强行兼容23333版
// info.version = settings.version // info.version = settings.version
// struct = ygopro.structs["CTOS_JoinGame"] // struct = ygopro.structs.get("CTOS_JoinGame")
// struct._setBuff(buffer) // struct._setBuff(buffer)
// struct.set("version", info.version) // struct.set("version", info.version)
// buffer = struct.buffer // buffer = struct.buffer
...@@ -3960,7 +3960,7 @@ ...@@ -3960,7 +3960,7 @@
} }
pos = info.pos; pos = info.pos;
if (pos < 4 && pos !== client.pos) { if (pos < 4 && pos !== client.pos) {
struct = ygopro.structs["STOC_HS_PlayerEnter"]; struct = ygopro.structs.get("STOC_HS_PlayerEnter");
struct._setBuff(buffer); struct._setBuff(buffer);
struct.set("name", "********"); struct.set("name", "********");
buffer = struct.buffer; buffer = struct.buffer;
...@@ -4716,7 +4716,7 @@ ...@@ -4716,7 +4716,7 @@
report_to_big_brother(room.name, client.name, client.ip, 1, oldmsg, RegExp.$1); report_to_big_brother(room.name, client.name, client.ip, 1, oldmsg, RegExp.$1);
client.abuse_count = client.abuse_count + 1; client.abuse_count = client.abuse_count + 1;
ygopro.stoc_send_chat(client, "${chat_warn_level1}"); ygopro.stoc_send_chat(client, "${chat_warn_level1}");
struct = ygopro.structs["chat"]; struct = ygopro.structs.get("chat");
struct._setBuff(buffer); struct._setBuff(buffer);
struct.set("msg", msg); struct.set("msg", msg);
buffer = struct.buffer; buffer = struct.buffer;
...@@ -4810,7 +4810,7 @@ ...@@ -4810,7 +4810,7 @@
} }
return true; return true;
} }
struct = ygopro.structs["deck"]; struct = ygopro.structs.get("deck");
struct._setBuff(buffer); struct._setBuff(buffer);
if (room.random_type || room.arena) { if (room.random_type || room.arena) {
if (client.pos === 0) { if (client.pos === 0) {
......
ygopro.coffee
View file @ 6f99491a
...@@ -7,8 +7,8 @@ loadJSON = require('load-json-file').sync ...@@ -7,8 +7,8 @@ loadJSON = require('load-json-file').sync
@i18ns = loadJSON './data/i18n.json' @i18ns = loadJSON './data/i18n.json'
YGOProMessageHelper = require("./YGOProMessages.js") # 为 SRVPro2 准备的库，这里拿这个库只用来测试，SRVPro1 对异步支持不是特别完善，因此不会有很多异步优化 YGOProMessagesHelper = require("./YGOProMessages.js").YGOProMessagesHelper # 为 SRVPro2 准备的库，这里拿这个库只用来测试，SRVPro1 对异步支持不是特别完善，因此不会有很多异步优化
@helper = new YGOProMessageHelper() @helper = new YGOProMessagesHelper()
@structs = @helper.structs @structs = @helper.structs
@structs_declaration = @helper.structs_declaration @structs_declaration = @helper.structs_declaration
......
ygopro.js
View file @ 6f99491a
// Generated by CoffeeScript 2.5.1 // Generated by CoffeeScript 2.5.1
(function() { (function() {
var Struct, YGOProMessageHelper, _, loadJSON, translateHandler; var Struct, YGOProMessagesHelper, _, loadJSON, translateHandler;
_ = require('underscore'); _ = require('underscore');
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
this.i18ns = loadJSON('./data/i18n.json'); this.i18ns = loadJSON('./data/i18n.json');
YGOProMessageHelper = require("./YGOProMessages.js"); // 为 SRVPro2 准备的库，这里拿这个库只用来测试，SRVPro1 对异步支持不是特别完善，因此不会有很多异步优化 YGOProMessagesHelper = require("./YGOProMessages.js").YGOProMessagesHelper; // 为 SRVPro2 准备的库，这里拿这个库只用来测试，SRVPro1 对异步支持不是特别完善，因此不会有很多异步优化
this.helper = new YGOProMessageHelper(); this.helper = new YGOProMessagesHelper();
this.structs = this.helper.structs; this.structs = this.helper.structs;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment