procon_bypass_man 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7599b3687d6efc95875555ba97158421b94422f350b9bb049e80476aaffb9efa
-  data.tar.gz: fc62c5c839586c5149d89c3391bcaa0feb2bfbfa2662a0a20e6c9225a3a76c2b
+  metadata.gz: 0517ee4fdd17910ba59e27c6775d9c6ed84b061458ab6aa65e0c184baa90773d
+  data.tar.gz: bbe27048f71e5b0fecaf79a775252d36b804baebbf42d4664a48a4be77d958ea
 SHA512:
-  metadata.gz: fd12efc1f2f10b8177177bd7aa179da834991939a4cd460d0b10b2e03c476482d5de747de588a98a05e917a0eef44bc17c58b1e14a699ea693a34cdff246be11
-  data.tar.gz: a60c477422fe598bb50cd0773e94a8de9fee9607a7bd32ffd7d25bc6ea466a930a6a9e311f2615ecf995d7d9b91fd9be599f52abce31f109200a6bf42fabe61e
+  metadata.gz: 1c12516bc8ff8950e26d29207eef77691482373dedf493a6c65675b2c19d3959146d03ac2febd446580f97eeb63001028d53290747cf1b89ab98cd71f0ed0a6f
+  data.tar.gz: abcf11a50b53783f7f9c2698a45d849ebe3c30fae2fa1141f1252df6791b5e1eb3a7b41f907ccfd8ce0e69c5792bd7599e0699a33476551542b1d3b76212a23d

data/.github/workflows/ruby.yml

@@ -16,18 +16,15 @@ jobs:
     timeout-minutes: 5
     strategy:
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3.0']
 
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+        bundler-cache: true
     - name: Run tests
       run: |-
         bundle exec rake

data/CHANGELOG.md

@@ -1,6 +1,11 @@
-## unrelease
+## [0.3.12] 2024-1-8
+* sudoをつけずにPBMを起動できるようになりました。(なお周辺ファイルは未対応)
+* setting.ymlからコントローラーアイコンの色を変更できるようになりました
+  * https://github.com/splaplapla/procon_bypass_man/pull/287
+
+## [0.3.11] 2023-12-13
 * 起動時の安定性向上
-* systemd unit pbm.serviceのRestart=noにしました
+* systemd unit pbm.serviceをRestart=noにしました
 
 ## [0.3.10] 2023-11-30
 * マクロを実行するとメモリ使用率が増え続ける不具合を修正しました

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.3.11)
+    procon_bypass_man (0.3.12)
       action_cable_client
-      blue_green_process (= 0.1.4.2)
+      blue_green_process (= 0.1.4.3)
       pbmenv (>= 0.1.11)
       sorted_set
 
@@ -21,7 +21,7 @@ GEM
     ast (2.4.2)
     backport (1.2.0)
     benchmark (0.2.1)
-    blue_green_process (0.1.4.2)
+    blue_green_process (0.1.4.3)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
@@ -40,19 +40,13 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     method_source (1.0.0)
-    mini_portile2 (2.8.2)
+    mini_portile2 (2.8.5)
     minitest (5.14.4)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.15.2)
+    nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.2-arm-linux)
-      racc (~> 1.4)
-    nokogiri (1.15.2-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.2-x86_64-linux)
-      racc (~> 1.4)
     parallel (1.21.0)
     parser (3.0.3.2)
       ast (~> 2.4.1)
@@ -60,7 +54,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (2.2.3.1)
     rack-protection (2.2.0)
       rack
@@ -102,7 +96,7 @@ GEM
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     serialport (1.3.2)
-    set (1.0.3)
+    set (1.1.0)
     sinatra (2.2.0)
       mustermann (~> 1.0)
       rack (~> 2.2)

data/lib/procon_bypass_man/buttons_setting_configuration/layer.rb

@@ -3,7 +3,8 @@ module ProconBypassMan
     class Layer
       attr_accessor :mode, :flips, :macros, :disable_macros, :remaps, :left_analog_stick_caps, :disables
 
-      def initialize(mode: :manual)
+      def initialize(context, mode: :manual)
+        @context = context
         self.mode = mode
         self.flips = {}
         self.macros = {}
@@ -83,7 +84,7 @@ module ProconBypassMan
         end
 
         macro_name = name.to_s.to_sym
-        if ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins[macro_name]
+        if @context.macro_registry.plugins[macro_name]
           self.macros[macro_name] = { if_pressed: if_pressed, if_tilted_left_stick: if_tilted_left_stick, force_neutral: force_neutral }.compact
         else
           warn "#{macro_name}マクロがinstallされていません"
@@ -133,7 +134,7 @@ module ProconBypassMan
         end
 
         macro_name = name || "OpenMacro-#{steps.join}".to_sym
-        ProconBypassMan::Procon::MacroRegistry.install_plugin(macro_name, steps: steps)
+        @context.macro_registry.install_plugin(macro_name, steps: steps)
         self.macros[macro_name] = { if_pressed: if_pressed, if_tilted_left_stick: if_tilted_left_stick, force_neutral: force_neutral }.compact
       end
 

data/lib/procon_bypass_man/buttons_setting_configuration/loader.rb

@@ -8,58 +8,48 @@ module ProconBypassMan
 
       # @return [ProconBypassMan::ButtonsSettingConfiguration]
       def self.load(setting_path: )
-        ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path = setting_path
-
         metadata_loader = ProconBypassMan::ButtonsSettingConfiguration::MetadataLoader.load(setting_path: setting_path)
         if(Gem::Version.new(metadata_loader.required_pbm_version) >= Gem::Version.new(ProconBypassMan::VERSION))
           ProconBypassMan::SendErrorCommand.execute(error: '起動中のPBMが設定ファイルのバージョンを満たしていません。設定ファイルが意図した通り動かない可能性があります。PBMのバージョンをあげてください。')
         end
 
