procon_bypass_man 0.1.20.1 → 0.1.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29c989ae104586849ff797f9086b997294925372a2997797da279c6b2178098a
-  data.tar.gz: d23be38b1c10f9f856407fa65db924e4f8528d453c5fe59f8bdc0832dc3e93f0
+  metadata.gz: b74bbbe94f6c14a8e8cfbabb306e7229cab042ea9d5fae34ddfe134df0911528
+  data.tar.gz: b42ea9a421add0181270f5c957c9d10079598871634f5f20da8e7101349c981e
 SHA512:
-  metadata.gz: 53a8875027f7b2e172bbb1873d1b76ff7ec191531e36c43dd044cc26e9bb54c80c2e1c9b63e5c9c0ec9f42829fd502f3cdbd9ac2ba41862c7835b97c8d3b66ac
-  data.tar.gz: 5476c22c2648861968b08ace121eef62993c3c05685ecbd08829ab5bdae7a66045a96eb3b22c50af154393edf7f9b027e91a66d70e10f4d1db67bf8d8b240822
+  metadata.gz: df4ce5c1fc721fe5aa06236a0909c143f49b3616b4c02ca4202f0de7519206a22f5de864e58e50390e47dfe631475cdf1a04c3b4e99ed492913825cf0315039f
+  data.tar.gz: 8fed8f7f1181bfb51b6b214984af09b0bc1d8b83573174fa276e97e857a0569affb14148aeabf52f0ba3b90cc30083548c191346649e8c534832fcba3b6aee25

data/.circleci/config.yml

@@ -34,6 +34,19 @@ commands: &commands
             - vendor/bundle
 
 jobs:
+  syntax_check:
+    parameters:
+      ruby-version:
+        type: string
+    executor:
+      name: ruby
+      tag: << parameters.ruby-version >>
+    steps:
+      - checkout
+      - run: ruby -cw project_template/app.rb
+      - run: ruby -cw project_template/web.rb
+      - run: ruby -ryaml -e 'puts YAML.load_file("./project_template/setting.yml")["setting"]' > /tmp/content_of_setting.rb && ruby -cw /tmp/content_of_setting.rb
+
   bundle_install:
     parameters:
       ruby-version:
@@ -79,6 +92,14 @@ jobs:
       - run: bundle exec rspec
 
 build_jobs: &build_jobs
+  - syntax_check:
+      matrix:
+        parameters:
+          ruby-version:
+            - "2.7"
+            - "3.0.1"
+            - "3.0.2"
+            - "3.1.1"
   - bundle_install:
       matrix:
         parameters:
@@ -86,7 +107,7 @@ build_jobs: &build_jobs
             - "2.7"
             - "3.0.1"
             - "3.0.2"
-            - "3.1.0"
+            - "3.1.1"
   - lint:
       matrix:
         parameters:
@@ -94,7 +115,7 @@ build_jobs: &build_jobs
             - "2.7"
             - "3.0.1"
             - "3.0.2"
-            - "3.1.0"
+            - "3.1.1"
       requires:
         - bundle_install
   - type_check:
@@ -104,7 +125,7 @@ build_jobs: &build_jobs
             - "2.7"
             # - "3.0.1" # たまにSEGVするので
             - "3.0.2"
-            - "3.1.0"
+            - "3.1.1"
       requires:
         - bundle_install
   - rspec:
@@ -114,7 +135,7 @@ build_jobs: &build_jobs
             - "2.7"
             - "3.0.1"
             - "3.0.2"
-            - "3.1.0"
+            - "3.1.1"
       requires:
         - bundle_install
 workflows:

data/CHANGELOG.md

@@ -1,12 +1,17 @@
+## [0.1.20.2] - 2022-2-18
+- 起動時にreniceするようにしました
+- 起動時にusb gadgetモードを有効にするようにしました
+- pbm-cloudからprocon_bypass_manをアップグレードできるようになりました
+
 ## [0.1.20.1] - 2022-02-13
-- Switchからプロコンへ送信するバイパスのインターバルを設定できるようにしました（切断対策）
+- Switchからプロコンへ送信するバイパスのインターバルを設定できるようにしました（切断・フリーズ対策）
 
 ## [0.1.20] - 2022-02-13
 - pbm-cloudから再起動・設定ファイルの適用指示があったときにackイベントを返すようになりました
 - 起動オプションにnever_exit_accidentallyを追加しました。これを有効にすると想定外のエラーが起きたときにプロセスが停止しなくなります。デフォルトで無効です。
 - pbm-cloudから設定ファイルの適用に失敗したときにファイルへの書き込みをしないようになりました
 - まだadd_procon_gadget.shを実行していないときに、接続処理をする前に処理を停止するようにしました
