procon_bypass_man 0.1.19 → 0.1.20.2

data/lib/procon_bypass_man/commands/print_boot_message_command.rb

@@ -4,6 +4,7 @@ class ProconBypassMan::PrintBootMessageCommand
       @table = {}
       @table[:ruby_version] = RUBY_VERSION
       @table[:pbm_version] = ProconBypassMan::VERSION
+      @table[:pbmenv_version] = Pbmenv::VERSION
       @table[:pid] = $$
       @table[:root_path] = ProconBypassMan.root
       @table[:pid_path] = ProconBypassMan.pid_path
@@ -12,6 +13,9 @@ class ProconBypassMan::PrintBootMessageCommand
       @table[:use_pbmenv] = !(!!`which pbmenv`.empty?)
       @table[:session_id] = ProconBypassMan.session_id
       @table[:device_id] = ProconBypassMan.device_id
+      @table[:bypass_mode] = ProconBypassMan.config.bypass_mode.to_s
+      @table[:never_exit_accidentally] = ProconBypassMan.config.never_exit_accidentally
+      @table[:uname] = `uname -a`.chomp
 
       # 開発中のHEADを取りたかったけど、Gem::Specification経由から取得する必要がありそう
       # build_version = `git rev-parse --short HEAD`.chomp
@@ -30,6 +34,7 @@ class ProconBypassMan::PrintBootMessageCommand
       ----
       RUBY_VERSION: #{@table[:ruby_version]}
       ProconBypassMan::VERSION: #{@table[:pbm_version]}
+      Pbmenv::VERSION: #{@table[:pbmenv_version]}
       pid: #{@table[:pid]}
       root: #{@table[:root_path]}
       pid_path: #{@table[:pid_path]}
@@ -38,6 +43,7 @@ class ProconBypassMan::PrintBootMessageCommand
       use_pbmenv: #{@table[:use_pbmenv]}
       session_id: #{ProconBypassMan.session_id}
       device_id: #{ProconBypassMan.device_id}
+      bypass_mode: #{ProconBypassMan.config.bypass_mode}
       ----
       EOF
     end

data/lib/procon_bypass_man/configuration.rb

@@ -38,10 +38,19 @@ class ProconBypassMan::Configuration
     def device_id
       ENV["DEBUG_DEVICE_ID"] || ProconBypassMan::WriteDeviceIdCommand.execute
     end
+
+    # @return [Boolean]
+    def never_exit_accidentally
+      config.never_exit_accidentally
+    end
+
+    def fallback_setting_path
+      "/tmp/procon_bypass_man_fallback_setting.yaml"
+    end
   end
 
   attr_accessor :enable_critical_error_logging
-  attr_writer :verbose_bypass_log, :raw_setting, :enable_reporting_pressed_buttons
+  attr_writer :verbose_bypass_log, :raw_setting, :enable_reporting_pressed_buttons, :never_exit_accidentally
 
   def root=(path)
     @root = path
@@ -56,6 +65,17 @@ class ProconBypassMan::Configuration
     end
   end
 
+  def bypass_mode=(value)
+    @bypass_mode = ProconBypassMan::BypassMode.new(
+      mode: value[:mode],
+      gadget_to_procon_interval: value[:gadget_to_procon_interval],
+    )
+  end
+
+  def bypass_mode
+    @bypass_mode || ProconBypassMan::BypassMode.default_value
+  end
+
   def api_servers=(api_servers)
     @api_servers = api_servers
     return self
@@ -147,6 +167,10 @@ class ProconBypassMan::Configuration
     end
   end
 
+  def has_api_server?
+    not api_servers.length.zero?
+  end
+
   def verbose_bypass_log
     @verbose_bypass_log || !!ENV["VERBOSE_BYPASS_LOG"]
   end
@@ -158,4 +182,9 @@ class ProconBypassMan::Configuration
   def enable_reporting_pressed_buttons
     @enable_reporting_pressed_buttons ||= false
   end
+
+  # @return [Boolean]
+  def never_exit_accidentally
+    @never_exit_accidentally || false
+  end
 end

