procon_bypass_man 0.1.8 → 0.1.12

data/lib/procon_bypass_man/configuration.rb

@@ -1,86 +1,111 @@
-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
-
-    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
 
-    MODES = [:manual]
-    def layer(direction, mode: :manual, &block)
-      if mode.respond_to?(:name)
-        mode_name = mode.name.to_sym
-      else
-        mode_name = mode
-      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 pid_path
+      @@pid_path ||= File.expand_path("#{root}/pbm_pid", __dir__).freeze
     end
 
-    def install_mode_plugin(klass)
-      ProconBypassMan::Procon::ModeRegistry.install_plugin(klass)
-      self
+    def digest_path
+      config.digest_path
     end
 
-    def install_macro_plugin(klass)
-      ProconBypassMan::Procon::MacroRegistry.install_plugin(klass)
-      self
+    def cache
+      @@cache_table ||= ProconBypassMan::OnMemoryCache.new
     end
 
-    def prefix_keys_for_changing_layer(buttons)
-      @prefix_keys_for_changing_layer = buttons
-      self
+    # @return [String]
+    def session_id
+      ProconBypassMan::WriteSessionIdCommand.execute
     end
 
-    def prefix_keys
-      @prefix_keys_for_changing_layer
+    # @return [String]
+    def device_id
+      ProconBypassMan::WriteDeviceIdCommand.execute
+    end
+  end
+
+  attr_accessor :enable_critical_error_logging, :raw_setting
+  attr_writer :verbose_bypass_log
+
+  def root=(path)
+    @root = path
+    return self
+  end
+
+  def root
+    if defined?(@root)
+      @root
+    else
+      File.expand_path('..', __dir__ || ".").freeze
+    end
+  end
+
+  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,
-      }
+    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
+    self
+  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
 end

data/lib/procon_bypass_man/device_connector.rb

@@ -12,23 +12,6 @@ class ProconBypassMan::DeviceConnector
   PROCON_PATH = "/dev/hidraw0"
   PROCON2_PATH = "/dev/hidraw1"
 
