procon_bypass_man 0.1.9 → 0.1.13

data/lib/procon_bypass_man/configuration.rb

@@ -1,100 +1,114 @@
-require "procon_bypass_man/configuration/validator"
-require "procon_bypass_man/configuration/loader"
-require "procon_bypass_man/configuration/layer"
-
-module ProconBypassMan
-  class Configuration
-    attr_accessor :layers,
-      :setting_path,
-      :mode_plugins,
-      :macro_plugins,
-      :context,
-      :current_context_key,
-      :neutral_position
-
-    def self.instance
-      @@current_context_key ||= :main
-      @@context ||= {}
-      @@context[@@current_context_key] ||= new
+class ProconBypassMan::Configuration
+  module ClassMethods
+    def root
+      config.root
     end
 
-    def self.switch_new_context(key)
-      @@context[key] = new
-      previous_key = @@current_context_key
-      if block_given?
-        @@current_context_key = key
-        value = yield(@@context[key])
-        @@current_context_key = previous_key
-        return value
-      else
-        @@current_context_key = key
-      end
+    def logger
+      config.logger
     end
 
-    def initialize
-      reset!
+    def error_logger
+      config.error_logger
     end
 
-    module ManualMode
-      def self.name
-        'manual'
-      end
+    def pid_path
+      @@pid_path ||= File.expand_path("#{root}/pbm_pid", __dir__).freeze
     end
-    MODES = [:manual]
-    def layer(direction, mode: ManualMode, &block)
-      mode_name = case mode
-                  when String
-                    mode.to_sym
-                  when Symbol
-                    mode
-                  else
-                    mode.name.to_sym
-                  end
-      unless (MODES + ProconBypassMan::Procon::ModeRegistry.plugins.keys).include?(mode_name)
-        raise("#{mode_name} mode is unknown")
-      end
-
-      layer = Layer.new(mode: mode_name)
-      layer.instance_eval(&block) if block_given?
-      self.layers[direction] = layer
-      self
+
+    def digest_path
+      config.digest_path
     end
 
-    def install_mode_plugin(klass)
-      ProconBypassMan::Procon::ModeRegistry.install_plugin(klass)
-      self
+    def cache
+      @@cache_table ||= ProconBypassMan::OnMemoryCache.new
     end
 
-    def install_macro_plugin(klass)
-      ProconBypassMan::Procon::MacroRegistry.install_plugin(klass)
-      self
+    # @return [String]
+    def session_id
+      ProconBypassMan::WriteSessionIdCommand.execute
     end
 
-    def prefix_keys_for_changing_layer(buttons)
-      @prefix_keys_for_changing_layer = buttons
-      self
+    # @return [String]
+    def device_id
+      ProconBypassMan::WriteDeviceIdCommand.execute
     end
+  end
 
-    def set_neutral_position(x, y)
-      self.neutral_position = AnalogStickPosition.new(x: x, y: y)
-      self
+  attr_accessor :enable_critical_error_logging
+  attr_writer :verbose_bypass_log, :raw_setting
+
+  def root=(path)
+    @root = path
+    return self
+  end
+
+  def root
+    if defined?(@root)
+      @root
+    else
+      File.expand_path('..', __dir__ || ".").freeze
     end
+  end
 
-    def prefix_keys
-      @prefix_keys_for_changing_layer
+  def api_servers=(api_servers)
+    @api_servers = api_servers
+    return self
+  end
+
+  def logger=(logger)
+    @logger = logger
+    return self
+  end
+
+  def logger
+    if ENV["PBM_ENV"] == 'test'
+      return Logger.new($stdout)
     end
 
-    def reset!
-      @prefix_keys_for_changing_layer = []
-      self.mode_plugins = {}
-      self.macro_plugins = {}
-      self.layers = {
-        up: Layer.new,
-        down: Layer.new,
-        left: Layer.new,
-        right: Layer.new,
-      }
-      @neutral_position = AnalogStickPosition.new(x: 2124, y: 1808)
+    if defined?(@logger) && @logger.is_a?(Logger)
+      @logger
+    else
+      Logger.new(File.open("/dev/null"))
+    end
+  end
+
+  def error_logger
+    if enable_critical_error_logging
+      @error_logger ||= Logger.new("#{ProconBypassMan.root}/error.log", 5, 1024 * 1024 * 10)
+    else
+      Logger.new(File.open("/dev/null"))
     end
   end
+
+  def digest_path
+    "#{root}/.setting_yaml_digest"
+  end
+
+  # @return [String] pbm-webの接続先
+  def internal_api_servers
+    if !!ENV["INTERNAL_API_SERVER"]
+      [ENV["INTERNAL_API_SERVER"]]
+    else
+      [ 'http://localhost:9090',
+        'http://localhost:8080',
+      ].compact
+    end
+  end
+
+  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

