procon_bypass_man 0.1.21 → 0.2.0

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/button.rb

@@ -0,0 +1,28 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class Button
+        attr_reader :button
+
+        def initialize(button)
+          @button = button
+        end
+
+        def to_value!
+          case button
+          when TrueClass, FalseClass, NilClass, Array, Integer
+            raise UnSupportValueError
+          when Symbol, String
+            unless !!ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP[button.to_sym]
+              raise UnexpectedValueError
+            end
+
+            return button.to_sym
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/button_list.rb

@@ -0,0 +1,31 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class ButtonList
+        attr_reader :button
+
+        def initialize(button)
+          @button = button
+        end
+
+        # @return [Array]
+        # @raise [UnSupportValueError]
+        # @raise [UnexpectedValueError]
+        def to_value!
+          case button
+          when Integer, TrueClass, FalseClass, NilClass
+            raise UnSupportValueError
+          when Symbol
+            return [button]
+          when String
+            return [button.to_sym]
+          when Array
+            return button.map(&:to_sym).uniq
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/disable_macro_if_pressed.rb

@@ -0,0 +1,28 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class DisableMacroIfPressed
+        attr_reader :value
+
+        def initialize(value)
+          @value = value
+        end
+
+        def to_value!
+          case value
+          when FalseClass, Integer, TrueClass
+            raise UnSupportValueError
+          when Symbol, String
+            return [value.to_sym]
+          when Array
+            return value.map(&:to_sym).uniq
+          when NilClass # 常に対象のmacroをdisableにする
+            return [true]
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/flip_if_pressed.rb

@@ -0,0 +1,31 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class FlipIfPressed
+        attr_reader :value
+
+        def initialize(value, button: )
+          @value = value
+          @button = button
+        end
+
+        def to_value!
+          case value
+          when Integer
+            raise UnSupportValueError
+          when TrueClass
+            return [@button]
+          when Symbol, String
+            return [value.to_sym]
+          when Array
+            return value.map(&:to_sym).uniq
+          when FalseClass, NilClass
+            return false
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/force_neutral.rb

@@ -0,0 +1,28 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class ForceNeutral
+        attr_reader :force_neutral
+
+        def initialize(force_neutral)
+          @force_neutral = force_neutral
+        end
+
+        def to_value!
+          case force_neutral
+          when Integer, TrueClass
+            raise UnSupportValueError
+          when Symbol, String
+            return [force_neutral.to_sym]
+          when Array
+            return force_neutral.map(&:to_sym).uniq
+          when FalseClass, NilClass
+            return nil
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/if_pressed.rb

@@ -0,0 +1,26 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class IfPressed
+        attr_reader :value
+
+        def initialize(value)
+          @value = value
+        end
+
+        def to_value!
+          case value
+          when Integer, TrueClass, FalseClass, NilClass
+            raise UnSupportValueError
+          when Symbol, String
+            return [value.to_sym]
+          when Array
+            return value.map(&:to_sym).uniq
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/if_pressed_allows_nil.rb

@@ -0,0 +1,28 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class IfPressedAllowsFalsy
+        attr_reader :value
+
+        def initialize(value)
+          @value = value
+        end
+
+        def to_value!
+          case value
+          when Integer, TrueClass
+            raise UnSupportValueError
+          when Symbol, String
+            return [value.to_sym]
+          when Array
+            return value.map(&:to_sym).uniq
+          when FalseClass, NilClass
+            # OK
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/open_macro_steps.rb

@@ -0,0 +1,26 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class OpenMacroSteps
+        attr_reader :steps
+
+        def initialize(steps)
+          @steps = steps
+        end
+
+        def to_value!
+          case steps
+          when Integer, TrueClass, FalseClass, NilClass
+            raise UnSupportValueError
+          when String, Symbol
+            return [steps.to_sym]
+          when Array
+            return steps.map(&:to_sym)
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer.rb

