acpc_table_manager 3.0.18 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baafc01d85fd023455f3ae040095e0136c70965b
-  data.tar.gz: 6b1f411c878dbcbaf19d31446a3f8a93ed159a8f
+  metadata.gz: 655cf8543981e79b37a64173b226e5f8a70a9505
+  data.tar.gz: b7e29cbda06b285efcf2226ca6a8f30aa18162b9
 SHA512:
-  metadata.gz: 252335c1b38e9a254bf811f0c1709f3119da5b9ddce9a1e98f039ad8da0541f346d5dc334baf790fa5a6c83c863e289a67a45e49058501f6a01360927bcb5655
-  data.tar.gz: 1dbad1a737aa5ea205b6f427da1b8052ba9b68a41c27b8a6c55ddb5ccc8d85964148fb43bab84edc46795a95a5b026526cd6cf2ad92df270cd1a941a4b7b9106
+  metadata.gz: aa46f88eb7051f13e971151493b2502b11fd22fbc7262817ce7ef48fac8ad6b4b4729c8b10c0d4de3bec97047ef5f4676a7ae81e97452f64cd33ecdd1dc30f66
+  data.tar.gz: c76a667f2ff2a731ab0590e91d6c850e1f1b7c7f2f5a0fd080f87a727ef9156682724a69797292925b42946796f5175f4a9bc7e203df534888fe47d788b272cc

data/.gitignore

@@ -7,4 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-/test/tmp
+/test/*tmp
+dump.rdb

data/.travis.yml

@@ -2,3 +2,5 @@ language: ruby
 rvm:
   - 2.1.2
 before_install: gem install bundler -v 1.10.6
+services:
+  - redis-server

data/README.md

@@ -1,25 +1,13 @@
-# AcpcTableManager
+# Annual Computer Poker Competition Table Manager
 
-Must be able to accomplish the following tasks:
+This is a server that starts an ACPC poker match on demand according to a fixed
+configuration set at start-up through a messaging server
+([Redis](https://redis.io/)). It manages the log files produced by all matches.
+All matches to be started are persisted in a file-based queue, and information
+about those already running are also saved in a file. Special ports can be
+designed for use by agents that require them to connect remotely to
+`dealer` instances, and this server will manage their allocation.
 
-- Start a dealer
-- Start a bot and have it connect to the dealer
-- Start multiple bots and have them connect to the dealer
-- Start a proxy and connect it to the dealer
-- Send actions to the proxy for them to be played
-- Ensure dealer processes are killed when matches are finished
-- Ensure the number of matches being run is less than set maximum
-- Manage a queue of matches
-    - Start the next match in the queue when one finishes
-- Manage a pool of port on which remote bots can connect to dealers
-
-The following tasks can be done in parallel:
-
-- Playing actions
-- Starting proxies
-- Starting bots
-
-Everything else must be done sequentially.
 
 ## Installation
 
@@ -55,4 +43,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/Rakefile

@@ -5,6 +5,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList['test/**/*_test.rb']
+  t.warning = false
 end
 
 task :default => :test

data/acpc_table_manager.gemspec

@@ -20,42 +20,30 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # To send emails
-  spec.add_dependency "pony"
-
-  # For persistence
-  spec.add_dependency 'origin', '~>1.0'
-  spec.add_dependency 'moped', '~>1.4'
-  spec.add_dependency "mongoid", '~> 3.1'
+  spec.add_dependency "pony", '~> 1.11'
 
   # For message passing
-  spec.add_dependency 'redis', '~> 3.2'
+  spec.add_dependency 'redis', '~> 3.3'
 
   # For poker logic
-  spec.add_dependency "acpc_poker_types"
-  spec.add_dependency 'acpc_dealer', '~> 3.0'
-  spec.add_dependency 'acpc_poker_player_proxy', '~> 1.3'
+  spec.add_dependency "acpc_poker_types", '~> 7.8'
+  spec.add_dependency 'acpc_dealer', '~> 3.1'
+  spec.add_dependency 'acpc_poker_player_proxy', '~> 1.6'
 
   # Simple exception email notifications
-  spec.add_dependency 'rusen'
-
-  # To run processes asynchronously
-  spec.add_dependency 'process_runner', '~> 0.0'
+  spec.add_dependency 'rusen', '~> 0.1'
 
   # For better errors
-  spec.add_dependency 'contextual_exceptions'
+  spec.add_dependency 'contextual_exceptions', '~> 0.0'
 
   # For better logging
-  spec.add_dependency 'awesome_print'
+  spec.add_dependency 'awesome_print', '~> 1.7'
 
   # For sanitizing file names