-        ProconBypassMan::ButtonsSettingConfiguration.switch_new_context(:validation) do |new_instance|
-          yaml = YAML.load_file(setting_path) or raise "読み込みに失敗しました"
-          new_instance.instance_eval(yaml["setting"])
-          validator = Validator.new(new_instance)
-          if validator.valid?
-            next
-          else
-            raise ProconBypassMan::CouldNotLoadConfigError, validator.errors_to_s
-          end
-        rescue SyntaxError
-          fallback_setting_if_has_backup(current_setting_path: setting_path)
-          raise ProconBypassMan::CouldNotLoadConfigError, "Rubyスクリプトのシンタックスエラーです"
-        rescue NameError
-          fallback_setting_if_has_backup(current_setting_path: setting_path)
-          raise ProconBypassMan::CouldNotLoadConfigError, "Rubyスクリプトに未定義の定数・変数があります"
-        rescue Psych::SyntaxError
-          fallback_setting_if_has_backup(current_setting_path: setting_path)
-          raise ProconBypassMan::CouldNotLoadConfigError, "yamlのシンタックスエラーです"
-        end
-
-        ProconBypassMan::ButtonsSettingConfiguration.instance.reset!
-        ProconBypassMan.reset!
+        ProconBypassMan::Procon.reset! # TODO: ここでresetするのは微妙な気がする
 
-        yaml = ProconBypassMan::YamlLoader.load(path: setting_path)
-        ProconBypassMan.config.raw_setting = yaml.dup
-        case yaml["version"]
-        when 1.0, nil
-          ProconBypassMan::ButtonsSettingConfiguration.instance.instance_eval(yaml["setting"])
-        else
-          ProconBypassMan.logger.warn "不明なバージョンです。failoverします"
-          ProconBypassMan::ButtonsSettingConfiguration.instance.instance_eval(yaml["setting"])
-        end
+        new_instance, yaml =
+          begin
+            new_instance = ProconBypassMan::ButtonsSettingConfiguration.new
+            new_instance.setting_path = setting_path
+            yaml = ProconBypassMan::YamlLoader.load(path: setting_path)
+            new_instance.instance_eval(yaml["setting"])
+            validator = Validator.new(new_instance)
+            if validator.valid?
+              [new_instance, yaml]
+            else
+              fallback_setting_if_has_backup(current_setting_path: setting_path)
+              raise ProconBypassMan::CouldNotLoadConfigError, validator.errors_to_s
+            end
+          rescue SyntaxError
+            fallback_setting_if_has_backup(current_setting_path: setting_path)
+            raise ProconBypassMan::CouldNotLoadConfigError, "Rubyスクリプトのシンタックスエラーです"
+          rescue NameError
+            fallback_setting_if_has_backup(current_setting_path: setting_path)
+            raise ProconBypassMan::CouldNotLoadConfigError, "Rubyスクリプトに未定義の定数・変数があります"
+          rescue Psych::SyntaxError
+            fallback_setting_if_has_backup(current_setting_path: setting_path)
+            raise ProconBypassMan::CouldNotLoadConfigError, "yamlのシンタックスエラーです"
+          end
 
+        ProconBypassMan.config.raw_setting = yaml
+        ProconBypassMan.buttons_setting_configuration = new_instance
         File.write(ProconBypassMan.digest_path, Digest::MD5.hexdigest(yaml["setting"]))
+        FileUtils.rm_rf(ProconBypassMan.fallback_setting_path) # NOTE: 設定ファイルの読み込みに成功したら、バックアップを削除する
 
-        if File.exist?(ProconBypassMan.fallback_setting_path)
-          FileUtils.rm_rf(ProconBypassMan.fallback_setting_path)
-        end
-
-        ProconBypassMan::ButtonsSettingConfiguration.instance
+        ProconBypassMan.buttons_setting_configuration
       end
 
       def self.reload_setting
         ProconBypassMan.ephemeral_config.reset!
-        self.load(setting_path: ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path)
+        self.load(setting_path: ProconBypassMan.buttons_setting_configuration.setting_path)
       end
 
       def self.fallback_setting_if_has_backup(current_setting_path: )

data/lib/procon_bypass_man/buttons_setting_configuration/validator.rb

@@ -2,8 +2,8 @@ module ProconBypassMan
   class ButtonsSettingConfiguration
     class Validator
       def initialize(config)
-        @macro_plugins = config.macro_plugins
-        @mode_plugins = config.mode_plugins
+        @macro_plugins = config.macro_registry.plugins
+        @mode_plugins = config.mode_registry.plugins
         @layers = config.layers
         @prefix_keys = config.prefix_keys
       end
@@ -46,7 +46,7 @@ module ProconBypassMan
 
       def validate_config_of_button_lonely
         @layers.each do |layer_key, value|
-          if ProconBypassMan::Procon::ModeRegistry::PRESETS.key?(value.mode)
+          if ProconBypassMan.buttons_setting_configuration.mode_registry.presets.key?(value.mode)
             next
           else
             if !value.flips.empty? || !value.macros.empty?
@@ -83,8 +83,8 @@ module ProconBypassMan
               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(", ")}があります"
+          unless(unsupported_buttons = (unverified_buttons - ProconBypassMan::Procon::ButtonCollection::BUTTONS)).length.zero?
+            @errors[:layers] << "#{layer_key}で存在しないボタン#{unsupported_buttons.join(", ")}があります"
           end
         end
       end