-- ラズパイの複数のUSBデバイスが刺さっていてもプロコンのデバイスを選択できるようにしました
+- ラズパイに複数のUSBデバイスが刺さっていてもプロコンのデバイスを選択できるようにしました
 - Switchからプロコンへ送信するバイパスを動かし続けるようにしました（切断対策）
 
 ## [0.1.19.1] - 2022-02-09

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.20.1)
+    procon_bypass_man (0.1.20.2)
       action_cable_client
-      pbmenv
+      pbmenv (>= 0.1.9)
       sorted_set
 
 GEM
@@ -36,7 +36,7 @@ GEM
     parallel (1.21.0)
     parser (3.0.3.2)
       ast (~> 2.4.1)
-    pbmenv (0.1.8)
+    pbmenv (0.1.9)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)

data/docs/getting_started.md

@@ -14,10 +14,9 @@
 * マクロ
 * 左スティックの感度調整
 * 設定ファイルの書き方
-  * layer
 * プラグインの書き方
 * 設定ファイルの書き方がわからない、エラーが起きるとき
-* procon_bypass_manのアップグレード方法
+* [procon_bypass_manのアップグレード方法](#procon_bypass_manのアップグレード方法)
 * procon_bypass_man_cloudについて
 
 ## はじめに
@@ -86,3 +85,32 @@ sudo systemctl enable pbm.service
 pbmenvを使っていない場合は、 https://github.com/splaplapla/procon_bypass_man/blob/master/project_template/systemd_units/pbm.service をダウンロードして、 `systemctl link` をしてください。
 
 ゲームをやめたくなったらSwitchはそのままスリープに入って問題ないです。このときにRaspberry Piも一緒に電源が切れてしまいますが故障することはありません。
+
+## レイヤー
+* 後で書きます
+
+## モード
+* 後で書きます
+
+## マクロ
+* 後で書きます
+
+## 左スティックの感度調整
+* 後で書きます
+
+## 設定ファイルの書き方
+* 後で書きます
+
+## プラグインの書き方
+* 後で書きます
+
+## 設定ファイルの書き方がわからない、エラーが起きるとき
+
+設定部分は、Rubyスクリプトになっているので構文エラーが起きることがあります。  
+discordで質問してみてください。
+
+## procon_bypass_manのアップグレード方法
+[/docs/upgrade_pbm.md](/docs/upgrade_pbm.md)
+
+## procon_bypass_man_cloudについて
+* 後で書きます

data/lib/procon_bypass_man/background/jobs/report_completed_upgrade_pbm_job.rb

@@ -0,0 +1,10 @@
+class ProconBypassMan::ReportCompletedUpgradePbmJob < ProconBypassMan::ReportEventBaseJob
+  extend ProconBypassMan::HasExternalApiSetting
+
+  def self.perform
+    ProconBypassMan::ReportHttpClient.new(
+      path: path,
+      server_pool: server_pool,
+    ).post(body: nil, event_type: :completed_upgrade_pbm)
+  end
+end

data/lib/procon_bypass_man/background.rb

@@ -12,4 +12,5 @@ require "procon_bypass_man/background/jobs/report_error_reload_config_job"
 require "procon_bypass_man/background/jobs/report_load_config_job"
 require "procon_bypass_man/background/jobs/report_error_job"
 require "procon_bypass_man/background/jobs/report_pressed_buttons_job"
+require "procon_bypass_man/background/jobs/report_completed_upgrade_pbm_job"
 require "procon_bypass_man/background/jobs/sync_device_stats_job"

data/lib/procon_bypass_man/bypass/bypass_mode.rb

@@ -18,4 +18,12 @@ class ProconBypassMan::BypassMode
     @mode = mode.to_sym
     @gadget_to_procon_interval = gadget_to_procon_interval
   end
+
+  def to_s
+    if mode == TYPE_NORMAL
+      "#{mode}(#{gadget_to_procon_interval})"
+    else
+      mode.to_s
+    end
+  end
 end

data/lib/procon_bypass_man/commands/connect_device_command.rb

@@ -3,26 +3,16 @@ class ProconBypassMan::ConnectDeviceCommand
 
   # @return [void]
   def self.execute!
-    unless has_required_files?
-      raise ProconBypassMan::NotFoundRequiredFilesError, "there is not /sys/kernel/config/usb_gadget/procon"
-    end
-
-    begin
-      gadget, procon = ProconBypassMan::DeviceConnector.connect
-    rescue ProconBypassMan::DeviceConnector::NotFoundProconError => e
-      ProconBypassMan.logger.error e
-      gadget&.close
-      procon&.close
-      raise ProconBypassMan::ConnectDeviceCommand::NotFoundProconError
-    rescue ProconBypassMan::SafeTimeout::Timeout
-      ProconBypassMan.logger.error "デバイスとの通信でタイムアウトが起きて接続ができませんでした。"
-      gadget&.close
-      procon&.close
-      raise ProconBypassMan::EternalConnectionError
-    end
-  end
-
-  def self.has_required_files?
-    Dir.exist?("/sys/kernel/config/usb_gadget/procon")
+    gadget, procon = ProconBypassMan::DeviceConnector.connect
+  rescue ProconBypassMan::DeviceConnector::NotFoundProconError => e
+    ProconBypassMan.logger.error e
+    gadget&.close
+    procon&.close
+    raise ProconBypassMan::ConnectDeviceCommand::NotFoundProconError
+  rescue ProconBypassMan::SafeTimeout::Timeout
+    ProconBypassMan.logger.error "デバイスとの通信でタイムアウトが起きて接続ができませんでした。"
+    gadget&.close
+    procon&.close
+    raise ProconBypassMan::EternalConnectionError
   end
 end

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/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
 
@@ -267,6 +267,7 @@ class ProconBypassMan::DeviceConnector
     if @initialized_devices
       return
     end
+    ProconBypassMan::UsbDeviceController.init
 
     if path = ProconBypassMan::DeviceProconFinder.find
       @procon = File.open(path, "w+b")
@@ -276,9 +277,7 @@ class ProconBypassMan::DeviceConnector
     end
     @gadget = File.open('/dev/hidg0', "w+b")
 
-    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::UsbDeviceController.reset
 
     @initialized_devices = true
 
@@ -290,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

@@ -42,24 +42,4 @@ class ProconBypassMan::DeviceProconFinder
       done
     SHELL
   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
 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/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.20.1"
+  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"
@@ -31,6 +33,7 @@ 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"
@@ -54,7 +57,6 @@ module ProconBypassMan
 
   class CouldNotLoadConfigError < StandardError; end
   class ConnectionError < StandardError; end
-  class NotFoundRequiredFilesError < StandardError; end
   class FirstConnectionError < ConnectionError; end
   class EternalConnectionError < ConnectionError; end
 
@@ -71,11 +73,6 @@ module ProconBypassMan
     Runner.new(gadget: gadget, procon: procon).run # ここでblockingする
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     FileUtils.rm_rf(ProconBypassMan.digest_path)
-  rescue ProconBypassMan::NotFoundRequiredFilesError
-    ProconBypassMan::SendErrorCommand.execute(error: "/sys/kernel/config/usb_gadget/proconディレクトリがありませんでした。処理を終了します。")
-    FileUtils.rm_rf(ProconBypassMan.pid_path)
-    FileUtils.rm_rf(ProconBypassMan.digest_path)
-    exit 1 # 前提条件を満たしていないので絶対に落とす
   rescue ProconBypassMan::CouldNotLoadConfigError
     ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。設定ファイルの読み込みに失敗しました")
     ProconBypassMan::DeviceStatus.change_to_setting_syntax_error_and_shutdown!
@@ -127,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,20 +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.20.1'
+  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: 0.5 }
+  config.bypass_mode = { mode: :normal, gadget_to_procon_interval: 5 }
 end
 
 ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")