-  spec.add_dependency 'zaru'
-
-  # For sanitizing file names in the match slice action log
-  spec.add_dependency 'hescape'
+  spec.add_dependency 'zaru', '~> 0.1'
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "mocha"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "minitest", '~> 5.10'
+  spec.add_development_dependency "pry", '~> 0.10'
 end

data/exe/acpc_proxy

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'acpc_table_manager'
-require 'redis'
 require 'json'
 require 'optparse'
-require 'mongoid'
+
+include AcpcTableManager::SimpleLogging
 
 ARGV << '-h' if ARGV.empty?
 
@@ -12,101 +12,188 @@ options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} [options]"
 
+  opts.version = AcpcTableManager::VERSION
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
   end
 
-  opts.on("-m", "--match_id MATCH ID", "The ID of the match to join.") do |c|
-    options[:match_id] = c.strip
+  opts.on("-i", "--id ID", "This proxie's ID. Used as its messaging channel name.") do |c|
+    options[:id] = c
+  end
+  opts.on("-s", "--seat SEAT", "This proxie's seat at the table (zero indexed).") do |c|
+    options[:seat] = c.to_i
   end
   opts.on("-t", "--config TABLE MANAGER CONFIG", "Table manager configuration file.") do |c|
     options[:table_manager_config] = File.expand_path c, Dir.pwd
   end
+  opts.on("-p", "--port PORT", "The dealer port on which to connect.") do |c|
+    options[:port] = c.to_i
+  end
+  opts.on("-g", "--game GAME DEF KEY", "The game to be played.") do |c|
+    options[:game] = c
+  end
 end.parse!
 
-raise OptionParser::MissingArgument.new('MATCH ID') unless options[:match_id]
+raise OptionParser::MissingArgument.new('ID') unless options[:id]
+raise OptionParser::MissingArgument.new('SEAT') unless options[:seat]
+raise OptionParser::MissingArgument.new('PORT') unless options[:port]
 raise OptionParser::MissingArgument.new('TABLE MANAGER CONFIG') unless options[:table_manager_config]
+raise OptionParser::MissingArgument.new('GAME DEF KEY') unless options[:game]
 
 raise OptionParser::ArgumentError.new("#{options[:table_manager_config]} doesn't exist.") unless File.exist?(options[:table_manager_config])
+raise OptionParser::ArgumentError.new("SEAT must be non-negative, received #{options[:seat] } instead.") unless options[:seat] >= 0
 
 CONFIG_FILE = options[:table_manager_config]
 
 AcpcTableManager.load! CONFIG_FILE
 
-match = begin
-  AcpcTableManager::Match.find options[:match_id]
-rescue Mongoid::Errors::DocumentNotFound
-  raise OptionParser::ArgumentError.new("Match \"#{options[:match_id]}\" doesn't exist.")
+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
 
-unless match.running? && !match.finished?
-  raise OptionParser::ArgumentError.new("Match \"#{options[:match_id]}\" is not running or has already finished.")
-end
+Signal.trap("INT") { exit_and_del_saved }
+Signal.trap("TERM") { exit_and_del_saved }
 
-Signal.trap("INT") { exit }
-Signal.trap("TERM") { exit }
+must_send_ready = AcpcTableManager.config.must_send_ready
 
