procon_bypass_man 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8326aa72e03d6b2b8ebe7342778c357ba7595019617683e075694c93d870960c
-  data.tar.gz: fc1df85f7d880ec11c8b5f7d47d46c1a21e726d862cc18000310571e8a072011
+  metadata.gz: 5780c7567981a37aef9f32801868f1e59db9d70e47f5cb65dc302cc16a22252e
+  data.tar.gz: e1f6d212b9076c0e081e720f3f3c75217183d3bdb4cbab660ab14abc61a35671
 SHA512:
-  metadata.gz: bc6aeb40ae12912216e0c40e4b538ab0337ef963c0bcc8e3ac46bafa858a56f44d140f8db694c2200eb1444bf53edf2e49ebc80e9ee63073af29287e556fcd7a
-  data.tar.gz: bdcb9405fe592e390073e70c2b7eb75d9336bf5f26a6ab08dc1db768e45217103abee62c06eb1dc847d80ff03a600135a0a8b3b41564d1ca68f5161b484df60a
+  metadata.gz: 4ea7163f5d33b68c1cfe9e65c15bbe40414435ecf6c5c3fdadc9c70e29eb77f8fa4bbd8897cc8306f2d9cb8b42d231cce240973828f30e8e24771a66235c7304
+  data.tar.gz: d829cdf3cd7d3428247a55eb2e5140344d79d6c0b48321a4a7bdcbc3f3e122c66066fa31839bc260016643375b104847f9c8435dfe151f9afa027990b98df630

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-## [0.1.4] - 2021-0
+## [0.1.5] - 2021-07-29
+- siwtch, proコンが電源OFF時にCPU使いまくるのを修正した
+- 連打中に無視するボタンを複数登録できるようにした
+- キーのリマップ先に複数ボタンを登録できるようにした
+- 1つのボタンへ連打とリマップをできないようにしました
+    - NG ex)
+        - flip :zr, if_pressed: [:y]
+        - remap :zr, to: [:x]
+
+## [0.1.4] - 2021-07-11
 - ProconBypassMan.rootの定義を、gem rootからproject rootへ変更した
 - 連打の頻度を変更できるようにした
 - シグナルで設定ファイルを読み直すとpid_pathが消滅する不具合を修正した

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.4)
+    procon_bypass_man (0.1.5)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -60,9 +60,9 @@ Switch <-- (PBM): ZR連打
 ## 開発系
 ```ruby
 ProconBypassMan.tap do |pbm|
+  pbm.root = File.expand_path(__dir__)
   pbm.logger = Logger.new("#{ProconBypassMan.root}/app.log", 5, 1024 * 1024 * 10)
   pbm.logger.level = :debug
-  pbm.root = File.expand_path(__dir__)
 end
 ```
 

data/lib/procon_bypass_man.rb

@@ -3,11 +3,11 @@ require 'yaml'
 require "fileutils"
 
 require_relative "procon_bypass_man/version"
-require_relative "procon_bypass_man/device_registry"
+require_relative "procon_bypass_man/timer"
 require_relative "procon_bypass_man/bypass"
+require_relative "procon_bypass_man/device_connector"
 require_relative "procon_bypass_man/runner"
 require_relative "procon_bypass_man/processor"
-require_relative "procon_bypass_man/procon/data"
 require_relative "procon_bypass_man/configuration"
 require_relative "procon_bypass_man/procon"
 
@@ -18,6 +18,7 @@ module ProconBypassMan
   class ProConRejected < StandardError; end
   class CouldNotLoadConfigError < StandardError; end
   class FirstConnectionError < StandardError; end
+  class EternalConnectionError < StandardError; end
 
   def self.configure(setting_path: nil, &block)
     unless setting_path
@@ -34,13 +35,17 @@ module ProconBypassMan
   def self.run(setting_path: nil, &block)
     configure(setting_path: setting_path, &block)
     File.write(pid_path, $$)