@@ -0,0 +1,17 @@
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/button_list"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/button"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/force_neutral"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/if_pressed_allows_nil"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/flip_if_pressed"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/disable_macro_if_pressed"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/if_pressed"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/open_macro_steps"
+
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class UnSupportValueError < StandardError; end
+      class UnexpectedValueError < UnSupportValueError; end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration.rb

@@ -3,7 +3,7 @@ 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 Position < Struct.new(:x, :y); end
 
   class ButtonsSettingConfiguration
     attr_accessor :layers,
@@ -90,7 +90,7 @@ module ProconBypassMan
     end
 
     def set_neutral_position(x, y)
-      self.neutral_position = AnalogStickPosition.new(x, y).freeze
+      self.neutral_position = Position.new(x, y).freeze
       self
     end
 
@@ -103,14 +103,15 @@ module ProconBypassMan
       self.mode_plugins = {}
       # プロセスを一度起動するとsetting_pathは変わらない、という想定なので適当に扱う. resetでは初期化しない
       # self.setting_path = nil
-      self.macro_plugins = {}
+      # どこかで初期化している気がするのでコメントアウト
+      self.macro_plugins = ProconBypassMan::Procon::MacroPluginMap.new # ProconBypassMan::Procon::MacroRegistry.reset!と重複している
       self.layers = {
         up: Layer.new,
         down: Layer.new,
         left: Layer.new,
         right: Layer.new,
       }
-      @neutral_position = AnalogStickPosition.new(2124, 1808).freeze
+      @neutral_position = Position.new(2124, 1808).freeze
     end
   end
 end

data/lib/procon_bypass_man/{commands → bypass}/bypass_command.rb

@@ -1,18 +1,23 @@
 class ProconBypassMan::BypassCommand
   include ProconBypassMan::SignalHandler
 
+  module WILL_TERMINATE_TOKEN
+    TERMINATE = :terminate
+    RESTART = :restart
+  end
+
   def initialize(gadget:, procon:)
     @gadget = gadget
     @procon = procon
 
-    ProconBypassMan::IOMonitor.start!
+    ProconBypassMan::IOMonitor.start! if ProconBypassMan.io_monitor_logging
     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|
+    %w(TERM INT USR2).each do |sig|
       begin
         trap sig do
           self_write.puts(sig)
@@ -28,30 +33,22 @@ class ProconBypassMan::BypassCommand
     monitor2 = ProconBypassMan::IOMonitor.new(label: "procon -> switch")
     ProconBypassMan.logger.info "Thread1を起動します"
 
-    @send_interval = 0.005
+    cycle_sleep = ProconBypassMan::CycleSleep.new(cycle_interval: 1, execution_cycle: ProconBypassMan.config.bypass_mode.gadget_to_procon_interval)
 
     t1 = Thread.new do
-      timer = ProconBypassMan::SafeTimeout.new(timeout: Time.now + 10)
-      @did_first_step = false
+      if ProconBypassMan.config.bypass_mode.mode == ProconBypassMan::BypassMode::TYPE_AGGRESSIVE
+        ProconBypassMan.logger.info "TYPE_AGGRESSIVEなのでThread1を終了します"
+        monitor1.shutdown
+        next
+      end
+
       loop do
-        bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor1)
         break if $will_terminate_token
-        !@did_first_step && timer.throw_if_timeout!
-        bypass.send_gadget_to_procon!
-        sleep(@send_interval)
-      rescue ProconBypassMan::SafeTimeout::Timeout
-        case ProconBypassMan.config.bypass_mode.mode
-        when ProconBypassMan::BypassMode::TYPE_AGGRESSIVE
-          ProconBypassMan.logger.info "10秒経過したのでThread1を終了します"
-          monitor1.shutdown
-          break
-        when ProconBypassMan::BypassMode::TYPE_NORMAL
-          ProconBypassMan.logger.info "10秒経過したのでsend_intervalを長くします"
-          @send_interval = ProconBypassMan.config.bypass_mode.gadget_to_procon_interval
-        else
-          raise "unknown type"
+
+        cycle_sleep.sleep_or_execute do
+          bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor1)
+          bypass.send_gadget_to_procon!
         end