data/project_template/systemd_units/pbm.service

@@ -7,7 +7,7 @@ Type=simple
 WorkingDirectory=/usr/share/pbm/current
 ExecStart=/bin/bash -c "/home/pi/.rbenv/versions/3.0.1/bin/ruby /usr/share/pbm/current/app.rb"
 Restart=always
-Nice=-19
+Nice=-20
 
 [Install]
 WantedBy=multi-user.target

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.20.1
+  version: 0.1.20.2
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-13 00:00:00.000000000 Z
+date: 2022-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: action_cable_client
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +96,7 @@ files:
 - lib/procon_bypass_man/background/jobs/concerns/has_internal_api_setting.rb
 - lib/procon_bypass_man/background/jobs/concerns/job_runnable.rb
 - lib/procon_bypass_man/background/jobs/report_boot_job.rb
+- lib/procon_bypass_man/background/jobs/report_completed_upgrade_pbm_job.rb
 - lib/procon_bypass_man/background/jobs/report_error_job.rb
 - lib/procon_bypass_man/background/jobs/report_error_reload_config_job.rb
 - lib/procon_bypass_man/background/jobs/report_event_base_job.rb
@@ -179,6 +180,7 @@ files:
 - lib/procon_bypass_man/support/update_remote_pbm_action_status_http_client.rb
 - lib/procon_bypass_man/support/uptime.rb
 - lib/procon_bypass_man/support/yaml_writer.rb
+- lib/procon_bypass_man/usb_device_controller.rb
 - lib/procon_bypass_man/version.rb
 - lib/procon_bypass_man/websocket/pbm_job_client.rb
 - procon_bypass_man.gemspec