-    registry = ProconBypassMan::DeviceRegistry.new
-    Runner.new(gadget: registry.gadget, procon: registry.procon).run
+    Runner.new.run
   rescue CouldNotLoadConfigError
     ProconBypassMan.logger.error "設定ファイルが不正です。設定ファイルの読み込みに失敗しました"
     puts "設定ファイルが不正です。設定ファイルの読み込みに失敗しました"
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     exit 1
+  rescue EternalConnectionError
+    ProconBypassMan.logger.error "接続の見込みがないのでsleepしまくります"
+    puts "接続の見込みがないのでsleepしまくります"
+    FileUtils.rm_rf(ProconBypassMan.pid_path)
+    sleep(999999999999999999)
   rescue FirstConnectionError
     puts "接続を確立できませんでした。やりなおします。"
     retry

data/lib/procon_bypass_man/configuration.rb

@@ -39,11 +39,16 @@ module ProconBypassMan
 
     MODES = [:manual]
     def layer(direction, mode: :manual, &block)
-      unless (MODES + ProconBypassMan::Procon::ModeRegistry.plugins.keys).include?(mode)
-        raise("#{mode} mode is unknown")
+      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)
+      layer = Layer.new(mode: mode_name)
       layer.instance_eval(&block) if block_given?
       self.layers[direction] = layer
       self

data/lib/procon_bypass_man/configuration/layer.rb

@@ -16,7 +16,7 @@ module ProconBypassMan
         case if_pressed
         when TrueClass
           if_pressed = [button]
-        when Symbol
+        when Symbol, String
           if_pressed = [if_pressed]
         when Array, FalseClass
           # sono mama
@@ -25,8 +25,16 @@ module ProconBypassMan
         end
         hash = { if_pressed: if_pressed }
         if force_neutral
-          hash[:force_neutral] = force_neutral
+          case force_neutral
+          when TrueClass, FalseClass
+            raise "ボタンを渡してください"
+          when Symbol, String
+            hash[:force_neutral] = [force_neutral]
+          when Array
+            hash[:force_neutral] = force_neutral
+          end
         end
+
         if flip_interval
           if /\A(\d+)F\z/i =~ flip_interval
             interval =  ((frame = $1.to_i) / 60.0).floor(2)
@@ -35,17 +43,33 @@ module ProconBypassMan
           end
           hash[:flip_interval] = interval
         end
-        self.flips[button] = hash
+        if self.flips[button]
+          raise "#{button}への設定をすでに割り当て済みです"
+        else
+          self.flips[button] = hash
+        end
       end
 
       PRESET_MACROS = [:fast_return]
       def macro(name, if_pressed: )
-        self.macros[name] = { if_pressed: if_pressed }
+        if name.respond_to?(:name)
+          macro_name = name.name.to_sym
+        else
+          macro_name = name
+        end
+        self.macros[macro_name] = { if_pressed: if_pressed }
       end
 
       def remap(button, to: )
-        raise "シンボル以外は設定できません" unless to.is_a?(Symbol)
-        self.remaps[button] = to
+        case to
+        when TrueClass, FalseClass
+          raise "ボタンを渡してください"
+        when Symbol, String
+          self.remaps[button] = { to: [to] }
+        when Array
+          raise "ボタンを渡してください" if to.size.zero?
+          self.remaps[button] = { to: to }
+        end
       end
 
       # @return [Array]

data/lib/procon_bypass_man/configuration/validator.rb

@@ -4,10 +4,11 @@ module ProconBypassMan
       # @return [Boolean]
       def valid?
         @errors = Hash.new {|h,k| h[k] = [] }
-        if prefix_keys.empty?
-          @errors[:prefix_keys] ||= []
-          @errors[:prefix_keys] << "prefix_keys_for_changing_layerに値が入っていません。"
-        end
+
+        validate_require_prefix_keys
+        validate_config_of_button_lonely
+        validate_verify_button_existence
+        validate_flip_and_remap_are_hate_each_other
 
         @errors.empty?
       end