data/lib/procon_bypass_man/buttons_setting_configuration.rb

@@ -3,51 +3,21 @@ require "procon_bypass_man/buttons_setting_configuration/loader"
 require "procon_bypass_man/buttons_setting_configuration/layer"
 
 module ProconBypassMan
-  class Position < Struct.new(:x, :y); end
-
   class ButtonsSettingConfiguration
+    class Position < Struct.new(:x, :y); end
+
+    module ManualMode; def self.name; :manual; end; end
+
     attr_accessor :layers,
       :setting_path,
-      :mode_plugins,
-      :macro_plugins,
+      :macro_registry,
+      :mode_registry,
       :neutral_position
 
-    def self.instance
-      @@context ||= {}
-      @@context[current_context_key] ||= new
-    end
-
-    def self.current_context_key
-      @@current_context_key ||= :main
-    end
-
-    def self.instance=(val)
-      @@context[current_context_key] = val
-    end
-
-    def self.switch_new_context(new_context_key)
-      @@context[new_context_key] = new
-      previous_key = current_context_key
-      if block_given?
-        @@current_context_key = new_context_key
-        value = yield(@@context[new_context_key])
-        return value
-      else
-        @@current_context_key = new_context_key
-      end
-    ensure
-      @@current_context_key = previous_key
-    end
-
     def initialize
       reset!
     end
 
-    module ManualMode
-      def self.name
-        :manual
-      end
-    end
     def layer(direction, mode: ManualMode, &block)
       if ProconBypassMan::ButtonsSettingConfiguration::ManualMode == mode
         mode_name = mode.name
@@ -64,23 +34,24 @@ module ProconBypassMan
                     end
       end
 
-      unless ([ManualMode.name] + ProconBypassMan::Procon::ModeRegistry.plugins.keys).include?(mode_name)
+      unless ([ManualMode.name] + mode_registry.plugins.keys).include?(mode_name)
+        # TODO: strict modeが有効なときはエラーにする
         warn "#{mode_name}モードがinstallされていません"
       end
 
-      layer = Layer.new(mode: mode_name)
+      layer = Layer.new(self, mode: mode_name)
       layer.instance_eval(&block) if block_given?
       self.layers[direction] = layer
       self
     end
 
     def install_mode_plugin(klass)
-      ProconBypassMan::Procon::ModeRegistry.install_plugin(klass)
+      mode_registry.install_plugin(klass)
       self
     end
 
     def install_macro_plugin(klass)
-      ProconBypassMan::Procon::MacroRegistry.install_plugin(klass)
+      macro_registry.install_plugin(klass)
       self
     end
 
@@ -99,11 +70,21 @@ module ProconBypassMan
     end
 
     # @param [Symbol, String] setting_name
+    # @param [Array<any>] args
     # @return [void]
-    def enable(setting_name)
+    def enable(setting_name, *args)
       case setting_name.to_sym
       when :rumble_on_layer_change
         ProconBypassMan.ephemeral_config.enable_rumble_on_layer_change = true
+      when :procon_color
+        color_name = args.first
+        return if color_name.nil? || color_name == :default || color_name == 'default'
+        color = ProconBypassMan::DeviceConnection::ProconColor.new(color_name)
+        if color.valid?
+          ProconBypassMan.ephemeral_config.recognized_procon_color = ProconBypassMan::DeviceConnection::ProconColor.new(color_name)
+        else
+          warn "recognized_procon_colorに存在しないcolor(#{color_name})が呼び出されました。"
+        end
       else
         warn "存在しないenable(#{setting_name.to_sym})が呼び出されました。"
       end
@@ -111,17 +92,17 @@ module ProconBypassMan
 
     def reset!
       @prefix_keys_for_changing_layer = []
-      self.mode_plugins = {}
       # プロセスを一度起動するとsetting_pathは変わらない、という想定なので適当に扱う. resetでは初期化しない
       # self.setting_path = nil
       # どこかで初期化している気がするのでコメントアウト
-      self.macro_plugins = ProconBypassMan::Procon::MacroPluginMap.new # ProconBypassMan::Procon::MacroRegistry.reset!と重複している
       self.layers = {
-        up: Layer.new,
-        down: Layer.new,
-        left: Layer.new,
-        right: Layer.new,
+        up: Layer.new(self),
+        down: Layer.new(self),
+        left: Layer.new(self),
+        right: Layer.new(self),
       }
+      @macro_registry = ProconBypassMan::Procon::MacroRegistry2.new
+      @mode_registry = ProconBypassMan::Procon::ModeRegistry2.new
       @neutral_position = Position.new(2124, 1808).freeze
     end
   end

data/lib/procon_bypass_man/commands/print_boot_message_command.rb

@@ -8,7 +8,7 @@ class ProconBypassMan::PrintBootMessageCommand
       @table[:pid] = $$
       @table[:root_path] = ProconBypassMan.root
       @table[:pid_path] = ProconBypassMan.pid_path
-      @table[:setting_path] = ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path
+      @table[:setting_path] = ProconBypassMan.buttons_setting_configuration.setting_path
       @table[:uptime_from_boot] = ProconBypassMan::Uptime.from_boot
       @table[:use_pbmenv] = ProconBypassMan.root.start_with?(Pbmenv::PBM_DIR)
       @table[:session_id] = ProconBypassMan.session_id

data/lib/procon_bypass_man/device_connection/command.rb

@@ -15,7 +15,7 @@ class ProconBypassMan::DeviceConnection::Command
 
       retry_count = retry_count + 1
       retry
