procon_bypass_man 0.1.10 → 0.1.14

data/lib/procon_bypass_man/buttons_setting_configuration.rb

@@ -1,8 +1,10 @@
-require "procon_bypass_man/configuration/validator"
-require "procon_bypass_man/configuration/loader"
-require "procon_bypass_man/configuration/layer"
+require "procon_bypass_man/buttons_setting_configuration/validator"
+require "procon_bypass_man/buttons_setting_configuration/loader"
+require "procon_bypass_man/buttons_setting_configuration/layer"
 
 module ProconBypassMan
+  class AnalogStickPosition < Struct.new(:x, :y); end
+
   class ButtonsSettingConfiguration
     attr_accessor :layers,
       :setting_path,
@@ -40,7 +42,6 @@ module ProconBypassMan
         'manual'
       end
     end
-    MODES = [:manual]
     def layer(direction, mode: ManualMode, &block)
       mode_name = case mode
                   when String
@@ -50,7 +51,7 @@ module ProconBypassMan
                   else
                     mode.name.to_sym
                   end
-      unless (MODES + ProconBypassMan::Procon::ModeRegistry.plugins.keys).include?(mode_name)
+      unless ([ManualMode.name.to_sym] + ProconBypassMan::Procon::ModeRegistry.plugins.keys).include?(mode_name)
         raise("#{mode_name} mode is unknown")
       end
 
@@ -76,7 +77,7 @@ module ProconBypassMan
     end
 
     def set_neutral_position(x, y)
-      self.neutral_position = AnalogStickPosition.new(x: x, y: y)
+      self.neutral_position = AnalogStickPosition.new(x, y).freeze
       self
     end
 
@@ -94,7 +95,7 @@ module ProconBypassMan
         left: Layer.new,
         right: Layer.new,
       }
-      @neutral_position = AnalogStickPosition.new(x: 2124, y: 1808)
+      @neutral_position = AnalogStickPosition.new(2124, 1808).freeze
     end
   end
 end

data/lib/procon_bypass_man/bypass/usb_hid_logger.rb

@@ -10,11 +10,29 @@ class ProconBypassMan::Bypass
     set_callback :send_procon_to_gadget, :after, :log_procon_to_gadget
 
     def log_send_gadget_to_procon
-      ProconBypassMan.logger.debug { ">>> #{bypass_status.to_text}" }
+      if ProconBypassMan.config.verbose_bypass_log
+        ProconBypassMan.logger.debug { ">>> #{bypass_value.to_text}" }
+      else
+        ProconBypassMan.cache.fetch key: 'bypass_log', expires_in: 1 do
+          ProconBypassMan.logger.debug { ">>> #{bypass_value.to_text}" }
+        end
+      end
     end
 
     def log_procon_to_gadget
-      ProconBypassMan.logger.debug { "<<< #{bypass_status.to_text}" }
+      if ProconBypassMan.config.verbose_bypass_log
+        ProconBypassMan.logger.debug { "<<< #{bypass_value.to_text}" }
+      else
+        ProconBypassMan.cache.fetch key: 'bypass_log', expires_in: 1 do
+          ProconBypassMan.logger.debug { "<<< #{bypass_value.to_text}" }
+        end
+      end
+
+      ProconBypassMan.cache.fetch key: 'pressed_buttons_reporter', expires_in: 5 do
+        ProconBypassMan::ReportPressedButtonsJob.perform_async(
+          ProconBypassMan::ProconReader.new(binary: bypass_value.binary).to_hash
+        )
+      end
     end
   end
 end

data/lib/procon_bypass_man/bypass.rb

@@ -3,13 +3,13 @@ require "procon_bypass_man/bypass/usb_hid_logger"
 class ProconBypassMan::Bypass
   include ProconBypassMan::Bypass::UsbHidLogger
 