@@ -21,6 +22,69 @@ module ProconBypassMan
       def errors
         @errors ||= Hash.new {|h,k| h[k] = [] }
       end
+
+      private
+
+      def validate_config_of_button_lonely
+        @layers.each do |layer_key, value|
+          if ProconBypassMan::Procon::ModeRegistry::PRESETS.key?(value.mode)
+            next
+          else
+            if !value.flips.empty? || !value.macros.empty?
+              @errors[:layers] << "#{layer_key}でmodeを設定しているのでボタンの設定はできません。"
+            end
+          end
+        end
+      end
+
+      def validate_require_prefix_keys
+        if prefix_keys.empty?
+          @errors[:prefix_keys] ||= []
+          @errors[:prefix_keys] << "prefix_keys_for_changing_layerに値が入っていません。"
+        end
+      end
+
+      def validate_verify_button_existence
+        @layers.each do |layer_key, value|
+          unverified_buttons = []
+          # teplevel target button
+          value.instance_eval { @flips.keys }.map(&:to_sym).each { |b| unverified_buttons << b }
+          value.instance_eval { @remaps.keys }.map(&:to_sym).each { |b| unverified_buttons << b }
+          # internal target button
+          value.instance_eval {
+            @flips.flat_map { |flip_button, flip_option|
+              flip_option.flat_map { |flip_option_key, flip_option_target_button|
+                next if flip_option_key == :flip_interval
+                next if flip_option_target_button.is_a?(FalseClass) || flip_option_target_button.is_a?(TrueClass)
+                flip_option_target_button
+              }
+            }
+          }.compact.each { |b| unverified_buttons << b }
+          value.instance_eval {
+            @remaps.flat_map { |button, option|
+              option.flat_map { |flip_option_key, flip_option_target_button|
+                next if flip_option_target_button.is_a?(FalseClass) || flip_option_target_button.is_a?(TrueClass)
+                flip_option_target_button
+              }
+            }
+          }.compact.each { |b| unverified_buttons << b }
+          unless(nunsupport_buttons = (unverified_buttons - ProconBypassMan::Procon::ButtonCollection::BUTTONS)).length.zero?
+            @errors[:layers] << "#{layer_key}で存在しないボタン#{nunsupport_buttons.join(", ")}があります"
+          end
+        end
+      end
+
+      def validate_flip_and_remap_are_hate_each_other
+        @layers.each do |layer_key, value|
+          flip_buttons = []
+          remap_buttons = []
+          value.instance_eval { @flips.keys }.map(&:to_sym).each { |b| flip_buttons << b }
+          value.instance_eval { @remaps.keys }.map(&:to_sym).each { |b| remap_buttons << b }
+          if(duplicated_buttons = flip_buttons & remap_buttons).length > 0
+            @errors[:layers] << "レイヤー#{layer_key}で、連打とリマップの定義が重複しているボタン#{duplicated_buttons.join(", ")}があります"
+          end
+        end
+      end
     end
   end
 end

data/lib/procon_bypass_man/device_connector.rb