-    rescue ProconBypassMan::DeviceConnection::NotFoundProconError => e
+    rescue ProconBypassMan::DeviceConnection::NotFoundProconError, ProconBypassMan::DeviceConnection::SetupIncompleteError => e
       raise
     end
 

data/lib/procon_bypass_man/device_connection/executor.rb

@@ -150,14 +150,21 @@ class ProconBypassMan::DeviceConnection::Executer
     @procon
   end
 
+  GADGET_PATH = '/dev/hidg0'
   def init_devices
+    unless SudoNeedPasswordChecker.execute!
+      raise ProconBypassMan::DeviceConnection::SetupIncompleteError
+    end
+
     if @initialized_devices
       return
     end
+
     ProconBypassMan::UsbDeviceController.init
     ProconBypassMan::UsbDeviceController.reset
 
     if path = ProconBypassMan::DeviceProconFinder.find
+      ShellRunner.execute("sudo chmod 777 #{path}")
       @procon = File.open(path, "w+b")
       ProconBypassMan.logger.info "proconのデバイスファイルは#{path}を使います"
     else
@@ -165,7 +172,8 @@ class ProconBypassMan::DeviceConnection::Executer
     end
 
     begin
-      @gadget = File.open('/dev/hidg0', "w+b")
+      ShellRunner.execute("sudo chmod 777 #{GADGET_PATH}")
+      @gadget = File.open(GADGET_PATH, "w+b")
     rescue Errno::ENXIO => e
       # /dev/hidg0 をopenできないときがある
       ProconBypassMan::SendErrorCommand.execute(error: "Errno::ENXIOが起きたのでresetします.\n #{e.full_message}", stdout: false)

data/lib/procon_bypass_man/device_connection/pre_bypass.rb

@@ -33,7 +33,16 @@ class ProconBypassMan::DeviceConnection::PreBypass
       begin
         raw_data = non_blocking_read_procon
         output_report_watcher.mark_as_receive(raw_data)
-        ProconBypassMan.logger.info "[pre_bypass] <<< #{raw_data.unpack("H*").first}"
+        ProconBypassMan.logger.info "[pre_bypass] <<< #{raw_data.unpack1("H*")}"
+
+        if(recognized_procon_color = ProconBypassMan.ephemeral_config.recognized_procon_color)
+          first_data_part = raw_data[0].unpack1("H*")
+          sub_command = raw_data[15..16].unpack1("H*")
+          if first_data_part == '21' && sub_command == "5060"
+            raw_data[recognized_procon_color.byte_position] = recognized_procon_color.to_bytes
+          end
+        end
+
         send_switch(raw_data)
       rescue IO::EAGAINWaitReadable
         # no-op

data/lib/procon_bypass_man/device_connection/procon_color.rb

@@ -0,0 +1,37 @@
+class ProconBypassMan::DeviceConnection::ProconColor
+  # NOTE: [Body, Buttons, Left Grip, Right Grip] RGB
+  COLOR_TABLE = {
+    red:    ['ff 00 00', 'ff ff ff', 'ff 00 00', 'ff 00 00'],
+    blue:   ['00 00 ff', 'ff ff ff', '00 00 ff', '00 00 ff'],
+    yellow: ['ff ff 00', 'ff ff ff', 'ff ff 00', 'ff ff 00'],
+    green:  ['00 ff 00', 'ff ff ff', '00 ff 00', '00 ff 00'],
+    pink:   ['ff 00 ff', 'ff ff ff', 'ff 00 ff', 'ff 00 ff'],
+    cyan:   ['00 ff ff', 'ff ff ff', '00 ff ff', '00 ff ff'],
+    white:  ['ff ff ff', '00 00 00', 'ff ff ff', 'ff ff ff'],
+  }
+
+  BYTE_POSITION = 20...(20+(3*4))
+
+  attr_accessor :name
+
+  # @param [Symbol] color_name
+  # @return [void]
+  def initialize(color_name)
+    self.name = color_name.to_sym
+  end
+
+  # @return [String]
+  def to_bytes
+    [COLOR_TABLE[self.name].join.gsub(/[,\s]/, '')].pack('H*')
+  end
+
+  # @return [Range]
+  def byte_position
+    BYTE_POSITION
+  end
+
+  # @return [Boolean]
+  def valid?
+    !!COLOR_TABLE[self.name]
+  end
+end

data/lib/procon_bypass_man/device_connection/procon_setting_overrider.rb

@@ -17,7 +17,7 @@ class ProconBypassMan::DeviceConnection::ProconSettingOverrider
   def initialize(procon: )
     use_steps = {}
     if ProconBypassMan.config.enable_home_led_on_connect
-      use_steps.merge!(ALL_SETTINGS)
+      use_steps.merge!(home_led_on: ALL_SETTINGS[:home_led_on])
     end
 
     @setting_steps = use_steps.keys

data/lib/procon_bypass_man/device_connection.rb

@@ -3,6 +3,7 @@ module ProconBypassMan::DeviceConnection
   class NotFoundProconError < StandardError; end
   class TimeoutErrorInConditionalRoute < StandardError; end
   class TimeoutError < StandardError; end
+  class SetupIncompleteError < StandardError; end
 end
 
 require_relative "device_connection/executor"
@@ -14,3 +15,4 @@ require_relative "device_connection/output_report_generator"
 require_relative "device_connection/output_report_sub_command_table"
 require_relative "device_connection/spoofing_output_report_watcher"
 require_relative "device_connection/output_report_watcher"
+require_relative "device_connection/procon_color"

data/lib/procon_bypass_man/ephemeral_configuration.rb

