Commit: 7cd512b50be019cee0d9c000716be2277d50743f - shogi-server (git)

shogi-server source

Commit MetaInfo

• Revision: 7cd512b50be019cee0d9c000716be2277d50743f (tree)
• Time: 2020-10-04 23:05:22
• Author: Mizar <mizar.jp@gmai...>
• Commiter: Mizar

Log Message

Improved timeout detection for space command
Support for clients that perform SP+LF keep-alive, likes Shogidokoro (version 4.7.1+Test4).

Change Summary

• modified: shogi_server/command.rb

Incremental Difference

--- a/shogi_server/command.rb
+++ b/shogi_server/command.rb
@@ -28,7 +28,7 @@ module ShogiServer
     def Command.factory(str, player, time=Time.now)
       cmd = nil
       case str
-      when "", /^%[^%]/, :timeout
+      when "", /^\s*$/, /^%[^%]/, :timeout
         cmd = SpecialCommand.new(str, player)
       when /^[\+\-][^%]/
         cmd = MoveCommand.new(str, player)
@@ -108,8 +108,6 @@ module ShogiServer
         new_buoy_game = nil
         nth_move      = nil
         cmd = ForkCommand.new(str, player, source_game, new_buoy_game, nth_move)
-      when /^\s*$/
-        cmd = SpaceCommand.new(str, player)
       when /^%%%[^%]/
         # TODO: just ignore commands specific to 81Dojo.
         # Need to discuss with 81Dojo people.
@@ -172,7 +170,7 @@ module ShogiServer
     end
   end
 
-  # Command like "%TORYO", :timeout, or keep alive
+  # Command like "%TORYO", :timeout, space, or keep alive
   #
   # Keep Alive is an application-level protocol. Whenever the server receives
   # an LF, it sends back an LF.  Note that the 30 sec rule (client may not send
@@ -191,6 +189,9 @@ module ShogiServer
         @player.write_safe("\n")
         # Fall back to :timeout to check the game gets timed up
         @str = :timeout
+      elsif /^\s+$/ =~ @str
+        # Fall back to :timeout to check the game gets timed up
+        @str = :timeout
       end
 
       if (@player.status == "game")
@@ -673,19 +674,6 @@ module ShogiServer
     end
   end
 
-  # Command for a space
-  #
-  class SpaceCommand < Command
-    def initialize(str, player)
-      super
-    end
-
-    def call
-      ## ignore null string
-      return :continue
-    end
-  end
-
   # Command for an error
   #
   class ErrorCommand < Command