@@ -0,0 +1,336 @@
+class ProconBypassMan::DeviceConnector
+  class BytesMismatchError < StandardError; end
+
+  class Value
+    attr_accessor :read_from, :values
+    def initialize(values: , read_from: )
+      @values = values
+      @read_from = read_from
+    end
+  end
+
+  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(throw_error_if_timeout: true, enable_at_exit: false)
+    s = new(throw_error_if_timeout: true, enable_at_exit: false)
+    s.add([
+      ["0000"],
+      ["0000"],
+      ["8005"],
+      ["0010"],
+    ], read_from: :switch)
+    # 1
+    s.add([["8001"]], read_from: :switch)
+    s.add([/^8101/], read_from: :procon) # <<< 81010003176d96e7a5480000000, macaddressとコントローラー番号を返す
+    # 2
+    s.add([["8002"]], read_from: :switch)
+    s.add([/^8102/], read_from: :procon)
+    # 3
+    s.add([/^0100/], read_from: :switch)
+    s.add([/^21/], read_from: :procon)
+    # 4
+    s.add([["8004"]], read_from: :switch)
+    s.drain_all
+    return [s.switch, s.procon]
+  end
+
+  def initialize(throw_error_if_timeout: false, throw_error_if_mismatch: false , enable_at_exit: true)
+    @stack = []
+    @initialized_devices = false
+    @throw_error_if_timeout = throw_error_if_timeout
+    @throw_error_if_mismatch = throw_error_if_mismatch
+    @enable_at_exit = enable_at_exit
+  end
+
+  def add(values, read_from: )
+    @stack << Value.new(values: values, read_from: read_from)
+  end
+
+  def drain_all
+    unless @initialized_devices
+      init_devices
+    end
+
+    while(item = @stack.shift)
+      item.values.each do |value|
+        data = nil
+        timer = ProconBypassMan::Timer.new
+        begin
+          timer.throw_if_timeout!
+          data = from_device(item).read_nonblock(128)
+        rescue IO::EAGAINWaitReadable
+          retry
+        end
+
+        result =
+          case value
+          when String, Array
+            value == data.unpack("H*")
+          when Regexp
+            value =~ data.unpack("H*").first
+          else
+            raise "#{value}は知りません"
+          end
+        if result
+          ProconBypassMan.logger.info "OK(expected: #{value}, got: #{data.unpack("H*")})"
+        else
+          ProconBypassMan.logger.info "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
+    ProconBypassMan.logger.error "timeoutになりました"
+    raise if @throw_error_if_timeout
+  end
+
+  # switchに任意の命令を入力して、switchから読み取る
+  def write_switch(data, only_write: false)
+    if data.encoding.name == "UTF-8"
+      data = [data].pack("H*")
+    end
+    unless @initialized_devices
+      init_devices
+    end
+
+    timer = ProconBypassMan::Timer.new
+    data = nil
+    begin
+      timer.throw_if_timeout!
+      switch.write_nonblock(data)
+    rescue IO::EAGAINWaitReadable
+      retry
+    rescue ProconBypassMan::Timer::Timeout
+      ProconBypassMan.logger.error "writeでtimeoutになりました"
+      raise
+    end
+    return(data.unpack("H*")) if only_write
+
+    timer = ProconBypassMan::Timer.new
+    begin
+      timer.throw_if_timeout!
+      data = switch.read_nonblock(128)
+      ProconBypassMan.logger.debug { " >>> #{data.unpack("H*")})" }
+    rescue IO::EAGAINWaitReadable
+      retry
+    rescue ProconBypassMan::Timer::Timeout
+      ProconBypassMan.logger.error "readでtimeoutになりました"
+      raise
+    end
+  rescue ProconBypassMan::Timer::Timeout
+    raise if @throw_error_if_timeout
+  end
+
+  def write_procon(data, only_write: false)
+    if data.encoding.name == "UTF-8"
+      data = [data].pack("H*")
+    end
+    unless @initialized_devices
+      init_devices
+    end
+
+    timer = ProconBypassMan::Timer.new
+    begin
+      timer.throw_if_timeout!
+      procon.write_nonblock(data)
+    rescue IO::EAGAINWaitReadable
+      retry
+    rescue ProconBypassMan::Timer::Timeout
+      ProconBypassMan.logger.error "writeでtimeoutになりました"
+      raise
+    end
+    return(data.unpack("H*")) if only_write
+
+    timer = ProconBypassMan::Timer.new
+    begin
+      timer.throw_if_timeout!
+      data = procon.read_nonblock(128)
+      ProconBypassMan.logger.error " <<< #{data.unpack("H*")})"
+    rescue IO::EAGAINWaitReadable
+      retry
+    rescue ProconBypassMan::Timer::Timeout
+      ProconBypassMan.logger.error "readでtimeoutになりました"
+      raise
+    end
+  rescue ProconBypassMan::Timer::Timeout
+    raise if @throw_error_if_timeout
+  end
+
+  def read_procon(only_read: false)
+    unless @initialized_devices
+      init_devices
+    end
+
+    data = nil
+    timer = ProconBypassMan::Timer.new
+    begin
+      timer.throw_if_timeout!
+      data = procon.read_nonblock(128)
+      ProconBypassMan.logger.debug { " <<< #{data.unpack("H*")})" }
+    rescue IO::EAGAINWaitReadable
+      retry
+    rescue ProconBypassMan::Timer::Timeout
+      ProconBypassMan.logger.error "readでtimeoutになりました"
+      raise
+    end
+    return(data.unpack("H*")) if only_read
+
+    timer = ProconBypassMan::Timer.new
+    begin
+      timer.throw_if_timeout!
+      switch.write_nonblock(data)
+    rescue IO::EAGAINWaitReadable
+      retry
+    rescue ProconBypassMan::Timer::Timeout
+      ProconBypassMan.logger.error "writeでtimeoutになりました"
+      raise
+    end
+  rescue ProconBypassMan::Timer::Timeout
+    raise if @throw_error_if_timeout
+  end
+
+  def read_switch(only_read: false)
+    unless @initialized_devices
+      init_devices
+    end
+
+    data = nil
+    timer = ProconBypassMan::Timer.new
+    begin
+      timer.throw_if_timeout!
+      data = switch.read_nonblock(128)
+      ProconBypassMan.logger.debug { " >>> #{data.unpack("H*")})" }
+    rescue IO::EAGAINWaitReadable
+      retry
+    rescue ProconBypassMan::Timer::Timeout
+      ProconBypassMan.logger.error "readでtimeoutになりました"
+      raise
+    end
+    return(data.unpack("H*")) if only_read
+
+    timer = ProconBypassMan::Timer.new
+    begin
+      timer.throw_if_timeout!
+      procon.write_nonblock(data)
+    rescue IO::EAGAINWaitReadable
+      retry
+    rescue ProconBypassMan::Timer::Timeout
+      ProconBypassMan.logger.error "writeでtimeoutになりました"
+      raise
+    end
+  rescue ProconBypassMan::Timer::Timeout
+    raise if @throw_error_if_timeout
+  end
+
+  def from_device(item)
+    case item.read_from
+    when :switch
+      switch
+    when :procon
+      procon
+    else
+      raise
+    end
+  end
+
+  # fromの対になる
+  def to_device(item)
+    case item.read_from
+    when :switch
+      procon
+    when :procon
+      switch
+    else
+      raise
+    end
+  end
+
+  def switch
+    @gadget
+  end
+
+  def procon
+    @procon
+  end
+
+  def is_available_device?(path)
+    return false if !File.exist?(path)
+
+    system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
+    system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
+    sleep 0.5
+
+    file = File.open(path, "w+")
+    begin
+      file.read_nonblock(128)
+    rescue EOFError
+      file.close
+      return false
+    rescue IO::EAGAINWaitReadable
+      file.close
+      return true
+    end
+  end
+
+  def to_bin(string)
+    string.unpack "H*"
+  end
+
+  def init_devices
+    if @initialized_devices
+      return
+    end
+
+    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+")
+    when is_available_device?(PROCON2_PATH)
+      ProconBypassMan.logger.info "proconのデバイスファイルは#{PROCON2_PATH}を使います"
+      @procon = File.open(PROCON2_PATH, "w+")
+      @gadget = File.open('/dev/hidg0', "w+")
+    else
+      raise "/dev/hidraw0, /dev/hidraw1の両方見つかりませんでした"
+    end
+    system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
+    system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
+    sleep 0.5
+
+    @initialized_devices = true
+
+    if @enable_at_exit
+      at_exit do
+        @procon&.close
+        @gadget&.close
+      end
+    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
+    system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
+    system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
+    sleep 2
+    retry
+  end
+end

