procon_bypass_man 0.1.22 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f213faf13081ece91f62fb64af88e63672d035d29740b9c98c832f89921d8f9d
-  data.tar.gz: 3ec15d612dfaa91b085fef0a9e8810625b79b3a2a0781c57a56a39cc0b2d6be4
+  metadata.gz: b867d9fe101999d57ded64ff71be83610f04fde36c1c1fffa43ca8495902fb0b
+  data.tar.gz: 8eb0b7506c7bdb5d4601fb0e6f33cff79cb71a4975449d0c84bcd6a2c0b6303a
 SHA512:
-  metadata.gz: 3570d9025f546e14e13b441a60568d58ec2ae728805061f7152c34e544e142a5c75ac37e893af96cafa5c956a8063eff41ddf6585b044c87e003e1ea4ba1902d
-  data.tar.gz: 4a1dceca2806e28ac8cb9ca859f82adc5dc09ce9071c743df0ee7d4e2a4f761386a43057660f930d4d105c3898ba48496658c6a7eb3e86fc2d60e86f0df5cd8d
+  metadata.gz: a37867fc758ecb8aa45698fbb79be8b48cc221cd218bf6c29646b04587ae66514846709cd1bf951a651ec1ba737cab5dbae010334cb125bc8dca1644d19aa30e
+  data.tar.gz: d2cf7935350a3085251deb495051586b52b422d388bfd07da7842c09fbc3f50fa0b6090a41652e662d15e367863c76e0b3a2e9e061e87a7e100f3d1e7d9be58e

data/.circleci/config.yml

@@ -40,7 +40,7 @@ jobs:
       tag: 3.0.1
     steps:
       - checkout
-      - run: GEM_VERSION=$(grep -o -E '[0-9.]+' lib/procon_bypass_man/version.rb) && GEM_VERSION_IN_BUNDER=$(grep procon_bypass_man project_template/app.rb | grep -o -E '[0-9.]+') && test "$GEM_VERSION" = "$GEM_VERSION_IN_BUNDER"
+      - run: GEM_VERSION=$(grep -o -E '[0-9.]+' lib/procon_bypass_man/version.rb) && GEM_VERSION_IN_BUNDER=$(grep procon_bypass_man project_template/app.rb | grep "gem 'procon_bypass_man'" | grep -o -E '[0-9.]+') && test "$GEM_VERSION" = "$GEM_VERSION_IN_BUNDER"
 
   syntax_check:
     parameters:

data/.github/workflows/gitleacks.yml

@@ -0,0 +1,12 @@
+name: gitleaks
+
+on: [push]
+
+jobs:
+  gitleaks:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+    - uses: actions/checkout@v1
+    - name: gitleaks-action
+      uses: zricethezav/gitleaks-action@master

data/.github/workflows/release.yml

@@ -6,6 +6,7 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       contents: write
 

data/.github/workflows/ruby.yml

@@ -12,8 +12,8 @@ on:
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     strategy:
       matrix:
         ruby-version: ['3.0.1', '3.1.1']

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [0.2.1] - 2022-05-29
+- 入力表示機能を提供するSwitchProconInputViewerに対応しました
+  - https://github.com/splaplapla/switch-procon-input-viewer
+- app.rb内のバグ修正, ログファイルとして残る世代を減らしました
+
+## [0.2.0] - 2022-05-20
+- 3つ以上のボタンを操作するマクロに対応しました
+- IOに関するログをデフォルトで無効にしました
+  - 有効にする場合はapp.rbに `config.io_monitor_logging = true` を記述してください
+- 接続が安定化するまでの時間が短くなりました
+- 接続中にプロコンのケーブルを抜くと、エラーを吐いて終了できなくなる不具合を修正しました
+- プロセスをCtrl+Cで停止するときに終了するまでの時間が短くなりました
+- 接続に成功するとhomeボタンのledが光るようになりました
+  - 無効にする場合はapp.rbに `config.enable_home_led_on_connect = false` を記述してください
+
+## [0.1.23] - 2022-05-04
+- プロセスを停止するとプロコンがBluetooth経由でSwitchと接続するようになりました
+- 起動時に表示するdevice_idを一部のみ表示するようになりました
+- ライブリロードが不安定になっていたのを修正しました
+- コントローラのバイブレーションを無効にしました
+- プロセスを停止後、再接続しやすくなりました
+
 ## [0.1.22] - 2022-04-09
 * スティックを左右に入れるマクロが使えるようになりました
   * スプラトゥーン2でのタンサンボムのチャージに使えます

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.22)
+    procon_bypass_man (0.2.1)
       action_cable_client
       pbmenv (>= 0.1.9)
       sorted_set
@@ -40,8 +40,8 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.3)
-    rack-protection (2.1.0)
+    rack (2.2.3.1)
+    rack-protection (2.2.0)
       rack
     rainbow (3.0.0)
     rake (13.0.6)
