acpc_table_manager 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee2dea44e92ca39a540609c2223658a34b6bbd6c
-  data.tar.gz: 7fc6b9d7bf0f79d06b20be90d974761b25e385f3
+  metadata.gz: 7369e948b3edcb36e35deeb8f0da2efe2fee95f5
+  data.tar.gz: 9028307a76384a8ea83e04330eb9df49f8e4d389
 SHA512:
-  metadata.gz: 2de517e6ac65237cf51bee818d81f348492d6cc6dfbdf4e3615dac72b637a6a20d117576beb494e7595daebb8c612a10fd2b6e2eecb33510e31aede98d8d0a0c
-  data.tar.gz: 502d992178265dced2830a82c6f414865b9c1daa598ec0ce370539296e2e5a649ae8bb516d25b9a351ad50e1531ae735b85dc4bca6278725d97c769674643eed
+  metadata.gz: 64e6e2748b7d4d740f4d7fa3ce7c7a2931619a8351afa56cf461372dbb51c6c0e54d4dad3f0b67bd504eb03c411acc9589d2fadf0c8ca21b5179353393b231f9
+  data.tar.gz: 7de81c3455a554101da0e3a5577dfe8b4a0756baa7f9003159e7c17070292306631ff7a9b9733a9ea37d2084968bb3936d7900b5bb4e5d919015fcf6849b2524

data/exe/acpc_proxy

@@ -4,8 +4,6 @@ require 'acpc_table_manager'
 require 'json'
 require 'optparse'
 
-include AcpcTableManager::SimpleLogging
-
 ARGV << '-h' if ARGV.empty?
 
 options = {}
@@ -49,156 +47,8 @@ CONFIG_FILE = options[:table_manager_config]
 
 AcpcTableManager.load! CONFIG_FILE
 
-game_info = AcpcTableManager.exhibition_config.games[options[:game]]
-unless game_info
-  raise OptionParser::ArgumentError.new(
-    "\"#{options[:game]}\" is not a recognized game. Registered games: #{AcpcTableManager.exhibition_config.games.keys}."
-  )
-end
-
-Signal.trap("INT") { exit_and_del_saved }
-Signal.trap("TERM") { exit_and_del_saved }
-
-must_send_ready = AcpcTableManager.config.must_send_ready
-
-@logger = AcpcTableManager.new_log(
-  "#{options[:id]}.log",
-  File.join(AcpcTableManager.config.log_directory, 'proxies')
-)
-include AcpcTableManager::ProxyUtils
+Signal.trap("INT") { exit }
+Signal.trap("TERM") { exit }
 
