procon_bypass_man 0.1.7 → 0.1.11

data/lib/procon_bypass_man/outbound/error_reporter.rb

@@ -0,0 +1,13 @@
+require "procon_bypass_man/outbound/base"
+
+class ProconBypassMan::ErrorReporter < ProconBypassMan::Outbound::Base
+  PATH = "/api/error_reports"
+
+  def self.report(body: )
+    Client.new(
+      path: PATH,
+      server: ProconBypassMan.config.api_server,
+    ).post(body: body.full_message)
+  end
+end
+

data/lib/procon_bypass_man/outbound/pressed_buttons_reporter.rb

@@ -0,0 +1,13 @@
+require "procon_bypass_man/outbound/base"
+
+class ProconBypassMan::PressedButtonsReporter < ProconBypassMan::Outbound::Base
+  PATH = "/api/pressed_buttons"
+
+  def self.report(body: )
+    Client.new(
+      path: PATH,
+      server: ProconBypassMan.config.internal_api_servers,
+    ).post(body: body)
+  end
+end
+

data/lib/procon_bypass_man/outbound/reporter.rb

@@ -0,0 +1,12 @@
+require "procon_bypass_man/outbound/base"
+
+class ProconBypassMan::Reporter < ProconBypassMan::Outbound::Base
+  PATH = "/api/reports"
+
+  def self.report(body: )
+    Client.new(
+      path: PATH,
+      server: ProconBypassMan.config.api_server,
+    ).post(body: body)
+  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/layer_changeable.rb

@@ -16,10 +16,10 @@ module ProconBypassMan::Procon::LayerChangeable
   end
 
   def change_layer?
-    if ProconBypassMan::Configuration.instance.prefix_keys.empty?
+    if ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.empty?
       raise "prefix_keysが未設定です"
     end
-    ProconBypassMan::Configuration.instance.prefix_keys.map { |b| pressed_button?(b) }.all?
+    ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.map { |b| pressed_button?(b) }.all?
   end
 
   def pressed_next_layer?

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

data/lib/procon_bypass_man/procon/pressed_button_helper.rb

@@ -1,14 +1,4 @@
-module ProconBypassMan::Procon::PushedButtonHelper
-  module Static
-    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
-
+module ProconBypassMan::Procon::PressedButtonHelper
   module Dynamic
     @@compiled = false
     def compile_if_not_compile_yet!

data/lib/procon_bypass_man/procon/user_operation.rb

@@ -1,8 +1,7 @@
 class ProconBypassMan::Procon
   class UserOperation
     include LayerChangeable
-    include PushedButtonHelper::Static
-    extend PushedButtonHelper::Dynamic
+    extend PressedButtonHelper::Dynamic
 
     attr_reader :binary
 
@@ -32,14 +31,22 @@ class ProconBypassMan::Procon
     end
 
     def unpress_button(button)
+      return if not pressed_button?(button)
+
       byte_position = ButtonCollection.load(button).byte_position
-      value = binary[byte_position].unpack("H*").first.to_i(16) - 2**ButtonCollection.load(button).bit_position
+      value = binary[byte_position].unpack("H*").first.to_i(16) - (2**ButtonCollection.load(button).bit_position)
       binary[byte_position] = ["%02X" % value.to_s].pack("H*")
     end
 
+    def apply_left_analog_stick_cap(cap: )
+      binary[6..8] = ProconBypassMan::Procon::AnalogStickCap.new(binary).capped_position(cap_hypotenuse: cap).to_binary
+    end
+
     def press_button(button)
+      return if pressed_button?(button)
+
       byte_position = ButtonCollection.load(button).byte_position
-      value = binary[byte_position].unpack("H*").first.to_i(16) + 2**ButtonCollection.load(button).bit_position
+      value = binary[byte_position].unpack("H*").first.to_i(16) + (2**ButtonCollection.load(button).bit_position)
       binary[byte_position] = ["%02X" % value.to_s].pack("H*")
     end
 
@@ -68,5 +75,9 @@ class ProconBypassMan::Procon
       binary[11] = tb[11]
       self.binary
     end
+
+    def pressed_button?(button)
+      ProconBypassMan::PpressButtonAware.new(binary).pressed_button?(button)
+    end
   end
 end

data/lib/procon_bypass_man/procon.rb

@@ -7,6 +7,7 @@ class ProconBypassMan::Procon
   require "procon_bypass_man/procon/pressed_button_helper"
   require "procon_bypass_man/procon/user_operation"
   require "procon_bypass_man/procon/flip_cache"
+  require "procon_bypass_man/procon/press_button_aware"
 
   attr_accessor :user_operation
 
@@ -30,7 +31,7 @@ class ProconBypassMan::Procon
   def current_layer_key; @@status[:current_layer_key]; end
 
   def current_layer