data/lib/procon_bypass_man/device_connector.rb

@@ -61,9 +61,9 @@ class ProconBypassMan::DeviceConnector
         begin
           timer.throw_if_timeout!
           data = from_device(item).read_nonblock(64)
-          debug_log_buffer << "read_from(#{item.read_from}): #{data}"
+          debug_log_buffer << "read_from(#{item.read_from}): #{data.unpack("H*")}"
         rescue IO::EAGAINWaitReadable
-          debug_log_buffer << "read_from(#{item.read_from}): IO::EAGAINWaitReadable"
+          # debug_log_buffer << "read_from(#{item.read_from}): IO::EAGAINWaitReadable"
           retry
         end
 
@@ -263,49 +263,21 @@ class ProconBypassMan::DeviceConnector
     @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(64)
-    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
+    ProconBypassMan::UsbDeviceController.init
 
-    case
-    when is_available_device?(PROCON_PATH)
-      ProconBypassMan.logger.info "proconのデバイスファイルは#{PROCON_PATH}を使います"
-      @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+b")
-      @gadget = File.open('/dev/hidg0', "w+b")
+    if path = ProconBypassMan::DeviceProconFinder.find
+      @procon = File.open(path, "w+b")
+      ProconBypassMan.logger.info "proconのデバイスファイルは#{path}を使います"
     else
-      raise NotFoundProconError, "/dev/hidraw0, /dev/hidraw1の両方見つかりませんでした"
+      raise(ProconBypassMan::DeviceConnector::NotFoundProconError)
     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
+    @gadget = File.open('/dev/hidg0', "w+b")
+
+    ProconBypassMan::UsbDeviceController.reset
 
     @initialized_devices = true
 
@@ -317,10 +289,8 @@ class ProconBypassMan::DeviceConnector
     end
   rescue Errno::ENXIO => e
     # /dev/hidg0 をopenできないときがある
-    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 0.5
+    ProconBypassMan::SendErrorCommand.execute(error: "Errno::ENXIO (No such device or address @ rb_sysopen - /dev/hidg0)が起きました。resetします.\n #{e.full_message}")
+    ProconBypassMan::UsbDeviceController.reset
     retry
   end
 end

data/lib/procon_bypass_man/device_procon_finder.rb

@@ -0,0 +1,45 @@
+class ProconBypassMan::DeviceProconFinder
+  HID_NAME = "Nintendo Co., Ltd. Pro Controller"
+
+  def self.find
+    new.find
+  end
+
+  # @return [String, NilClass]
+  def find
+    find_device_path
+  end
+
+  private
+
+  # @return [String , NilClass]
+  def find_device_path
+    if(line = device_from_shell) && (hidraw_name = line.match(/(hidraw\d+)\s+/)[1])
+      "/dev/#{hidraw_name}"
+    end
+  end
+
+  # @return [String , NilClass]
+  def device_from_shell
+    shell_output.split("\n").detect { |o| o.include?(HID_NAME) }
+  end
+
+  # @return [String]
+  def shell_output
+    `bash -c '#{get_list_shell}'`
+  end
+
+  def get_list_shell
+    <<~SHELL
+      #!/bin/bash
+
+      FILES=/dev/hidraw*
+      for f in $FILES
+      do
+        FILE=${f##*/}
+        DEVICE="$(cat /sys/class/hidraw/${FILE}/device/uevent | grep HID_NAME | cut -d '=' -f2)"
+        printf "%s   %s\n" $FILE "$DEVICE"
+      done
+    SHELL
+  end
+end

data/lib/procon_bypass_man/never_exit_accidentally.rb

@@ -0,0 +1,12 @@
+module ProconBypassMan
+  module NeverExitAccidentally
+    def exit_if_allow(status)
+      if ProconBypassMan.never_exit_accidentally
+        eternal_sleep
+      else
+        yield if block_given?
+        exit(status)
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/plugin/splatoon2/macro/fast_return.rb

@@ -10,6 +10,10 @@ module ProconBypassMan
           def self.steps
             [:x, :down, :a, :a].freeze
           end
+
+          def self.description
+            '試合中にリスポーンにスーパージャンプ'
+          end
         end
       end
     end

data/lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_left_key.rb

@@ -10,6 +10,10 @@ module ProconBypassMan
           def self.steps
             [:x, :left, :a, :a].freeze
           end
+
+          def self.description
+            '試合中に左キーに割り当てられている味方へのスーパージャンプ'
+          end
         end
       end
     end

data/lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_right_key.rb

@@ -10,6 +10,10 @@ module ProconBypassMan
           def self.steps
             [:x, :right, :a, :a].freeze
           end
+
+          def self.description
+            '試合中に右キーに割り当てられている味方へのスーパージャンプ'
+          end
         end
       end
     end

data/lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_up_key.rb

@@ -10,6 +10,10 @@ module ProconBypassMan
           def self.steps
             [:x, :up, :a, :a].freeze
           end
+
+          def self.description
+            '試合中に上キーに割り当てられている味方へのスーパージャンプ'
+          end
         end
       end
     end

data/lib/procon_bypass_man/plugin/splatoon2/macro/sokuwari_for_splash_bomb.rb

@@ -15,6 +15,10 @@ module ProconBypassMan
               :toggle_r_for_1sec,
             ].freeze
           end