@@ -1,9 +1,15 @@
-
 # setting.yamlから設定される値。設定ファイルを再読み込みするとすべて消える
 class ProconBypassMan::EphemeralConfiguration
-  attr_accessor :enable_rumble_on_layer_change
+  KEYS = [
+    :enable_rumble_on_layer_change,
+    :recognized_procon_color,
+  ].freeze
+
+  attr_accessor(*KEYS)
 
   def reset!
-    self.enable_rumble_on_layer_change = false
+    KEYS.each do |key|
+      self.send("#{key}=", nil)
+    end
   end
 end

data/lib/procon_bypass_man/procon/analog_stick_manipulator.rb

@@ -28,7 +28,7 @@ class ProconBypassMan::Procon::AnalogStickManipulator
       power_level = $1
       arc_degree = $2.to_i
       syahen = 1800 # 最大まで傾けた状態
-      neutral_position = ProconBypassMan::ButtonsSettingConfiguration.instance.neutral_position
+      neutral_position = ProconBypassMan.buttons_setting_configuration.neutral_position
       self.manipulated_abs_x = (syahen * Math.cos(arc_degree * Math::PI / 180)).to_i - neutral_position.x
       self.manipulated_abs_y = (syahen * Math.sin(arc_degree * Math::PI / 180)).to_i - neutral_position.y
       return

data/lib/procon_bypass_man/procon/layer_changer.rb

@@ -25,13 +25,13 @@ class ProconBypassMan::Procon::LayerChanger
 
   # @return [Boolean]
   def change_layer?
-    if ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.empty?
+    if ProconBypassMan.buttons_setting_configuration.prefix_keys.empty?
       ProconBypassMan.cache.fetch key: 'unknown prefix_keys', expires_in: 60 do
         warn "prefix_keysが未設定です"
       end
       return false
     end
-    ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.map { |b| pressed?(button: b) }.all?
+    ProconBypassMan.buttons_setting_configuration.prefix_keys.map { |b| pressed?(button: b) }.all?
   end
 
   # @return [Boolean]

data/lib/procon_bypass_man/procon/{macro_registry.rb → macro_registry2.rb}

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
 
-class ProconBypassMan::Procon::MacroRegistry
+class ProconBypassMan::Procon::MacroRegistry2
+  attr_accessor :plugins
+
   PRESETS = {
     null: [],
   }
 
-  def self.install_plugin(klass, steps: nil, macro_type: :normal)
+  def initialize
+    self.plugins = ProconBypassMan::Procon::MacroPluginMap.new
+  end
+
+  def install_plugin(klass, steps: nil, macro_type: :normal)
     if plugins.fetch([klass.to_s.to_sym, macro_type], nil)
       Kernel.warn "#{klass} macro is already registered"
       return
@@ -19,7 +25,7 @@ class ProconBypassMan::Procon::MacroRegistry
   end
 
   # @return [ProconBypassMan::Procon::Macro]
-  def self.load(name, macro_type: :normal, force_neutral_buttons: [], &after_callback_block)
+  def load(name, macro_type: :normal, force_neutral_buttons: [], &after_callback_block)
     if(steps = PRESETS[name] || plugins.fetch([name.to_s.to_sym, macro_type], nil)&.call)
       return ProconBypassMan::Procon::Macro.new(name: name, steps: steps.dup, force_neutral_buttons: force_neutral_buttons, &after_callback_block)
     else
@@ -28,21 +34,12 @@ class ProconBypassMan::Procon::MacroRegistry
     end
   end
 
-  def self.reset!
-    ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins = ProconBypassMan::Procon::MacroPluginMap.new
-  end
 
-  def self.plugins
-    ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins
-  end
-
-  def self.cleanup_remote_macros!
-    remote_keys = ProconBypassMan::Procon::MacroRegistry.plugins.original_keys.select { |_, y| y == :remote }
+  def cleanup_remote_macros!
+    remote_keys = plugins.original_keys.select { |_, y| y == :remote }
     remote_keys.each do |remote_key|
-      ProconBypassMan::Procon::MacroRegistry.plugins.delete(remote_key)
+      plugins.delete(remote_key)
     end
-    ProconBypassMan::Procon::MacroRegistry.plugins
+    plugins
   end
-
-  reset!
 end

data/lib/procon_bypass_man/procon/{mode_registry.rb → mode_registry2.rb}

@@ -1,4 +1,4 @@
-class ProconBypassMan::Procon::ModeRegistry
+class ProconBypassMan::Procon::ModeRegistry2
   class Mode
     attr_accessor :name, :binaries, :source_binaries
 
@@ -18,29 +18,29 @@ class ProconBypassMan::Procon::ModeRegistry
     end
   end
 
+  attr_accessor :plugins
+
   PRESETS = {
     manual: [],
   }
 
-  def self.install_plugin(klass)
+  def initialize
+    self.plugins = {}
+  end
+
+  def install_plugin(klass)
     if plugins[klass.to_s.to_sym]
       raise "#{klass} mode is already registered"
     end
     plugins[klass.to_s.to_sym] = ->{ klass.binaries }
   end
 
-  def self.load(name)
+  def load(name)
     b = PRESETS[name] || plugins[name]&.call || raise("#{name} is unknown mode")
     Mode.new(name: name, binaries: b.dup)
   end
 
-  def self.reset!
-    ProconBypassMan::ButtonsSettingConfiguration.instance.mode_plugins = {}
+  def presets
+    PRESETS
   end
-
-  def self.plugins
-    ProconBypassMan::ButtonsSettingConfiguration.instance.mode_plugins
-  end
-
-  reset!
 end

data/lib/procon_bypass_man/procon/value_objects/analog_stick.rb