-    ProconBypassMan::Configuration.instance.layers[current_layer_key]
+    ProconBypassMan::ButtonsSettingConfiguration.instance.layers[current_layer_key]
   end
 
   def apply!
@@ -94,10 +95,23 @@ class ProconBypassMan::Procon
       return user_operation.binary
     end
 
+    current_layer.disables.each do |button|
+      user_operation.unpress_button(button)
+    end
+
+    current_layer.left_analog_stick_caps.each do |button, options|
+      if button.nil? || button.all? { |b| user_operation.pressed_button?(b) }
+        options[:force_neutral]&.each do |force_neutral_button|
+          user_operation.unpress_button(force_neutral_button)
+        end
+        user_operation.apply_left_analog_stick_cap(cap: options[:cap])
+      end
+    end
+
     current_layer.flip_buttons.each do |button, options|
       # 何もしないで常に連打
       if !options[:if_pressed] && status[button]
-        user_operation.press_button(button) unless user_operation.pressed_button?(button)
+        user_operation.press_button(button)
         next
       end
 
@@ -108,7 +122,7 @@ class ProconBypassMan::Procon
         end
 
         options[:force_neutral]&.each do |force_neutral_button|
-          user_operation.pressed_button?(force_neutral_button) && user_operation.unpress_button(force_neutral_button)
+          user_operation.unpress_button(force_neutral_button)
         end
       end
     end
@@ -118,12 +132,18 @@ class ProconBypassMan::Procon
         user_operation.unpress_button(from_button)
         # TODO 2重でpressしないようにしたい
         to_buttons[:to].each do |to_button|
-          user_operation.press_button(to_button) unless user_operation.pressed_button?(to_button)
+          user_operation.press_button(to_button)
         end
       end
     end
 
-    user_operation.binary
+    b = user_operation.binary
+    ProconBypassMan.cache.fetch key: 'user_operation.binary', expires_in: 60 do
+      left_analog_stick = ProconBypassMan::ReadonlyProcon.new(binary: b).left_analog_stick
+      ProconBypassMan.logger.debug "x: #{left_analog_stick[:x]}, val: #{left_analog_stick[:x].to_s(2)}"
+      ProconBypassMan.logger.debug "y: #{left_analog_stick[:y]}, val: #{left_analog_stick[:y].to_s(2)}"
+    end
+    b
   end
 
   private

data/lib/procon_bypass_man/readonly_procon.rb

@@ -0,0 +1,32 @@
+# read
+class ProconBypassMan::ReadonlyProcon
+  def initialize(binary: )
+    @binary = binary
+    @user_operation = ProconBypassMan::Procon::UserOperation.new(binary.dup)
+    @analog_stick = ProconBypassMan::Procon::AnalogStick.new(binary: binary)
+  end
+
+  # @return [Array<Symbol>]
+  def pressed
+    pressed_table = ::ProconBypassMan::Procon::ButtonCollection::BUTTONS.reduce({}) do |acc, button|
+      acc[button] = @user_operation.pressed_button?(button)
+      acc
+    end
+    pressed_table.select { |_key, value| value }.keys
+  end
+
+  def left_analog_stick
+    { x: @analog_stick.relative_x, y: @analog_stick.relative_y }
+  end
+
+  def left_analog_stick_by_abs
+    { x: @analog_stick.abs_x, y: @analog_stick.abs_y }
+  end
+
+  def to_hash
+    { left_analog_stick: left_analog_stick,
+      left_analog_stick_by_abs: left_analog_stick_by_abs,
+      buttons: pressed,
+    }
+  end
+end

data/lib/procon_bypass_man/runner.rb

@@ -1,13 +1,11 @@
 require_relative "io_monitor"
+require_relative "uptime"
+require_relative "boot_message"
+require_relative "background/report_thread"
 
 class ProconBypassMan::Runner
   class InterruptForRestart < StandardError; end
 
-  def initialize
-    $will_interval_0_0_0_5 = 0
-    $will_interval_1_6 = 0
-  end
-
   def run
     first_negotiation
     print_booted_message
@@ -38,7 +36,7 @@ class ProconBypassMan::Runner
         Process.wait
         ProconBypassMan.logger.info("Reloading config file")
         begin
-          ProconBypassMan::Configuration::Loader.reload_setting
+          ProconBypassMan::ButtonsSettingConfiguration::Loader.reload_setting
           puts "設定ファイルの再読み込みができました"
         rescue ProconBypassMan::CouldNotLoadConfigError
           ProconBypassMan.logger.error "設定ファイルが不正です。再読み込みができませんでした"
@@ -60,31 +58,36 @@ class ProconBypassMan::Runner
   private
 
   def main_loop