+
+          def self.description
+            'バブル即割'
+          end
         end
       end
     end

data/lib/procon_bypass_man/plugin/splatoon2/mode/guruguru.rb

@@ -3,6 +3,10 @@ module ProconBypassMan
     module Splatoon2
       module Mode
         module Guruguru
+          def self.description
+            '適当に動きます'
+          end
+
           def self.binaries
             [ "309481408000362d684658750968f71cfe2c0e51000001480053f71ffedf0d4b000a013d00caf6ecfd4c0d480003011c00000000000000000000000000000000",
               "30978140800037dd6748687509fdf6adfded0d6d0081005d00eef68dfdef0d6d00830059001bf791fd140e720090005400000000000000000000000000000000",

data/lib/procon_bypass_man/remote_pbm_action/change_pbm_version_action.rb

@@ -6,8 +6,11 @@ module ProconBypassMan
         require "pbmenv"
         ProconBypassMan.logger.info "execute ChangePbmVersionAction!"
         pbm_version = args["pbm_version"] or raise(ProconBypassMan::RemotePbmAction::NeedPbmVersionError, "pbm_versionが必要です, #{args.inspect}")
-        Pbmenv.install(pbm_version)
+        Pbmenv.uninstall(pbm_version) # 途中でシャットダウンしてしまった、とか状態が途中の状態かもしれないので一旦消す
+        Pbmenv.install(pbm_version, enable_pbm_cloud: true)
         Pbmenv.use(pbm_version)
+        ProconBypassMan.logger.info "#{pbm_version}へアップグレードしました"
+        ProconBypassMan::ReportCompletedUpgradePbmJob.perform
         `reboot` # symlinkの参照先が変わるのでrebootする必要がある
       end
 

data/lib/procon_bypass_man/remote_pbm_action/reboot_os_action.rb

@@ -10,6 +10,7 @@ module ProconBypassMan
       private
 
       def before_action_callback
+        ProconBypassMan::ReportStartRebootJob.perform
         be_processed
       end
 

data/lib/procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb

@@ -6,7 +6,14 @@ module ProconBypassMan
         require "pbmenv"
         ProconBypassMan.logger.info "execute RestorePbmSettingAction!"
         setting = args.dig("setting") or raise(ProconBypassMan::RemotePbmAction::NeedPbmVersionError, "settingが必要です, #{args.inspect}")
-        ProconBypassMan::YamlWriter.execute(
+
+        # 復元に失敗したら戻せるように退避する
+        FileUtils.copy(
+          ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
+          ProconBypassMan.fallback_setting_path,
+        )
+
+        ProconBypassMan::YamlWriter.write(
           path: ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
           content: setting,
         )

data/lib/procon_bypass_man/runner.rb

@@ -27,7 +27,7 @@ class ProconBypassMan::Runner
     loop do
       $will_terminate_token = false
       # NOTE メインプロセスではThreadをいくつか起動しているので念のためパフォーマンスを優先するためにforkしていく
-      main_loop_pid = Kernel.fork { ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute }
+      child_pid = Kernel.fork { ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute }
 
       begin
         # TODO 小プロセスが消滅した時に、メインプロセスは生き続けてしまい、何もできなくなる問題がある
@@ -37,25 +37,25 @@ class ProconBypassMan::Runner
         end
       rescue InterruptForRestart
         $will_terminate_token = true
-        Process.kill("TERM", main_loop_pid)
+        Process.kill("TERM", child_pid)
         Process.wait
         ProconBypassMan::PrintMessageCommand.execute(text: "Reloading config file")
         begin
           ProconBypassMan::ButtonsSettingConfiguration::Loader.reload_setting
           ProconBypassMan::SendReloadConfigEventCommand.execute
-        rescue ProconBypassMan::CouldNotLoadConfigError
+        rescue ProconBypassMan::CouldNotLoadConfigError => error
           ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。再読み込みができませんでした")
+          ProconBypassMan::ReportErrorReloadConfigJob.perform_async(error.message)
         end
         ProconBypassMan::PrintMessageCommand.execute(text: "バイパス処理を再開します")
       rescue Interrupt
         $will_terminate_token = true
-        Process.kill("TERM", main_loop_pid)
+        Process.kill("TERM", child_pid)
         Process.wait
+        ProconBypassMan::PrintMessageCommand.execute(text: "処理を終了します")
         @gadget&.close
         @procon&.close
-        FileUtils.rm_rf(ProconBypassMan.pid_path)
-        FileUtils.rm_rf(ProconBypassMan.digest_path)
-        exit 1
+        break
       end
     end
   end

data/lib/procon_bypass_man/scheduler.rb

@@ -74,7 +74,7 @@ module ProconBypassMan
           args: [->{ ProconBypassMan::DeviceStatus.current }],
           interval: 60,
         )
-      )
+      ) if ProconBypassMan.config.has_api_server?
     end
 
     # @param [Schedule] schedule