data/lib/procon_bypass_man/procon.rb

@@ -1,4 +1,5 @@
 class ProconBypassMan::Procon
+  require "procon_bypass_man/procon/data"
   require "procon_bypass_man/procon/mode_registry"
   require "procon_bypass_man/procon/macro_registry"
   require "procon_bypass_man/procon/layer_changeable"
@@ -9,7 +10,7 @@ class ProconBypassMan::Procon
 
   attr_accessor :user_operation
 
-  def self.reset_cvar!
+  def self.reset!
     @@status = {
       buttons: {},
       current_layer_key: :up,
@@ -17,7 +18,6 @@ class ProconBypassMan::Procon
       ongoing_mode: ModeRegistry.load(:manual),
     }
   end
-  def self.reset!; reset_cvar!; end
   reset!
 
   def initialize(binary)
@@ -106,18 +106,20 @@ class ProconBypassMan::Procon
         if !status[button]
           user_operation.unpress_button(button)
         end
-        if options[:force_neutral] && user_operation.pressed_button?(options[:force_neutral])
-          button = options[:force_neutral]
-          user_operation.unpress_button(button)
+
+        options[:force_neutral]&.each do |force_neutral_button|
+          user_operation.pressed_button?(force_neutral_button) && user_operation.unpress_button(force_neutral_button)
         end
       end
     end
 