@@ -79,10 +79,10 @@ GEM
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     set (1.0.2)
-    sinatra (2.1.0)
+    sinatra (2.2.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
-      rack-protection (= 2.1.0)
+      rack-protection (= 2.2.0)
       tilt (~> 2.0)
     sorted_set (1.0.3)
       rbtree

data/docs/getting_started.md

@@ -13,6 +13,7 @@
 * モード
 * [マクロ](#マクロ)
 * [左スティックの感度調整](#左スティックの感度調整)
+* [入力表示](#入力表示)
 * 設定ファイルの書き方
 * プラグインの書き方
 * [設定ファイルの書き方がわからない、エラーが起きるとき](#設定ファイルの書き方がわからない、エラーが起きるとき)
@@ -39,6 +40,8 @@
   * [設定方法](/docs/setting/left-analogstick-cap.md)
 * WEBから設定状態の閲覧・反映
 * ボタンリマップ
+* 入力表示
+　　* https://github.com/splaplapla/switch-procon-input-viewer
 
 ## セットアップ
 ### ラズベリーパイのセットアップ
@@ -162,6 +165,10 @@ open_macro :sokuwari, steps: [:toggle_r_for_0_2sec, :toggle_thumbr_for_0_14sec,
 ## 左スティックの感度調整
 [左スティックの感度調整](/docs/setting/left-analogstick-cap.md)
 
+## 入力表示
+* https://github.com/splaplapla/switch-procon-input-viewer
+* 後で書きます
+
 ## 設定ファイルの書き方
 * 後で書きます
 
@@ -180,6 +187,7 @@ discordで質問してみてください。
 https://pbm-cloud.herokuapp.com/  
 procon_bypass_man_cloudの運用をWEBで完結できるようになる無料のWEBサービスです。  
   
-procon_bypass_man_cloudとの接続が完了後、Raspberry Piを起動時にprocon_bypass_man_cloudが自動で立ち上がるように設定すれば、Raspberry Piへのログインが不要で設定ファイルの変更やprocon_bypass_man_cloudのアップグレードができます。  
+procon_bypass_man_cloudとの接続が完了後、Raspberry Piを起動時にprocon_bypass_manが自動で立ち上がるように設定すれば、Raspberry Piへのログインが不要で設定ファイルの変更やprocon_bypass_man自体のアップグレードができます。  
 セットアップ方法などでわからないことがあればdiscordで質問してみてください。  
+  
 セットアップ方法は https://pbm-cloud.herokuapp.com/faq に書いています。

data/docs/setup_raspi.md

@@ -33,7 +33,6 @@ https://github.com/splaplapla/procon_bypass_man/blob/master/docs/setup_raspi_by_
   * chmod 755 ~/add_procon_gadget.sh
   * sudo reboot
   * sudo sh ~/add_procon_gadget.sh の実行に成功させる
-  *  /etc/rc.local に sh /home/pi/add_procon_gadget.sh って書く
 * cd ~ && mkdir -p src && cd ~/src && git clone https://github.com/jiikko/procon_bypass_man_sample && cd procon_bypass_man_sample
 
 おわり. 起動する時は都度 sudo ruby app.rb を実行する

data/lib/procon_bypass_man/buttons_setting_configuration/loader.rb

@@ -32,7 +32,7 @@ module ProconBypassMan
         ProconBypassMan::ButtonsSettingConfiguration.instance.reset!
         ProconBypassMan.reset!
 
-        yaml = YAML.load_file(setting_path)
+        yaml = ProconBypassMan::YamlLoader.load(path: setting_path)
         ProconBypassMan.config.raw_setting = yaml.dup
         case yaml["version"]
         when 1.0, nil

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

@@ -32,6 +32,9 @@ class ProconBypassMan::Bypass
         end
       end
 
+      # TODO 別のコールバッククラスから実行したい
+      ProconBypassMan::ProconDisplay::Status.instance.current = bypass_value.binary.to_procon_reader.to_hash.dup
+
       if ProconBypassMan.config.enable_reporting_pressed_buttons
         ProconBypassMan.cache.fetch key: 'pressed_buttons_reporter', expires_in: 5 do
           ProconBypassMan::ReportPressedButtonsJob.perform_async(

data/lib/procon_bypass_man/bypass.rb

@@ -1,12 +1,15 @@
 require "procon_bypass_man/bypass/usb_hid_logger"
+require "procon_bypass_man/bypass/bypass_command"
 
 class ProconBypassMan::Bypass
   include ProconBypassMan::Bypass::UsbHidLogger
+  # TODO callbackモジュールを修正して複数のメソッドをチェインできるようにする
+  # include ProconBypassMan::ProconDisplay::BypassCallback
 
-  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 +24,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 +61,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 +84,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 +95,16 @@ 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
 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
@@ -100,7 +104,7 @@ class ProconBypassMan::Configuration
 
   def error_logger
     if enable_critical_error_logging
-      @error_logger ||= Logger.new("#{ProconBypassMan.root}/error.log", 5, 1024 * 1024 * 10)
+      @error_logger ||= Logger.new("#{ProconBypassMan.root}/error.log", 1, 1024 * 1024 * 1)
     else
       Logger.new(File.open("/dev/null"))
     end
@@ -186,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

data/lib/procon_bypass_man/device_connection/command.rb

@@ -0,0 +1,28 @@
+class ProconBypassMan::DeviceConnection::Command
+  MAX_RETRY_COUNT = 3
+
+  # @return [void]
+  def self.execute!(retry_count: 0)
+    begin
+      gadget, procon = ProconBypassMan::DeviceConnection::Executer.execute!
+    rescue ProconBypassMan::DeviceConnection::TimeoutErrorInConditionalRoute
+      if retry_count >= MAX_RETRY_COUNT
+        ProconBypassMan::SendErrorCommand.execute(error: "リトライしましたが、接続できませんでした")
+        raise ProconBypassMan::DeviceConnection::TimeoutError
+      else
+        ProconBypassMan::SendErrorCommand.execute(error: "接続に失敗したのでリトライします")
+      end
+
+      retry_count = retry_count + 1
+      retry
+    rescue ProconBypassMan::DeviceConnection::NotFoundProconError => e
+      raise
+    rescue ProconBypassMan::SafeTimeout::Timeout
+      raise ProconBypassMan::DeviceConnection::TimeoutError
+    end
+
+    ProconBypassMan::DeviceConnection::PreBypass.new(gadget: gadget, procon: procon).execute!
+    ProconBypassMan::DeviceConnection::ProconSettingOverrider.new(procon: procon).execute!
+    return [gadget, procon]
+  end
+end