@@ -5,7 +5,7 @@ class ProconBypassMan::Procon::AnalogStick
   attr_writer :bin_x, :bin_y
 
   def initialize(binary: )
-    @neutral_position = ProconBypassMan::ButtonsSettingConfiguration.instance.neutral_position
+    @neutral_position = ProconBypassMan.buttons_setting_configuration.neutral_position
     bytes = binary[ProconBypassMan::Procon::ButtonCollection::LEFT_ANALOG_STICK.fetch(:byte_position)]
     byte6, byte7, byte8 = bytes.each_char.map { |x| x.unpack("C").first.to_s(2).rjust(8, "0") }
 

data/lib/procon_bypass_man/procon.rb

@@ -11,9 +11,9 @@ class ProconBypassMan::Procon
   require "procon_bypass_man/procon/value_objects/bypass_mode"
   require "procon_bypass_man/procon/performance_measurement"
   require "procon_bypass_man/procon/performance_measurement/queue_over_process"
-  require "procon_bypass_man/procon/mode_registry"
+  require "procon_bypass_man/procon/mode_registry2"
   require "procon_bypass_man/procon/macro"
-  require "procon_bypass_man/procon/macro_registry"
+  require "procon_bypass_man/procon/macro_registry2"
   require "procon_bypass_man/procon/macro_builder"
   require "procon_bypass_man/procon/layer_changer"
   require "procon_bypass_man/procon/button_collection"
@@ -27,14 +27,13 @@ class ProconBypassMan::Procon
 
   def self.reset!
     @@status = {
-      ongoing_macro: MacroRegistry.load(:null),
-      ongoing_mode: ModeRegistry.load(:manual), # 削除予定
+      ongoing_macro: ProconBypassMan.buttons_setting_configuration.macro_registry.load(:null),
+      ongoing_mode: ProconBypassMan.buttons_setting_configuration.mode_registry.load(:manual), # 削除予定
     }
     BlueGreenProcess::SharedVariable.instance.data["buttons"] = {}
     BlueGreenProcess::SharedVariable.instance.data["current_layer_key"] = :up
     BlueGreenProcess::SharedVariable.instance.data["recent_left_stick_hypotenuses"] = []
   end
-  reset!
 
   # @param [string] binary
   def initialize(binary)
@@ -74,7 +73,7 @@ class ProconBypassMan::Procon
   def ongoing_mode; @@status[:ongoing_mode]; end
 
   def current_layer
-    ProconBypassMan::ButtonsSettingConfiguration.instance.layers[current_layer_key]
+    ProconBypassMan.buttons_setting_configuration.layers[current_layer_key]
   end
 
   # 内部ステータスを書き換えるフェーズ
@@ -112,7 +111,7 @@ class ProconBypassMan::Procon
         if(if_tilted_left_stick_value = options[:if_tilted_left_stick])
           threshold = (if_tilted_left_stick_value.is_a?(Hash) && if_tilted_left_stick_value[:threshold]) || ProconBypassMan::AnalogStickTiltingPowerScaler::DEFAULT_THRESHOLD
           if dumped_tilting_power.tilting?(threshold: threshold, current_position_x: analog_stick.relative_x, current_position_y: analog_stick.relative_y) && user_operation.pressing_all_buttons?(options[:if_pressed])
-            @@status[:ongoing_macro] = MacroRegistry.load(macro_name)
+            @@status[:ongoing_macro] = ProconBypassMan.buttons_setting_configuration.macro_registry.load(macro_name)
             break
           end
 
@@ -120,7 +119,8 @@ class ProconBypassMan::Procon
         end
 
         if user_operation.pressing_all_buttons?(options[:if_pressed])
-          @@status[:ongoing_macro] = MacroRegistry.load(macro_name, force_neutral_buttons: options[:force_neutral])
+          @@status[:ongoing_macro] = ProconBypassMan.buttons_setting_configuration.macro_registry.load(macro_name, force_neutral_buttons: options[:force_neutral])
+
           break
         end
       end
@@ -132,11 +132,11 @@ class ProconBypassMan::Procon
       when ProconBypassMan::RemoteAction::Task::TYPE_MACRO
         no_op_step = :wait_for_0_3 # マクロの最後に固まって最後の入力をし続けるので、無の状態を最後に注入する
         BlueGreenProcess::SharedVariable.extend_run_on_this_process = true
-        ProconBypassMan::Procon::MacroRegistry.cleanup_remote_macros!
+        ProconBypassMan.buttons_setting_configuration.macro_registry.cleanup_remote_macros!
         macro_name = task.name || "RemoteMacro-#{task.steps.join}".to_sym
         task.steps << no_op_step
-        ProconBypassMan::Procon::MacroRegistry.install_plugin(macro_name, steps: task.steps, macro_type: :remote)
-        @@status[:ongoing_macro] = MacroRegistry.load(macro_name, macro_type: :remote) do
+        ProconBypassMan.buttons_setting_configuration.macro_registry.install_plugin(macro_name, steps: task.steps, macro_type: :remote)
+        @@status[:ongoing_macro] = ProconBypassMan.buttons_setting_configuration.macro_registry.load(macro_name, macro_type: :remote) do
           GC.start # NOTE: extend_run_on_this_process = true するとGCされなくなるので手動で呼び出す
           ProconBypassMan::PostCompletedRemoteMacroJob.perform_async(task.uuid)
         end
@@ -153,7 +153,7 @@ class ProconBypassMan::Procon
 
     case current_layer.mode
     when :manual