-    current_layer.remaps.each do |from_button, to_button|
+    current_layer.remaps.each do |from_button, to_buttons|
       if user_operation.pressed_button?(from_button)
         user_operation.unpress_button(from_button)
         # TODO 2重でpressしないようにしたい
-        user_operation.press_button(to_button) unless user_operation.pressed_button?(to_button)
+        to_buttons[:to].each do |to_button|
+          user_operation.press_button(to_button) unless user_operation.pressed_button?(to_button)
+        end
       end
     end
 

data/lib/procon_bypass_man/procon/button_collection.rb

@@ -24,7 +24,7 @@ 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],
-  }
+  }.freeze
 
   BUTTONS_MAP = BYTES_MAP.reduce({}) { |acc, value|
     next acc if value[1].nil?
@@ -32,7 +32,8 @@ class ProconBypassMan::Procon::ButtonCollection
       acc[button] = { byte_position: value[0], bit_position: index }
     end
     acc
-  }
+  }.freeze
+  BUTTONS = ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.keys.freeze
 
   def self.load(button_key)
     Button.new(button_key)

data/lib/procon_bypass_man/runner.rb

@@ -3,10 +3,7 @@ require_relative "io_monitor"
 class ProconBypassMan::Runner
   class InterruptForRestart < StandardError; end
 
-  def initialize(gadget: , procon: )
-    @gadget = gadget
-    @procon = procon
-
+  def initialize
     $will_interval_0_0_0_5 = 0
     $will_interval_1_6 = 0
   end
@@ -98,8 +95,11 @@ class ProconBypassMan::Runner
         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が切断されました.終了処理を開始します"
+          ProconBypassMan.logger.error "Proconが切断されました。終了処理を開始します"
           Process.kill "TERM", Process.ppid
         end
         ProconBypassMan.logger.info "Thread2を終了します"
@@ -133,38 +133,14 @@ class ProconBypassMan::Runner
   end
 
   def first_negotiation
