X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=blobdiff_plain;f=shogi-server;h=23dde67a280b09b6af72dc68a4bf8b7a1993c30e;hp=1cbd3876173b51eb16fee1f93096c432b55841d3;hb=c94895ebd4aeb6b7c0ab72e379ddb9615ea8fed7;hpb=cc7957d8baa16d6163d658180938d08f1445b28b diff --git a/shogi-server b/shogi-server index 1cbd387..23dde67 100755 --- a/shogi-server +++ b/shogi-server @@ -2,6 +2,7 @@ ## $Id$ ## Copyright (C) 2004 NABEYA Kenichi (aka nanami@2ch) +## Copyright (C) 2007-2008 Daigo Moriwaki (daigo at debian dot org) ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -17,23 +18,6 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Max_Write_Queue_Size = 1000 -Max_Identifier_Length = 32 -Default_Timeout = 60 # for single socket operation - -Default_Game_Name = "default-1500-0" - -One_Time = 10 -Least_Time_Per_Move = 1 -Login_Time = 300 # time for LOGIN - -Release = "$Name$".split[1].sub(/\A[^\d]*/, '').gsub(/_/, '.') -Release.concat("-") if (Release == "") -Revision = "$Revision$".gsub(/[^\.\d]/, '') - -STDOUT.sync = true -STDERR.sync = true - require 'getoptlong' require 'thread' require 'timeout' @@ -41,9 +25,8 @@ require 'socket' require 'yaml' require 'yaml/store' require 'digest/md5' - -TCPSocket.do_not_reverse_lookup = true -Thread.abort_on_exception = true +require 'webrick' +require 'fileutils' class TCPSocket @@ -61,16 +44,19 @@ class TCPSocket def gets_safe(t = nil) if (t && t > 0) begin + return :exception if closed? timeout(t) do return self.gets end rescue TimeoutError return :timeout - rescue - return nil + rescue Exception => ex + log_error("#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}") + return :exception end else begin + return nil if closed? return self.gets rescue return nil @@ -87,50 +73,190 @@ class TCPSocket end +module ShogiServer # for a namespace + +Max_Write_Queue_Size = 1000 +Max_Identifier_Length = 32 +Default_Timeout = 60 # for single socket operation + +Default_Game_Name = "default-1500-0" + +One_Time = 10 +Least_Time_Per_Move = 1 +Login_Time = 300 # time for LOGIN + +Release = "$Name$".split[1].sub(/\A[^\d]*/, '').gsub(/_/, '.') +Release.concat("-") if (Release == "") +Revision = "$Revision$".gsub(/[^\.\d]/, '') + class League + + class Floodgate + class << self + def game_name?(str) + return /^floodgate-\d+-\d+$/.match(str) ? true : false + end + end + + def initialize(league) + @league = league + @next_time = nil + charge + end + + def run + @thread = Thread.new do + Thread.pass + while (true) + begin + sleep(10) + next if Time.now < @next_time + @league.reload + match_game + charge + rescue Exception => ex + # ignore errors + log_error("[in Floodgate's thread] #{ex}") + end + end + end + end + + def shutdown + @thread.kill if @thread + end + + # private + + def charge + now = Time.now + if now.min < 30 + @next_time = Time.mktime(now.year, now.month, now.day, now.hour, 30) + else + @next_time = Time.mktime(now.year, now.month, now.day, now.hour) + 3600 + end + # for test + # if now.sec < 30 + # @next_time = Time.mktime(now.year, now.month, now.day, now.hour, now.min, 30) + # else + # @next_time = Time.mktime(now.year, now.month, now.day, now.hour, now.min) + 60 + # end + end + + def match_game + players = @league.find_all_players do |pl| + pl.status == "game_waiting" && + Floodgate.game_name?(pl.game_name) && + pl.sente == nil + end + load File.join(File.dirname(__FILE__), "pairing.rb") + Pairing.default_pairing.match(players) + end + end # class Floodgate + def initialize + @mutex = Mutex.new # guard @players @games = Hash::new @players = Hash::new @event = nil - @db = YAML::Store.new( File.join(File.dirname(__FILE__), "players.yaml") ) + @dir = File.dirname(__FILE__) + @floodgate = Floodgate.new(self) + @floodgate.run + end + attr_accessor :players, :games, :event, :dir + + def shutdown + @mutex.synchronize do + @players.each {|a| save(a)} + end + @floodgate.shutdown + end + + # this should be called just after instanciating a League object. + def setup_players_database + @db = YAML::Store.new(File.join(@dir, "players.yaml")) end - attr_accessor :players, :games, :event def add(player) self.load(player) if player.id - @players[player.name] = player + @mutex.synchronize do + @players[player.name] = player + end end def delete(player) - @players.delete(player.name) + @mutex.synchronize do + save(player) + @players.delete(player.name) + end + end + + def reload + @mutex.synchronize do + @players.each {|player| load(player)} + end + end + + def find_all_players + found = nil + @mutex.synchronize do + found = @players.find_all do |name, player| + yield player + end + end + return found.map {|a| a.last} end - def get_player(status, game_name, sente, searcher=nil) - @players.each do |name, player| - if ((player.status == status) && - (player.game_name == game_name) && - ((sente == nil) || (player.sente == nil) || (player.sente == sente)) && - ((searcher == nil) || (player != searcher))) - return player + def get_player(status, game_name, sente, searcher) + found = nil + @mutex.synchronize do + found = @players.find do |name, player| + (player.status == status) && + (player.game_name == game_name) && + ( (sente == nil) || + (player.sente == nil) || + (player.sente == sente) ) && + (player.name != searcher.name) end end - return nil + return found ? found.last : nil end def load(player) hash = search(player.id) - if hash - # a current user - player.name = hash['name'] - player.rate = hash['rate'] - player.modified_at = hash['modified_at'] + return unless hash + + # a current user + player.name = hash['name'] + player.rate = hash['rate'] || 0 + player.modified_at = hash['last_modified'] + player.rating_group = hash['rating_group'] + player.win = hash['win'] || 0 + player.loss = hash['loss'] || 0 + player.last_game_win = hash['last_game_win'] || false + end + + def save(player) + @db.transaction do + break unless @db["players"] + @db["players"].each do |group, players| + hash = players[player.id] + if hash + hash['last_game_win'] = player.last_game_win + break + end + end end end def search(id) hash = nil - @db.transaction do - hash = @db[id] + @db.transaction(true) do + break unless @db["players"] + @db["players"].each do |group, players| + hash = players[id] + break if hash + end end hash end @@ -138,12 +264,13 @@ class League def rated_players players = [] @db.transaction(true) do - @db.roots.each do |id| - players << id + break unless @db["players"] + @db["players"].each do |group, players_hash| + players << players_hash.keys end end - return players.collect do |id| - p = RatedPlayer.new + return players.flatten.collect do |id| + p = BasicPlayer.new p.id = id self.load(p) p @@ -152,16 +279,158 @@ class League end -class RatedPlayer +###################################################### +# Processes the LOGIN command. +# +class Login + def Login.good_login?(str) + tokens = str.split + if (((tokens.length == 3) || ((tokens.length == 4) && tokens[3] == "x1")) && + (tokens[0] == "LOGIN") && + (good_identifier?(tokens[1]))) + return true + else + return false + end + end + + def Login.good_game_name?(str) + if ((str =~ /^(.+)-\d+-\d+$/) && (good_identifier?($1))) + return true + else + return false + end + end + + def Login.good_identifier?(str) + if str =~ /\A[\w\d_@\-\.]{1,#{Max_Identifier_Length}}\z/ + return true + else + return false + end + end + + def Login.factory(str, player) + (login, player.name, password, ext) = str.chomp.split + if (ext) + return Loginx1.new(player, password) + else + return LoginCSA.new(player, password) + end + end + + attr_reader :player + + # the first command that will be executed just after LOGIN. + # If it is nil, the default process will be started. + attr_reader :csa_1st_str + + def initialize(player, password) + @player = player + @csa_1st_str = nil + parse_password(password) + end + + def process + @player.write_safe(sprintf("LOGIN:%s OK\n", @player.name)) + log_message(sprintf("user %s run in %s mode", @player.name, @player.protocol)) + end + + def incorrect_duplicated_player(str) + @player.write_safe("LOGIN:incorrect\n") + @player.write_safe(sprintf("username %s is already connected\n", @player.name)) if (str.split.length >= 4) + sleep 3 # wait for sending the above messages. + @player.name = "%s [duplicated]" % [@player.name] + @player.finish + end +end + +###################################################### +# Processes LOGIN for the CSA standard mode. +# +class LoginCSA < Login + PROTOCOL = "CSA" + + def initialize(player, password) + @gamename = nil + super + @player.protocol = PROTOCOL + end + + def parse_password(password) + if Login.good_game_name?(password) + @gamename = password + @player.set_password(nil) + elsif password.split(",").size > 1 + @gamename, *trip = password.split(",") + @player.set_password(trip.join(",")) + else + @player.set_password(password) + @gamename = Default_Game_Name + end + @gamename = self.class.good_game_name?(@gamename) ? @gamename : Default_Game_Name + end + + def process + super + @csa_1st_str = "%%GAME #{@gamename} *" + end +end + +###################################################### +# Processes LOGIN for the extented mode. +# +class Loginx1 < Login + PROTOCOL = "x1" + + def initialize(player, password) + super + @player.protocol = PROTOCOL + end + + def parse_password(password) + @player.set_password(password) + end + + def process + super + @player.write_safe(sprintf("##[LOGIN] +OK %s\n", PROTOCOL)) + end +end + + +class BasicPlayer + def initialize + @id = nil + @name = nil + @password = nil + @last_game_win = false + end + # Idetifier of the player in the rating system attr_accessor :id + # Name of the player attr_accessor :name + + # Password of the player, which does not include a trip + attr_accessor :password + # Score in the rating sysem attr_accessor :rate + + # Number of games for win and loss in the rating system + attr_accessor :win, :loss + + # Group in the rating system + attr_accessor :rating_group + # Last timestamp when the rate was modified attr_accessor :modified_at + # Whether win the previous game or not + attr_accessor :last_game_win + def modified_at @modified_at || Time.now end @@ -176,12 +445,37 @@ class RatedPlayer def rated? @id != nil end + + def last_game_win? + return @last_game_win + end + + def simple_id + if @trip + simple_name = @name.gsub(/@.*?$/, '') + "%s+%s" % [simple_name, @trip[0..8]] + else + @name + end + end + + ## + # Parses str in the LOGIN command, sets up @id and @trip + # + def set_password(str) + if str && !str.empty? + @password = str.strip + @id = "%s+%s" % [@name, Digest::MD5.hexdigest(@password)] + else + @id = @password = nil + end + end end -class Player < RatedPlayer + +class Player < BasicPlayer def initialize(str, socket) - @name = nil - @password = nil + super() @socket = socket @status = "connected" # game_waiting -> agree_waiting -> start_waiting -> game -> finished @@ -191,13 +485,15 @@ class Player < RatedPlayer @game_name = "" @mytime = 0 # set in start method also @sente = nil - @writer_thread = nil - @main_thread = nil @write_queue = Queue::new - login(str) + @main_thread = Thread::current + @writer_thread = Thread::start do + Thread.pass + writer() + end end - attr_accessor :password, :socket, :status + attr_accessor :socket, :status attr_accessor :protocol, :eol, :game, :mytime, :game_name, :sente attr_accessor :main_thread, :writer_thread, :write_queue @@ -214,9 +510,10 @@ class Player < RatedPlayer if (@status != "finished") @status = "finished" log_message(sprintf("user %s finish", @name)) + # TODO you should confirm that there is no message in the queue. Thread::kill(@writer_thread) if @writer_thread begin - @socket.close if (! @socket.closed?) +# @socket.close if (! @socket.closed?) rescue log_message(sprintf("user %s finish failed", @name)) end @@ -229,7 +526,13 @@ class Player < RatedPlayer def writer while (str = @write_queue.pop) - @socket.write_safe(str) + begin + @socket.write(str) + rescue Exception => ex + log_error("Failed to send a message to #{@name}.") + log_error("#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}") + return + end end end @@ -250,45 +553,16 @@ class Player < RatedPlayer end end - def write_help - @socket.write_safe('##[HELP] available commands "%%WHO", "%%CHAT str", "%%GAME game_name +", "%%GAME game_name -"') - end - - def login(str) - str =~ /([\r\n]*)$/ - @eol = $1 - str.chomp! - (login, @name, @password, ext) = str.split - @name, trip = @name.split(",") # used by rating - @id = trip ? "%s+%s" % [@name, Digest::MD5.hexdigest(trip)] : nil - if (ext) - @protocol = "x1" - else - @protocol = "CSA" - end - @main_thread = Thread::current - @writer_thread = Thread::start do - writer() - end - end - - def run - write_safe(sprintf("LOGIN:%s OK\n", @name)) - if (@protocol != "CSA") - log_message(sprintf("user %s run in %s mode", @name, @protocol)) - write_safe(sprintf("##[LOGIN] +OK %s\n", @protocol)) - else - log_message(sprintf("user %s run in CSA mode", @name)) - if (good_game_name?(@password)) - csa_1st_str = "%%GAME #{@password} *" - else - csa_1st_str = "%%GAME #{Default_Game_Name} *" - end - end - + def run(csa_1st_str=nil) while (csa_1st_str || (str = @socket.gets_safe(Default_Timeout))) begin $mutex.lock + + if (@writer_thread == nil || !@writer_thread.status) + # The writer_thread has been killed because of socket errors. + return + end + if (csa_1st_str) str = csa_1st_str csa_1st_str = nil @@ -301,8 +575,14 @@ class Player < RatedPlayer if (@status == "finished") return end - str.chomp! if (str.class == String) - case str + str.chomp! if (str.class == String) # may be strip! ? + log_message(str) if $DEBUG + case str + when "" + # Application-level protocol for Keep-Alive + # If the server gets LF, it sends back LF. + # 30 sec rule (client may not send LF again within 30 sec) is not implemented yet. + write_safe("\n") when /^[\+\-][^%]/ if (@status == "game") array_str = str.split(",") @@ -313,17 +593,28 @@ class Player < RatedPlayer end s = @game.handle_one_move(move, self) @game.fh.print("#{comment}\n") if (comment && !s) - return if (s && @protocol == "CSA") + return if (s && @protocol == LoginCSA::PROTOCOL) end when /^%[^%]/, :timeout if (@status == "game") s = @game.handle_one_move(str, self) - return if (s && @protocol == "CSA") + return if (s && @protocol == LoginCSA::PROTOCOL) + # else + # begin + # @socket.write("##[KEEPALIVE] #{Time.now}\n") + # rescue Exception => ex + # log_error("Failed to send a keepalive to #{@name}.") + # log_error("#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}") + # return + # end end + when :exception + log_error("Failed to receive a message from #{@name}.") + return when /^REJECT/ if (@status == "agree_waiting") @game.reject(@name) - return if (@protocol == "CSA") + return if (@protocol == LoginCSA::PROTOCOL) else write_safe(sprintf("##[ERROR] you are in %s status. AGREE is valid in agree_waiting status\n", @status)) end @@ -358,13 +649,18 @@ class Player < RatedPlayer LEAGUE.games[game_id].monitoroff(self) end when /^%%HELP/ - write_help + write_safe( + %!##[HELP] available commands "%%WHO", "%%CHAT str", "%%GAME game_name +", "%%GAME game_name -"\n!) when /^%%RATING/ players = LEAGUE.rated_players players.sort {|a,b| b.rate <=> a.rate}.each do |p| - write_safe("%s (%s) \t %4d @%s\n" % - [p.name, p.id, p.rate, p.modified_at.strftime("%Y-%m-%d")]) + write_safe("##[RATING] %s \t %4d @%s\n" % + [p.simple_id, p.rate, p.modified_at.strftime("%Y-%m-%d")]) end + write_safe("##[RATING] +OK\n") + when /^%%VERSION/ + write_safe "##[VERSION] Shogi Server revision #{Revision}\n" + write_safe("##[VERSION] +OK\n") when /^%%GAME\s*$/ if ((@status == "connected") || (@status == "game_waiting")) @status = "connected" @@ -376,7 +672,7 @@ class Player < RatedPlayer command_name = $1 game_name = $2 my_sente_str = $3 - if (! good_game_name?(game_name)) + if (! Login::good_game_name?(game_name)) write_safe(sprintf("##[ERROR] bad game name\n")) next elsif ((@status == "connected") || (@status == "game_waiting")) @@ -385,24 +681,28 @@ class Player < RatedPlayer write_safe(sprintf("##[ERROR] you are in %s status. GAME is valid in connected or game_waiting status\n", @status)) next end - if ((my_sente_str == "*") || - (my_sente_str == "+") || - (my_sente_str == "-")) - ## ok - else - write_safe(sprintf("##[ERROR] bad game option\n")) - next - end - if (my_sente_str == "*") - rival = LEAGUE.get_player("game_waiting", game_name, nil, self) # no preference - elsif (my_sente_str == "+") - rival = LEAGUE.get_player("game_waiting", game_name, false, self) # rival must be gote - elsif (my_sente_str == "-") - rival = LEAGUE.get_player("game_waiting", game_name, true, self) # rival must be sente + rival = nil + if (League::Floodgate.game_name?(game_name)) + if (my_sente_str != "*") + write_safe(sprintf("##[ERROR] You are not allowed to specify TEBAN %s for the game %s\n", my_sente_str, game_name)) + next + end + @sente = nil else - ## never reached + if (my_sente_str == "*") + rival = LEAGUE.get_player("game_waiting", game_name, nil, self) # no preference + elsif (my_sente_str == "+") + rival = LEAGUE.get_player("game_waiting", game_name, false, self) # rival must be gote + elsif (my_sente_str == "-") + rival = LEAGUE.get_player("game_waiting", game_name, true, self) # rival must be sente + else + ## never reached + write_safe(sprintf("##[ERROR] bad game option\n")) + next + end end + if (rival) @game_name = game_name if ((my_sente_str == "*") && (rival.sente == nil)) @@ -427,8 +727,6 @@ class Player < RatedPlayer ## never reached end Game::new(@game_name, self, rival) - self.status = "agree_waiting" - rival.status = "agree_waiting" else # rival not found if (command_name == "GAME") @status = "game_waiting" @@ -450,7 +748,7 @@ class Player < RatedPlayer when /^%%CHAT\s+(.+)/ message = $1 LEAGUE.players.each do |name, player| - if (player.protocol != "CSA") + if (player.protocol != LoginCSA::PROTOCOL) player.write_safe(sprintf("##[CHAT][%s] %s\n", @name, message)) end end @@ -472,17 +770,23 @@ class Player < RatedPlayer @status = "connected" write_safe("LOGOUT:completed\n") return + when /^CHALLENGE/ + # This command is only available for CSA's official testing server. + # So, this means nothing for this program. + write_safe("CHALLENGE ACCEPTED\n") when /^\s*$/ ## ignore null string else - write_safe(sprintf("##[ERROR] unknown command %s\n", str)) + msg = "##[ERROR] unknown command %s\n" % [str] + write_safe(msg) + log_error(msg) end ensure $mutex.unlock end - end # enf of while - end -end + end # enf of while + end # def run +end # class class Piece PROMOTE = {"FU" => "TO", "KY" => "NY", "KE" => "NK", "GI" => "NG", "KA" => "UM", "HI" => "RY"} @@ -862,10 +1166,10 @@ end class Board def initialize @sente_hands = Array::new - @gote_hands = Array::new - @history = Hash::new - @sente_history = Hash::new - @gote_history = Hash::new + @gote_hands = Array::new + @history = Hash::new(0) + @sente_history = Hash::new(0) + @gote_history = Hash::new(0) @array = [[], [], [], [], [], [], [], [], [], []] @move_count = 0 end @@ -884,15 +1188,9 @@ class Board PieceKY::new(self, 9, 1, false) PieceKA::new(self, 2, 2, false) PieceHI::new(self, 8, 2, false) - PieceFU::new(self, 1, 3, false) - PieceFU::new(self, 2, 3, false) - PieceFU::new(self, 3, 3, false) - PieceFU::new(self, 4, 3, false) - PieceFU::new(self, 5, 3, false) - PieceFU::new(self, 6, 3, false) - PieceFU::new(self, 7, 3, false) - PieceFU::new(self, 8, 3, false) - PieceFU::new(self, 9, 3, false) + (1..9).each do |i| + PieceFU::new(self, i, 3, false) + end PieceKY::new(self, 1, 9, true) PieceKE::new(self, 2, 9, true) @@ -905,15 +1203,9 @@ class Board PieceKY::new(self, 9, 9, true) PieceKA::new(self, 8, 8, true) PieceHI::new(self, 2, 8, true) - PieceFU::new(self, 1, 7, true) - PieceFU::new(self, 2, 7, true) - PieceFU::new(self, 3, 7, true) - PieceFU::new(self, 4, 7, true) - PieceFU::new(self, 5, 7, true) - PieceFU::new(self, 6, 7, true) - PieceFU::new(self, 7, 7, true) - PieceFU::new(self, 8, 7, true) - PieceFU::new(self, 9, 7, true) + (1..9).each do |i| + PieceFU::new(self, i, 7, true) + end end def have_piece?(hands, name) @@ -932,20 +1224,20 @@ class Board if ((x0 == 0) || (y0 == 0)) piece = have_piece?(hands, name) - return :illegal if (! piece.move_to?(x1, y1, name)) + return :illegal if (! piece.move_to?(x1, y1, name)) # TODO null check for the piece? piece.move_to(x1, y1) else - return :illegal if (! @array[x0][y0].move_to?(x1, y1, name)) + return :illegal if (! @array[x0][y0].move_to?(x1, y1, name)) # TODO null check? if (@array[x0][y0].name != name) # promoted ? @array[x0][y0].promoted = true end - if (@array[x1][y1]) + if (@array[x1][y1]) # capture if (@array[x1][y1].name == "OU") return :outori # return board update end @array[x1][y1].sente = @array[x0][y0].sente @array[x1][y1].move_to(0, 0) - hands.sort! {|a, b| + hands.sort! {|a, b| # TODO refactor. Move to Piece class a.name <=> b.name } end @@ -972,6 +1264,7 @@ class Board raise "can't find ou" end + # note checkmate, but check. sente is checked. def checkmated?(sente) # sente is loosing ou = look_for_ou(sente) x = 1 @@ -1004,7 +1297,7 @@ class Board return false end else # gote - if ((rival_ou.y != 0) && + if ((rival_ou.y != 1) && (@array[rival_ou.x][rival_ou.y - 1]) && (@array[rival_ou.x][rival_ou.y - 1].name == "FU") && (@array[rival_ou.x][rival_ou.y - 1].sente == sente)) # uchifu true @@ -1014,9 +1307,8 @@ class Board return false end end - + ## case: rival_ou is moving - escaped = false rival_ou.movable_grids.each do |(cand_x, cand_y)| tmp_board = Marshal.load(Marshal.dump(self)) s = tmp_board.move_to(rival_ou.x, rival_ou.y, cand_x, cand_y, "OU", ! sente) @@ -1034,17 +1326,30 @@ class Board if (@array[x][y] && (@array[x][y].sente != sente) && @array[x][y].movable_grids.include?([fu_x, fu_y])) # capturable + + names = [] if (@array[x][y].promoted) - name = @array[x][y].promoted_name + names << @array[x][y].promoted_name else - name = @array[x][y].name + names << @array[x][y].name + if @array[x][y].promoted_name && + @array[x][y].move_to?(fu_x, fu_y, @array[x][y].promoted_name) + names << @array[x][y].promoted_name + end end - tmp_board = Marshal.load(Marshal.dump(self)) - s = tmp_board.move_to(x, y, fu_x, fu_y, name, ! sente) - raise "internal error" if (s != true) - if (! tmp_board.checkmated?(! sente)) # good move - return false + names.map! do |name| + tmp_board = Marshal.load(Marshal.dump(self)) + s = tmp_board.move_to(x, y, fu_x, fu_y, name, ! sente) + if s == :illegal + s # result + else + tmp_board.checkmated?(! sente) # result + end end + all_illegal = names.find {|a| a != :illegal} + raise "internal error: legal move not found" if all_illegal == nil + r = names.find {|a| a == false} # good move + return false if r == false # found good move end y = y + 1 end @@ -1053,25 +1358,44 @@ class Board return true end - def oute_sennichite?(sente) - if (checkmated?(! sente)) - str = to_s - if (sente) - if (@sente_history[str] && (@sente_history[str] >= 3)) # already 3 times - return true - end + # @[sente|gote]_history has at least one item while the player is checking the other or + # the other escapes. + def update_sennichite(player) + str = to_s + @history[str] += 1 + if checkmated?(!player) + if (player) + @sente_history["dummy"] = 1 # flag to see Sente player is checking Gote player else - if (@gote_history[str] && (@gote_history[str] >= 3)) # already 3 times - return true - end + @gote_history["dummy"] = 1 # flag to see Gote player is checking Sente player + end + else + if (player) + @sente_history.clear # no more continuous check + else + @gote_history.clear # no more continuous check end end - return false + if @sente_history.size > 0 # possible for Sente's or Gote's turn + @sente_history[str] += 1 + end + if @gote_history.size > 0 # possible for Sente's or Gote's turn + @gote_history[str] += 1 + end + end + + def oute_sennichite?(player) + if (@sente_history[to_s] >= 4) + return :oute_sennichite_sente_lose + elsif (@gote_history[to_s] >= 4) + return :oute_sennichite_gote_lose + else + return nil + end end def sennichite?(sente) - str = to_s - if (@history[str] && (@history[str] >= 3)) # already 3 times + if (@history[to_s] >= 4) # already 3 times return true end return false @@ -1139,7 +1463,8 @@ class Board return true end - def handle_one_move(str, sente) + # sente is nil only if tests in test_board run + def handle_one_move(str, sente=nil) if (str =~ /^([\+\-])(\d)(\d)(\d)(\d)([A-Z]{2})/) sg = $1 x0 = $2.to_i @@ -1148,6 +1473,7 @@ class Board y1 = $5.to_i name = $6 elsif (str =~ /^%KACHI/) + raise ArgumentError, "sente is null", caller if sente == nil if (good_kachi?(sente)) return :kachi_win else @@ -1166,11 +1492,14 @@ class Board return :illegal end + if (sg == "+") - sente = true + sente = true if sente == nil # deprecated + return :illegal unless sente == true # black player's move must be black hands = @sente_hands else - sente = false + sente = false if sente == nil # deprecated + return :illegal unless sente == false # white player's move must be white hands = @gote_hands end @@ -1196,7 +1525,9 @@ class Board tmp_board = Marshal.load(Marshal.dump(self)) return :illegal if (tmp_board.move_to(x0, y0, x1, y1, name, sente) == :illegal) return :oute_kaihimore if (tmp_board.checkmated?(sente)) - return :oute_sennichite if tmp_board.oute_sennichite?(sente) + tmp_board.update_sennichite(sente) + os_result = tmp_board.oute_sennichite?(sente) + return os_result if os_result # :oute_sennichite_sente_lose or :oute_sennichite_gote_lose return :sennichite if tmp_board.sennichite?(sente) if ((x0 == 0) && (y0 == 0) && (name == "FU") && tmp_board.uchifuzume?(sente)) @@ -1206,20 +1537,7 @@ class Board move_to(x0, y0, x1, y1, name, sente) str = to_s - if (checkmated?(! sente)) - if (sente) - @sente_history[str] = (@sente_history[str] || 0) + 1 - else - @gote_history[str] = (@gote_history[str] || 0) + 1 - end - else - if (sente) - @sente_history.clear - else - @gote_history.clear - end - end - @history[str] = (@history[str] || 0) + 1 + update_sennichite(sente) return :normal end @@ -1265,9 +1583,7 @@ class GameResult attr_reader :players, :black, :white def initialize(p1, p2) - @players = [] - @players << p1 - @players << p2 + @players = [p1, p2] if p1.sente && !p2.sente @black, @white = p1, p2 elsif !p1.sente && p2.sente @@ -1284,6 +1600,8 @@ class GameResultWin < GameResult def initialize(winner, loser) super @winner, @loser = winner, loser + @winner.last_game_win = true + @loser.last_game_win = false end def to_s @@ -1294,7 +1612,11 @@ class GameResultWin < GameResult end class GameResultDraw < GameResult - + def initialize(p1, p2) + super + p1.last_game_win = false + p2.last_game_win = false + end end class Game @@ -1330,7 +1652,7 @@ class Game @id = sprintf("%s+%s+%s+%s+%s", LEAGUE.event, @game_name, @sente.name, @gote.name, issue_current_time) - @logfile = @id + ".csa" + @logfile = File.join(LEAGUE.dir, @id + ".csa") LEAGUE.games[@id] = self @@ -1386,10 +1708,10 @@ class Game @sente.status = "connected" @gote.status = "connected" - if (@current_player.protocol == "CSA") + if (@current_player.protocol == LoginCSA::PROTOCOL) @current_player.finish end - if (@next_player.protocol == "CSA") + if (@next_player.protocol == LoginCSA::PROTOCOL) @next_player.finish end @monitors = Array::new @@ -1428,7 +1750,7 @@ class Game if ((move_status == :illegal) || (move_status == :uchifuzme) || (move_status == :oute_kaihimore)) @fh.printf("'ILLEGAL_MOVE(%s)\n", str) else - if ((move_status == :normal) || (move_status == :outori) || (move_status == :sennichite) || (move_status == :oute_sennichite)) + if ((move_status == :normal) || (move_status == :outori) || (move_status == :sennichite) || (move_status == :oute_sennichite_sente_lose) || (move_status == :oute_sennichite_gote_lose)) @sente.write_safe(sprintf("%s,T%d\n", str, t)) @gote.write_safe(sprintf("%s,T%d\n", str, t)) @fh.printf("%s\nT%d\n", str, t) @@ -1457,10 +1779,12 @@ class Game toryo_lose() elsif (move_status == :outori) outori_win() + elsif (move_status == :oute_sennichite_sente_lose) + oute_sennichite_win_lose(@gote, @sente) # Sente is checking + elsif (move_status == :oute_sennichite_gote_lose) + oute_sennichite_win_lose(@sente, @gote) # Gote is checking elsif (move_status == :sennichite) sennichite_draw() - elsif (move_status == :oute_sennichite) - oute_sennichite_lose() elsif (move_status == :uchifuzume) uchifuzume_lose() elsif (move_status == :oute_kaihimore) @@ -1519,14 +1843,18 @@ class Game end end - def oute_sennichite_lose + def oute_sennichite_win_lose(winner, loser) @current_player.status = "connected" @next_player.status = "connected" - @current_player.write_safe("#OUTE_SENNICHITE\n#LOSE\n") - @next_player.write_safe("#OUTE_SENNICHITE\n#WIN\n") + loser.write_safe("#OUTE_SENNICHITE\n#LOSE\n") + winner.write_safe("#OUTE_SENNICHITE\n#WIN\n") @fh.print(@board.to_s.gsub(/^/, "\'")) - @fh.printf("'summary:oute_sennichite:%s lose:%s win\n", @current_player.name, @next_player.name) - @result = GameResultWin.new(@next_player, @current_player) + if loser == @current_player + @fh.printf("'summary:oute_sennichite:%s lose:%s win\n", @current_player.name, @next_player.name) + else + @fh.printf("'summary:oute_sennichite:%s win:%s lose\n", @current_player.name, @next_player.name) + end + @result = GameResultWin.new(winner, loser) @fh.printf("'rating:#{@result.to_s}\n") if rated? @monitors.each do |monitor| monitor.write_safe(sprintf("##[MONITOR][%s] #OUTE_SENNICHITE\n", @id)) @@ -1658,20 +1986,20 @@ class Game end def propose - begin - @fh = open(@logfile, "w") - @fh.sync = true + @fh = open(@logfile, "w") + @fh.sync = true - @fh.printf("V2\n") - @fh.printf("N+%s\n", @sente.name) - @fh.printf("N-%s\n", @gote.name) - @fh.printf("$EVENT:%s\n", @id) + @fh.puts("V2") + @fh.puts("N+#{@sente.name}") + @fh.puts("N-#{@gote.name}") + @fh.puts("$EVENT:#{@id}") - @sente.write_safe(propose_message("+")) - @gote.write_safe(propose_message("-")) + @sente.write_safe(propose_message("+")) + @gote.write_safe(propose_message("-")) - @fh.printf("$START_TIME:%s\n", Time::new.strftime("%Y/%m/%d %H:%M:%S")) - @fh.print < true) + end + end + + server = WEBrick::GenericServer.new(config) + ["INT", "TERM"].each do |signal| + trap(signal) do + LEAGUE.shutdown + server.shutdown + end + end + $stderr.puts("server started as a deamon [Revision: #{ShogiServer::Revision}]") if $options["daemon"] + log_message("server started [Revision: #{ShogiServer::Revision}]") + + server.start do |client| + # client.sync = true # this is already set in WEBrick + client.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true) + # Keepalive time can be set by /proc/sys/net/ipv4/tcp_keepalive_time player = nil - while (str = client.gets_timeout(Login_Time)) + login = nil + while (str = client.gets_timeout(ShogiServer::Login_Time)) begin $mutex.lock str =~ /([\r\n]*)$/ eol = $1 - if (good_login?(str)) - player = Player::new(str, client) + if (ShogiServer::Login::good_login?(str)) + player = ShogiServer::Player::new(str, client) + player.eol = eol + login = ShogiServer::Login::factory(str, player) if (LEAGUE.players[player.name]) if ((LEAGUE.players[player.name].password == player.password) && (LEAGUE.players[player.name].status != "game")) log_message(sprintf("user %s login forcely", player.name)) LEAGUE.players[player.name].kill else - client.write_safe("LOGIN:incorrect" + eol) - client.write_safe(sprintf("username %s is already connected%s", player.name, eol)) if (str.split.length >= 4) - client.close - Thread::exit - return + login.incorrect_duplicated_player(str) + #Thread::exit + #return + # TODO + player = nil + break end end LEAGUE.add(player) @@ -1946,12 +2283,14 @@ def main end end # login loop if (! player) - client.close - Thread::exit - return + #client.close + #Thread::exit + #return + next end log_message(sprintf("user %s login", player.name)) - player.run + login.process + player.run(login.csa_1st_str) begin $mutex.lock if (player.game) @@ -1963,11 +2302,16 @@ def main ensure $mutex.unlock end - end end end + if ($0 == __FILE__) - LEAGUE = League::new + STDOUT.sync = true + STDERR.sync = true + TCPSocket.do_not_reverse_lookup = true + Thread.abort_on_exception = false + + LEAGUE = ShogiServer::League::new main end