data/lib/procon_bypass_man/device_connector.rb

@@ -48,6 +48,7 @@ class ProconBypassMan::DeviceConnector
   end
 
   def drain_all
+    debug_log_buffer = []
     unless @initialized_devices
       init_devices
     end
@@ -55,11 +56,13 @@ class ProconBypassMan::DeviceConnector
     while(item = @stack.shift)
       item.values.each do |value|
         data = nil
-        timer = ProconBypassMan::Timer.new
+        timer = ProconBypassMan::SafeTimeout.new
         begin
           timer.throw_if_timeout!
           data = from_device(item).read_nonblock(64)
+          debug_log_buffer << "read_from(#{item.read_from}): #{data}"
         rescue IO::EAGAINWaitReadable
+          debug_log_buffer << "read_from(#{item.read_from}): IO::EAGAINWaitReadable"
           retry
         end
 
@@ -74,15 +77,19 @@ class ProconBypassMan::DeviceConnector
           end
         if result
           ProconBypassMan.logger.info "OK(expected: #{value}, got: #{data.unpack("H*")})"
+          debug_log_buffer << "OK(expected: #{value}, got: #{data.unpack("H*")})"
         else
           ProconBypassMan.logger.info "NG(expected: #{value}, got: #{data.unpack("H*")})"
+          debug_log_buffer << "NG(expected: #{value}, got: #{data.unpack("H*")})"
           raise BytesMismatchError if @throw_error_if_mismatch
         end
         to_device(item).write_nonblock(data)
       end
     end
-  rescue ProconBypassMan::Timer::Timeout
+  rescue ProconBypassMan::SafeTimeout::Timeout
     ProconBypassMan.logger.error "timeoutになりました"
+    copressed_buffer_text = ProconBypassMan::CompressArray.new(debug_log_buffer).compress.join("\n")
+    ProconBypassMan::SendErrorCommand.execute(error: copressed_buffer_text)
     raise if @throw_error_if_timeout
   end
 
@@ -95,31 +102,31 @@ class ProconBypassMan::DeviceConnector
       init_devices
     end
 
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     data = nil
     begin
       timer.throw_if_timeout!
       switch.write_nonblock(data)
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "writeでtimeoutになりました"
       raise
     end
     return(data.unpack("H*")) if only_write
 
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       data = switch.read_nonblock(64)
       ProconBypassMan.logger.debug { " >>> #{data.unpack("H*")})" }
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "readでtimeoutになりました"
       raise
     end
-  rescue ProconBypassMan::Timer::Timeout
+  rescue ProconBypassMan::SafeTimeout::Timeout
     raise if @throw_error_if_timeout
   end
 
@@ -131,30 +138,30 @@ class ProconBypassMan::DeviceConnector
       init_devices
     end
 
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       procon.write_nonblock(data)
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "writeでtimeoutになりました"
       raise
     end
     return(data.unpack("H*")) if only_write
 
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       data = procon.read_nonblock(64)
       ProconBypassMan.logger.error " <<< #{data.unpack("H*")})"
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "readでtimeoutになりました"
       raise
     end
-  rescue ProconBypassMan::Timer::Timeout
+  rescue ProconBypassMan::SafeTimeout::Timeout
     raise if @throw_error_if_timeout
   end
 
@@ -164,30 +171,30 @@ class ProconBypassMan::DeviceConnector
     end
 
     data = nil
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       data = procon.read_nonblock(64)
       ProconBypassMan.logger.debug { " <<< #{data.unpack("H*")})" }
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "readでtimeoutになりました"
       raise
     end
     return(data.unpack("H*")) if only_read
 
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       switch.write_nonblock(data)
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "writeでtimeoutになりました"
       raise
     end
-  rescue ProconBypassMan::Timer::Timeout
+  rescue ProconBypassMan::SafeTimeout::Timeout
     raise if @throw_error_if_timeout
   end
 
@@ -197,30 +204,30 @@ class ProconBypassMan::DeviceConnector
     end
 
     data = nil
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       data = switch.read_nonblock(64)
       ProconBypassMan.logger.debug { " >>> #{data.unpack("H*")})" }
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "readでtimeoutになりました"
       raise
     end
     return(data.unpack("H*")) if only_read
 
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       procon.write_nonblock(data)
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "writeでtimeoutになりました"
       raise
     end
-  rescue ProconBypassMan::Timer::Timeout
+  rescue ProconBypassMan::SafeTimeout::Timeout
     raise if @throw_error_if_timeout
   end
 
@@ -309,11 +316,10 @@ class ProconBypassMan::DeviceConnector
     end
   rescue Errno::ENXIO => e
     # /dev/hidg0 をopenできないときがある