-        @did_first_step = true
       rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN => e
         ProconBypassMan::SendErrorCommand.execute(error: "Switchとの切断されました.終了処理を開始します. #{e.full_message}")
         Process.kill "TERM", Process.ppid
@@ -60,6 +57,7 @@ class ProconBypassMan::BypassCommand
         ProconBypassMan::SendErrorCommand.execute(error: "Switchと意図せず切断されました.終了処理を開始します. #{e.full_message}")
         Process.kill "TERM", Process.ppid
       end
+
       ProconBypassMan.logger.info "Thread1を終了します"
     end
 
@@ -69,14 +67,22 @@ class ProconBypassMan::BypassCommand
     t2 = Thread.new do
       bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor2)
       loop do
-        break if $will_terminate_token
+        if $will_terminate_token
+          if $will_terminate_token == WILL_TERMINATE_TOKEN::TERMINATE
+            bypass.direct_connect_switch_via_bluetooth
+          end
+          break
+        end
+
         bypass.send_procon_to_gadget!
       rescue EOFError => e
         ProconBypassMan::SendErrorCommand.execute(error: "Proconが切断されました。終了処理を開始します. #{e.full_message}")
         Process.kill "TERM", Process.ppid
+        break
       rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN => e
         ProconBypassMan::SendErrorCommand.execute(error: "Proconが切断されました。終了処理を開始します2. #{e.full_message}")
         Process.kill "TERM", Process.ppid
+        break
       end
       ProconBypassMan.logger.info "Thread2を終了します"
     end
@@ -87,12 +93,18 @@ class ProconBypassMan::BypassCommand
         signal = readable_io.first[0].gets.strip
         handle_signal(signal)
       end
+    rescue ProconBypassMan::Runner::InterruptForRestart
+      $will_terminate_token = WILL_TERMINATE_TOKEN::RESTART
+      [t1, t2].each(&:join)
+      @gadget&.close
+      @procon&.close
+      exit! 1 # child processなのでexitしていい
     rescue Interrupt
-      $will_terminate_token = true
+      $will_terminate_token = WILL_TERMINATE_TOKEN::TERMINATE
       [t1, t2].each(&:join)
       @gadget&.close
       @procon&.close
-      exit 1 # child processなのでexitしていい
+      exit! 1 # child processなのでexitしていい
     end
   end
 end

data/lib/procon_bypass_man/bypass/usb_hid_logger.rb

@@ -10,6 +10,8 @@ class ProconBypassMan::Bypass
     set_callback :send_procon_to_gadget, :after, :log_procon_to_gadget
 
     def log_send_gadget_to_procon
+      return unless bypass_value.to_text
+
       if ProconBypassMan.config.verbose_bypass_log
         ProconBypassMan.logger.debug { ">>> #{bypass_value.to_text}" }
       else
@@ -20,6 +22,8 @@ class ProconBypassMan::Bypass
     end
 
     def log_procon_to_gadget
+      return unless bypass_value.to_text
+
       if ProconBypassMan.config.verbose_bypass_log
         ProconBypassMan.logger.debug { "<<< #{bypass_value.to_text}" }
       else

data/lib/procon_bypass_man/bypass.rb

@@ -1,12 +1,13 @@
 require "procon_bypass_man/bypass/usb_hid_logger"
+require "procon_bypass_man/bypass/bypass_command"
 
 class ProconBypassMan::Bypass
   include ProconBypassMan::Bypass::UsbHidLogger
 
-  class BypassValue < Struct.new(:binary, :sent)
+  class BypassValue < Struct.new(:binary)
     def to_text
       return unless binary