-    # TODO 接続確立完了をswitchを読み取るようにして、この暫定で接続完了sleepを消す
-    Thread.new do
-      sleep(5)
-      $will_interval_0_0_0_5 = 0.005
-      $will_interval_1_6 = 1.6
-    end
-
     ProconBypassMan::IOMonitor.start!
+    ProconBypassMan::Background::Reporter.start!
+
     # 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::Timer.new(timeout: Time.now + 10)
       bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor1)
-      begin
-        loop do
-          break if $will_terminate_token
-          bypass.send_gadget_to_procon!
-        rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
-          ProconBypassMan.logger.error "Proconが切断されました.終了処理を開始します"
-          Process.kill "TERM", Process.ppid
-        end
-        ProconBypassMan.logger.info "Thread1を終了します"
+      loop do
+        break if $will_terminate_token
+        timer.throw_if_timeout!
+        bypass.send_gadget_to_procon!
+        sleep(0.005)
+      rescue ProconBypassMan::Timer::Timeout
+        ProconBypassMan.logger.info "10秒経過したのでThread1を終了します"
+        puts "10秒経過したのでThread1を終了します"
+        break
+      rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
+        ProconBypassMan.logger.error "Proconが切断されました.終了処理を開始します"
+        Process.kill "TERM", Process.ppid
+      rescue Errno::ETIMEDOUT => e
+        # TODO まれにこれが発生する. 再接続したい
+        ProconBypassMan::ErrorReporter.report(body: e)
+        ProconBypassMan.logger.error "Switchとの切断されました.終了処理を開始します"
+        Process.kill "TERM", Process.ppid
       end
+      ProconBypassMan.logger.info "Thread1を終了します"
     end
 
     # procon => gadget
@@ -92,19 +95,17 @@ class ProconBypassMan::Runner
     ProconBypassMan.logger.info "Thread2を起動します"
     t2 = Thread.new do
       bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor2)
-      begin
-        loop do
-          break if $will_terminate_token
-          bypass.send_procon_to_gadget!
-        rescue EOFError => e
-          ProconBypassMan.logger.error "Proconと通信ができませんでした.終了処理を開始します"
-          Process.kill "TERM", Process.ppid
-        rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
-          ProconBypassMan.logger.error "Proconが切断されました。終了処理を開始します"
-          Process.kill "TERM", Process.ppid
-        end
-        ProconBypassMan.logger.info "Thread2を終了します"
+      loop do
+        break if $will_terminate_token
+        bypass.send_procon_to_gadget!
+      rescue EOFError => e
+        ProconBypassMan.logger.error "Proconと通信ができませんでした.終了処理を開始します"
+        Process.kill "TERM", Process.ppid
+      rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
+        ProconBypassMan.logger.error "Proconが切断されました。終了処理を開始します"
+        Process.kill "TERM", Process.ppid
       end
+      ProconBypassMan.logger.info "Thread2を終了します"
     end
 
     self_read, self_write = IO.pipe
@@ -134,8 +135,6 @@ class ProconBypassMan::Runner
   end
 
   def first_negotiation
-    return if $will_terminate_token
-
     @gadget, @procon = ProconBypassMan::DeviceConnector.connect
   rescue ProconBypassMan::Timer::Timeout
     ::ProconBypassMan.logger.error "デバイスとの通信でタイムアウトが起きて接続ができませんでした。"
@@ -156,17 +155,9 @@ class ProconBypassMan::Runner
 
   # @return [void]
   def print_booted_message
-    booted_message = <<~EOF
-      ----
-      RUBY_VERSION: #{RUBY_VERSION}
-      ProconBypassMan: #{ProconBypassMan::VERSION}
-      pid: #{$$}
-      root: #{ProconBypassMan.root}
-      pid_path: #{ProconBypassMan.pid_path}
-      setting_path: #{ProconBypassMan::Configuration.instance.setting_path}
-      ----
-    EOF
-    ProconBypassMan.logger.info(booted_message)
-    puts booted_message
+    message = ProconBypassMan::BootMessage.new
+    ProconBypassMan.logger.info(message.to_s)
+    Thread.new { ProconBypassMan::Reporter.report(body: message.to_hash) }
+    puts message.to_s
   end
 end

data/lib/procon_bypass_man/uptime.rb

@@ -0,0 +1,15 @@
+require "time"
+
+module ProconBypassMan
+  class Uptime
+    def self.from_boot
+      result = `uptime -s`.chomp
+      return -1 if result == '' # darwin系だとsオプションが使えない
+      boot_time = result.to_i
+      return Time.now.to_i - boot_time.to_i
+    rescue => e
+      ProconBypassMan.logger.error(e)
+      return -1
+    end
+  end
+end

data/lib/procon_bypass_man/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProconBypassMan
-  VERSION = "0.1.7"
+  VERSION = "0.1.11"
 end