-  class BypassStatus < Struct.new(:binary, :sent)
+  class BypassValue < Struct.new(:binary, :sent)
     def to_text
       "#{binary.unpack("H*").first} #{'x' unless sent}"
     end
   end
 
-  attr_accessor :gadget, :procon, :monitor, :bypass_status
+  attr_accessor :gadget, :procon, :monitor, :bypass_value
 
   def initialize(gadget: , procon: , monitor: )
     self.gadget = gadget
@@ -21,14 +21,14 @@ class ProconBypassMan::Bypass
   def send_gadget_to_procon!
     monitor.record(:start_function)
     input = nil
-    self.bypass_status = BypassStatus.new(input, sent = false)
+    self.bypass_value = BypassValue.new(input, sent = false)
 
-    run_callbacks :send_gadget_to_procon do
+    run_callbacks(:send_gadget_to_procon) do
       begin
-        return if $will_terminate_token
-        # TODO blocking readにしたいが、接続時のフェーズによって長さが違宇野で厳しい
+        break if $will_terminate_token
+        # TODO blocking readにしたいが、接続時のフェーズによって長さが違うので厳しい
         input = self.gadget.read_nonblock(64)
-        self.bypass_status.binary = input
+        self.bypass_value.binary = input
       rescue IO::EAGAINWaitReadable
         monitor.record(:eagain_wait_readable_on_read)
         sleep(0.001)
@@ -37,10 +37,10 @@ class ProconBypassMan::Bypass
 
       begin
         self.procon.write_nonblock(input)
-        self.bypass_status.sent = true
+        self.bypass_value.sent = true
       rescue IO::EAGAINWaitReadable
         monitor.record(:eagain_wait_readable_on_write)
-        return
+        break
       end
     end
 
@@ -50,18 +50,19 @@ class ProconBypassMan::Bypass
   def send_procon_to_gadget!
     monitor.record(:start_function)
     output = nil
-    self.bypass_status = BypassStatus.new(output, sent = false)
+    self.bypass_value = BypassValue.new(output, sent = false)
 
     run_callbacks(:send_procon_to_gadget) do
       begin
-        return if $will_terminate_token
+        break if $will_terminate_token
         Timeout.timeout(1) do
           output = self.procon.read(64)
-          self.bypass_status.binary = output
+          self.bypass_value.binary = output
         end
       rescue Timeout::Error
         ProconBypassMan.logger.debug { "read timeout! do sleep. by send_procon_to_gadget!" }
         ProconBypassMan.error_logger.error { "read timeout! do sleep. by send_procon_to_gadget!" }
+        ProconBypassMan::SendErrorCommand.execute(error: "read timeout! do sleep. by send_procon_to_gadget!")
         monitor.record(:eagain_wait_readable_on_read)
         retry
       rescue IO::EAGAINWaitReadable
@@ -72,12 +73,11 @@ class ProconBypassMan::Bypass
       end
 
       begin
-        # ProconBypassMan::Procon::DebugDumper.new(binary: output).dump_analog_sticks
         self.gadget.write_nonblock(ProconBypassMan::Processor.new(output).process)
-        self.bypass_status.sent = true
+        self.bypass_value.sent = true
       rescue IO::EAGAINWaitReadable
         monitor.record(:eagain_wait_readable_on_write)
-        return
+        break
       end
     end
     monitor.record(:end_function)

data/lib/procon_bypass_man/commands/bypass_command.rb