-      "#{binary.unpack.first} #{'x' unless sent}"
+      binary.unpack.first
     end
   end
 
@@ -21,23 +22,31 @@ class ProconBypassMan::Bypass
   # ゆっくりでいい
   def send_gadget_to_procon!
     monitor.record(:start_function)
-    input = nil
-    self.bypass_value = BypassValue.new(nil, sent = false)
+    self.bypass_value = BypassValue.new(nil)
 
     run_callbacks(:send_gadget_to_procon) do
+      break if $will_terminate_token
+
+      raw_input = nil
       begin
-        break if $will_terminate_token
-        # TODO blocking readにしたいが、接続時のフェーズによって長さが違うので厳しい
-        input = self.gadget.read_nonblock(64)
-        self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: input)
+        raw_input = self.gadget.read_nonblock(64)
+        self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: raw_input)
       rescue IO::EAGAINWaitReadable
         monitor.record(:eagain_wait_readable_on_read)
       end
 
-      if input
+      if self.bypass_value.binary
         begin
-          self.procon.write_nonblock(input)
-          self.bypass_value.sent = true
+          raw_data =
+            case
+            when self.bypass_value.binary.rumble_data?
+              binary = ProconBypassMan::RumbleBinary.new(binary: self.bypass_value.binary.raw)
+              binary.noop!
+              binary.raw
+            else
+              self.bypass_value.binary.raw
+            end
+          self.procon.write_nonblock(raw_data)
         rescue IO::EAGAINWaitReadable
           monitor.record(:eagain_wait_readable_on_write)
           break
@@ -50,15 +59,15 @@ class ProconBypassMan::Bypass
 
   def send_procon_to_gadget!
     monitor.record(:start_function)
-    output = nil
-    self.bypass_value = BypassValue.new(nil, sent = false)
+    self.bypass_value = BypassValue.new(nil)
 
     run_callbacks(:send_procon_to_gadget) do
+      break if $will_terminate_token
+
       begin
-        break if $will_terminate_token
         Timeout.timeout(1) do
-          output = self.procon.read(64)
-          self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: output)
+          raw_output = self.procon.read(64)
+          self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: raw_output)
         end
       rescue Timeout::Error
         ProconBypassMan.logger.debug { "read timeout! do sleep. by send_procon_to_gadget!" }
@@ -73,16 +82,10 @@ class ProconBypassMan::Bypass
         retry
       end
 
-      # blocking readをしているのでnilが入ることはないが、雑なテストでnilが通るので分岐を入れる。できれば消したい
-      break if output.nil?
-
       begin
         self.gadget.write_nonblock(
-          ProconBypassMan::Processor.new(
-            ProconBypassMan::Domains::InboundProconBinary.new(binary: output)
-          ).process
+          ProconBypassMan::Processor.new(bypass_value.binary).process
         )
-        self.bypass_value.sent = true
       rescue IO::EAGAINWaitReadable
         monitor.record(:eagain_wait_readable_on_write)
         break
@@ -90,4 +93,21 @@ class ProconBypassMan::Bypass
     end
     monitor.record(:end_function)
   end
+
+  # @return [void]
+  def direct_connect_switch_via_bluetooth
+    ProconBypassMan.logger.debug { "direct_connect_switch_via_bluetooth!" }
+    self.procon.write_nonblock(["010500000000000000003800"].pack("H*")) # home led off
+    self.procon.write_nonblock(["010600000000000000003800"].pack("H*")) # home led off
+    self.procon.write_nonblock(["010700000000000000003800"].pack("H*")) # home led off
+    self.procon.write_nonblock(["010800000000000000003800"].pack("H*")) # home led off
+    self.procon.write_nonblock(["8005"].pack("H*"))
+    self.procon.write_nonblock(["8005"].pack("H*"))
+    self.procon.write_nonblock(["8005"].pack("H*"))
+  end
+
+  # @return [void] 入力してから取り出さないと接続しっぱなしになるっぽいのでこれが必要っぽい
+  def be_empty_procon
+    # タイムアウトまでブロッキングされるので、プロセスに逃す
+  end
 end

