Commit: e549c6dfdb66adbe66909389f005a45526d6b144 - shogi-server (git)

shogi-server source

Commit MetaInfo

• Revision: e549c6dfdb66adbe66909389f005a45526d6b144 (tree)
• Time: 2020-12-14 20:42:55
• Author: Mizar <mizar.jp@gmai...>
• Commiter: Mizar

Log Message

Handle timeout checks when executing KeepAlive and Space commands

Change Summary

• modified: shogi_server/command.rb
• modified: shogi_server/game.rb

Incremental Difference

--- a/shogi_server/command.rb
+++ b/shogi_server/command.rb
@@ -157,6 +157,10 @@ module ShogiServer
 
     def call
       @player.write_safe("\n")
+      if (@player.status == "game")
+        s = @player.game.handle_one_move(:keepalive, @player, @time)
+        return :return if (s && @player.protocol == LoginCSA::PROTOCOL)
+      end
       return :continue
     end
   end
@@ -685,6 +689,10 @@ module ShogiServer
 
     def call
       ## ignore null string
+      if (@player.status == "game")
+        s = @player.game.handle_one_move(:space, @player, @time)
+        return :return if (s && @player.protocol == LoginCSA::PROTOCOL)
+      end
       return :continue
     end
   end

--- a/shogi_server/game.rb
+++ b/shogi_server/game.rb
@@ -248,7 +248,7 @@ class Game
   # class Game
   def handle_one_move(str, player, end_time)
     unless turn?(player)
-      return false if str == :timeout
+      return false if (str == :timeout || str == :keepalive || str == :space)
 
       @fh.puts("'Deferred %s" % [str])
       log_warning("Deferred a move [%s] scince it is not %s 's turn." %
@@ -263,7 +263,7 @@ class Game
 
     if (@time_clock.timeout?(@current_player, @start_time, @end_time))
       status = :timeout
-    elsif (str == :timeout)
+    elsif (str == :timeout || str == :keepalive || str == :space)
       return false            # time isn't expired. players aren't swapped. continue game
     else
       t = @time_clock.process_time(@current_player, @start_time, @end_time)