@@ -0,0 +1,86 @@
+class ProconBypassMan::BypassCommand
+  include ProconBypassMan::SignalHandler
+
+  def initialize(gadget:, procon:)
+    @gadget = gadget
+    @procon = procon
+
+    ProconBypassMan::IOMonitor.start!
+    ProconBypassMan::Background::JobRunner.queue.clear # forkしたときに残留物も移ってしまうため
+    ProconBypassMan::Background::JobRunner.start!
+  end
+
+  def execute
+    self_read, self_write = IO.pipe
+    %w(TERM INT).each do |sig|
+      begin
+        trap sig do
+          self_write.puts(sig)
+        end
+      rescue ArgumentError
+        puts "プロセスでSignal #{sig} not supported"
+      end
+    end
+
+    # gadget => procon
+    # 遅くていい
+    monitor1 = ProconBypassMan::IOMonitor.new(label: "switch -> procon")
+    monitor2 = ProconBypassMan::IOMonitor.new(label: "procon -> switch")
+    ProconBypassMan.logger.info "Thread1を起動します"
+    t1 = Thread.new do
+      timer = ProconBypassMan::SafeTimeout.new(timeout: Time.now + 10)
+      bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor1)
+      loop do
+        break if $will_terminate_token
+        timer.throw_if_timeout!
+        bypass.send_gadget_to_procon!
+        sleep(0.005)
+      rescue ProconBypassMan::SafeTimeout::Timeout
+        ProconBypassMan.logger.info "10秒経過したのでThread1を終了します"
+        monitor1.shutdown
+        puts "10秒経過したのでThread1を終了します"
+        break
+      rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
+        ProconBypassMan::SendErrorCommand.execute(error: "Switchとの切断されました.終了処理を開始します. #{e.full_message}")
+        Process.kill "TERM", Process.ppid
+      rescue Errno::ETIMEDOUT => e
+        # TODO まれにこれが発生する. 再接続したい
+        ProconBypassMan::SendErrorCommand.execute(error: "Switchと意図せず切断されました.終了処理を開始します. #{e.full_message}")
+        Process.kill "TERM", Process.ppid
+      end
+      ProconBypassMan.logger.info "Thread1を終了します"
+    end
+
+    # procon => gadget
+    # シビア
+    ProconBypassMan.logger.info "Thread2を起動します"
+    t2 = Thread.new do
+      bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor2)
+      loop do
+        break if $will_terminate_token
+        bypass.send_procon_to_gadget!
+      rescue EOFError => e
+        ProconBypassMan::SendErrorCommand.execute(error: "Proconが切断されました。終了処理を開始します. #{e.full_message}")
+        Process.kill "TERM", Process.ppid
+      rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
+        ProconBypassMan::SendErrorCommand.execute(error: "Proconが切断されました。終了処理を開始します2. #{e.full_message}")
+        Process.kill "TERM", Process.ppid
+      end
+      ProconBypassMan.logger.info "Thread2を終了します"
+    end
+
+    ProconBypassMan.logger.info "子プロセスでgraceful shutdownの準備ができました"
+    begin
+      while(readable_io = IO.select([self_read]))
+        signal = readable_io.first[0].gets.strip
+        handle_signal(signal)
+      end
+    rescue Interrupt
+      $will_terminate_token = true
+      [t1, t2].each(&:join)
+      @gadget&.close
+      @procon&.close
+      exit 1
+    end
+  end
+end

data/lib/procon_bypass_man/commands/connect_device_command.rb

@@ -0,0 +1,16 @@
+class ProconBypassMan::ConnectDeviceCommand
+  # @return [void]
+  def self.execute!
+    gadget, procon = ProconBypassMan::DeviceConnector.connect
+  rescue ProconBypassMan::DeviceConnector::NotFoundProconError => e
+    ProconBypassMan.logger.error e
+    gadget&.close
+    procon&.close
+    raise ProconBypassMan::NotFoundProconError
+  rescue ProconBypassMan::SafeTimeout::Timeout
+    ProconBypassMan.logger.error "デバイスとの通信でタイムアウトが起きて接続ができませんでした。"
+    gadget&.close
+    procon&.close
+    raise ::ProconBypassMan::EternalConnectionError
+  end
+end

data/lib/procon_bypass_man/commands/print_boot_message_command.rb

