Merge branch 'master' into koishi

ygopro-server.coffee

@@ -249,6 +249,7 @@ geoip = null
 dataManager = null
 windbots = []
 disconnect_list = {} # {old_client, old_server, room_id, timeout, deckbuf}
+extra_mode_list = global.extra_mode_list = [] # (rule) => void, with 'this' is ROOM 
 
 moment_now = global.moment_now = null
 moment_now_string = global.moment_now_string = null
@@ -731,9 +732,10 @@ init = () ->
 
   plugin_list = await fs.promises.readdir("./plugins")
   for plugin_filename in plugin_list
-    plugin_path = process.cwd() + "/plugins/" + plugin_filename
-    require(plugin_path)
-    log.info("Plugin loaded:", plugin_filename)
+    if plugin_filename.endsWith '.js'
+      plugin_path = process.cwd() + "/plugins/" + plugin_filename
+      require(plugin_path)
+      log.info("Plugin loaded:", plugin_filename)
 
   return
 
@@ -1447,6 +1449,9 @@ class Room
         lflist = parseInt(param[3]) - 1
         @hostinfo.lflist = lflist
 
+      for extra_mode_func from extra_mode_list
+        extra_mode_func.call this, rule
+
       if (rule.match /(^|，|,)(NOLFLIST|NF)(，|,|$)/)
         @hostinfo.lflist = -1
 

ygopro-server.js

 // Generated by CoffeeScript 2.7.0
 (function() {
   // 标准库
-  var CLIENT_check_vip, CLIENT_get_absolute_pos, CLIENT_get_authorize_key, CLIENT_get_kick_reconnect_target, CLIENT_get_partner, CLIENT_get_save_data, 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_replays_and_kick, CLIENT_send_vip_status, CLIENT_use_cdkey, Q, 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_kick, ROOM_player_flee, ROOM_player_get_score, ROOM_player_lose, ROOM_player_win, ROOM_players_oppentlist, ROOM_unwelcome, ROOM_validate, ReplayParser, ResolveData, Room, SERVER_clear_disconnect, SERVER_kick, SOCKET_flush_data, VIP_generate_cdkeys, _, _async, addCallback, athleticChecker, auth, axios, badwordR, badwords, ban_user, bunyan, challonge, checkFileExists, concat_name, createDirectoryIfNotExists, crypto, dataManager, deck_name_match, dialogues, disconnect_list, exec, execFile, fs, geoip, getDuelLogQueryFromQs, getSeedTimet, get_memory_usage, http, httpRequestListener, importOldConfig, import_datas, init, ip6addr, lflists, loadJSON, loadJSONAsync, loadLFList, loadRemoteData, load_dialogues, load_dialogues_custom, load_tips, load_tips_zh, load_words, log, long_resolve_cards, memory_usage, merge, moment, moment_long_ago_string, moment_now, moment_now_string, neosRequestListener, net, netRequestHandler, os, osu, path, qs, real_windbot_server_ip, release_disconnect, report_to_big_brother, request, roomlist, rooms_count, setting_change, setting_get, setting_save, settings, spawn, spawnSync, spawn_windbot, tips, url, users_cache, util, 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_get_save_data, 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_replays_and_kick, CLIENT_send_vip_status, CLIENT_use_cdkey, Q, 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_kick, ROOM_player_flee, ROOM_player_get_score, ROOM_player_lose, ROOM_player_win, ROOM_players_oppentlist, ROOM_unwelcome, ROOM_validate, ReplayParser, ResolveData, Room, SERVER_clear_disconnect, SERVER_kick, SOCKET_flush_data, VIP_generate_cdkeys, _, _async, addCallback, athleticChecker, auth, axios, badwordR, badwords, ban_user, bunyan, challonge, checkFileExists, concat_name, createDirectoryIfNotExists, crypto, dataManager, deck_name_match, dialogues, disconnect_list, exec, execFile, extra_mode_list, fs, geoip, getDuelLogQueryFromQs, getSeedTimet, get_memory_usage, http, httpRequestListener, importOldConfig, import_datas, init, ip6addr, lflists, loadJSON, loadJSONAsync, loadLFList, loadRemoteData, load_dialogues, load_dialogues_custom, load_tips, load_tips_zh, load_words, log, long_resolve_cards, memory_usage, merge, moment, moment_long_ago_string, moment_now, moment_now_string, neosRequestListener, net, netRequestHandler, os, osu, path, qs, real_windbot_server_ip, release_disconnect, report_to_big_brother, request, roomlist, rooms_count, setting_change, setting_get, setting_save, settings, spawn, spawnSync, spawn_windbot, tips, url, users_cache, util, wait_room_start, wait_room_start_arena, windbot_looplimit, windbot_process, windbots, words, ygopro, zlib;
 
   net = require('net');
 
@@ -314,6 +314,8 @@
 
   disconnect_list = {}; // {old_client, old_server, room_id, timeout, deckbuf}
 
+  extra_mode_list = global.extra_mode_list = []; // (rule) => void, with 'this' is ROOM 
+
   moment_now = global.moment_now = null;
 
   moment_now_string = global.moment_now_string = null;
@@ -927,9 +929,11 @@
     plugin_list = (await fs.promises.readdir("./plugins"));
     for (m = 0, len2 = plugin_list.length; m < len2; m++) {
       plugin_filename = plugin_list[m];
-      plugin_path = process.cwd() + "/plugins/" + plugin_filename;
-      require(plugin_path);
-      log.info("Plugin loaded:", plugin_filename);
+      if (plugin_filename.endsWith('.js')) {
+        plugin_path = process.cwd() + "/plugins/" + plugin_filename;
+        require(plugin_path);
+        log.info("Plugin loaded:", plugin_filename);
+      }
     }
   };
 
@@ -1706,7 +1710,7 @@
 
   Room = class Room {
     constructor(name, hostinfo) {
-      var death_time, draw_count, duel_rule, lflist, param, rule, start_hand, start_lp, time_limit;
+      var death_time, draw_count, duel_rule, extra_mode_func, lflist, param, rule, start_hand, start_lp, time_limit;
       this.hostinfo = hostinfo;
       this.name = name;
       //@alive = true
@@ -1883,6 +1887,9 @@
           lflist = parseInt(param[3]) - 1;
           this.hostinfo.lflist = lflist;
         }
+        for (extra_mode_func of extra_mode_list) {
+          extra_mode_func.call(this, rule);
+        }
         if (rule.match(/(^|，|,)(NOLFLIST|NF)(，|,|$)/)) {
           this.hostinfo.lflist = -1;
         }