Merge branch 'master' into tcg_random

.dockerignore

@@ -37,6 +37,7 @@ $RECYCLE.BIN/
 
 .git*
 .dockerignore
+.travis.yml
 Dockerfile*
 /docs
 /README.md

.travis.yml

+services:
+  - docker
+dist: bionic 
+script:
+  # - echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
+  - docker build -t mycard/ygopro-server:latest .
+  - mkdir output dist
+  - docker run --rm -v "$PWD/output:/output" mycard/ygopro-server:latest -e 'require("child_process").execSync("cp -rf ./* /output")'
+  - cd output && tar -zcf ../dist/ygopro-server.tar.gz --format=posix --exclude='.git*' ./* && cd ..
+  # - docker push mycard/ygopro-server:latest
+#deploy:
+#  provider: s3
+#  access_key_id: ztDf0fCxr0eCgSIi
+#  secret_access_key:
+#    secure: Bm63Gi9Ok19pxhPiCbNnXlRYCmxxZWsj/PfxqGm1ruWLxinjJfpQHSRzSNTb/j0D8kK3uzUB+9MjrtcA5Nnfby4r+zuU+gvpW+3hOX2TiEtCSqYjenQmSsLD5WelMrBHXwfAQ5jOBzkdtC0vX4UTLAGcwJ8DhL9CbMJi0ZqDK9o=
+#  bucket: mycard
+#  skip_cleanup: true
+#  local-dir: dist
+#  upload-dir: srvpro
+#  endpoint: https://minio.mycard.moe:9000
+branches:
+  only:
+    - master

Dockerfile

 # Dockerfile for SRVPro
-FROM node:12-stretch-slim
+FROM node:12-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
-
-RUN npm install -g pm2
+    env DEBIAN_FRONTEND=noninteractive apt install -y wget git build-essential libevent-dev libsqlite3-dev mono-complete p7zip-full redis-server && \
+    rm -rf /var/lib/apt/lists/*
 
 # srvpro
 COPY . /ygopro-server
@@ -14,24 +15,27 @@ RUN npm ci && \
     mkdir config decks replays logs /redis
 
 # ygopro
-RUN git clone --branch=server --recursive --depth=1 https://github.com/purerosefallen/ygopro /ygopro-server/ygopro
-WORKDIR /ygopro-server/ygopro
-RUN git submodule foreach git checkout master && \
+RUN git clone --branch=server --recursive --depth=1 https://github.com/purerosefallen/ygopro && \
+    cd ygopro && \
+    git submodule foreach git checkout master && \
     wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx - && \
     ./premake5 gmake && \
     cd build && \
-    make config=release && \
+    make config=release -j$(nproc) && \
     cd .. && \
-    ln -s ./bin/release/ygopro . && \
+    mv ./bin/release/ygopro . && \
     strip ygopro && \
-    mkdir replay expansions
+    mkdir replay expansions && \
+    rm -rf .git* bin obj build ocgcore cmake lua premake* sound textures .travis.yml *.txt appveyor.yml LICENSE README.md *.lua strings.conf system.conf && \
+    ls gframe | sed '/game.cpp/d' | xargs -I {} rm -rf gframe/{}
 
 # windbot
-RUN git clone --depth=1 https://github.com/purerosefallen/windbot  /ygopro-server/windbot
-WORKDIR /ygopro-server/windbot
-RUN xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5" && \
-    ln -s ./bin/Release/WindBot.exe . && \
-    ln -s /ygopro-server/ygopro/cards.cdb .
+RUN git clone --depth=1 https://github.com/purerosefallen/windbot /tmp/windbot && \
+    cd /tmp/windbot && \
+    xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5" && \
+    mv /tmp/windbot/bin/Release /ygopro-server/windbot && \
+    cp -rf /ygopro-server/ygopro/cards.cdb /ygopro-server/windbot/ && \
+    rm -rf /tmp/windbot
 
 # infos
 WORKDIR /ygopro-server

Dockerfile.lite

 # Dockerfile for SRVPro Lite
-FROM node:12-stretch-slim
+FROM node:12-buster-slim
 
 # apt
 RUN apt update && \
-    env DEBIAN_FRONTEND=noninteractive apt install -y wget git build-essential libsqlite3-dev libevent-dev p7zip-full
+    env DEBIAN_FRONTEND=noninteractive apt install -y wget git build-essential libsqlite3-dev libevent-dev p7zip-full && \
+    rm -rf /var/lib/apt/lists/*
 
 # srvpro
 COPY . /ygopro-server
@@ -11,18 +12,19 @@ WORKDIR /ygopro-server
 RUN npm ci && \
     mkdir config decks replays logs
 
-# ygopro
-RUN git clone --branch=server --recursive --depth=1 https://github.com/purerosefallen/ygopro /ygopro-server/ygopro
-WORKDIR /ygopro-server/ygopro
-RUN git submodule foreach git checkout master && \
+RUN git clone --branch=server --recursive --depth=1 https://github.com/purerosefallen/ygopro && \
+    cd ygopro && \
+    git submodule foreach git checkout master && \
     wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx - && \
     ./premake5 gmake && \
     cd build && \
-    make config=release && \
+    make config=release -j$(nproc) && \
     cd .. && \
-    ln -s ./bin/release/ygopro . && \
+    mv ./bin/release/ygopro . && \
     strip ygopro && \
-    mkdir replay expansions
+    mkdir replay expansions && \
+    rm -rf .git* bin obj build ocgcore cmake lua premake* sound textures .travis.yml *.txt appveyor.yml LICENSE README.md *.lua strings.conf system.conf && \
+    ls gframe | sed '/game.cpp/d' | xargs -I {} rm -rf gframe/{}
 
 # infos
 WORKDIR /ygopro-server

ygopro-server.coffee

@@ -1120,6 +1120,7 @@ class Room
     @turn = 0
     @duel_stage = ygopro.constants.DUEL_STAGE.BEGIN
     @replays = []
+    @first_list = []
     ROOM_all.push this
 
     @hostinfo ||= JSON.parse(JSON.stringify(settings.hostinfo))
@@ -1364,7 +1365,8 @@ class Room
         userscoreB: score_array[1].score,
         userdeckA: score_array[0].deck,
         userdeckB: score_array[1].deck,
-        replays: formatted_replays,
+        first: JSON.stringify(@first_list),
+        replays: JSON.stringify(formatted_replays),
         start: @start_time,
         end: end_time,
         arena: @arena
@@ -1689,13 +1691,13 @@ net.createServer (client) ->
     return
 
   server.on 'close', (had_error) ->
+    server.closed = true unless server.closed
+    if !server.client
+      return
     #log.info "server closed", server.client.name, had_error
     room=ROOM_all[server.client.rid]
     #log.info "server close", server.client.ip, ROOM_connected_ip[server.client.ip]
     room.disconnector = 'server' if room
-    server.closed = true unless server.closed
-    if !server.client
-      return
     unless server.client.closed
       ygopro.stoc_send_chat(server.client, "${server_closed}", ygopro.constants.COLORS.RED)
       #if room and settings.modules.replay_delay
@@ -1705,13 +1707,13 @@ net.createServer (client) ->
     return
 
   server.on 'error', (error)->
+    server.closed = error
+    if !server.client
+      return
     #log.info "server error", client.name, error
     room=ROOM_all[server.client.rid]
     #log.info "server err close", client.ip, ROOM_connected_ip[client.ip]
     room.disconnector = 'server' if room
-    server.closed = error
-    if !server.client
-      return
     unless server.client.closed
       ygopro.stoc_send_chat(server.client, "${server_error}: #{error}", ygopro.constants.COLORS.RED)
       #if room and settings.modules.replay_delay
@@ -1919,6 +1921,12 @@ net.createServer (client) ->
 if settings.modules.stop
   log.info "NOTE: server not open due to config, ", settings.modules.stop
 
+deck_name_match = global.deck_name_match = (deck_name, player_name) ->
+  if deck_name == player_name or deck_name == player_name + ".ydk" or deck_name == player_name + ".ydk.ydk"
+    return true
+  parsed_deck_name = deck_name.match(/^([^\+ \uff0b]+)[\+ \uff0b](.+?)(\.ydk){0,2}$/)
+  return parsed_deck_name and (player_name == parsed_deck_name[1] or player_name == parsed_deck_name[2])
+
 # 功能模块
 # return true to cancel a synchronous message
 
@@ -2193,7 +2201,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
           skip_track_visit: true
         json: true
       , (error, response, body)->
-        if body and body.user
+        if !error and body and body.user
           users_cache[client.name] = body.user.id
           secret = body.user.id % 65535 + 1
           decrypted_buffer = Buffer.allocUnsafe(6)
@@ -2201,6 +2209,10 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
             decrypted_buffer.writeUInt16LE(buffer.readUInt16LE(i) ^ secret, i)
           if check_buffer_indentity(decrypted_buffer)
             buffer = decrypted_buffer
+        else
+          log.warn("READ USER FAIL", error, body)
+          ygopro.stoc_die(client, "${create_room_failed}")
+          return
 
         # buffer != decrypted_buffer  ==> auth failed
 
@@ -2258,7 +2270,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
             return
           found = false
           for k,user of data
-            if user.participant and user.participant.name and _.endsWith(user.participant.name, client.name)
+            if user.participant and user.participant.name and deck_name_match(user.participant.name, client.name)
               found = user.participant
               break
           if !found
@@ -2589,6 +2601,8 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server, datas)->
   if ygopro.constants.MSG[msg] == 'START'
     playertype = buffer.readUInt8(1)
     client.is_first = !(playertype & 0xf)
+    if client.is_first and (room.hostinfo.mode != 2 or client.pos == 0 or client.pos == 2)
+      room.first_list[room.duel_count - 1] = client.name_vpass
     client.lp = room.hostinfo.start_lp
     client.card_count = 0 if room.hostinfo.mode != 2
     room.duel_stage = ygopro.constants.DUEL_STAGE.DUELING
@@ -3470,9 +3484,7 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server, datas)->
     found_deck=false
     decks=fs.readdirSync(settings.modules.tournament_mode.deck_path)
     for deck in decks
-      if _.endsWith(deck, client.name+".ydk")
-        found_deck=deck
-      if _.endsWith(deck, client.name+".ydk.ydk")
+      if deck_name_match(deck, client.name)
         found_deck=deck
     if found_deck
       deck_text=fs.readFileSync(settings.modules.tournament_mode.deck_path+found_deck,{encoding:"ASCII"})

ygopro-server.js

 // Generated by CoffeeScript 1.12.7
 (function() {
-  var CLIENT_check_vip, CLIENT_get_absolute_pos, CLIENT_get_authorize_key, CLIENT_get_kick_reconnect_target, CLIENT_get_partner, CLIENT_heartbeat_register, CLIENT_heartbeat_unregister, CLIENT_import_data, CLIENT_is_able_to_kick_reconnect, CLIENT_is_able_to_reconnect, CLIENT_is_banned_by_mc, CLIENT_is_player, CLIENT_kick, CLIENT_kick_reconnect, CLIENT_pre_reconnect, CLIENT_reconnect, CLIENT_reconnect_register, CLIENT_reconnect_unregister, CLIENT_send_pre_reconnect_info, CLIENT_send_reconnect_info, CLIENT_send_replays, CLIENT_send_vip_status, CLIENT_use_cdkey, Cloud_replay_ids, ROOM_all, ROOM_bad_ip, ROOM_ban_player, ROOM_clear_disconnect, ROOM_connected_ip, ROOM_find_by_name, ROOM_find_by_pid, ROOM_find_by_port, ROOM_find_by_title, ROOM_find_or_create_ai, ROOM_find_or_create_by_name, ROOM_find_or_create_random, ROOM_player_flee, ROOM_player_get_score, ROOM_player_lose, ROOM_player_win, ROOM_players_banned, ROOM_players_oppentlist, ROOM_players_scores, ROOM_unwelcome, ROOM_validate, Room, SERVER_clear_disconnect, SOCKET_flush_data, VIP_generate_cdkeys, _, addCallback, auth, badwords, ban_user, bunyan, challonge, challonge_cache, challonge_module_name, challonge_queue_callbacks, chat_color, concat_name, config, cppversion, crypto, date, default_config, default_data, dialogues, disconnect_list, dns, duel_log, e, exec, execFile, fs, geoip, get_callback, get_memory_usage, http, http_server, https, https_server, import_datas, imported, is_requesting, j, k, l, len, len1, len2, lflists, list, loadJSON, load_dialogues, load_dialogues_custom, load_tips, load_tips_zh, load_words, log, long_resolve_cards, m, memory_usage, merge, moment, net, oldbadwords, oldconfig, olddialogues, oldduellog, oldtips, oldwords, options, os, path, pgClient, pg_client, pg_query, plugin_filename, plugin_list, plugin_path, real_windbot_server_ip, rebooted, redis, redisdb, ref, ref1, ref2, refresh_challonge_cache, release_disconnect, report_to_big_brother, request, requestListener, roomlist, setting_change, setting_save, settings, spawn, spawnSync, spawn_windbot, tips, url, users_cache, v, vip_info, wait_room_start, wait_room_start_arena, windbot_looplimit, windbot_process, windbots, words, ygopro, zlib;
+  var CLIENT_check_vip, CLIENT_get_absolute_pos, CLIENT_get_authorize_key, CLIENT_get_kick_reconnect_target, CLIENT_get_partner, CLIENT_heartbeat_register, CLIENT_heartbeat_unregister, CLIENT_import_data, CLIENT_is_able_to_kick_reconnect, CLIENT_is_able_to_reconnect, CLIENT_is_banned_by_mc, CLIENT_is_player, CLIENT_kick, CLIENT_kick_reconnect, CLIENT_pre_reconnect, CLIENT_reconnect, CLIENT_reconnect_register, CLIENT_reconnect_unregister, CLIENT_send_pre_reconnect_info, CLIENT_send_reconnect_info, CLIENT_send_replays, CLIENT_send_vip_status, CLIENT_use_cdkey, Cloud_replay_ids, ROOM_all, ROOM_bad_ip, ROOM_ban_player, ROOM_clear_disconnect, ROOM_connected_ip, ROOM_find_by_name, ROOM_find_by_pid, ROOM_find_by_port, ROOM_find_by_title, ROOM_find_or_create_ai, ROOM_find_or_create_by_name, ROOM_find_or_create_random, ROOM_player_flee, ROOM_player_get_score, ROOM_player_lose, ROOM_player_win, ROOM_players_banned, ROOM_players_oppentlist, ROOM_players_scores, ROOM_unwelcome, ROOM_validate, Room, SERVER_clear_disconnect, SOCKET_flush_data, VIP_generate_cdkeys, _, addCallback, auth, badwords, ban_user, bunyan, challonge, challonge_cache, challonge_module_name, challonge_queue_callbacks, chat_color, concat_name, config, cppversion, crypto, date, deck_name_match, default_config, default_data, dialogues, disconnect_list, dns, duel_log, e, exec, execFile, fs, geoip, get_callback, get_memory_usage, http, http_server, https, https_server, import_datas, imported, is_requesting, j, k, l, len, len1, len2, lflists, list, loadJSON, load_dialogues, load_dialogues_custom, load_tips, load_tips_zh, load_words, log, long_resolve_cards, m, memory_usage, merge, moment, net, oldbadwords, oldconfig, olddialogues, oldduellog, oldtips, oldwords, options, os, path, pgClient, pg_client, pg_query, plugin_filename, plugin_list, plugin_path, real_windbot_server_ip, rebooted, redis, redisdb, ref, ref1, ref2, refresh_challonge_cache, release_disconnect, report_to_big_brother, request, requestListener, roomlist, setting_change, setting_save, settings, spawn, spawnSync, spawn_windbot, tips, url, users_cache, v, vip_info, wait_room_start, wait_room_start_arena, windbot_looplimit, windbot_process, windbots, words, ygopro, zlib;
 
   net = require('net');
 
@@ -1454,6 +1454,7 @@
       this.turn = 0;
       this.duel_stage = ygopro.constants.DUEL_STAGE.BEGIN;
       this.replays = [];
+      this.first_list = [];
       ROOM_all.push(this);
       this.hostinfo || (this.hostinfo = JSON.parse(JSON.stringify(settings.hostinfo)));
       delete this.hostinfo.comment;
@@ -1781,7 +1782,8 @@
             userscoreB: score_array[1].score,
             userdeckA: score_array[0].deck,
             userdeckB: score_array[1].deck,
-            replays: formatted_replays,
+            first: JSON.stringify(this.first_list),
+            replays: JSON.stringify(formatted_replays),
             start: this.start_time,
             end: end_time,
             arena: this.arena
@@ -2208,16 +2210,16 @@
     });
     server.on('close', function(had_error) {
       var room;
-      room = ROOM_all[server.client.rid];
-      if (room) {
-        room.disconnector = 'server';
-      }
       if (!server.closed) {
         server.closed = true;
       }
       if (!server.client) {
         return;
       }
+      room = ROOM_all[server.client.rid];
+      if (room) {
+        room.disconnector = 'server';
+      }
       if (!server.client.closed) {
         ygopro.stoc_send_chat(server.client, "${server_closed}", ygopro.constants.COLORS.RED);
         CLIENT_kick(server.client);
@@ -2226,14 +2228,14 @@
     });
     server.on('error', function(error) {
       var room;
-      room = ROOM_all[server.client.rid];
-      if (room) {
-        room.disconnector = 'server';
-      }
       server.closed = error;
       if (!server.client) {
         return;
       }
+      room = ROOM_all[server.client.rid];
+      if (room) {
+        room.disconnector = 'server';
+      }
       if (!server.client.closed) {
         ygopro.stoc_send_chat(server.client, "${server_error}: " + error, ygopro.constants.COLORS.RED);
         CLIENT_kick(server.client);
@@ -2487,6 +2489,15 @@
     log.info("NOTE: server not open due to config, ", settings.modules.stop);
   }
 
+  deck_name_match = global.deck_name_match = function(deck_name, player_name) {
+    var parsed_deck_name;
+    if (deck_name === player_name || deck_name === player_name + ".ydk" || deck_name === player_name + ".ydk.ydk") {
+      return true;
+    }
+    parsed_deck_name = deck_name.match(/^([^\+ \uff0b]+)[\+ \uff0b](.+?)(\.ydk){0,2}$/);
+    return parsed_deck_name && (player_name === parsed_deck_name[1] || player_name === parsed_deck_name[2]);
+  };
+
   ygopro.ctos_follow('PLAYER_INFO', true, function(buffer, info, client, server, datas) {
     var geo, lang, name, name_full, struct, vpass;
     name_full = info.name.split("$");
@@ -2791,7 +2802,7 @@
           json: true
         }, function(error, response, body) {
           var len3, n, ref4;
-          if (body && body.user) {
+          if (!error && body && body.user) {
             users_cache[client.name] = body.user.id;
             secret = body.user.id % 65535 + 1;
             decrypted_buffer = Buffer.allocUnsafe(6);
@@ -2803,6 +2814,10 @@
             if (check_buffer_indentity(decrypted_buffer)) {
               buffer = decrypted_buffer;
             }
+          } else {
+            log.warn("READ USER FAIL", error, body);
+            ygopro.stoc_die(client, "${create_room_failed}");
+            return;
           }
           if (!check_buffer_indentity(buffer)) {
             ygopro.stoc_die(client, '${invalid_password_checksum}');
@@ -2869,7 +2884,7 @@
             found = false;
             for (k in data) {
               user = data[k];
-              if (user.participant && user.participant.name && _.endsWith(user.participant.name, client.name)) {
+              if (user.participant && user.participant.name && deck_name_match(user.participant.name, client.name)) {
                 found = user.participant;
                 break;
               }
@@ -3255,6 +3270,9 @@
     if (ygopro.constants.MSG[msg] === 'START') {
       playertype = buffer.readUInt8(1);
       client.is_first = !(playertype & 0xf);
+      if (client.is_first && (room.hostinfo.mode !== 2 || client.pos === 0 || client.pos === 2)) {
+        room.first_list[room.duel_count - 1] = client.name_vpass;
+      }
       client.lp = room.hostinfo.start_lp;
       if (room.hostinfo.mode !== 2) {
         client.card_count = 0;
@@ -4491,10 +4509,7 @@
       decks = fs.readdirSync(settings.modules.tournament_mode.deck_path);
       for (m = 0, len2 = decks.length; m < len2; m++) {
         deck = decks[m];
-        if (_.endsWith(deck, client.name + ".ydk")) {
-          found_deck = deck;
-        }
-        if (_.endsWith(deck, client.name + ".ydk.ydk")) {
+        if (deck_name_match(deck, client.name)) {
           found_deck = deck;
         }
       }