-    ProconBypassMan.logger.error "Errno::ENXIO (No such device or address @ rb_sysopen - /dev/hidg0)が起きました。resetします"
-    ProconBypassMan.logger.error e
+    ProconBypassMan::SendErrorCommand.execute(error: "Errno::ENXIO (No such device or address @ rb_sysopen - /dev/hidg0)が起きました。resetします. #{e.full_message}")
     system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
     system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
-    sleep 2
+    sleep 0.5
     retry
   end
 end

data/lib/procon_bypass_man/io_monitor.rb

@@ -1,11 +1,12 @@
 module ProconBypassMan
   class Counter
-    attr_accessor :label, :table, :previous_table
+    attr_accessor :label, :table, :previous_table, :active
 
     def initialize(label: )
       self.label = label
       self.table = {}
       self.previous_table = {}
+      self.active = true
     end
 
     # アクティブなバケットは1つだけ
@@ -24,7 +25,7 @@ module ProconBypassMan
       self
     end
 
-    def formated_previous_table
+    def formatted_previous_table
       t = previous_table.dup
       start_function = t[:start_function] || 0
       end_function = t[:end_function] || 0
@@ -32,6 +33,10 @@ module ProconBypassMan
       eagain_wait_readable_on_write = t[:eagain_wait_readable_on_write] || 0
       "(#{(end_function / start_function.to_f * 100).floor(1)}%(#{end_function}/#{start_function}), loss: #{eagain_wait_readable_on_read}, #{eagain_wait_readable_on_write})"
     end
+
+    def shutdown
+      self.active = false
+    end
   end
 
   module IOMonitor
@@ -51,14 +56,14 @@ module ProconBypassMan
       Thread.start do
         max_output_length = 0
         loop do
-          list = @@list.dup
+          list = @@list.select(&:active).dup
           unless list.all? { |x| x&.previous_table.is_a?(Hash) }
             sleep 0.5
             next
           end
 
           line = list.map { |counter|
-            "#{counter.label}(#{counter.formated_previous_table})"
+            "#{counter.label}(#{counter.formatted_previous_table})"
           }.join(", ")
           max_output_length = line.length
           sleep 0.7

data/lib/procon_bypass_man/procon/analog_stick.rb

@@ -0,0 +1,31 @@
+class ProconBypassMan::Procon::AnalogStick
+  attr_accessor :neutral_position
+  attr_accessor :bin_x, :bin_y
+
+  def initialize(binary: )
+    @neutral_position = ProconBypassMan::ButtonsSettingConfiguration.instance.neutral_position
+
+    byte6 = binary[6].unpack("H*").first.to_i(16).to_s(2).rjust(8, "0")
+    byte7 = binary[7].unpack("H*").first.to_i(16).to_s(2).rjust(8, "0")
+    byte8 = binary[8].unpack("H*").first.to_i(16).to_s(2).rjust(8, "0")
+
+    self.bin_x = "#{byte7[4..7]}#{byte6}"
+    self.bin_y = "#{byte8}#{byte7[0..3]}"
+  end
+
+  def abs_x
+    bin_x.to_i(2)
+  end
+
+  def abs_y
+    bin_y.to_i(2)
+  end
+
+  def relative_x
+    bin_x.to_i(2) - neutral_position.x
+  end
+
+  def relative_y
+    bin_y.to_i(2) - neutral_position.y
+  end
+end

data/lib/procon_bypass_man/procon/analog_stick_cap.rb

@@ -18,19 +18,9 @@ class ProconBypassMan::Procon::AnalogStickCap
     end
   end
 
-  attr_accessor :bin_x, :bin_y
-  attr_accessor :neutral_position
-
   def initialize(binary)
-    @neutral_position = ProconBypassMan::Configuration.instance.neutral_position
     @binary = binary
-
-    byte6 = binary[6].unpack("H*").first.to_i(16).to_s(2).rjust(8, "0")
-    byte7 = binary[7].unpack("H*").first.to_i(16).to_s(2).rjust(8, "0")
-    byte8 = binary[8].unpack("H*").first.to_i(16).to_s(2).rjust(8, "0")
-
-    self.bin_x = "#{byte7[4..7]}#{byte6}"
-    self.bin_y = "#{byte8}#{byte7[0..3]}"
+    @analog_stick = ProconBypassMan::Procon::AnalogStick.new(binary: binary)
   end
 
   # @return [ProconBypassMan::Procon::AnalogStickCap::Position]
