Merge branch 'databasen'

.dockerignore

@@ -2,6 +2,7 @@
 jsconfig.json
 coffeelint.json
 .vscode/
+.idea
 
 password.json
 config.*.json
@@ -13,6 +14,7 @@ config.user.bak
 /windbot
 /decks
 /decks_save*
+/deck_log
 /replays
 /node_modules
 /ssl

.gitignore

@@ -2,6 +2,7 @@
 jsconfig.json
 coffeelint.json
 .vscode/
+.idea
 
 password.json
 config.*.json

Dockerfile

 # Dockerfile for SRVPro
-FROM node:12-buster-slim
+FROM node:14-buster-slim
 
 RUN npm install -g pm2
 
 # apt
 RUN apt update && \
-    env DEBIAN_FRONTEND=noninteractive apt install -y wget git build-essential libevent-dev libsqlite3-dev mono-complete p7zip-full redis-server python3 liblua5.3-dev && \
+    env DEBIAN_FRONTEND=noninteractive apt install -y wget git build-essential libevent-dev libsqlite3-dev mono-complete p7zip-full python3 liblua5.3-dev && \
     rm -rf /var/lib/apt/lists/*
 
 # srvpro

Dockerfile.lite

 # Dockerfile for SRVPro Lite
-FROM node:12-buster-slim
+FROM node:14-buster-slim
 
 # apt
 RUN apt update && \

Replay.coffee

@@ -117,7 +117,7 @@ class Replay
     @header == null ? false : @header.isTag
 
   @fromFile: (filePath) ->
-    Replay.fromBuffer fs.readFileSync filePath
+    Replay.fromBuffer await fs.promises.readFile filePath
 
   @fromBuffer: (buffer) ->
     reader = new ReplayReader buffer

Replay.js

@@ -175,8 +175,8 @@
         };
       }
 
-      static fromFile(filePath) {
-        return Replay.fromBuffer(fs.readFileSync(filePath));
+      static async fromFile(filePath) {
+        return Replay.fromBuffer((await fs.promises.readFile(filePath)));
       }
 
       static fromBuffer(buffer) {

data-manager/DeckEncoder.js

+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeDeck = exports.encodeDeck = void 0;
+const assert_1 = __importDefault(require("assert"));
+function encodeDeck(deck) {
+    let pointer = 0;
+    const bufferSize = (2 + deck.main.length + deck.side.length) * 4;
+    const buffer = Buffer.allocUnsafe(bufferSize);
+    buffer.writeInt32LE(deck.main.length, pointer);
+    pointer += 4;
+    buffer.writeInt32LE(deck.side.length, pointer);
+    pointer += 4;
+    for (let cardCode of deck.main.concat(deck.side)) {
+        buffer.writeInt32LE(cardCode, pointer);
+        pointer += 4;
+    }
+    assert_1.default(pointer === bufferSize, `Invalid buffer size. Expected: ${bufferSize}. Got: ${pointer}`);
+    return buffer;
+}
+exports.encodeDeck = encodeDeck;
+function decodeDeck(buffer) {
+    let pointer = 0;
+    const mainLength = buffer.readInt32LE(pointer);
+    pointer += 4;
+    const sideLength = buffer.readInt32LE(pointer);
+    pointer += 4;
+    const correctBufferLength = (2 + mainLength + sideLength) * 4;
+    assert_1.default(buffer.length >= (2 + mainLength + sideLength) * 4, `Invalid buffer size. Expected: ${correctBufferLength}. Got: ${buffer.length}`);
+    const main = [];
+    const side = [];
+    for (let i = 0; i < mainLength; ++i) {
+        main.push(buffer.readInt32LE(pointer));
+        pointer += 4;
+    }
+    for (let i = 0; i < sideLength; ++i) {
+        side.push(buffer.readInt32LE(pointer));
+        pointer += 4;
+    }
+    return { main, side };
+}
+exports.decodeDeck = decodeDeck;
+//# sourceMappingURL=DeckEncoder.js.map
\ No newline at end of file

data-manager/DeckEncoder.ts

+import assert from "assert";
+
+export interface Deck {
+    main: number[];
+    side: number[];
+}
+
+export function encodeDeck(deck: Deck) {
+    let pointer = 0;
+    const bufferSize = (2 + deck.main.length + deck.side.length) * 4;
+    const buffer = Buffer.allocUnsafe(bufferSize);
+    buffer.writeInt32LE(deck.main.length, pointer);
+    pointer += 4;
+    buffer.writeInt32LE(deck.side.length, pointer);
+    pointer += 4;
+    for(let cardCode of deck.main.concat(deck.side)) {
+        buffer.writeInt32LE(cardCode, pointer);
+        pointer += 4;
+    }
+    assert(pointer === bufferSize, `Invalid buffer size. Expected: ${bufferSize}. Got: ${pointer}`);
+    return buffer;
+}
+
+export function decodeDeck(buffer: Buffer): Deck {
+    let pointer = 0;
+    const mainLength = buffer.readInt32LE(pointer);
+    pointer += 4;
+    const sideLength = buffer.readInt32LE(pointer);
+    pointer += 4;
+    const correctBufferLength = (2 + mainLength + sideLength) * 4;
+    assert(buffer.length >= (2 + mainLength + sideLength) * 4, `Invalid buffer size. Expected: ${correctBufferLength}. Got: ${buffer.length}`);
+    const main: number[] = [];
+    const side: number[] = [];
+    for(let i = 0; i < mainLength; ++i) {
+        main.push(buffer.readInt32LE(pointer));
+        pointer += 4;
+    }
+    for(let i = 0; i < sideLength; ++i) {
+        side.push(buffer.readInt32LE(pointer));
+        pointer += 4;
+    }
+    return {main, side};
+}
\ No newline at end of file

data-manager/entities/Ban.js

+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Ban = void 0;
+const typeorm_1 = require("typeorm");
+let Ban = class Ban {
+};
+__decorate([
+    typeorm_1.PrimaryGeneratedColumn({ unsigned: true, type: "bigint" }),
+    __metadata("design:type", Number)
+], Ban.prototype, "id", void 0);
+__decorate([
+    typeorm_1.Index(),
+    typeorm_1.Column({ type: "varchar", length: 64, nullable: true }),
+    __metadata("design:type", String)
+], Ban.prototype, "ip", void 0);
+__decorate([
+    typeorm_1.Index(),
+    typeorm_1.Column({ type: "varchar", length: 20, nullable: true }),
+    __metadata("design:type", String)
+], Ban.prototype, "name", void 0);
+Ban = __decorate([
+    typeorm_1.Entity(),
+    typeorm_1.Unique(["ip", "name"])
+], Ban);
+exports.Ban = Ban;
+//# sourceMappingURL=Ban.js.map
\ No newline at end of file

data-manager/entities/Ban.ts

+import {Column, Entity, Index, PrimaryGeneratedColumn, Unique} from "typeorm";
+
+@Entity()
+@Unique(["ip", "name"])
+export class Ban {
+	@PrimaryGeneratedColumn({ unsigned: true, type: "bigint" })
+	id: number;
+
+	@Index()
+	@Column({ type: "varchar", length: 64, nullable: true })
+	ip: string;
+
+	@Index()
+	@Column({ type: "varchar", length: 20, nullable: true })
+	name: string;
+}

data-manager/entities/BasePlayer.js

+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BasePlayer = void 0;
+const typeorm_1 = require("typeorm");
+class BasePlayer {
+}
+__decorate([
+    typeorm_1.PrimaryGeneratedColumn({ unsigned: true, type: "bigint" }),
+    __metadata("design:type", Number)
+], BasePlayer.prototype, "id", void 0);
+__decorate([
+    typeorm_1.Column({ type: "varchar", length: 20 }),
+    __metadata("design:type", String)
+], BasePlayer.prototype, "name", void 0);
+__decorate([
+    typeorm_1.Column({ type: "tinyint" }),
+    __metadata("design:type", Number)
+], BasePlayer.prototype, "pos", void 0);
+exports.BasePlayer = BasePlayer;
+//# sourceMappingURL=BasePlayer.js.map
\ No newline at end of file

data-manager/entities/BasePlayer.ts

+import {Column, PrimaryGeneratedColumn} from "typeorm";
+
+export abstract class BasePlayer {
+    @PrimaryGeneratedColumn({unsigned: true, type: "bigint"})
+    id: number;
+
+    @Column({ type: "varchar", length: 20 })
+    name: string;
+
+    @Column({ type: "tinyint" })
+    pos: number;
+}
\ No newline at end of file

data-manager/entities/CloudReplay.js

+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudReplay = void 0;
+const typeorm_1 = require("typeorm");
+const CloudReplayPlayer_1 = require("./CloudReplayPlayer");
+const underscore_1 = __importDefault(require("underscore"));
+const moment_1 = __importDefault(require("moment"));
+let CloudReplay = class CloudReplay {
+    fromBuffer(buffer) {
+        this.data = buffer.toString("base64");
+    }
+    toBuffer() {
+        return Buffer.from(this.data, "base64");
+    }
+    getDateString() {
+        return moment_1.default(this.date).format('YYYY-MM-DD HH:mm:ss');
+    }
+    getPlayerNamesString() {
+        const playerInfos = underscore_1.default.clone(this.players);
+        playerInfos.sort((p1, p2) => p1.pos - p2.pos);
+        return playerInfos[0].name + (playerInfos[2] ? "+" + playerInfos[2].name : "") + " VS " + (playerInfos[1] ? playerInfos[1].name : "AI") + (playerInfos[3] ? "+" + playerInfos[3].name : "");
+    }
+    getDisplayString() {
+        return `R#${this.id} ${this.getPlayerNamesString()} ${this.getDateString()}`;
+    }
+};
+__decorate([
+    typeorm_1.PrimaryColumn({ unsigned: true, type: "bigint" }),
+    __metadata("design:type", Number)
+], CloudReplay.prototype, "id", void 0);
+__decorate([
+    typeorm_1.Column({ type: "text" }),
+    __metadata("design:type", String)
+], CloudReplay.prototype, "data", void 0);
+__decorate([
+    typeorm_1.Column({ type: "datetime" }),
+    __metadata("design:type", Date)
+], CloudReplay.prototype, "date", void 0);
+__decorate([
+    typeorm_1.OneToMany(() => CloudReplayPlayer_1.CloudReplayPlayer, player => player.cloudReplay),
+    __metadata("design:type", Array)
+], CloudReplay.prototype, "players", void 0);
+CloudReplay = __decorate([
+    typeorm_1.Entity()
+], CloudReplay);
+exports.CloudReplay = CloudReplay;
+//# sourceMappingURL=CloudReplay.js.map
\ No newline at end of file

data-manager/entities/CloudReplay.ts

+import {Column, Entity, OneToMany, PrimaryColumn} from "typeorm";
+import {CloudReplayPlayer} from "./CloudReplayPlayer";
+import _ from "underscore";
+import moment from "moment";
+
+@Entity()
+export class CloudReplay {
+	@PrimaryColumn({ unsigned: true, type: "bigint" })
+	id: number;
+
+	@Column({ type: "text" })
+	data: string;
+
+	fromBuffer(buffer: Buffer) {
+		this.data = buffer.toString("base64");
+	}
+
+	toBuffer() {
+		return Buffer.from(this.data, "base64");
+	}
+
+	@Column({ type: "datetime" })
+	date: Date;
+
+	getDateString() {
+		return moment(this.date).format('YYYY-MM-DD HH:mm:ss')
+	}
+
+	@OneToMany(() => CloudReplayPlayer, player => player.cloudReplay)
+	players: CloudReplayPlayer[];
+
+	getPlayerNamesString() {
+		const playerInfos = _.clone(this.players);
+		playerInfos.sort((p1, p2) => p1.pos - p2.pos);
+		return playerInfos[0].name + (playerInfos[2] ? "+" + playerInfos[2].name : "") + " VS " + (playerInfos[1] ? playerInfos[1].name : "AI") + (playerInfos[3] ? "+" + playerInfos[3].name : "");
+	}
+	
+	getDisplayString() {
+		return `R#${this.id} ${this.getPlayerNamesString()} ${this.getDateString()}`;
+	}
+}

data-manager/entities/CloudReplayPlayer.js

+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var CloudReplayPlayer_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudReplayPlayer = void 0;
+const typeorm_1 = require("typeorm");
+const CloudReplay_1 = require("./CloudReplay");
+const BasePlayer_1 = require("./BasePlayer");
+let CloudReplayPlayer = CloudReplayPlayer_1 = class CloudReplayPlayer extends BasePlayer_1.BasePlayer {
+    static fromPlayerInfo(info) {
+        const p = new CloudReplayPlayer_1();
+        p.key = info.key;
+        p.name = info.name;
+        p.pos = info.pos;
+        return p;
+    }
+};
+__decorate([
+    typeorm_1.Index(),
+    typeorm_1.Column({ type: "varchar", length: 40 }),
+    __metadata("design:type", String)
+], CloudReplayPlayer.prototype, "key", void 0);
+__decorate([
+    typeorm_1.ManyToOne(() => CloudReplay_1.CloudReplay, replay => replay.players),
+    __metadata("design:type", CloudReplay_1.CloudReplay)
+], CloudReplayPlayer.prototype, "cloudReplay", void 0);
+CloudReplayPlayer = CloudReplayPlayer_1 = __decorate([
+    typeorm_1.Entity()
+], CloudReplayPlayer);
+exports.CloudReplayPlayer = CloudReplayPlayer;
+//# sourceMappingURL=CloudReplayPlayer.js.map
\ No newline at end of file

data-manager/entities/CloudReplayPlayer.ts

+import {Column, Entity, Index, ManyToOne} from "typeorm";
+import {CloudReplayPlayerInfo} from "../DataManager";
+import {CloudReplay} from "./CloudReplay";
+import {BasePlayer} from "./BasePlayer";
+
+@Entity()
+export class CloudReplayPlayer extends BasePlayer {
+	@Index()
+	@Column({ type: "varchar", length: 40 })
+	key: string;
+
+	@ManyToOne(() => CloudReplay, replay => replay.players)
+	cloudReplay: CloudReplay;
+
+	static fromPlayerInfo(info: CloudReplayPlayerInfo) {
+		const p = new CloudReplayPlayer();
+		p.key = info.key;
+		p.name = info.name;
+		p.pos = info.pos;
+		return p;
+	}
+}

data-manager/entities/DuelLog.js

+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DuelLog = void 0;
+const typeorm_1 = require("typeorm");
+const DuelLogPlayer_1 = require("./DuelLogPlayer");
+const moment_1 = __importDefault(require("moment"));
+const underscore_1 = __importDefault(require("underscore"));
+let DuelLog = class DuelLog {
+    getViewString() {
+        const viewPlayers = underscore_1.default.clone(this.players);
+        viewPlayers.sort((p1, p2) => p1.pos - p2.pos);
+        const playerString = viewPlayers[0].realName.split("$")[0] + (viewPlayers[2] ? "+" + viewPlayers[2].realName.split("$")[0] : "") + " VS " + (viewPlayers[1] ? viewPlayers[1].realName.split("$")[0] : "AI") + (viewPlayers[3] ? "+" + viewPlayers[3].realName.split("$")[0] : "");
+        return `<${this.id}> ${playerString} ${moment_1.default(this.time).format("YYYY-MM-DD HH-mm-ss")}`;
+    }
+    getViewJSON(tournamentModeSettings) {
+        const data = {
+            id: this.id,
+            time: moment_1.default(this.time).format("YYYY-MM-DD HH:mm:ss"),
+            name: this.name + (tournamentModeSettings.show_info ? " (Duel:" + this.duelCount + ")" : ""),
+            roomid: this.roomId,
+            cloud_replay_id: "R#" + this.cloudReplayId,
+            replay_filename: this.replayFileName,
+            roommode: this.roomMode,
+            players: this.players.map(player => {
+                return {
+                    pos: player.pos,
+                    is_first: player.isFirst === 1,
+                    name: player.name + (tournamentModeSettings.show_ip ? " (IP: " + player.ip.slice(7) + ")" : "") + (tournamentModeSettings.show_info && !(this.roomMode === 2 && player.pos % 2 > 0) ? " (Score:" + player.score + " LP:" + (player.lp != null ? player.lp : "???") + (this.roomMode !== 2 ? " Cards:" + (player.cardCount != null ? player.cardCount : "???") : "") + ")" : ""),
+                    winner: player.winner === 1
+                };
+            })
+        };
+        return data;
+    }
+};
+__decorate([
+    typeorm_1.PrimaryGeneratedColumn({ unsigned: true, type: "bigint" }),
+    __metadata("design:type", Number)
+], DuelLog.prototype, "id", void 0);
+__decorate([
+    typeorm_1.Column("datetime"),
+    __metadata("design:type", Date)
+], DuelLog.prototype, "time", void 0);
+__decorate([
+    typeorm_1.Index(),
+    typeorm_1.Column({ type: "varchar", length: 20 }),
+    __metadata("design:type", String)
+], DuelLog.prototype, "name", void 0);
+__decorate([
+    typeorm_1.Column("int"),
+    __metadata("design:type", Number)
+], DuelLog.prototype, "roomId", void 0);
+__decorate([
+    typeorm_1.Column("bigint"),
+    __metadata("design:type", Number)
+], DuelLog.prototype, "cloudReplayId", void 0);
+__decorate([
+    typeorm_1.Column({ type: "varchar", length: 256 }),
+    __metadata("design:type", String)
+], DuelLog.prototype, "replayFileName", void 0);
+__decorate([
+    typeorm_1.Column("tinyint", { unsigned: true }),
+    __metadata("design:type", Number)
+], DuelLog.prototype, "roomMode", void 0);
+__decorate([
+    typeorm_1.Column("tinyint", { unsigned: true }),
+    __metadata("design:type", Number)
+], DuelLog.prototype, "duelCount", void 0);
+__decorate([
+    typeorm_1.OneToMany(() => DuelLogPlayer_1.DuelLogPlayer, player => player.duelLog),
+    __metadata("design:type", Array)
+], DuelLog.prototype, "players", void 0);
+DuelLog = __decorate([
+    typeorm_1.Entity()
+], DuelLog);
+exports.DuelLog = DuelLog;
+//# sourceMappingURL=DuelLog.js.map
\ No newline at end of file

data-manager/entities/DuelLog.ts

+import {Column, Entity, Index, OneToMany, PrimaryGeneratedColumn} from "typeorm";
+import {DuelLogPlayer} from "./DuelLogPlayer";
+import moment from "moment";
+import _ from "underscore";
+
+@Entity()
+export class DuelLog {
+    @PrimaryGeneratedColumn({unsigned: true, type: "bigint"})
+    id: number;
+
+    @Column("datetime")
+    time: Date;
+
+    @Index()
+    @Column({type: "varchar", length: 20})
+    name: string;
+
+    @Column("int")
+    roomId: number;
+
+    @Column("bigint")
+    cloudReplayId: number; // not very needed to become a relation
+
+    @Column({type: "varchar", length: 256})
+    replayFileName: string;
+
+    @Column("tinyint", {unsigned: true})
+    roomMode: number;
+
+    @Column("tinyint", {unsigned: true})
+    duelCount: number;
+
+    @OneToMany(() => DuelLogPlayer, player => player.duelLog)
+    players: DuelLogPlayer[];
+
+    getViewString() {
+        const viewPlayers = _.clone(this.players);
+        viewPlayers.sort((p1, p2) => p1.pos - p2.pos);
+        const playerString = viewPlayers[0].realName.split("$")[0] + (viewPlayers[2] ? "+" + viewPlayers[2].realName.split("$")[0] : "") + " VS " + (viewPlayers[1] ? viewPlayers[1].realName.split("$")[0] : "AI") + (viewPlayers[3] ? "+" + viewPlayers[3].realName.split("$")[0] : "");
+        return `<${this.id}> ${playerString} ${moment(this.time).format("YYYY-MM-DD HH-mm-ss")}`;
+    }
+
+    getViewJSON(tournamentModeSettings: any) {
+        const data = {
+            id: this.id,
+            time: moment(this.time).format("YYYY-MM-DD HH:mm:ss"),
+            name: this.name + (tournamentModeSettings.show_info ? " (Duel:" + this.duelCount + ")" : ""),
+            roomid: this.roomId,
+            cloud_replay_id: "R#" + this.cloudReplayId,
+            replay_filename: this.replayFileName,
+            roommode: this.roomMode,
+            players: this.players.map(player => {
+                return {
+                    pos: player.pos,
+                    is_first: player.isFirst === 1,
+                    name: player.name + (tournamentModeSettings.show_ip ? " (IP: " + player.ip.slice(7) + ")" : "") + (tournamentModeSettings.show_info && !(this.roomMode === 2 && player.pos % 2 > 0) ? " (Score:" + player.score + " LP:" + (player.lp != null ? player.lp : "???") + (this.roomMode !== 2 ? " Cards:" + (player.cardCount != null ? player.cardCount : "???") : "") + ")" : ""),
+                    winner: player.winner === 1
+                }
+            })
+        }
+        return data;
+    }
+}
\ No newline at end of file

data-manager/entities/DuelLogPlayer.js

+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var DuelLogPlayer_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DuelLogPlayer = void 0;
+const typeorm_1 = require("typeorm");
+const BasePlayer_1 = require("./BasePlayer");
+const DuelLog_1 = require("./DuelLog");
+const DeckEncoder_1 = require("../DeckEncoder");
+let DuelLogPlayer = DuelLogPlayer_1 = class DuelLogPlayer extends BasePlayer_1.BasePlayer {
+    setStartDeck(deck) {
+        if (deck === null) {
+            this.startDeckBuffer = null;
+            return;
+        }
+        this.startDeckBuffer = DeckEncoder_1.encodeDeck(deck).toString("base64");
+    }
+    getStartDeck() {
+        return DeckEncoder_1.decodeDeck(Buffer.from(this.startDeckBuffer, "base64"));
+    }
+    setCurrentDeck(deck) {
+        if (deck === null) {
+            this.currentDeckBuffer = null;
+            return;
+        }
+        this.currentDeckBuffer = DeckEncoder_1.encodeDeck(deck).toString("base64");
+    }
+    getCurrentDeck() {
+        return DeckEncoder_1.decodeDeck(Buffer.from(this.currentDeckBuffer, "base64"));
+    }
+    static fromDuelLogPlayerInfo(info) {
+        const p = new DuelLogPlayer_1();
+        p.name = info.name;
+        p.pos = info.pos;
+        p.realName = info.realName;
+        p.lp = info.lp;
+        p.ip = info.ip;
+        p.score = info.score;
+        p.cardCount = info.cardCount;
+        p.isFirst = info.isFirst ? 1 : 0;
+        p.winner = info.winner ? 1 : 0;
+        p.startDeckBuffer = info.startDeckBuffer.toString("base64");
+        p.setCurrentDeck(info.deck);
+        return p;
+    }
+};
+__decorate([
+    typeorm_1.Index(),
+    typeorm_1.Column({ type: "varchar", length: 20 }),
+    __metadata("design:type", String)
+], DuelLogPlayer.prototype, "realName", void 0);
+__decorate([
+    typeorm_1.Column({ type: "varchar", length: 64, nullable: true }),
+    __metadata("design:type", String)
+], DuelLogPlayer.prototype, "ip", void 0);
+__decorate([
+    typeorm_1.Column("tinyint", { unsigned: true }),
+    __metadata("design:type", Number)
+], DuelLogPlayer.prototype, "isFirst", void 0);
+__decorate([
+    typeorm_1.Column("tinyint"),
+    __metadata("design:type", Number)
+], DuelLogPlayer.prototype, "score", void 0);
+__decorate([
+    typeorm_1.Column("int", { nullable: true }),
+    __metadata("design:type", Number)
+], DuelLogPlayer.prototype, "lp", void 0);
+__decorate([
+    typeorm_1.Column("smallint", { nullable: true }),
+    __metadata("design:type", Number)
+], DuelLogPlayer.prototype, "cardCount", void 0);
+__decorate([
+    typeorm_1.Column("text", { nullable: true }),
+    __metadata("design:type", String)
+], DuelLogPlayer.prototype, "startDeckBuffer", void 0);
+__decorate([
+    typeorm_1.Column("text", { nullable: true }),
+    __metadata("design:type", String)
+], DuelLogPlayer.prototype, "currentDeckBuffer", void 0);
+__decorate([
+    typeorm_1.Column("tinyint"),
+    __metadata("design:type", Number)
+], DuelLogPlayer.prototype, "winner", void 0);
+__decorate([
+    typeorm_1.ManyToOne(() => DuelLog_1.DuelLog, duelLog => duelLog.players),
+    __metadata("design:type", DuelLog_1.DuelLog)
+], DuelLogPlayer.prototype, "duelLog", void 0);
+DuelLogPlayer = DuelLogPlayer_1 = __decorate([
+    typeorm_1.Entity()
+], DuelLogPlayer);
+exports.DuelLogPlayer = DuelLogPlayer;
+//# sourceMappingURL=DuelLogPlayer.js.map
\ No newline at end of file

data-manager/entities/DuelLogPlayer.ts

+import {Column, Entity, Index, ManyToOne} from "typeorm";
+import {BasePlayer} from "./BasePlayer";
+import {DuelLog} from "./DuelLog";
+import {Deck, decodeDeck, encodeDeck} from "../DeckEncoder";
+import {DuelLogPlayerInfo} from "../DataManager";
+
+@Entity()
+export class DuelLogPlayer extends BasePlayer {
+    @Index()
+    @Column({ type: "varchar", length: 20 })
+    realName: string;
+
+    @Column({ type: "varchar", length: 64, nullable: true })
+    ip: string;
+
+    @Column("tinyint", {unsigned: true})
+    isFirst: number;
+
+    @Column("tinyint")
+    score: number;
+
+    @Column("int", {nullable: true})
+    lp: number;
+
+    @Column("smallint", {nullable: true})
+    cardCount: number;
+
+    @Column("text", {nullable: true})
+    startDeckBuffer: string;
+
+    @Column("text", {nullable: true})
+    currentDeckBuffer: string;
+
+    @Column("tinyint")
+    winner: number;
+
+    setStartDeck(deck: Deck) {
+        if(deck === null) {
+            this.startDeckBuffer = null;
+            return;
+        }
+        this.startDeckBuffer = encodeDeck(deck).toString("base64");
+    }
+
+    getStartDeck() {
+        return decodeDeck(Buffer.from(this.startDeckBuffer, "base64"));
+    }
+
+    setCurrentDeck(deck: Deck) {
+        if(deck === null) {
+            this.currentDeckBuffer = null;
+            return;
+        }
+        this.currentDeckBuffer = encodeDeck(deck).toString("base64");
+    }
+
+    getCurrentDeck() {
+        return decodeDeck(Buffer.from(this.currentDeckBuffer, "base64"));
+    }
+
+    @ManyToOne(() => DuelLog, duelLog => duelLog.players)
+    duelLog: DuelLog;
+
+    static fromDuelLogPlayerInfo(info: DuelLogPlayerInfo) {
+        const p = new DuelLogPlayer();
+        p.name = info.name;
+        p.pos = info.pos;
+        p.realName = info.realName;
+        p.lp = info.lp;
+        p.ip = info.ip;
+        p.score = info.score;
+        p.cardCount = info.cardCount;
+        p.isFirst = info.isFirst ? 1 : 0;
+        p.winner = info.winner ? 1 : 0;
+        p.startDeckBuffer = info.startDeckBuffer.toString("base64");
+        p.setCurrentDeck(info.deck);
+        return p;
+    }
+}

data-manager/entities/RandomDuelBan.js

+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RandomDuelBan = void 0;
+const typeorm_1 = require("typeorm");
+let RandomDuelBan = class RandomDuelBan {
+    setNeedTip(need) {
+        this.needTip = need ? 1 : 0;
+    }
+    getNeedTip() {
+        return this.needTip > 0 ? true : false;
+    }
+};
+__decorate([
+    typeorm_1.PrimaryColumn({ type: "varchar", length: 64 }),
+    __metadata("design:type", String)
+], RandomDuelBan.prototype, "ip", void 0);
+__decorate([
+    typeorm_1.Column("datetime"),
+    __metadata("design:type", Date)
+], RandomDuelBan.prototype, "time", void 0);
+__decorate([
+    typeorm_1.Column("smallint"),
+    __metadata("design:type", Number)
+], RandomDuelBan.prototype, "count", void 0);
+__decorate([
+    typeorm_1.Column({ type: "simple-array" }),
+    __metadata("design:type", Array)
+], RandomDuelBan.prototype, "reasons", void 0);
+__decorate([
+    typeorm_1.Column({ type: "tinyint", unsigned: true }),
+    __metadata("design:type", Number)
+], RandomDuelBan.prototype, "needTip", void 0);
+RandomDuelBan = __decorate([
+    typeorm_1.Entity()
+], RandomDuelBan);
+exports.RandomDuelBan = RandomDuelBan;
+//# sourceMappingURL=RandomDuelBan.js.map
\ No newline at end of file

data-manager/entities/RandomDuelBan.ts

+import {Column, Entity, PrimaryColumn} from "typeorm";
+
+
+@Entity()
+export class RandomDuelBan {
+    @PrimaryColumn({type: "varchar", length: 64})
+    ip: string;
+
+    @Column("datetime")
+    time: Date;
+
+    @Column("smallint")
+    count: number;
+
+    @Column({type: "simple-array"})
+    reasons: string[]
+
+    @Column({type: "tinyint", unsigned: true})
+    needTip: number;
+
+    setNeedTip(need: boolean) {
+        this.needTip = need ? 1 : 0;
+    }
+
+    getNeedTip() {
+        return this.needTip > 0 ? true : false;
+    }
+}
\ No newline at end of file

data-manager/entities/User.js

+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.User = void 0;
+const typeorm_1 = require("typeorm");
+const UserDialog_1 = require("./UserDialog");
+const VipKey_1 = require("./VipKey");
+const moment_1 = __importDefault(require("moment"));
+let User = class User {
+    isVip() {
+        return this.vipExpireDate && moment_1.default().isBefore(this.vipExpireDate);
+    }
+};
+__decorate([
+    typeorm_1.PrimaryColumn({ type: "varchar", length: 128 }),
+    __metadata("design:type", String)
+], User.prototype, "key", void 0);
+__decorate([
+    typeorm_1.Column("varchar", { length: 16, nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "chatColor", void 0);
+__decorate([
+    typeorm_1.Index(),
+    typeorm_1.Column("datetime", { nullable: true }),
+    __metadata("design:type", Date)
+], User.prototype, "vipExpireDate", void 0);
+__decorate([
+    typeorm_1.Column("text", { nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "victory", void 0);
+__decorate([
+    typeorm_1.Column("text", { nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "words", void 0);
+__decorate([
+    typeorm_1.OneToMany(() => UserDialog_1.UserDialog, dialog => dialog.user),
+    __metadata("design:type", Array)
+], User.prototype, "dialogues", void 0);
+__decorate([
+    typeorm_1.OneToMany(() => VipKey_1.VipKey, vipKey => vipKey.usedBy),
+    __metadata("design:type", Array)
+], User.prototype, "usedKeys", void 0);
+User = __decorate([
+    typeorm_1.Entity()
+], User);
+exports.User = User;
+//# sourceMappingURL=User.js.map
\ No newline at end of file

data-manager/entities/User.ts

+import {Column, Entity, Index, OneToMany, PrimaryColumn} from "typeorm";
+import {UserDialog} from "./UserDialog";
+import {VipKey} from "./VipKey";
+import moment from "moment";
+
+@Entity()
+export class User {
+    @PrimaryColumn({type: "varchar", length: 128})
+    key: string;
+
+    @Column("varchar", {length: 16, nullable: true})
+    chatColor: string;
+
+    @Index()
+    @Column("datetime", {nullable: true})
+    vipExpireDate: Date;
+
+    isVip() {
+        return this.vipExpireDate && moment().isBefore(this.vipExpireDate);
+    }
+
+    @Column("text", {nullable: true})
+    victory: string;
+
+    @Column("text", {nullable: true})
+    words: string;
+
+    @OneToMany(() => UserDialog, dialog => dialog.user)
+    dialogues: UserDialog[];
+
+    @OneToMany(() => VipKey, vipKey => vipKey.usedBy)
+    usedKeys: VipKey[];
+}

data-manager/entities/UserDialog.js

+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserDialog = void 0;
+const typeorm_1 = require("typeorm");
+const User_1 = require("./User");
+let UserDialog = class UserDialog {
+};
+__decorate([
+    typeorm_1.PrimaryGeneratedColumn({ unsigned: true, type: "bigint" }),
+    __metadata("design:type", Number)
+], UserDialog.prototype, "id", void 0);
+__decorate([
+    typeorm_1.Index(),
+    typeorm_1.Column("int", { unsigned: true }),
+    __metadata("design:type", Number)
+], UserDialog.prototype, "cardCode", void 0);
+__decorate([
+    typeorm_1.Column("text"),
+    __metadata("design:type", String)
+], UserDialog.prototype, "text", void 0);
+__decorate([
+    typeorm_1.ManyToOne(() => User_1.User, user => user.dialogues),
+    __metadata("design:type", User_1.User)
+], UserDialog.prototype, "user", void 0);
+UserDialog = __decorate([
+    typeorm_1.Entity()
+], UserDialog);
+exports.UserDialog = UserDialog;
+//# sourceMappingURL=UserDialog.js.map
\ No newline at end of file

data-manager/entities/UserDialog.ts

+import {Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn} from "typeorm";
+import {User} from "./User";
+
+@Entity()
+export class UserDialog {
+    @PrimaryGeneratedColumn({ unsigned: true, type: "bigint" })
+    id: number;
+
+    @Index()
+    @Column("int", {unsigned: true})
+    cardCode: number;
+
+    @Column("text")
+    text: string;
+
+    @ManyToOne(() => User, user => user.dialogues)
+    user: User;
+
+
+}

data-manager/entities/VipKey.js

+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VipKey = void 0;
+const typeorm_1 = require("typeorm");
+const User_1 = require("./User");
+let VipKey = class VipKey {
+    toJSON() {
+        return { key: this.key, type: this.type };
+    }
+};
+__decorate([
+    typeorm_1.PrimaryGeneratedColumn({ unsigned: true, type: "bigint" }),
+    __metadata("design:type", Number)
+], VipKey.prototype, "id", void 0);
+__decorate([
+    typeorm_1.Index({ unique: true }),
+    typeorm_1.Column("varchar", { length: 30 }),
+    __metadata("design:type", String)
+], VipKey.prototype, "key", void 0);
+__decorate([
+    typeorm_1.Column("int", { unsigned: true }),
+    __metadata("design:type", Number)
+], VipKey.prototype, "type", void 0);
+__decorate([
+    typeorm_1.Index(),
+    typeorm_1.Column("tinyint", { unsigned: true, default: 0 }),
+    __metadata("design:type", Number)
+], VipKey.prototype, "isUsed", void 0);
+__decorate([
+    typeorm_1.ManyToOne(() => User_1.User, user => user.usedKeys),
+    __metadata("design:type", User_1.User)
+], VipKey.prototype, "usedBy", void 0);
+VipKey = __decorate([
+    typeorm_1.Entity()
+], VipKey);
+exports.VipKey = VipKey;
+//# sourceMappingURL=VipKey.js.map
\ No newline at end of file

data-manager/entities/VipKey.ts

+import {Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn} from "typeorm";
+import {User} from "./User";
+
+@Entity()
+export class VipKey {
+    @PrimaryGeneratedColumn({unsigned: true, type: "bigint"})
+    id: number;
+
+    @Index({unique: true})
+    @Column("varchar", {length: 30})
+    key: string;
+
+    @Column("int", {unsigned: true})
+    type: number;
+
+    @Index()
+    @Column("tinyint", {unsigned: true, default: 0})
+    isUsed: number;
+
+    @ManyToOne(() => User, user => user.usedKeys)
+    usedBy: User;
+
+    toJSON() {
+        return {key: this.key, type: this.type};
+    }
+}

data/default_config.json

@@ -94,13 +94,18 @@
       "ready_time": 20,
       "hang_timeout": 90
     },
-    "cloud_replay": {
+    "mysql": {
       "enabled": false,
-      "redis": {
+      "db": {
         "host": "127.0.0.1",
-        "port": 6379
-      },
-      "never_expire": false,
+        "port": 3306,
+        "username": "root",
+        "password": "localhost",
+        "database": "srvpro"
+      }
+    },
+    "cloud_replay": {
+      "enabled": false,
       "enable_halfway_watch": true
     },
     "windbot": {
@@ -328,8 +333,6 @@
     }
   },
   "ban": {
-    "banned_user": [],
-    "banned_ip": [],
     "illegal_id": [
       "^Lv\\.-*\\d+\\s*(.*)",
       "^VIP\\.\\d+\\s*(.*)"

data/default_data.json

@@ -44,28 +44,6 @@
       ]
     }
   },
-  "duel_log": {
-    "file": "./config/duel_log.json",
-    "duel_log": []
-  },
-  "chat_color": {
-    "file": "./config/chat_color.json",
-    "save_list": {}
-  },
-  "vip_info": {
-    "file": "./config/vip_info.json",
-    "cdkeys": {
-      "365": [],
-      "180": [],
-      "90": [],
-      "30": [],
-      "15": [],
-      "7": [],
-      "3": [],
-      "1": []
-    },
-    "players": {}
-  },
   "users": {
     "file": "./config/admin_user.json",
     "permission_examples": {

data/i18n.json

@@ -189,10 +189,11 @@
     "vip_set_dialogues_part2": " have been set.",
     "vip_cleared_words": "Your join word have been deleted.",
     "vip_set_words": "Your join word have been set.",
-    "vip_cleared_victory": "Your victory word have been deleted.",
-    "vip_set_victory": "Your victory word have been set.",
+    "vip_cleared_victory": "Your victory word have been deleted, which would take effect next duel.",
+    "vip_set_victory": "Your victory word have been set, which would take effect next duel.",
     "vip_password_changed": "Password changed.",
     "vip_player_name_too_long": "Your username or password is too long to log in. Please change your username and try again.",
+    "vip_no_pass": "You must use the name format of Name$Password to support.",
     "replay_hint_part1": "Sending the replay of the duel number ",
     "replay_hint_part2": ".",
     "arena_wait_hint": "If you opponent does not appear within 25 seconds, you may quit without any penalty.",
@@ -539,10 +540,11 @@
     "vip_set_dialogues_part2": " 设置召唤台词。",
     "vip_cleared_words": "已删除进场台词。",
     "vip_set_words": "已设置进场台词。",
-    "vip_cleared_victory": "已删除胜利台词。",
-    "vip_set_victory": "已设置胜利台词。",
+    "vip_cleared_victory": "已删除胜利台词，将在下次决斗生效。",
+    "vip_set_victory": "已设置胜利台词，将在下次决斗生效。",
     "vip_password_changed": "密码修改成功。",
     "vip_player_name_too_long": "你的用户名或设置的密码太长，使用此用户名可能会无法登陆。请更换用户名重试。",
+    "vip_no_pass": "为了保证未来可以识别您的身份，请使用 用户名$密码 的格式重试。",
     "replay_hint_part1": "正在发送第",
     "replay_hint_part2": "局决斗的录像。",
     "arena_wait_hint": "若对手在25秒内不进入游戏，您退房时不会进行扣分。",

data/pm2-docker.json

@@ -11,11 +11,6 @@
 			"cwd": "/ygopro-server/windbot/",
 			"args": "ServerMode=true ServerPort=2399",
 			"interpreter": "mono"
-		},
-		{
-			"name": "redis-server",
-			"script": "/usr/bin/redis-server",
-			"cwd": "/redis"
 		}
 	]
 }

package.json

@@ -11,29 +11,35 @@
   ],
   "author": "zh99998 <zh99998@gmail.com>, mercury233 <me@mercury233.me>, Nanahira <78877@qq.com>",
   "dependencies": {
+    "@types/bunyan": "^1.8.6",
     "@types/node": "^14.0.13",
-    "@types/underscore": "^1.10.0",
+    "@types/underscore": "^1.10.24",
     "async": "^3.2.0",
     "axios": "^0.19.2",
-    "bunyan": "latest",
+    "bunyan": "^1.8.14",
     "challonge": "latest",
+    "coffeescript": "^2.5.1",
     "deepmerge": "latest",
     "formidable": "latest",
     "geoip-country-lite": "latest",
     "load-json-file": "latest",
     "lzma": "^2.3.2",
-    "moment": "latest",
+    "moment": "^2.29.1",
+    "mysql": "^2.18.1",
     "pg": "^6.4.2",
+    "q": "^1.5.1",
     "querystring": "^0.2.0",
-    "redis": "latest",
     "request": "latest",
     "sqlite3": "latest",
-    "underscore": "latest",
+    "typeorm": "^0.2.29",
+    "typescript": "^4.0.5",
+    "underscore": "^1.11.0",
     "underscore.string": "latest",
     "ws": "^1.1.1"
   },
   "license": "AGPL-3.0",
   "scripts": {
+    "build": "coffee -c *.coffee && tsc",
     "start": "node ygopro-server.js",
     "tournament": "node ygopro-tournament.js",
     "pre": "node ygopro-pre.js",

tsconfig.json

@@ -4,11 +4,15 @@
 		"target": "esnext",
 		"esModuleInterop": true,
 		"resolveJsonModule": true,
+		"emitDecoratorMetadata": true,
+		"experimentalDecorators": true,
 		"sourceMap": true
 	},
 	"compileOnSave": true,
 	"allowJs": true,
 	"include": [
-		"*.ts"
+		"*.ts",
+		"data-manager/*.ts",
+		"data-manager/entities/*.ts"
 	]
 }

ygopro-auth.coffee

@@ -59,7 +59,7 @@ add_log = (message) ->
   text = mt.format('YYYY-MM-DD HH:mm:ss') + " --> " + message + "\n"
   res = false
   try
-    await util.promisify(fs.appendFile)("./logs/"+mt.format('YYYY-MM-DD')+".log", text)
+    await fs.promises.appendFile("./logs/"+mt.format('YYYY-MM-DD')+".log", text)
     res = true
   catch
     res = false
@@ -69,7 +69,7 @@ add_log = (message) ->
 default_data = loadJSON('./data/default_data.json')
 setting_save = (settings) ->
   try
-    await util.promisify(fs.writeFile)(settings.file, JSON.stringify(settings, null, 2))
+    await fs.promises.writeFile(settings.file, JSON.stringify(settings, null, 2))
   catch e
     add_log("save fail");
   return

ygopro-auth.js

@@ -73,7 +73,7 @@
     text = mt.format('YYYY-MM-DD HH:mm:ss') + " --> " + message + "\n";
     res = false;
     try {
-      await util.promisify(fs.appendFile)("./logs/" + mt.format('YYYY-MM-DD') + ".log", text);
+      await fs.promises.appendFile("./logs/" + mt.format('YYYY-MM-DD') + ".log", text);
       res = true;
     } catch (error) {
       res = false;
@@ -86,7 +86,7 @@
   setting_save = async function(settings) {
     var e;
     try {
-      await util.promisify(fs.writeFile)(settings.file, JSON.stringify(settings, null, 2));
+      await fs.promises.writeFile(settings.file, JSON.stringify(settings, null, 2));
     } catch (error) {
       e = error;
       add_log("save fail");