-    loop do
-      begin
-        input = @gadget.read_nonblock(128)
-        ProconBypassMan.logger.debug { ">>> #{input.unpack("H*")}" }
-        @procon.write_nonblock(input)
-        if input[0] == "\x80".b && input[1] == "\x01".b
-          ProconBypassMan.logger.info("first negotiation is over")
-          break
-        end
-        break if $will_terminate_token
-      rescue IO::EAGAINWaitReadable
-      end
-    end
-
-    # ...
-    #   switch) 8001
-    #   procon) 8101
-    #   switch) 8002
-    # が返ってくるプロトコルがあって、これができていないならやり直す
-    loop do
-      begin
-        data = @procon.read_nonblock(128)
-        if data[0] == "\x81".b && data[1] == "\x01".b
-          ProconBypassMan.logger.debug { "接続を確認しました" }
-          @gadget.write_nonblock(data)
-          break
-        else
-          raise ::ProconBypassMan::FirstConnectionError
-        end
-      rescue IO::EAGAINWaitReadable
-      end
-    end
+    return if $will_terminate_token
+
+    @gadget, @procon = ProconBypassMan::DeviceConnector.connect(throw_error_if_timeout: true, enable_at_exit: false)
+  rescue ProconBypassMan::Timer::Timeout
+    ::ProconBypassMan.logger.error "デバイスとの通信でタイムアウトが起きて接続ができませんでした。"
+    @gadget&.close
+    @procon&.close
+    raise ::ProconBypassMan::EternalConnectionError
   end
 
   def handle_signal(sig)

data/lib/procon_bypass_man/timer.rb

@@ -0,0 +1,14 @@
+module ProconBypassMan
+  class Timer
+    class Timeout < StandardError; end
+
+    # 5秒後がタイムアウト
+    def initialize(timeout: Time.now + 5)
+      @timeout = timeout
+    end
+
+    def throw_if_timeout!
+      raise Timeout if @timeout < Time.now
+    end
+  end
+end

data/lib/procon_bypass_man/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - jiikko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-10 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies: []
 description: extension for Nintendo Switch Pro Controller
 email:
@@ -41,7 +41,7 @@ files:
 - lib/procon_bypass_man/configuration/layer.rb
 - lib/procon_bypass_man/configuration/loader.rb
 - lib/procon_bypass_man/configuration/validator.rb
-- lib/procon_bypass_man/device_registry.rb
+- lib/procon_bypass_man/device_connector.rb
 - lib/procon_bypass_man/io_monitor.rb
 - lib/procon_bypass_man/processor.rb
 - lib/procon_bypass_man/procon.rb
@@ -54,6 +54,7 @@ files:
 - lib/procon_bypass_man/procon/pressed_button_helper.rb
 - lib/procon_bypass_man/procon/user_operation.rb
 - lib/procon_bypass_man/runner.rb
+- lib/procon_bypass_man/timer.rb
 - lib/procon_bypass_man/version.rb
 - procon_bypass_man.gemspec
 homepage: https://github.com/splaspla-hacker/procon_bypass_man

data/lib/procon_bypass_man/device_registry.rb

@@ -1,42 +0,0 @@
-class ProconBypassMan::DeviceRegistry
-  PROCON_PATH = "/dev/hidraw0"
-  PROCON2_PATH = "/dev/hidraw1"
-
-  def gadget
-    @gadget
-  end
-
-  def procon
-    @procon
-  end
-
-  def initialize
-    init_devices
-  end
-
-  # @return [void]
-  def init_devices
-    loop do
-      case
-      when File.exist?(PROCON_PATH)
-        system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
-        system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
-        sleep 0.5
-        @gadget = File.open('/dev/hidg0', "w+")
-        @procon = File.open(PROCON_PATH, "w+")
-        break
-      when File.exist?(PROCON2_PATH)
-        system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
-        system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
-        sleep 0.5
-        @gadget = File.open('/dev/hidg0', "w+")
-        @procon = File.open(PROCON2_PATH, "w+")
-        break
-      else
-        puts "プロコンをラズベイに挿してください"
-        ProconBypassMan.logger.info("プロコンをラズベイに挿してください")
-        sleep(1)
-      end
-    end
-  end
-end