-  # 画面で再接続ができたが状況は変わらない
-  def self.reset_connection!
-    s = new
-    s.add([
-      ["0000"],
-      ["0000"],
-      ["8005"],
-      ["0000"],
-      ["8001"],
-    ], read_from: :switch)
-    s.drain_all
-    s.read_procon
-    s.write_switch("213c910080005db7723d48720a800300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-    sleep(10) # いらないかも
-    s
-  end
-
   def self.connect
     s = new(throw_error_if_timeout: true, enable_at_exit: false)
     s.add([
@@ -75,7 +58,7 @@ class ProconBypassMan::DeviceConnector
         timer = ProconBypassMan::Timer.new
         begin
           timer.throw_if_timeout!
-          data = from_device(item).read_nonblock(128)
+          data = from_device(item).read_nonblock(64)
         rescue IO::EAGAINWaitReadable
           retry
         end
@@ -128,7 +111,7 @@ class ProconBypassMan::DeviceConnector
     timer = ProconBypassMan::Timer.new
     begin
       timer.throw_if_timeout!
-      data = switch.read_nonblock(128)
+      data = switch.read_nonblock(64)
       ProconBypassMan.logger.debug { " >>> #{data.unpack("H*")})" }
     rescue IO::EAGAINWaitReadable
       retry
@@ -163,7 +146,7 @@ class ProconBypassMan::DeviceConnector
     timer = ProconBypassMan::Timer.new
     begin
       timer.throw_if_timeout!
-      data = procon.read_nonblock(128)
+      data = procon.read_nonblock(64)
       ProconBypassMan.logger.error " <<< #{data.unpack("H*")})"
     rescue IO::EAGAINWaitReadable
       retry
@@ -184,7 +167,7 @@ class ProconBypassMan::DeviceConnector
     timer = ProconBypassMan::Timer.new
     begin
       timer.throw_if_timeout!
-      data = procon.read_nonblock(128)
+      data = procon.read_nonblock(64)
       ProconBypassMan.logger.debug { " <<< #{data.unpack("H*")})" }
     rescue IO::EAGAINWaitReadable
       retry
@@ -217,7 +200,7 @@ class ProconBypassMan::DeviceConnector
     timer = ProconBypassMan::Timer.new
     begin
       timer.throw_if_timeout!
-      data = switch.read_nonblock(128)
+      data = switch.read_nonblock(64)
       ProconBypassMan.logger.debug { " >>> #{data.unpack("H*")})" }
     rescue IO::EAGAINWaitReadable
       retry
@@ -281,7 +264,7 @@ class ProconBypassMan::DeviceConnector
 
     file = File.open(path, "w+")
     begin
-      file.read_nonblock(128)
+      file.read_nonblock(64)
     rescue EOFError
       file.close
       return false
@@ -303,12 +286,12 @@ class ProconBypassMan::DeviceConnector
     case
     when is_available_device?(PROCON_PATH)
       ProconBypassMan.logger.info "proconのデバイスファイルは#{PROCON_PATH}を使います"
-      @procon = File.open(PROCON_PATH, "w+")
-      @gadget = File.open('/dev/hidg0', "w+")
+      @procon = File.open(PROCON_PATH, "w+b")
+      @gadget = File.open('/dev/hidg0', "w+b")
     when is_available_device?(PROCON2_PATH)
       ProconBypassMan.logger.info "proconのデバイスファイルは#{PROCON2_PATH}を使います"
-      @procon = File.open(PROCON2_PATH, "w+")
-      @gadget = File.open('/dev/hidg0', "w+")
+      @procon = File.open(PROCON2_PATH, "w+b")
+      @gadget = File.open('/dev/hidg0', "w+b")
     else
       raise "/dev/hidraw0, /dev/hidraw1の両方見つかりませんでした"
     end
@@ -326,8 +309,7 @@ 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

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,21 +56,24 @@ 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
-          print "\r"
-          print " " * max_output_length
-          print "\r"
-          print line
+
+          if ENV["PBM_FOREGROUND"]
+            print "\r"
+            print " " * max_output_length
+            print "\r"
+            print line
+          end
           ProconBypassMan.logger.debug { line }
           break if $will_terminate_token
         end

data/lib/procon_bypass_man/on_memory_cache.rb

@@ -0,0 +1,34 @@
+class ProconBypassMan::OnMemoryCache
+  class CacheValue
+    attr_accessor :expired_at, :value
+
+    def initialize(expired_at: , value: )
+      self.expired_at = expired_at
+      self.value = value
+    end
+  end
+
+  def initialize
+    @table = {}
+  end
+
+  # @param [Integer] expires_in 秒数
+  # @param [String] key
+  def fetch(key: , expires_in: , &block)
+    now = Time.now
+    if @table[key].nil?
+      value = block.call
+      value_object = CacheValue.new(expired_at: now + expires_in, value: value)
+      @table[key] = value_object
+      return value
+    end
+
+    if @table[key].expired_at < now
+      value = block.call
+      @table[key] = CacheValue.new(expired_at: now + expires_in, value: value)
+      return value
+    else
+      return @table[key].value
+    end
+  end
+end

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

@@ -0,0 +1,65 @@
+class ProconBypassMan::Procon::AnalogStickCap
+  class Position
+    attr_accessor :x, :y
+
+    def initialize(x:, y:)
+      @x = x.to_i
+      @y = y.to_i
+    end
+
+    def to_binary
+      analog_stick_data = [
+        (@x & "0xff".to_i(16)),
+        ((@y << 4) & "0xf0".to_i(16)) | ((@x >> 8) & "0x0f".to_i(16)),
+        (@y >> 4) & "0xff".to_i(16),
+      ]
+      hex = analog_stick_data.map{ |x| x.to_s(16).rjust(2, "0") }.join
+      [hex].pack("H*")
+    end
+  end
+
+  def initialize(binary)
+    @binary = binary
+    @analog_stick = ProconBypassMan::Procon::AnalogStick.new(binary: binary)
+  end
+
+  # @return [ProconBypassMan::Procon::AnalogStickCap::Position]
+  def capped_position(cap_hypotenuse: )
+    if hypotenuse > cap_hypotenuse
+      relative_capped_x = cap_hypotenuse * Math.cos(rad * Math::PI / 180).abs
+      relative_capped_y = cap_hypotenuse * Math.sin(rad * Math::PI / 180).abs
+      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 + @analog_stick.neutral_position.x,
+        y: relative_capped_y + @analog_stick.neutral_position.y,
+      )
+    else
+      return position
+    end
+  end
+
+  # @return [ProconBypassMan::Procon::AnalogStickCap::Position]
+  def position
+    Position.new(x: abs_x, y: abs_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
+  def y; relative_y; end
+
+  def rad
+    (
+      Math.atan(relative_y / relative_x.to_f) * 180 / Math::PI
+    ).floor(6)
+  end
+
+  def hypotenuse
+    Math.sqrt(relative_x**2 + relative_y**2).floor(6)
+  end
+end

data/lib/procon_bypass_man/procon/button_collection.rb

@@ -8,15 +8,20 @@ class ProconBypassMan::Procon::ButtonCollection
     end
   end
 
+  # https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/ac8093c84194b3232acb675ac1accce9bcb456a3/bluetooth_hid_notes.md
+  #0) Input report ID
+  #1) Timer. Increments very fast. Can be used to estimate excess Bluetooth latency.
+  #2 high nibble) Battery level. 8=full, 6=medium, 4=low, 2=critical, 0=empty. LSB=Charging.
+  #2 low nibble) Connection info. (con_info >> 1) & 3 - 3=JC, 0=Pro/ChrGrip. con_info & 1 - 1=Switch/USB powered.
   #3)  ZR	R	SR(right)	SL(right)	A	B	X	Y
   #4)  Grip	(none)	Cap	Home	ThumbL	ThumbR	+	-
   #5)  ZL	L	SL(left)	SR(left)	Left	Right	Up	Down
-  #6)  analog[0]
-  #7)  analog[1]
-  #8)  analog[2]
-  #9)  analog[3]
-  #a)  analog[4]
-  #b)  analog[5]
+  #6)  analog[0] Left analog stick data
+  #7)  analog[1] Left analog stick data
+  #8)  analog[2] Left analog stick data
+  #9)  analog[3] Right analog stick data
+  #a)  analog[4] Right analog stick data
+  #b)  analog[5] Right analog stick data
   BYTES_MAP = {
     0 => nil,
     1 => nil,
@@ -24,11 +29,15 @@ class ProconBypassMan::Procon::ButtonCollection
     3 => [:zr, :r, :sr, :sl, :a, :b, :x, :y],
     4 => [:grip, :_undefined_key, :cap, :home, :thumbl, :thumbr, :plus, :minus],
     5 => [:zl, :l, :sl, :sr, :left, :right, :up, :down],
+    6 => [],
+    7 => [],
+    8 => [],
   }.freeze
 
   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)
+  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

@@ -23,10 +23,10 @@ class ProconBypassMan::Procon::ModeRegistry
   }
 
   def self.install_plugin(klass)
-    if plugins[klass.name]
+    if plugins[klass.name.to_sym]
       raise "すでに登録済みです"
     end
-    plugins[klass.name] = klass.binaries
+    plugins[klass.name.to_sym] = klass.binaries
   end
 
   def self.load(name)
@@ -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!

data/lib/procon_bypass_man/procon/press_button_aware.rb

@@ -0,0 +1,13 @@
+class ProconBypassMan::PpressButtonAware
+  def initialize(binary)
+    @binary = binary
+  end
+
+  def pressed_button?(button)
+    @binary[
+      ::ProconBypassMan::Procon::ButtonCollection.load(button).byte_position
+    ].unpack("H*").first.to_i(16).to_s(2).reverse[
+      ::ProconBypassMan::Procon::ButtonCollection.load(button).bit_position
+    ] == '1'
+  end
+end