data/lib/procon_bypass_man/commands/print_boot_message_command.rb

@@ -32,8 +32,8 @@ class ProconBypassMan::PrintBootMessageCommand
     def to_s
       booted_message = <<~EOF
       ----
-      RUBY_VERSION: #{@table[:ruby_version]}
       ProconBypassMan::VERSION: #{@table[:pbm_version]}
+      RUBY_VERSION: #{@table[:ruby_version]}
       Pbmenv::VERSION: #{@table[:pbmenv_version]}
       pid: #{@table[:pid]}
       root: #{@table[:root_path]}
@@ -42,7 +42,7 @@ class ProconBypassMan::PrintBootMessageCommand
       uptime from boot: #{@table[:uptime_from_boot]} sec
       use_pbmenv: #{@table[:use_pbmenv]}
       session_id: #{ProconBypassMan.session_id}
-      device_id: #{ProconBypassMan.device_id}
+      device_id: #{ProconBypassMan.device_id.gsub(/.{25}$/, "*"*25)}
       bypass_mode: #{ProconBypassMan.config.bypass_mode}
       ----
       EOF
@@ -58,7 +58,6 @@ class ProconBypassMan::PrintBootMessageCommand
   def self.execute
     message = 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/send_error_command.rb

@@ -1,7 +1,7 @@
 class ProconBypassMan::SendErrorCommand
   # @param [String, Hash, Exception] error
   # @return [void]
-  def self.execute(error: )
+  def self.execute(error: , stdout: true)
     body =
       case error
       when String, Hash
@@ -12,7 +12,7 @@ class ProconBypassMan::SendErrorCommand
 
     ProconBypassMan.logger.error body
     ProconBypassMan.error_logger.error body
-    puts body
+    puts body if stdout
 
     ProconBypassMan::ReportErrorJob.perform(error)
   end

data/lib/procon_bypass_man/commands.rb

@@ -4,6 +4,3 @@ 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

@@ -47,10 +47,14 @@ class ProconBypassMan::Configuration
     def fallback_setting_path
       "/tmp/procon_bypass_man_fallback_setting.yaml"
     end
+
+    def io_monitor_logging
+      config.io_monitor_logging
+    end
   end
 
   attr_accessor :enable_critical_error_logging
-  attr_writer :verbose_bypass_log, :raw_setting, :enable_reporting_pressed_buttons, :never_exit_accidentally
+  attr_writer :verbose_bypass_log, :raw_setting, :enable_reporting_pressed_buttons, :never_exit_accidentally, :io_monitor_logging, :enable_home_led_on_connect
 
   def root=(path)
     @root = path
@@ -156,7 +160,14 @@ class ProconBypassMan::Configuration
   end
 
   # @return [Boolean]
-  def enable_ws?; !!current_server; end
+  def enable_ws?
+    !!current_server
+  end
+
+  # @return [Boolean]
+  def enable_remote_macro?
+    enable_ws?
+  end
 
   # @return [Array<String>]
   def api_servers
@@ -179,12 +190,27 @@ class ProconBypassMan::Configuration
     @raw_setting ||= {}
   end
 
+  # @return [Boolean] default false
   def enable_reporting_pressed_buttons
     @enable_reporting_pressed_buttons ||= false
   end
 
-  # @return [Boolean]
+  # @return [Boolean] default false
   def never_exit_accidentally
     @never_exit_accidentally || false
   end
+
+  # @return [Boolean] default false
+  def io_monitor_logging
+    @io_monitor_logging ||= false
+  end
+
+  # @return [Boolean] default true
+  def enable_home_led_on_connect
+    if defined?(@enable_home_led_on_connect)
+      return @enable_home_led_on_connect
+    else
+      true
+    end
+  end
 end