-must_send_ready = !AcpcTableManager.config.next_hand_request_code.nil?
+@logger = AcpcTableManager.new_log(
+  "#{options[:id]}.log",
+  File.join(AcpcTableManager.config.log_directory, 'proxies')
+)
+include AcpcTableManager::ProxyUtils
+
+@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
-  proxy = AcpcTableManager::Proxy.start match, must_send_ready
-  proxy.log __method__, options
-  loop do
-    message = AcpcTableManager.redis.blpop(
-      "#{AcpcTableManager.config.player_action_channel_prefix}#{options[:match_id]}",
-      :timeout => AcpcTableManager.config.maintenance_interval_s
+  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'
+    @communicator.publish(
+      AcpcTableManager::ProxyUtils.players_at_the_table_to_json(
+        patt,
+        game_info['num_hands_per_match'],
+        state_index
+      )
     )
-    if message
-      data = JSON.parse message[1]
+    state_index += 1
+  end
 
-      proxy.log(__method__, {data: data})
+  log 'starting event loop'
 
-      action = data[AcpcTableManager.config.action_key]
-      if (
-        AcpcTableManager.config.next_hand_request_code &&
-        action == AcpcTableManager.config.next_hand_request_code
-      )
-        proxy.next_hand!
-      else
-        proxy.play! action
+  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', msg: 'Sending match state'
+              @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', msg: 'Sending match state'
+                @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
-      last_message_received = Time.now
-    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
+    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'
-        proxy.play_check_fold!
-      else
-        match = AcpcTableManager::Match.find options[:match_id]
-        match.proxy_pid = nil
-        match.dealer_pid = nil
-        match.save!
-        exit
+        if AcpcTableManager.config.on_proxy_timeout == 'fold'
+          play_check_fold! proxy
+        else
+          exit_and_del_saved
+        end
       end
     end
-    match = AcpcTableManager::Match.find options[:match_id]
-    if proxy.match_ended? or !match.dealer_running?
-      match.proxy_pid = nil
-      match.dealer_pid = nil
-      match.save!
-      exit
-    end
   end
 rescue => e
-  proxy.log(
+  log(
     __method__,
     {
-      match_id: options[:match_id],
+      id: options[:id],
       message: e.message,
       backtrace: e.backtrace
     },
@@ -114,3 +201,4 @@ rescue => e
   )
   AcpcTableManager.notify e # Send an email notification
 end
+exit_and_del_saved

data/exe/acpc_table_manager

@@ -1,61 +1,80 @@
 #!/usr/bin/env ruby
 
+require 'acpc_dealer'
 require 'acpc_table_manager'
 require 'redis'
 require 'json'
 require 'optparse'
-require 'acpc_table_manager/match'
-
+require 'yaml'
 
 ARGV << '-h' if ARGV.empty?
 
 options = {}
 OptionParser.new do |opts|
-  opts.banner = "Usage: #{$0} [options]"
+  opts.banner = "Usage: #{$PROGRAM_NAME} [options]"
+  
+  opts.version = AcpcTableManager::VERSION
 
-  opts.on_tail("-h", "--help", "Show this message") do
+  opts.on_tail('-h', '--help', 'Show this message') do
     puts opts
     exit
   end
 
-  opts.on("-t", "--table_manager TABLE MANAGER CONFIG", "Table manager configuration file.") do |c|
+  opts.on('-t', '--table_manager TABLE MANAGER CONFIG', 'Table manager configuration file.') do |c|
     options[:table_manager_config] = File.expand_path c, Dir.pwd
   end
 end.parse!
 
-raise OptionParser::MissingArgument.new('TABLE MANAGER CONFIG') unless options[:table_manager_config]
+raise OptionParser::MissingArgument, 'TABLE MANAGER CONFIG' unless options[:table_manager_config]
 
-raise OptionParser::ArgumentError.new("#{options[:table_manager_config]} doesn't exist.") unless File.exist?(options[:table_manager_config])
+raise OptionParser::ArgumentError, "#{options[:table_manager_config]} doesn't exist." unless File.exist?(options[:table_manager_config])
 
 CONFIG_FILE = options[:table_manager_config]
 
 AcpcTableManager.load! CONFIG_FILE
-table_manager = AcpcTableManager::Maintainer.new
 
-Signal.trap("INT") { exit }
-Signal.trap("TERM") { exit }
+Signal.trap('INT') { exit }
+Signal.trap('TERM') { exit }
+
+communicator = AcpcTableManager::TableManagerReceiver.new('table-manager')
+
+AcpcTableManager.config.log(
+  __method__,
+  options: options,
+  version: AcpcTableManager::VERSION,
+  receive_channel: communicator.channel
+)
 
 loop do
   begin
-    message = AcpcTableManager.redis.blpop("table-manager", :timeout => AcpcTableManager.config.maintenance_interval_s)
-    if message
-      data = JSON.parse message[1]
-      table_manager.log(__method__, {data: data})
+    communicator.subscribe_with_timeout do |match_info|
+      AcpcTableManager.config.log(__method__, match_info: match_info)
+
+      raise "No match information provided in message, \"#{message}\" sent on channel, \"#{channel}\"." unless match_info
 
-      case data['request']
-      when AcpcTableManager.config.check_matches
-      when AcpcTableManager.config.kill_match
-        match = AcpcTableManager::Match.quiet_find data['params'][AcpcTableManager.config.match_id_key]
-        if match then match.kill_proxy! end
-      when 'reload'
-        AcpcTableManager.load! CONFIG_FILE
-      else
-        raise StandardError.new("Unrecognized request: #{data['request']}")
-      end
+      AcpcTableManager.enqueue_match(
+        match_info['game_def_key'],
+        match_info['players'],
+        match_info['random_seed']
+      )
+      AcpcTableManager.start_matches_if_allowed
     end
-    table_manager.maintain!
+  rescue AcpcTableManager::SubscribeTimeout
+    AcpcTableManager.start_matches_if_allowed
+  rescue Redis::ConnectionError => e
+    AcpcTableManager.config.log(
+      __method__,
+      {
+        message: e.message,
+        exit: true,
+        backtrace: e.backtrace
+      },
+      Logger::Severity::ERROR
+    )
+    AcpcTableManager.notify e
+    exit
   rescue => e
-    table_manager.log(
+    AcpcTableManager.config.log(
       __method__,
       {
         message: e.message,