-@communicator = AcpcTableManager::ProxyCommunicator.new(options[:id])
-@communicator.del_saved # Clear stale messages to avoid unpredictable behaviour
-@state_index = 0
-
-last_message_received = Time.now
-
-begin
-  log(
-    __method__,
-    options: options,
-    version: AcpcTableManager::VERSION,
-    send_channel: @communicator.send_channel,
-    receive_channel: @communicator.receive_channel,
-    must_send_ready: must_send_ready
-  )
-
-  proxy = start_proxy(
-    game_info,
-    options[:seat],
-    options[:port],
-    must_send_ready
-  ) do |patt|
-    log 'start_proxy_block', match_state: patt.match_state.to_s
-    @communicator.publish(
-      AcpcTableManager::ProxyUtils.players_at_the_table_to_json(
-        patt,
-        game_info['num_hands_per_match'],
-        state_index
-      )
-    )
-    state_index += 1
-  end
-
-  log 'starting event loop'
-
-  loop do
-    begin
-      @communicator.subscribe_with_timeout do |data|
-        log __method__, data: data
-
-        if data['resend']
-          log __method__, msg: 'Resending match state'
-          @communicator.publish(
-            AcpcTableManager::ProxyUtils.players_at_the_table_to_json(
-              proxy,
-              game_info['num_hands_per_match'],
-              @state_index
-            )
-          )
-          @state_index += 1
-        elsif data['kill']
-          log __method__, msg: 'Exiting'
-          exit_and_del_saved
-        else
-          action = data['action']
-          if action == 'next-hand'
-            proxy.next_hand! do |patt|
-              log 'next_hand! block', match_state: patt.match_state.to_s
-              @communicator.publish(
-                AcpcTableManager::ProxyUtils.players_at_the_table_to_json(
-                  patt,
-                  game_info['num_hands_per_match'],
-                  @state_index
-                )
-              )
-              @state_index += 1
-            end
-
-            log(
-              'after next_hand!',
-              users_turn_to_act?: proxy.users_turn_to_act?,
-              match_ended?: proxy.match_ended?(game_info['num_hands_per_match'])
-            )
-          else
-            log 'before acting', users_turn_to_act?: proxy.users_turn_to_act?,
-                                 action: action
-
-            if proxy.users_turn_to_act?
-              action = PokerAction.new(action) unless action.is_a?(PokerAction)
-              proxy.play!(action) do |patt|
-                log 'play! block', match_state: patt.match_state.to_s
-                @communicator.publish(
-                  AcpcTableManager::ProxyUtils.players_at_the_table_to_json(
-                    patt,
-                    game_info['num_hands_per_match'],
-                    @state_index
-                  )
-                )
-                @state_index += 1
-              end
-
-              log(
-                'after play!',
-                users_turn_to_act?: proxy.users_turn_to_act?,
-                match_ended?: proxy.match_ended?(game_info['num_hands_per_match'])
-              )
-            end
-          end
-        end
-        exit_and_del_saved if proxy.match_ended?(game_info['num_hands_per_match'])
-        last_message_received = Time.now
-      end
-    rescue AcpcTableManager::SubscribeTimeout
-      if proxy.match_ended? game_info['num_hands_per_match']
-        exit_and_del_saved
-      elsif !proxy.users_turn_to_act?
-        last_message_received = Time.now
-      elsif (
-        AcpcTableManager.config.proxy_timeout_s && (
-          Time.now > (
-            last_message_received + AcpcTableManager.config.proxy_timeout_s
-          )
-        )
-      )
-        if AcpcTableManager.config.on_proxy_timeout == 'fold'
-          play_check_fold! proxy
-        else
-          exit_and_del_saved
-        end
-      end
-    end
-  end
-rescue => e
-  log(
-    __method__,
-    {
-      id: options[:id],
-      message: e.message,
-      backtrace: e.backtrace
-    },
-    Logger::Severity::ERROR
-  )
-  AcpcTableManager.notify e # Send an email notification
-end
-exit_and_del_saved
+app = AcpcTableManager::AcpcProxy.new(options[:id], options[:game])
+app.start(options[:seat], options[:port])

data/lib/acpc_table_manager.rb

@@ -14,6 +14,7 @@ require_relative 'acpc_table_manager/monkey_patches'
 require_relative 'acpc_table_manager/simple_logging'
 require_relative 'acpc_table_manager/utils'
 require_relative 'acpc_table_manager/proxy_utils'
+require_relative 'acpc_table_manager/acpc_proxy'
 
 using AcpcTableManager::SimpleLogging::MessageFormatting
 

data/lib/acpc_table_manager/acpc_proxy.rb