data/lib/procon_bypass_man/support/yaml_writer.rb

@@ -3,7 +3,14 @@ class ProconBypassMan::YamlWriter
   def self.write(path: , content: )
     File.write(
       path,
-      content.gsub("\r\n", "\n").to_yaml,
+      content.transform_values { |x|
+        case x
+        when String
+          x.gsub("\r\n", "\n")
+        else
+          x
+        end
+      }.to_yaml
     )
   end
 end

data/lib/procon_bypass_man/usb_device_controller.rb

@@ -0,0 +1,53 @@
+class ProconBypassMan::UsbDeviceController
+  class << self
+    def reset
+      system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
+      system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
+      sleep 0.5
+    end
+
+    def init
+      return if initialized?
+
+      shell = <<~EOH
+        #!/bin/bash
+
+        cd /sys/kernel/config/usb_gadget/
+        mkdir -p procon
+        cd procon
+        echo 0x057e > idVendor
+        echo 0x2009 > idProduct
+        echo 0x0200 > bcdDevice
+        echo 0x0200 > bcdUSB
+        echo 0x00 > bDeviceClass
+        echo 0x00 > bDeviceSubClass
+        echo 0x00 > bDeviceProtocol
+
+        mkdir -p strings/0x409
+        echo "000000000001" > strings/0x409/serialnumber
+        echo "Nintendo Co., Ltd." > strings/0x409/manufacturer
+        echo "Pro Controller" > strings/0x409/product
+
+        mkdir -p configs/c.1/strings/0x409
+        echo "Nintendo Switch Pro Controller" > configs/c.1/strings/0x409/configuration
+        echo 500 > configs/c.1/MaxPower
+        echo 0xa0 > configs/c.1/bmAttributes
+
+        mkdir -p functions/hid.usb0
+        echo 0 > functions/hid.usb0/protocol
+        echo 0 > functions/hid.usb0/subclass
+        echo 64 > functions/hid.usb0/report_length
+        echo 050115000904A1018530050105091901290A150025017501950A5500650081020509190B290E150025017501950481027501950281030B01000100A1000B300001000B310001000B320001000B35000100150027FFFF0000751095048102C00B39000100150025073500463B0165147504950181020509190F2912150025017501950481027508953481030600FF852109017508953F8103858109027508953F8103850109037508953F9183851009047508953F9183858009057508953F9183858209067508953F9183C0 | xxd -r -ps > functions/hid.usb0/report_desc
+
+        ln -s functions/hid.usb0 configs/c.1/
+        ls /sys/class/udc > UDC
+      EOH
+
+      `bash -c '#{shell}'`
+    end
+
+    def initialized?
+      Dir.exist?("/sys/kernel/config/usb_gadget/procon")
+    end
+  end
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/websocket/pbm_job_client.rb