-      @@status[:ongoing_mode] = ModeRegistry.load(:manual)
+      @@status[:ongoing_mode] = ProconBypassMan.buttons_setting_configuration.mode_registry.load(:manual)
       current_layer.flip_buttons.each do |button, options|
         if !options[:if_pressed]
           # FIXME マルチプロセス化したので、クラス変数に状態を保持するFlipCacheは意図した挙動にならない. BlueGreenProcess.shared_variables を使って状態をプロセス間で共有すれば動く
@@ -175,7 +175,7 @@ class ProconBypassMan::Procon
       end
     else
       unless ongoing_mode.name == current_layer.mode
-        @@status[:ongoing_mode] = ProconBypassMan::Procon::ModeRegistry.load(current_layer.mode)
+        @@status[:ongoing_mode] = ProconBypassMan.buttons_setting_configuration.mode_registry.load(current_layer.mode)
       end
       if(binary = ongoing_mode.next_binary)
         self.user_operation.merge([binary].pack("H*"))

data/lib/procon_bypass_man/remote_action/remote_pbm_job/restore_pbm_setting.rb

@@ -10,12 +10,12 @@ module ProconBypassMan
 
           # 復元に失敗したら戻せるように退避する
           FileUtils.copy(
-            ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
+            ProconBypassMan.buttons_setting_configuration.setting_path,
             ProconBypassMan.fallback_setting_path,
           )
 
           ProconBypassMan::YamlWriter.write(
-            path: ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
+            path: ProconBypassMan.buttons_setting_configuration.setting_path,
             content: setting,
           )
 

data/lib/procon_bypass_man/support/renice_command.rb

@@ -11,7 +11,7 @@ module ProconBypassMan
           raise "unknown priority"
         end
       ProconBypassMan.logger.debug { "[SHELL] #{cmd}" }
-      `#{cmd}`
+      `sudo #{cmd}`
     end
   end
 end

data/lib/procon_bypass_man/support/shell_runner.rb

@@ -0,0 +1,11 @@
+class ShellRunner
+  # @param [String] command
+  # @param [Boolean] stdout
+  # @return [void]
+  def self.execute(command, stdout: true)
+    system(command) # TODO: ここでエラーが起きたときに、エラーをログに出力する
+    if stdout
+      ProconBypassMan.logger.info("[SHELL]: #{command}")
+    end
+  end
+end

data/lib/procon_bypass_man/support/sudo_need_password_checker.rb

@@ -0,0 +1,6 @@
+class SudoNeedPasswordChecker
+  # @return [boolean] falseならパスワードが必要
+  def self.execute!
+    system('sudo -n true 2>/dev/null')
+  end
+end

data/lib/procon_bypass_man/support/usb_device_controller.rb

@@ -45,8 +45,8 @@ class ProconBypassMan::UsbDeviceController
         ls /sys/class/udc > UDC
       EOH
 
-      `bash -c '#{shell}'`
-      sleep(1)
+      `sudo bash -c '#{shell}'`
+      ShellRunner.execute('sudo chmod 777 -R /sys/kernel/config/usb_gadget/procon')
     end
 
     def initialized?

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/websocket/client.rb

@@ -52,8 +52,8 @@ module ProconBypassMan
             watchdog.active!
 
             ProconBypassMan.cache.fetch key: 'ws_pinged', expires_in: 10 do
-              ProconBypassMan.logger.info('[WebsocketClient] pinged!!')
-              ProconBypassMan.logger.info(msg)
+              ProconBypassMan.logger.debug('[WebsocketClient] pinged!!')
+              ProconBypassMan.logger.debug(msg)
             end
           }
         end

data/lib/procon_bypass_man.rb

@@ -47,6 +47,8 @@ require_relative "procon_bypass_man/support/forever"
 require_relative "procon_bypass_man/support/simple_tcp_server"
 require_relative "procon_bypass_man/support/proccess_cheacker"
 require_relative "procon_bypass_man/support/output_report_generator"
+require_relative "procon_bypass_man/support/sudo_need_password_checker"
+require_relative "procon_bypass_man/support/shell_runner"
 require_relative "procon_bypass_man/procon_display"
 require_relative "procon_bypass_man/background"
 require_relative "procon_bypass_man/commands"
@@ -57,8 +59,8 @@ require_relative "procon_bypass_man/processor"
 require_relative "procon_bypass_man/configuration"
 require_relative "procon_bypass_man/ephemeral_configuration"
 require_relative "procon_bypass_man/buttons_setting_configuration"
-require_relative "procon_bypass_man/procon"
 require_relative "procon_bypass_man/device_model"
+require_relative "procon_bypass_man/procon"
 require_relative "procon_bypass_man/procon/button"
 require_relative "procon_bypass_man/procon/analog_stick_cap"
 require_relative "procon_bypass_man/procon/analog_stick_manipulator"
@@ -105,6 +107,13 @@ module ProconBypassMan
     # デバイスの接続フェーズ
     begin
       gadget, procon = ProconBypassMan::DeviceConnection::Command.execute!
+    rescue ProconBypassMan::DeviceConnection::SetupIncompleteError
+      ProconBypassMan::SendErrorCommand.execute(error: "The program is terminating because it encountered a request for the sudo password. Please review your sudo settings.", stdout: true)
+      ProconBypassMan::DeviceStatus.change_to_procon_not_found_error! # NOTE: procon_not_found_errorではないけど、めんどいのでこのステータスにする
+      ProconBypassMan::NeverExitAccidentally.exit_if_allow_at_config do
+        terminate_pbm
+      end
+      return
     rescue ProconBypassMan::DeviceConnection::NotFoundProconError
       ProconBypassMan::SendErrorCommand.execute(error: "プロコンが見つかりませんでした。")
       ProconBypassMan::DeviceStatus.change_to_procon_not_found_error!