@@ -0,0 +1,204 @@
+require 'optparse'
+require 'acpc_table_manager/simple_logging'
+require 'acpc_table_manager/proxy_utils'
+
+module AcpcTableManager
+  class AcpcProxy
+    include AcpcTableManager::SimpleLogging
+    include AcpcTableManager::ProxyUtils
+
+    attr_reader :game, :id, :game_info, :state_index, :last_message_received
+
+    def initialize(id, game)
+      @game = game
+      @id = id
+      @game_info = AcpcTableManager.exhibition_config.games[game]
+      unless @game_info
+        raise OptionParser::ArgumentError.new(
+          "\"#{game}\" is not a recognized game. Registered games: #{AcpcTableManager.exhibition_config.games.keys}."
+        )
+      end
+
+      @logger = AcpcTableManager.new_log(
+        "#{id}.log",
+        File.join(AcpcTableManager.config.log_directory, 'proxies')
+      )
+
+      @communicator = AcpcTableManager::ProxyCommunicator.new(id)
+      @communicator.del_saved # Clear stale messages to avoid unpredictable behaviour
+      @state_index = 0
+      @last_message_received = Time.now
+    end
+
+    def must_send_ready() AcpcTableManager.config.must_send_ready end
+
+    def num_hands_per_match() @game_info['num_hands_per_match'] end
+
+    def play(action)
+      action = PokerAction.new(action) unless action.is_a?(PokerAction)
+
+      @proxy.play!(action) do |patt|
+        log 'play! block', match_state: patt.match_state.to_s
+        @communicator.publish(
+          AcpcTableManager::ProxyUtils.players_at_the_table_to_json(
+            patt,
+            num_hands_per_match,
+            @state_index
+          )
+        )
+        @state_index += 1
+      end
+    end
+
+    def act(action)
+      if action == 'next-hand'
+        @proxy.next_hand! do |patt|
+          log 'next_hand! block', match_state: patt.match_state.to_s
+          @communicator.publish(
+            AcpcTableManager::ProxyUtils.players_at_the_table_to_json(
+              patt,
+              num_hands_per_match,
+              @state_index
+            )
+          )
+          @state_index += 1
+        end
+
+        log(
+          'after next_hand!',
+          users_turn_to_act?: @proxy.users_turn_to_act?,
+          match_over?: match_over?
+        )
+      else
+        log 'before play', users_turn_to_act?: @proxy.users_turn_to_act?,
+                           action: action
+
+        if @proxy.users_turn_to_act?
+          play action
+
+          log(
+            'after play',
+            users_turn_to_act?: @proxy.users_turn_to_act?,
+            match_over?: match_over?
+          )
+        else
+          log 'skipped play'
+        end
+      end
+    end
+
+    def match_over?
+      @proxy.match_ended?(num_hands_per_match) ||
+      !@proxy.connected?
+    end
+
+    def message_loop
+      @communicator.subscribe_with_timeout do |data|
+        log __method__, data: data
+
+        if data['resend']
+          log __method__, msg: 'Resending match state'
+          @communicator.publish(
+            AcpcTableManager::ProxyUtils.players_at_the_table_to_json(
+              @proxy,
+              num_hands_per_match,
+              @state_index
+            )
+          )
+          @state_index += 1
+        elsif data['kill']
+          log __method__, msg: 'Exiting'
+          exit_and_del_saved
+        else
+          act data['action']
+        end
+        exit_and_del_saved if match_over?
+        @last_message_received = Time.now
+      end
+    end
+
+    def action_timeout_reached
+      AcpcTableManager.config.proxy_timeout_s && (
+        Time.now > (
+          @last_message_received + AcpcTableManager.config.proxy_timeout_s
+        )
+      )
+    end
+
+    def start(seat, port)
+      begin
+        log(
+          __method__,
+          id: @id,
+          game: @game,
+          seat: seat,
+          port: port,
+          version: AcpcTableManager::VERSION,
+          send_channel: @communicator.send_channel,
+          receive_channel: @communicator.receive_channel,
+          must_send_ready: must_send_ready
+        )
+
+        @proxy = start_proxy(
+          @game_info,
+          seat,
+          port,
+          must_send_ready
+        ) do |patt|
+          log 'start_proxy_block', match_state: patt.match_state.to_s
+          @communicator.publish(
+            AcpcTableManager::ProxyUtils.players_at_the_table_to_json(
+              patt,
+              num_hands_per_match,
+              @state_index
+            )
+          )
+          @state_index += 1
+        end
+
+        log 'starting event loop'
+
+        loop do
+          begin
+            message_loop
+          rescue AcpcTableManager::SubscribeTimeout
+            match_is_over = match_over?
+
+            log(
+              'subscription timeout reached',
+              {
+                match_over?: match_is_over,
+                users_turn_to_act?: @proxy.users_turn_to_act?,
+                action_timeout_reached: action_timeout_reached,
+                on_proxy_timeout: AcpcTableManager.config.on_proxy_timeout
+              }
+            )
+            if match_is_over
+              exit_and_del_saved
+            elsif !@proxy.users_turn_to_act?
+              @last_message_received = Time.now
+            elsif action_timeout_reached
+              if AcpcTableManager.config.on_proxy_timeout == 'fold'
+                play_check_fold! @proxy
+              else
+                exit_and_del_saved
+              end
+            end
+          end
+        end
+      rescue => e
+        log(
+          __method__,
+          {
+            id: @id,
+            message: e.message,
+            backtrace: e.backtrace
+          },
+          Logger::Severity::ERROR
+        )
+        AcpcTableManager.notify e # Send an email notification
+      end
+      exit_and_del_saved
+    end
+  end
+end

data/lib/acpc_table_manager/version.rb

@@ -1,3 +1,3 @@
 module AcpcTableManager
-  VERSION = '4.0.1'.freeze
+  VERSION = '4.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acpc_table_manager
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pony
@@ -217,6 +217,7 @@ files:
 - exe/acpc_table_manager
 - exe/acpc_testing_bot
 - lib/acpc_table_manager.rb
+- lib/acpc_table_manager/acpc_proxy.rb
 - lib/acpc_table_manager/config.rb
 - lib/acpc_table_manager/match.rb
 - lib/acpc_table_manager/monkey_patches.rb