Merge branch 'master' of github.com:moecube/srvpro

ygopro-server.coffee

@@ -1329,8 +1329,8 @@ class Room
         userscoreB: score_array[1].score,
         userdeckA: score_array[0].deck,
         userdeckB: score_array[1].deck,
-        first: @first_list,
-        replays: formatted_replays,
+        first: JSON.stringify(@first_list),
+        replays: JSON.stringify(formatted_replays),
         start: @start_time,
         end: end_time,
         arena: @arena
@@ -1655,13 +1655,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
@@ -1671,13 +1671,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
@@ -1885,6 +1885,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(/^([^\+]+)[\+ ](.+?)(\.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
 
@@ -2228,7 +2234,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
@@ -3437,9 +3443,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');
 
@@ -1738,8 +1738,8 @@
             userscoreB: score_array[1].score,
             userdeckA: score_array[0].deck,
             userdeckB: score_array[1].deck,
-            first: this.first_list,
-            replays: formatted_replays,
+            first: JSON.stringify(this.first_list),
+            replays: JSON.stringify(formatted_replays),
             start: this.start_time,
             end: end_time,
             arena: this.arena
@@ -2166,16 +2166,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);
@@ -2184,14 +2184,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);
@@ -2445,6 +2445,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(/^([^\+]+)[\+ ](.+?)(\.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("$");
@@ -2831,7 +2840,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;
               }
@@ -4450,10 +4459,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;
         }
       }