@@ -9,7 +9,8 @@ module ProconBypassMan
         Thread.start do
           loop do
             run
-          rescue
+          rescue => e
+            ProconBypassMan.logger.error("websocket client: #{e.full_message}")
             retry
           end
         end
@@ -24,14 +25,16 @@ module ProconBypassMan
           )
 
           client.connected {
-            ProconBypassMan.logger.info('successfully connected in ProconBypassMan::Websocket::PbmJobClient')
+            ProconBypassMan.logger.info('websocket client: successfully connected in ProconBypassMan::Websocket::PbmJobClient')
           }
           client.subscribed { |msg|
+            ProconBypassMan.logger.info('websocket client: subscribed')
             puts({ event: :subscribed, msg: msg })
             ProconBypassMan::SyncDeviceStatsJob.perform(ProconBypassMan::DeviceStatus.current)
           }
 
           client.received do |data|
+            ProconBypassMan.logger.info('websocket client: received!!')
             ProconBypassMan.logger.info(data)
 
             dispatch(data: data, client: client)
@@ -40,13 +43,20 @@ module ProconBypassMan
           end
 
           client.disconnected {
+            ProconBypassMan.logger.info('websocket client: disconnected!!')
             puts :disconnected
             client.reconnect!
             sleep 2
           }
-          client.errored { |msg|  puts :errored; puts msg }
+          client.errored { |msg|
+            ProconBypassMan.logger.error("websocket client: errored!!, #{msg}")
+            puts :errored
+            client.reconnect!
+            sleep 2
+          }
           client.pinged { |msg|
             ProconBypassMan.cache.fetch key: 'ws_pinged', expires_in: 10 do
+              ProconBypassMan.logger.info('websocket client: pinged!!')
               ProconBypassMan.logger.info(msg)
             end
           }

data/lib/procon_bypass_man.rb

@@ -8,6 +8,8 @@ require 'em/pure_ruby'
 require "action_cable_client"
 require "ext/em_pure_ruby"
 require "ext/module"
+require "resolv-replace"
+require "pbmenv"
 
 require_relative "procon_bypass_man/version"
 require_relative "procon_bypass_man/remote_pbm_action"
@@ -27,8 +29,11 @@ require_relative "procon_bypass_man/background"
 require_relative "procon_bypass_man/commands"
 require_relative "procon_bypass_man/bypass"
 require_relative "procon_bypass_man/domains"
+require_relative "procon_bypass_man/never_exit_accidentally"
 require_relative "procon_bypass_man/device_connector"
+require_relative "procon_bypass_man/device_procon_finder"
 require_relative "procon_bypass_man/device_status"
+require_relative "procon_bypass_man/usb_device_controller"
 require_relative "procon_bypass_man/runner"
 require_relative "procon_bypass_man/processor"
 require_relative "procon_bypass_man/configuration"
@@ -48,9 +53,9 @@ Thread.abort_on_exception = true
 
 module ProconBypassMan
   extend ProconBypassMan::Configuration::ClassMethods
+  extend ProconBypassMan::NeverExitAccidentally
 
   class CouldNotLoadConfigError < StandardError; end
-  class NotFoundProconError < StandardError; end
   class ConnectionError < StandardError; end
   class FirstConnectionError < ConnectionError; end
   class EternalConnectionError < ConnectionError; end