@@ -0,0 +1,9 @@
+class ProconBypassMan::PrintBootMessageCommand
+  # @return [void]
+  def self.execute
+    message = ProconBypassMan::BootMessage.new
+    ProconBypassMan::ReportBootJob.perform_async(message.to_hash)
+    ProconBypassMan::ReportLoadConfigJob.perform_async(ProconBypassMan.config.raw_setting)
+    puts message.to_s
+  end
+end

data/lib/procon_bypass_man/commands/run_local_shell_command.rb

@@ -0,0 +1,6 @@
+class ProconBypassMan::RunLocalShellCommand
+  class LocalCommandError < StandardError; end
+
+  def self.execute(action: , uuid: )
+  end
+end

data/lib/procon_bypass_man/commands/run_remote_pbm_action_dispatch_command.rb

@@ -0,0 +1,19 @@
+class ProconBypassMan::RunRemotePbmActionDispatchCommand
+  # @param [String] action
+  # @param [String] uuid
+  # @return [void]
+  def self.execute(action: , uuid: , job_args: )
+    case action
+    when ProconBypassMan::RemotePbmAction::ACTION_CHANGE_PBM_VERSION
+      ProconBypassMan::RemotePbmAction::ChangePbmVersionAction.new(pbm_job_uuid: uuid).run!(job_args: job_args)
+    when ProconBypassMan::RemotePbmAction::ACTION_STOP_PBM
+      ProconBypassMan::RemotePbmAction::StopPbmAction.new(pbm_job_uuid: uuid).run!(job_args: {})
+    when ProconBypassMan::RemotePbmAction::ACTION_REBOOT_OS
+      ProconBypassMan::RemotePbmAction::RebootOsAction.new(pbm_job_uuid: uuid).run!(job_args: {})
+    else
+      ProconBypassMan::SendErrorCommand.execute(error: "#{action}は対応していないアクションです")
+    end
+  rescue ProconBypassMan::RemotePbmAction::ActionUnexpectedError => e
+    ProconBypassMan::SendErrorCommand.execute(error: e)
+  end
+end

data/lib/procon_bypass_man/commands/send_error_command.rb

@@ -0,0 +1,19 @@
+class ProconBypassMan::SendErrorCommand
+  # @param [String, Hash, Exception] error
+  # @return [void]
+  def self.execute(error: )
+    body =
+      case error
+      when String, Hash
+        error
+      else
+        error.full_message
+      end
+
+    ProconBypassMan.logger.error body
+    ProconBypassMan.error_logger.error body
+    puts body
+
+    ProconBypassMan::ReportErrorJob.perform(error)
+  end
+end

data/lib/procon_bypass_man/commands/send_reload_config_event_command.rb

@@ -0,0 +1,11 @@
+class ProconBypassMan::SendReloadConfigEventCommand
+  # @return [void]
+  def self.execute
+    puts "設定ファイルの再読み込みができました"
+    ProconBypassMan.logger.info "設定ファイルの再読み込みができました"
+    ProconBypassMan::ReportReloadConfigJob.perform_async(
+      ProconBypassMan.config.raw_setting
+    )
+  end
+end
+

data/lib/procon_bypass_man/commands/write_device_id_command.rb

@@ -0,0 +1,12 @@
+class ProconBypassMan::WriteDeviceIdCommand
+  # @return [String]
+  def self.execute
+    path = "#{ProconBypassMan.root}/device_id"
+    if(sid = File.read(path))
+      return sid
+    end
+  rescue Errno::ENOENT
+    File.write(path, "m_#{SecureRandom.uuid}")
+    return SecureRandom.uuid
+  end
+end

data/lib/procon_bypass_man/commands/write_session_id_command.rb

@@ -0,0 +1,7 @@
+class ProconBypassMan::WriteSessionIdCommand
+  # @return [String] session_id ラズパイが起動してからshutdownするまで同じ文字列を返す
+  # 起動すると/tmp がなくなる前提の実装
+  def self.execute
+    @@session_id ||= "s_#{SecureRandom.uuid}"
+  end
+end