@@ -143,22 +152,25 @@ module ProconBypassMan
     nil
   end
 
+  # NOTE: app.rbみたいな実行ファイルに書き込まれている設定を管理する
   # @return [ProconBypassMan::Configuration]
   def self.config
     @@configuration ||= ProconBypassMan::Configuration.new
   end
 
+  # NOTE: setting.ymlから読み込んだ一部の値を管理する
   # @return [ProconBypassMan::EphemeralConfiguration]
   def self.ephemeral_config
     @@ephemeral_configuration ||= ProconBypassMan::EphemeralConfiguration.new
   end
 
-  # @return [void]
-  def self.reset!
-    ProconBypassMan::Procon::MacroRegistry.reset!
-    ProconBypassMan::Procon::ModeRegistry.reset!
-    ProconBypassMan::Procon.reset!
-    ProconBypassMan::ButtonsSettingConfiguration.instance.reset!
+  # NOTE: setting.ymlから読み込んだボタンに関する値を管理する
+  def self.buttons_setting_configuration
+    @@buttons_setting_configuration ||= ProconBypassMan::ButtonsSettingConfiguration.new
+  end
+
+  def self.buttons_setting_configuration=(instance)
+    @@buttons_setting_configuration = instance
   end
 
   # @return [void]

data/procon_bypass_man.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "action_cable_client"
-  spec.add_dependency "blue_green_process", '0.1.4.2'
+  spec.add_dependency "blue_green_process", '0.1.4.3'
   spec.add_dependency "pbmenv", ">= 0.1.11" # enable_pbm_cloud連携機能でPbmenv.install, .cleanを使っている.
   spec.add_dependency "sorted_set"
 

data/project_template/app.rb

@@ -12,7 +12,7 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.3.11'
+    gem 'procon_bypass_man', '0.3.12'
     # uncomment if you want to use master branch
     # gem 'procon_bypass_man', github: 'splaplapla/procon_bypass_man', branch: 'master'
     # uncomment if you want to use serial communication feature

data/project_template/app.rb.erb

@@ -12,7 +12,7 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.3.11'
+    gem 'procon_bypass_man', '0.3.12'
     # uncomment if you want to use master branch
     # gem 'procon_bypass_man', github: 'splaplapla/procon_bypass_man', branch: 'master'
     # uncomment if you want to use serial communication feature

data/project_template/setting.yml

@@ -1,7 +1,10 @@
 version: 1.0
 setting: |-
-  # レイヤー変更時にコントローラーが振動する。有効にすると稀に、コントローラーが数秒間固まることがあります。
+  # 1) レイヤー変更時にコントローラーが振動する。※有効にすると稀に、コントローラーが数秒間固まることがあります。
   # enable(:rumble_on_layer_change)
+  #
+  # 2) available colors: :default, :red, :blue, :yellow, :green, :pink, :cyan, :white
+  enable(:procon_color, :red)
 
   prefix_keys_for_changing_layer [:zr, :zl, :l]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - jiikko
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-12 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: action_cable_client
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.4.2
+        version: 0.1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.4.2
+        version: 0.1.4.3
 - !ruby/object:Gem::Dependency
   name: pbmenv
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +176,7 @@ files:
 - lib/procon_bypass_man/device_connection/output_report_sub_command_table.rb
 - lib/procon_bypass_man/device_connection/output_report_watcher.rb
 - lib/procon_bypass_man/device_connection/pre_bypass.rb
+- lib/procon_bypass_man/device_connection/procon_color.rb
 - lib/procon_bypass_man/device_connection/procon_setting_overrider.rb
 - lib/procon_bypass_man/device_connection/spoofing_output_report_watcher.rb
 - lib/procon_bypass_man/device_model.rb
@@ -221,8 +222,8 @@ files:
 - lib/procon_bypass_man/procon/macro.rb
 - lib/procon_bypass_man/procon/macro_builder.rb
 - lib/procon_bypass_man/procon/macro_plugin_map.rb
-- lib/procon_bypass_man/procon/macro_registry.rb
-- lib/procon_bypass_man/procon/mode_registry.rb
+- lib/procon_bypass_man/procon/macro_registry2.rb
+- lib/procon_bypass_man/procon/mode_registry2.rb
 - lib/procon_bypass_man/procon/performance_measurement.rb
 - lib/procon_bypass_man/procon/performance_measurement/last_bypass_at.rb
 - lib/procon_bypass_man/procon/performance_measurement/measurement_collection.rb
@@ -292,7 +293,9 @@ files:
 - lib/procon_bypass_man/support/retryable.rb
 - lib/procon_bypass_man/support/safe_timeout.rb
 - lib/procon_bypass_man/support/send_device_stats_http_client.rb
+- lib/procon_bypass_man/support/shell_runner.rb
 - lib/procon_bypass_man/support/simple_tcp_server.rb
+- lib/procon_bypass_man/support/sudo_need_password_checker.rb
 - lib/procon_bypass_man/support/update_remote_pbm_job_status_http_client.rb
 - lib/procon_bypass_man/support/uptime.rb
 - lib/procon_bypass_man/support/usb_device_controller.rb
@@ -323,7 +326,7 @@ metadata:
   homepage_uri: https://github.com/splaplapla/procon_bypass_man
   source_code_uri: https://github.com/splaplapla/procon_bypass_man
   changelog_uri: https://github.com/splaplapla/procon_bypass_man/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -338,8 +341,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.2.15
+signing_key: 
 specification_version: 4
 summary: A programmable converter for Nintendo Switch Pro Controller
 test_files: []