@@ -62,22 +67,26 @@ module ProconBypassMan
     ProconBypassMan::Websocket::PbmJobClient.start!
 
     ProconBypassMan::PrintMessageCommand.execute(text: "PBMを起動しています")
-    ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting_path)
     initialize_pbm
+    ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting_path)
     gadget, procon = ProconBypassMan::ConnectDeviceCommand.execute!
-    Runner.new(gadget: gadget, procon: procon).run
+    Runner.new(gadget: gadget, procon: procon).run # ここでblockingする
+    FileUtils.rm_rf(ProconBypassMan.pid_path)
+    FileUtils.rm_rf(ProconBypassMan.digest_path)
   rescue ProconBypassMan::CouldNotLoadConfigError
     ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。設定ファイルの読み込みに失敗しました")
     ProconBypassMan::DeviceStatus.change_to_setting_syntax_error_and_shutdown!
-    FileUtils.rm_rf(ProconBypassMan.pid_path)
-    FileUtils.rm_rf(ProconBypassMan.digest_path)
-    exit 1
-  rescue ProconBypassMan::NotFoundProconError
-    ProconBypassMan::SendErrorCommand.execute(error: "プロコンが見つかりませんでした。終了します。")
+    ProconBypassMan.exit_if_allow(1) do
+      FileUtils.rm_rf(ProconBypassMan.pid_path)
+      FileUtils.rm_rf(ProconBypassMan.digest_path)
+    end
+  rescue ProconBypassMan::ConnectDeviceCommand::NotFoundProconError
+    ProconBypassMan::SendErrorCommand.execute(error: "プロコンが見つかりませんでした。")
     ProconBypassMan::DeviceStatus.change_to_procon_not_found_error!
-    FileUtils.rm_rf(ProconBypassMan.pid_path)
-    FileUtils.rm_rf(ProconBypassMan.digest_path)
-    exit 1
+    ProconBypassMan.exit_if_allow(1) do
+      FileUtils.rm_rf(ProconBypassMan.pid_path)
+      FileUtils.rm_rf(ProconBypassMan.digest_path)
+    end
   rescue ProconBypassMan::ConnectionError
     begin
       raise
@@ -115,6 +124,7 @@ module ProconBypassMan
   def self.initialize_pbm
     ProconBypassMan::WriteDeviceIdCommand.execute
     ProconBypassMan::WriteSessionIdCommand.execute
+    system("renice -n -20 -p #{$$}")
     File.write(pid_path, $$)
     ProconBypassMan::DeviceStatus.change_to_running!
   end

data/procon_bypass_man.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "pbmenv"
+  spec.add_dependency "pbmenv", ">= 0.1.9" # Pbmenv.installでのenable_pbm_cloudに依存している
   spec.add_dependency "action_cable_client"
   spec.add_dependency "sorted_set"
 

data/project_template/app.rb

@@ -5,16 +5,28 @@ require 'bundler/inline'
 gemfile do
   source 'https://rubygems.org'
   git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-  gem 'procon_bypass_man', '0.1.19'
+  gem 'procon_bypass_man', '0.1.20.2'
 end
 
 ProconBypassMan.configure do |config|
   config.root = File.expand_path(__dir__)
   config.logger = Logger.new("#{ProconBypassMan.root}/app.log", 5, 1024 * 1024 * 10)
   config.logger.level = :debug
+
+  # バイパスするログを全部app.logに流すか
+  config.verbose_bypass_log = false
+
   # webからProconBypassManを操作できるwebサービス
   # config.api_servers = ['https://pbm-cloud.herokuapp.com']
+
+  # エラーが起きたらerror.logに書き込みます
   config.enable_critical_error_logging = true
+
+  # pbm-cloudで使う場合はnever_exitにtrueをセットしてください. trueがセットされている場合、不慮の事故が発生してもプロセスが終了しなくなります
+  config.never_exit_accidentally = true
+
+  # 操作が高頻度で固まるときは、 gadget_to_procon_interval の数値は大きくしてください
+  config.bypass_mode = { mode: :normal, gadget_to_procon_interval: 5 }
 end
 
 ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")