data/lib/procon_bypass_man/commands.rb

@@ -0,0 +1,8 @@
+require "procon_bypass_man/commands/print_boot_message_command"
+require "procon_bypass_man/commands/write_session_id_command"
+require "procon_bypass_man/commands/write_device_id_command"
+require "procon_bypass_man/commands/send_reload_config_event_command"
+require "procon_bypass_man/commands/send_error_command"
+require "procon_bypass_man/commands/connect_device_command"
+require "procon_bypass_man/commands/bypass_command"
+require "procon_bypass_man/commands/run_remote_pbm_action_dispatch_command"

data/lib/procon_bypass_man/configuration.rb

@@ -1,5 +1,5 @@
 class ProconBypassMan::Configuration
-  module ClassAttributes
+  module ClassMethods
     def root
       config.root
     end
@@ -16,6 +16,11 @@ class ProconBypassMan::Configuration
       @@pid_path ||= File.expand_path("#{root}/pbm_pid", __dir__).freeze
     end
 
+    # @return [Integer]
+    def pid
+      File.read(pid_path).to_i
+    end
+
     def digest_path
       config.digest_path
     end
@@ -23,10 +28,20 @@ class ProconBypassMan::Configuration
     def cache
       @@cache_table ||= ProconBypassMan::OnMemoryCache.new
     end
+
+    # @return [String]
+    def session_id
+      ProconBypassMan::WriteSessionIdCommand.execute
+    end
+
+    # @return [String]
+    def device_id
+      ENV["DEBUG_DEVICE_ID"] || ProconBypassMan::WriteDeviceIdCommand.execute
+    end
   end
 
-  attr_reader :api_server
   attr_accessor :enable_critical_error_logging
+  attr_writer :verbose_bypass_log, :raw_setting
 
   def root=(path)
     @root = path
@@ -41,8 +56,8 @@ class ProconBypassMan::Configuration
     end
   end
 
-  def api_server=(api_server)
-    @api_server = api_server
+  def api_servers=(api_servers)
+    @api_servers = api_servers
     return self
   end
 
@@ -65,11 +80,10 @@ class ProconBypassMan::Configuration
 
   def error_logger
     if enable_critical_error_logging
-      @@error_logger ||= Logger.new("#{ProconBypassMan.root}/error.log", 5, 1024 * 1024 * 10)
+      @error_logger ||= Logger.new("#{ProconBypassMan.root}/error.log", 5, 1024 * 1024 * 10)
     else
       Logger.new(File.open("/dev/null"))
     end
-    self
   end
 
   def digest_path
@@ -81,10 +95,36 @@ class ProconBypassMan::Configuration
     if !!ENV["INTERNAL_API_SERVER"]
       [ENV["INTERNAL_API_SERVER"]]
     else
-      [ ENV["INTERNAL_API_SERVER"],
-        'http://localhost:9090',
+      [ 'http://localhost:9090',
         'http://localhost:8080',
       ].compact
     end
   end
+
+  # @return [Array<ProconBypassMan::ServerPool>]
+  def internal_server_pool
+    @internal_server_pool ||= ProconBypassMan::ServerPool.new(servers: internal_api_servers)
+  end
+
+  # @return [Array<ProconBypassMan::ServerPool>]
+  def server_pool
+    @server_pool ||= ProconBypassMan::ServerPool.new(servers: api_servers)
+  end
+
+  # @return [Array<String>]
+  def api_servers
+    if !!ENV["API_SERVER"]
+      [ENV["API_SERVER"]].reject(&:nil?)
+    else
+      [@api_servers].flatten.reject(&:nil?)
+    end
+  end
+
+  def verbose_bypass_log
+    @verbose_bypass_log || !!ENV["VERBOSE_BYPASS_LOG"]
+  end
+
+  def raw_setting
+    @raw_setting ||= {}
+  end
 end