@@ -41,8 +31,8 @@ class ProconBypassMan::Procon::AnalogStickCap
       relative_capped_x = -(relative_capped_x.abs) if relative_x.negative?
       relative_capped_y = -(relative_capped_y.abs) if relative_y.negative?
       return Position.new(
-        x: relative_capped_x + neutral_position.x,
-        y: relative_capped_y + neutral_position.y,
+        x: relative_capped_x + @analog_stick.neutral_position.x,
+        y: relative_capped_y + @analog_stick.neutral_position.y,
       )
     else
       return position
@@ -54,23 +44,10 @@ class ProconBypassMan::Procon::AnalogStickCap
     Position.new(x: abs_x, y: abs_y)
   end
 
-  # 0, 0からのx
-  def abs_x
-    bin_x.to_i(2)
-  end
-
-  # 0, 0からのy
-  def abs_y
-    bin_y.to_i(2)
-  end
-
-  def relative_x
-    bin_x.to_i(2) - neutral_position.x
-  end
-
-  def relative_y
-    bin_y.to_i(2) - neutral_position.y
-  end
+  def abs_x; @analog_stick.abs_x; end # 0, 0からのx
+  def abs_y; @analog_stick.abs_y; end # 0, 0からのy
+  def relative_x; @analog_stick.relative_x; end
+  def relative_y; @analog_stick.relative_y; end
 
   # @deprecated
   def x; relative_x; end
@@ -78,11 +55,11 @@ class ProconBypassMan::Procon::AnalogStickCap
 
   def rad
     (
-      Math.atan(y / x.to_f) * 180 / Math::PI
+      Math.atan(relative_y / relative_x.to_f) * 180 / Math::PI
     ).floor(6)
   end
 
   def hypotenuse
-    Math.sqrt(x**2 + y**2).floor(6)
+    Math.sqrt((relative_x**2) + (relative_y**2)).floor(6)
   end
 end

data/lib/procon_bypass_man/procon/button_collection.rb

@@ -37,6 +37,7 @@ class ProconBypassMan::Procon::ButtonCollection
   BUTTONS_MAP = BYTES_MAP.reduce({}) { |acc, value|
     next acc if value[1].nil?
     value[1].reverse.each.with_index do |button, index|
+      next(acc) if button == :grip || button == :_undefined_key
       acc[button] = { byte_position: value[0], bit_position: index }
     end
     acc

data/lib/procon_bypass_man/procon/{data.rb → consts.rb}

@@ -1,5 +1,5 @@
 class ProconBypassMan::Procon
-  module Data
+  module Consts
     NO_ACTION = "30f28100800078c77448287509550274ff131029001b0022005a0271ff191028001e00210064027cff1410280020002100000000000000000000000000000000".freeze
   end
 end

data/lib/procon_bypass_man/procon/layer_changer.rb

@@ -0,0 +1,40 @@
+class ProconBypassMan::Procon::LayerChanger
+  def initialize(binary: )
+    @procon_reader = ProconBypassMan::ProconReader.new(binary: binary).freeze
+  end
+
+  # @return [Symbol]
+  def next_layer_key
+    case
+    when pressed?(button: :up)
+      :up
+    when pressed?(button: :right)
+      :right
+    when pressed?(button: :left)
+      :left
+    when pressed?(button: :down)
+      :down
+    else
+      ProconBypassMan.logger.warn("next_layer_key is unknown")
+      :up
+    end
+  end
+
+  # @return [Boolean]
+  def change_layer?
+    if ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.empty?
+      raise "prefix_keysが未設定です"
+    end
+    ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.map { |b| pressed?(button: b) }.all?
+  end
+
+  # @return [Boolean]
+  def pressed_next_layer?
+    change_layer? && (pressed?(button: :up) || pressed?(button: :right) || pressed?(button: :left) || pressed?(button: :down))
+  end
+
+  # @return [Boolean]
+  def pressed?(button: )
+    @procon_reader.pressed.include?(button)
+  end
+end

data/lib/procon_bypass_man/procon/macro_registry.rb

@@ -37,11 +37,11 @@ class ProconBypassMan::Procon::MacroRegistry
   end
 
   def self.reset!
-    ProconBypassMan::Configuration.instance.macro_plugins = {}
+    ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins = {}
   end
 
   def self.plugins
-    ProconBypassMan::Configuration.instance.macro_plugins
+    ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins
   end
 
   reset!

data/lib/procon_bypass_man/procon/mode_registry.rb

@@ -35,11 +35,11 @@ class ProconBypassMan::Procon::ModeRegistry
   end
 
   def self.reset!
-    ProconBypassMan::Configuration.instance.mode_plugins = {}
+    ProconBypassMan::ButtonsSettingConfiguration.instance.mode_plugins = {}
   end
 
   def self.plugins
-    ProconBypassMan::Configuration.instance.mode_plugins
+    ProconBypassMan::ButtonsSettingConfiguration.instance.mode_plugins
   end
 
   reset!