procon_bypass_man 0.1.16.1 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5af6fb77bbbd2aca55c93c8af1bb9c72ede43a043f069001b30201bf8352e7de
-  data.tar.gz: 5607eb2f41d4a09de6e7e04cb8afcf998c09d790931ed105dbe5136c7160698a
+  metadata.gz: 93bbba4d48bc92fc4f9882a5708d5947fde2e52fc9dbba3df2db6fe7530c52ec
+  data.tar.gz: d963b6553736bdf606f63588c4664ec19153e0c9824dc52293c4f0bf99bbaeb6
 SHA512:
-  metadata.gz: f21c116b2d69b79a2c896cd8c1298a1e80d82c2c879e0e0db328b64f9abb19901da93edd0a88d64314413092bfafead55a9ab359f9e09a2546794812178701e1
-  data.tar.gz: 89d32cbe122d38ad19d55481539a05cfad959695d46c29d2dc6db8ac34eb251a2f2f49d7ab36f5d514e191751ba19f747dd13e5a21fd4cde4ae435a93ce117de
+  metadata.gz: f36218eabf2625618182d45969cb5dd796fa3a9284d1921ab7a923062315f5302e422b7fe49a8d67fbef2e25de4fbd7b6ee378a29fa7f9eb2738de1b406a8c72
+  data.tar.gz: fe700aa1c024c3ae45ed57698dcdf35d898032c5a11954ffcf9b70fdcd2e5254bd947f2cb5b5e62d495bfad5e338337c109dafe5dd5bf7f1a1e543bc96ff54f2

data/.circleci/config.yml

@@ -42,6 +42,7 @@ build_jobs: &build_jobs
             - "2.7"
             - "3.0.1"
             - "3.0.2"
+            - "3.1.0"
 workflows:
   version: 2
   build:

data/.github/workflows/release.yml

@@ -13,10 +13,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Set up Ruby 2.6
+    - name: Set up Ruby 3.0.1
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.0.1
         bundler-cache: true
     - name: Publish to RubyGems
       run: |

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.1.17] - 2022-01
+- procon_bypass_man_cloudに組み込むために、内部のデータ構造を変更しました
+- 設定ファイルにmacroを直接打ち込めるようになりました
+  - ex) `open_macro :special_command, steps: [:x, :y, :up], if_pressed: [:y]`
+
 ## [0.1.16.1] - 2022-01-22
 - 初期状態ではinternal api(pbm-web)の通信を無効にしました
 

data/Gemfile

@@ -11,6 +11,7 @@ gem "pry"
 gem "timecop"
 gem "rubocop", require: false
 gem "steep", require: false
+gem 'typeprof', require: false
 gem 'rbs', require: false
 gem "sinatra", require: false
 gem "webrick", require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.16.1)
+    procon_bypass_man (0.1.17)
       action_cable_client
       pbmenv
       sorted_set
@@ -100,6 +100,8 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     tilt (2.0.10)
     timecop (0.9.4)
+    typeprof (0.20.4)
+      rbs (>= 1.6.2)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
@@ -131,6 +133,7 @@ DEPENDENCIES
   sinatra
   steep
   timecop
+  typeprof
   webrick
 
 BUNDLED WITH

data/README.md

@@ -82,7 +82,6 @@ Switch <-- (PBM): ZR連打
 ## TODO
 * レコーディング機能(プロコンの入力をマクロとして登録ができる)
 * マクロにdelayを入れれるようにする
-* 設定ファイル マクロの引数に、ボタンを取れるようにする
 
 ## 開発系
 ### プロコンとの接続を維持したまま、現在の設定ファイルをPBMに反映する

data/Steepfile

@@ -1,15 +1,15 @@
 # D = Steep::Diagnostic
 #
 # target :lib do
-#   signature "sig"
+#   signature 'sig'
 #
-#   check "lib"                       # Directory name
-#   check "Gemfile"                   # File name
-#   check "app/models/**/*.rb"        # Glob
-#   # ignore "lib/templates/*.rb"
+#   check 'lib'                       # Directory name
+#   check 'Gemfile'                   # File name
+#   check 'app/models/**/*.rb'        # Glob
+#   # ignore 'lib/templates/*.rb'
 #
-#   # library "pathname", "set"       # Standard libraries
-#   # library "strong_json"           # Gems
+#   # library 'pathname', 'set'       # Standard libraries
+#   # library 'strong_json'           # Gems
 #
 #   # configure_code_diagnostics(D::Ruby.strict)       # `strict` diagnostics setting
 #   # configure_code_diagnostics(D::Ruby.lenient)      # `lenient` diagnostics setting
@@ -19,21 +19,35 @@
 # end
 
 # target :test do
-#   signature "sig", "sig-private"
+#   signature 'sig', 'sig-private'
 #
-#   check "test"
+#   check 'test'
 #
-#   # library "pathname", "set"       # Standard libraries
+#   # library 'pathname', 'set'       # Standard libraries
 # end
 
 target :lib do
-  check "lib/procon_bypass_man/timer.rb"
-  check "lib/procon_bypass_man/uptime.rb"
-  check "lib/procon_bypass_man/configuration.rb"
+  check 'lib/procon_bypass_man/timer.rb'
+  check 'lib/procon_bypass_man/configuration.rb'
+  check 'lib/procon_bypass_man/processor'
+  check 'lib/procon_bypass_man/procon/macro_registry'
+  check 'lib/procon_bypass_man/procon/mode_registry'
+  check 'lib/procon_bypass_man/domains/*'
+  check 'lib/procon_bypass_man/domains'
+  check 'lib/procon_bypass_man/support/report_http_client'
+  check 'lib/procon_bypass_man/support/http_client'
+  check 'lib/procon_bypass_man/support/send_device_stats_http_client'
+  check 'lib/procon_bypass_man/support/on_memory_cache'
+  check 'lib/procon_bypass_man/support/server_pool'
+  check 'lib/procon_bypass_man/support/uptime.rb'
+  check 'lib/procon_bypass_man/support/safe_timeout'
+  check 'lib/procon_bypass_man/support/update_remote_pbm_action_status_http_client'
+  check 'lib/procon_bypass_man/support/compress_array'
 
-  signature "sig"
+  signature 'sig'
 
-  library "time"
-  library "logger"
-  library "monitor"
+  library 'time'
+  library 'logger'
+  library 'monitor'
+  library 'uri'
 end

data/docs/setting/left-analogstick-cap.md

@@ -0,0 +1,60 @@
+# 左アナログスティック感度調整の設定方法
+https://user-images.githubusercontent.com/1664497/150636857-f3d40900-2713-41b8-856a-279c200d9ae7.mp4
+
+* procon_bypass_man: 0.1.9以上が必要です
+* PBMには、左アナログスティックの入力の最大値を書き換える機能があります。それをsetting.ymlに書く方法を説明します
+* これを使うと、特定のボタンを押している間は、スティックを完全に倒している状態で、スプラトゥーンでいうところの `スニーキング` で移動ができるようになります
+
+## 1. プロコンの左スティックのほぼニュートラルな状態の座標を記述する
+* `set_neutral_position x, y`を使って、プロコンの左スティックのほぼニュートラルな状態の座標を記述します
+  * 完全にニュートラルな値を記述すると最速のスニーキングが出ないので微妙にずらします
+* プロコンごとにニュートラルな状態の座標に個体差があって、最速のスニーキングを出すには本数値を調整する必要があります
+* 実際に設定している座標の例
+  * `set_neutral_position 1906, 1886`
+  * `set_neutral_position 2100, 2000`
+
+## 2. 左アナログスティックの入力の最大値を設定する
+* ニュートラルな状態の座標が決まったら、次はどのボタンを押したときに、どれくらいスティック感度を書き換えるか、を設定します
+* 設定には `left_analog_stick_cap` を使います
+* 実際にパラメータを記述した例を用いると `left_analog_stick_cap cap: 1100, if_pressed: [:zl, :a], force_neutral: :a` のようになります
+  * パラメータは3つあります
+    * `cap: 1100`
+      * こちらはニュートラル座標からの最大距離をどのくらいにするか、を決めます
+        * 指定したボタンが押されている間は、ニュートラル座標から1100までの範囲に「現在の座標」を書き換える、という設定になります
+        * スプラトゥーンのスニーキング用途であれば、1100固定で問題ありません
+    * `if_pressed: [:zl, :a]`
+      * こちらは zlボタン, aボタンが両方押されている状態の時に本設定が発動する、という設定になります。トリガーです
+        * つまり、zlとaを同時押ししている時に、左アナログスティックの入力を書き換えます
+    * `force_neutral: :a`
+      * こちらは、左アナログスティックの入力を書き換えている時は、「強制的にaボタンを押していない状態にする」という設定になります
+      * つまり、zlボタンとaボタンを同時押ししている時には、左アナログスティックの入力を書き換えて、aボタンは押していない状態になります
+        * どうしてこれが必要かというと、ゲームタイトルによるのですが、スプラトゥーンの場合は、ガチアサリ中に、保有しているアサリを投げないために必要になっています
+      * force_neutralはoptionalです
+
+## 3. 設定を反映させる
+* 上記の記述を加えたsetting.ymlを起動中のprocon_bypass_manプロセスで読み込むには、プロセスにその旨を伝える必要があります
+  * ラズベリーパイを再起動して、プロセスを立ち上げ直す、でも目的は達成できますが、もっと簡単にsetting.ymlを再読み込みする必要があります
+* 書き換えたsetting.ymlを、起動中のprocon_bypass_manプロセスへ即時反映するには、procon_bypass_manプロセスを動かしたまま、別のshellから 以下をを実行してください
+  * setting.ymlのシンタックスが正しければ、switchとの接続が継続したままsetting.ymlの内容を読み込んでいるはずです
+
+```shell
+sudo kill -USR2 `cat ./pbm_pid` 
+```
+
+## まとめ
+* スティックの中央値を設定します
+  * スプラトゥーンでの最速スニーキングを出すには、set_neutral_positionの値を変更してください
+* 発動するボタンを設定します
+* setting.ymlを再読み込みします
+
+## 設定例
+```yaml
+version: 1.0
+setting: |-
+  prefix_keys_for_changing_layer [:zr, :zl, :l]
+  set_neutral_position 2100, 2000
+
+  layer :up, mode: :manual do
+    left_analog_stick_cap cap: 1100, if_pressed: [:zl, :a], force_neutral: :a
+  end
+```

data/lib/procon_bypass_man/buttons_setting_configuration/layer.rb

@@ -8,7 +8,7 @@ module ProconBypassMan
         self.flips = {}
         self.macros = {}
         self.remaps = {}
-        self.left_analog_stick_caps = {}
+        self.left_analog_stick_caps = []
         self.disables = []
       end
 
@@ -53,12 +53,18 @@ module ProconBypassMan
         self.flips[button] = hash
       end
 
+      # @param [String, Class] プラグインのclass
       def macro(name, if_pressed: )
-        if name.respond_to?(:name)
-          macro_name = name.name.to_sym
-        else
-          macro_name = name
-        end
+        macro_name = name.to_s.to_sym
+        self.macros[macro_name] = { if_pressed: if_pressed }
+      end
+
+      # 設定ファイルに直接マクロを打ち込める
+      # @param [String, Class] macroの識別子
+      # @paramh[Array<Symbol>] macroの本体. ボタンの配列
+      def open_macro(name, steps: , if_pressed: )
+        macro_name = name || "OpenMacro-#{steps.join}".to_sym
+        ProconBypassMan::Procon::MacroRegistry.install_plugin(macro_name, steps: steps)
         self.macros[macro_name] = { if_pressed: if_pressed }
       end
 
@@ -88,6 +94,10 @@ module ProconBypassMan
           raise "not support value"
         end
 
+        if if_pressed
+          hash[:if_pressed] = if_pressed
+        end
+
         case force_neutral
         when TrueClass
           raise "ボタンを渡してください"
@@ -101,7 +111,7 @@ module ProconBypassMan
           raise "not support value"
         end
 
-        left_analog_stick_caps[if_pressed] = hash
+        left_analog_stick_caps << hash
       end
 
       def disable(button)
@@ -123,6 +133,22 @@ module ProconBypassMan
       def flip_buttons
         flips
       end
+
+      # @return [String]
+      def to_json(*)
+        to_hash.to_json
+      end
+
+      # @return [Hash]
+      def to_hash
+        { mode: mode,
+          flips: flips,
+          macros: macros,
+          remaps: remaps,
+          disables: disables,
+          left_analog_stick_caps: left_analog_stick_caps,
+        }
+      end
     end
   end
 end

data/lib/procon_bypass_man/buttons_setting_configuration/loader.rb

@@ -3,6 +3,7 @@ module ProconBypassMan
     module Loader
       require 'digest/md5'
 
+      # @return [ProconBypassMan::ButtonsSettingConfiguration]
       def self.load(setting_path: )
         ProconBypassMan::ButtonsSettingConfiguration.switch_new_context(:validation) do |new_instance|
           yaml = YAML.load_file(setting_path) or raise "読み込みに失敗しました"

data/lib/procon_bypass_man/buttons_setting_configuration/validator.rb

@@ -2,6 +2,8 @@ module ProconBypassMan
   class ButtonsSettingConfiguration
     class Validator
       def initialize(config)
+        @macro_plugins = config.macro_plugins
+        @mode_plugins = config.mode_plugins
         @layers = config.layers
         @prefix_keys = config.prefix_keys
       end
@@ -14,6 +16,8 @@ module ProconBypassMan
         validate_config_of_button_lonely
         validate_verify_button_existence
         validate_flip_and_remap_are_hate_each_other
+        validate_verify_mode_plugins
+        validate_verify_macro_plugins
 
         @errors.empty?
       end
@@ -86,6 +90,38 @@ module ProconBypassMan
           end
         end
       end
+
+      def validate_verify_mode_plugins
+        @mode_plugins.each do |key, mode|
+          begin
+            Module.const_get(key.to_s)
+          rescue NameError
+            next
+          end
+
+          if(const = Module.const_get(key.to_s))
+            if not const.respond_to?(:binaries) && mode.call
+              @errors[:mode] << "モード #{key}を読み込めませんでした。"
+            end
+          end
+        end
+      end
+
+      def validate_verify_macro_plugins
+        @macro_plugins.each do |key, macro|
+          begin
+            Module.const_get(key.to_s)
+          rescue NameError
+            next
+          end
+
+          if(const = Module.const_get(key.to_s))
+            if not const.respond_to?(:steps) && macro.call
+              @errors[:macro] << "マクロ #{key}を読み込めませんでした。"
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/procon_bypass_man/buttons_setting_configuration.rb

@@ -15,14 +15,21 @@ module ProconBypassMan
       :neutral_position
 
     def self.instance
-      @@current_context_key ||= :main
       @@context ||= {}
-      @@context[@@current_context_key] ||= new
+      @@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(key)
       @@context[key] = new
-      previous_key = @@current_context_key
+      previous_key = current_context_key
       if block_given?
         @@current_context_key = key
         value = yield(@@context[key])
@@ -35,23 +42,31 @@ module ProconBypassMan
 
     def initialize
       reset!
+      self.class.instance = self
     end
 
     module ManualMode
       def self.name
-        'manual'
+        :manual
       end
     end
     def layer(direction, mode: ManualMode, &block)
-      mode_name = case mode
-                  when String
-                    mode.to_sym
-                  when Symbol
-                    mode
-                  else
-                    mode.name.to_sym
-                  end
-      unless ([ManualMode.name.to_sym] + ProconBypassMan::Procon::ModeRegistry.plugins.keys).include?(mode_name)
+      if ProconBypassMan::ButtonsSettingConfiguration::ManualMode == mode
+        mode_name = mode.name
+      else
+        mode_name = case mode
+                    when ProconBypassMan::ButtonsSettingConfiguration::ManualMode
+                      mode.name
+                    when String
+                      mode.to_sym
+                    when Symbol
+                      mode
+                    else
+                      mode.to_s.to_sym
+                    end
+      end
+
+      unless ([ManualMode.name] + ProconBypassMan::Procon::ModeRegistry.plugins.keys).include?(mode_name)
         raise("#{mode_name} mode is unknown")
       end
 

data/lib/procon_bypass_man/domains/binary/base.rb

@@ -8,4 +8,18 @@ class ProconBypassMan::Domains::Binary::Base
   def binary
     raise NotImplementedError
   end
+
+  # @return [String]
+  def raw
+    binary
+  end
+
+  def unpack
+    binary.unpack("H*")
+  end
+
+  # @return [ProconBypassMan::ProconReader]
+  def to_procon_reader
+    ProconBypassMan::ProconReader.new(binary: binary)
+  end
 end

data/lib/procon_bypass_man/domains/binary/inbound_procon_binary.rb

@@ -2,20 +2,6 @@
 class ProconBypassMan::Domains::InboundProconBinary < ProconBypassMan::Domains::Binary::Base
   include ProconBypassMan::Domains::HasImmutableBinary
 
-  # @return [String]
-  def raw
-    binary.dup
-  end
-
-  def unpack
-    binary.unpack("H*")
-  end
-
-  # @return [ProconBypassMan::ProconReader]
-  def to_procon_reader
-    ProconBypassMan::ProconReader.new(binary: binary)
-  end
-
   # @return [Boolean]
   def user_operation_data?
     binary[0] == "\x30".b

data/lib/procon_bypass_man/domains/binary/processing_procon_binary.rb

@@ -4,15 +4,6 @@ class ProconBypassMan::Domains::ProcessingProconBinary < ProconBypassMan::Domain
 
   ALL_ZERO_BIT = ["0"].pack("H*").freeze
 
-  # @return [String]
-  def raw
-    binary
-  end
-
-  def unpack
-    binary.unpack("H*")
-  end
-
   def set_no_action!
     binary[3] = ALL_ZERO_BIT
     binary[4] = ALL_ZERO_BIT
@@ -48,7 +39,7 @@ class ProconBypassMan::Domains::ProcessingProconBinary < ProconBypassMan::Domain
     raise "already pressing button(#{button})" if ProconBypassMan::PressButtonAware.new(binary).pressing_button?(button)
 
     button_obj = ProconBypassMan::Procon::Button.new(button)
-    value = binary[button_obj.byte_position].unpack("H*").first.to_i(16) + (2**button_obj.bit_position)
+    value = binary[button_obj.byte_position].unpack("C").first + (2**button_obj.bit_position)
     binary[button_obj.byte_position] = ["%02X" % value.to_s].pack("H*")
   end
 
@@ -57,7 +48,7 @@ class ProconBypassMan::Domains::ProcessingProconBinary < ProconBypassMan::Domain
     raise "not press button(#{button}) yet" if not ProconBypassMan::PressButtonAware.new(binary).pressing_button?(button)
 
     button_obj = ProconBypassMan::Procon::Button.new(button)
-    value = binary[button_obj.byte_position].unpack("H*").first.to_i(16) - (2**button_obj.bit_position)
+    value = binary[button_obj.byte_position].unpack("C").first - (2**button_obj.bit_position)
     binary[button_obj.byte_position] = ["%02X" % value.to_s].pack("H*")
   end
 
@@ -72,9 +63,4 @@ class ProconBypassMan::Domains::ProcessingProconBinary < ProconBypassMan::Domain
     analog_stick_cap = ProconBypassMan::Procon::AnalogStickCap.new(binary)
     binary[6..8] = analog_stick_cap.capped_position(cap_hypotenuse: cap).to_binary
   end
-
-  # @return [ProconBypassMan::ProconReader]
-  def to_procon_reader
-    ProconBypassMan::ProconReader.new(binary: binary)
-  end
 end

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

@@ -3,7 +3,7 @@ module ProconBypassMan
     module Splatoon2
       module Macro
         module FastReturn
-          def self.name
+          def self.display_name
             :fast_return
           end
 

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

@@ -3,7 +3,7 @@ module ProconBypassMan
     module Splatoon2
       module Macro
         module JumpToLeftKey
-          def self.name
+          def self.display_name
             :jump_to_left_key
           end
 

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

@@ -3,7 +3,7 @@ module ProconBypassMan
     module Splatoon2
       module Macro
         module JumpToRightKey
-          def self.name
+          def self.display_name
             :jump_to_right_key
           end
 

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

@@ -3,7 +3,7 @@ module ProconBypassMan
     module Splatoon2
       module Macro
         module JumpToUpKey
-          def self.name
+          def self.display_name
             :jump_to_up_key
           end
 

data/lib/procon_bypass_man/plugin/splatoon2/version.rb

@@ -3,7 +3,7 @@
 module ProconBypassMan
   module Plugin
     module Splatoon2
-      VERSION = "0.1.2"
+      VERSION = "0.1.3"
     end
   end
 end

data/lib/procon_bypass_man/procon/button_collection.rb

@@ -37,4 +37,12 @@ class ProconBypassMan::Procon::ButtonCollection
   BUTTONS = ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.keys.freeze
 
   LEFT_ANALOG_STICK = { byte_position: 6..8 }
+
+  # @param [Array<Symbol>] buttons
+  # @return [Array<Symbol>]
+  def self.normalize(buttons)
+    buttons.select { |x|
+      !!ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP[x]
+    }
+  end
 end

data/lib/procon_bypass_man/procon/macro_registry.rb

@@ -24,15 +24,18 @@ class ProconBypassMan::Procon::MacroRegistry
     null: [],
   }
 
-  def self.install_plugin(klass)
-    if plugins[klass.name]
-      raise "すでに登録済みです"
+  def self.install_plugin(klass, steps: nil)
+    if plugins[klass.to_s.to_sym]
+      raise "#{klass} macro is already registered"
     end
-    plugins[klass.name] = klass.steps
+
+    plugins[klass.to_s.to_sym] = ->{
+      ProconBypassMan::Procon::ButtonCollection.normalize(steps || klass.steps)
+    }
   end
 
   def self.load(name)
-    steps = PRESETS[name] || plugins[name] || raise("unknown macro")
+    steps = PRESETS[name] || plugins[name].call || raise("unknown macro")
     Macro.new(name: name, steps: steps.dup)
   end
 

data/lib/procon_bypass_man/procon/mode_registry.rb

@@ -23,14 +23,14 @@ class ProconBypassMan::Procon::ModeRegistry
   }
 
   def self.install_plugin(klass)
-    if plugins[klass.name.to_sym]
-      raise "すでに登録済みです"
+    if plugins[klass.to_s.to_sym]
+      raise "#{klass} mode is already registered"
     end
-    plugins[klass.name.to_sym] = klass.binaries
+    plugins[klass.to_s.to_sym] = ->{ klass.binaries }
   end
 
   def self.load(name)
-    b = PRESETS[name] || plugins[name] || raise("unknown mode")
+    b = PRESETS[name] || plugins[name]&.call || raise("#{name} is unknown mode")
     Mode.new(name: name, binaries: b.dup)
   end
 

data/lib/procon_bypass_man/procon/press_button_aware.rb

@@ -1,14 +1,15 @@
 class ProconBypassMan::PressButtonAware
+  BIT_ON = '1'.freeze
+
   def initialize(binary)
     @binary = binary
   end
 
+  # @param [Symbol]
+  # @return [Boolean]
   def pressing_button?(button)
     button_obj = ProconBypassMan::Procon::Button.new(button)
-    @binary[
-      button_obj.byte_position
-    ].unpack("H*").first.to_i(16).to_s(2).reverse[
-      button_obj.bit_position
-    ] == '1'
+    byte = @binary[button_obj.byte_position].unpack("C").first.to_s(2).reverse
+    byte[button_obj.bit_position] == BIT_ON
   end
 end

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

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

data/lib/procon_bypass_man/procon.rb

@@ -102,12 +102,12 @@ class ProconBypassMan::Procon
       user_operation.unpress_button(button)
     end
 
-    current_layer.left_analog_stick_caps.each do |buttons, options|
-      if buttons.nil? || user_operation.pressing_all_buttons?(buttons)
-        options[:force_neutral]&.each do |force_neutral_button|
+    current_layer.left_analog_stick_caps.each do |config|
+      if config[:if_pressed].nil? || user_operation.pressing_all_buttons?(config[:if_pressed])
+        config[:force_neutral]&.each do |force_neutral_button|
           user_operation.unpress_button(force_neutral_button)
         end
-        user_operation.apply_left_analog_stick_cap(cap: options[:cap])
+        user_operation.apply_left_analog_stick_cap(cap: config[:cap])
       end
     end
 

data/lib/procon_bypass_man/support/compress_array.rb

@@ -54,3 +54,8 @@ module ProconBypassMan
     end
   end
 end
+
+
+if $0 == __FILE__
+  ProconBypassMan::CompressArray.new([''])
+end

data/lib/procon_bypass_man/support/http_client.rb

@@ -100,3 +100,7 @@ module ProconBypassMan
     end
   end
 end
+
+if $0 == __FILE__
+  ProconBypassMan::HttpClient.new(path: '/', server_pool: nil, retry_on_connection_error: false).get(response_body: '')
+end

data/lib/procon_bypass_man/support/on_memory_cache.rb

@@ -1,6 +1,8 @@
 class ProconBypassMan::OnMemoryCache
   class CacheValue
-    attr_accessor :expired_at, :value
+    # @param [Time]
+    attr_accessor :expired_at
+    attr_accessor :value
 
     def initialize(expired_at: , value: )
       self.expired_at = expired_at

data/lib/procon_bypass_man/support/server_pool.rb

@@ -40,3 +40,7 @@ module ProconBypassMan
     end
   end
 end
+
+if $0 == __FILE__
+  ProconBypassMan::ServerPool.new(servers: ['http://example.com'])
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/websocket/pbm_job_client.rb

@@ -32,7 +32,9 @@ module ProconBypassMan
           }
 
           client.received do |data|
-            validate_and_run(data: data)
+            ProconBypassMan.logger.info(data)
+
+            dispatch(data: data, client: client)
           rescue => e
             ProconBypassMan::SendErrorCommand.execute(error: e)
           end
@@ -51,11 +53,20 @@ module ProconBypassMan
         end
       end
 
+      # @param [Hash] data
+      def self.dispatch(data: , client: )
+        pbm_job_hash = data.dig("message")
+        if pbm_job_hash['action'] == "ping"
+          client.perform('pong', { device_id: ProconBypassMan.device_id, message: 'hello from pbm' })
+        else
+          validate_and_run(data: data)
+        end
+      end
+
       # @raise [ProconBypassMan::RemotePbmActionObject::ValidationError]
       # @param [Hash] data
       # @return [Void]
       def self.validate_and_run(data: )
-        ProconBypassMan.logger.debug { data }
         pbm_job_hash = data.dig("message")
         begin
           pbm_job_object = ProconBypassMan::RemotePbmActionObject.new(action: pbm_job_hash["action"],

data/lib/procon_bypass_man.rb

@@ -44,6 +44,19 @@ require_relative "procon_bypass_man/websocket/pbm_job_client"
 STDOUT.sync = true
 Thread.abort_on_exception = true
 
+# pluginの定数を握りつぶす
+class Module
+  def const_missing(id)
+    if self.name =~ /^ProconBypassMan::Plugin/
+      parent_const = Object.const_get("#{self.name}")
+      parent_const.const_set(id, Module.new)
+      Object.const_get("#{self.name}::#{id}")
+    else
+      super
+    end
+  end
+end
+
 module ProconBypassMan
   extend ProconBypassMan::Configuration::ClassMethods
 

data/project_template/app.rb

@@ -5,7 +5,7 @@ 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.16.1'
+  gem 'procon_bypass_man', '0.1.17'
 end
 
 ProconBypassMan.configure do |config|

data/sig/main.rbs

@@ -34,7 +34,13 @@ module ProconBypassMan
 
   def self.root=: (untyped path) -> untyped
 
+  def self.pid: () -> Integer
+
   def self.digest_path: () -> ::String
+
+  def self.session_id: () -> ::String
+
+  def self.device_id: () -> ::String
 end
 
 class ProconBypassMan::Bypass
@@ -166,44 +172,44 @@ end
 
 class ProconBypassMan::Configuration
   module ClassMethods
-    def root: () -> untyped
+    def root: () -> String
 
-    def logger: () -> untyped
+    def logger: () -> Logger
 
     def error_logger: () -> untyped
 
-    def pid_path: () -> untyped
+    def pid_path: () -> String
 
-    def digest_path: () -> untyped
+    def digest_path: () -> String
 
-    def cache: () -> untyped
+    def cache: () -> ProconBypassMan::OnMemoryCache
 
-    def config: () -> untyped
+    def config: () -> ProconBypassMan::Configuration
   end
 
   attr_reader api_server: untyped
   attr_reader api_servers: untyped
 
-  attr_accessor enable_critical_error_logging: untyped
+  attr_accessor enable_critical_error_logging: bool
 
-  def root=: (untyped path) -> untyped
+  def root=: (String path) -> ProconBypassMan::Configuration
 
-  def root: () -> untyped
+  def root: () -> String
 
   def api_server=: (untyped api_server) -> untyped
 
-  def logger=: (untyped logger) -> untyped
+  def logger=: (Logger logger) -> ProconBypassMan::Configuration
 
-  def logger: () -> untyped
+  def logger: () -> Logger
 
-  def error_logger: () -> untyped
+  def error_logger: () -> Logger
 
-  def digest_path: () -> ::String
+  def digest_path: () -> String
 
   # @return [String] pbm-webの接続先
-  def current_server: () -> ::String
+  def current_server: () -> String
 
-  def current_ws_server: () -> (::String | nil)
+  def current_ws_server: () -> (String | nil)
 
   def current_ws_server_url: () -> ::String
 
@@ -216,6 +222,10 @@ class ProconBypassMan::Configuration
   def internal_servers: () -> ::Array[string | nil]
 
   def internal_api_servers: () -> ::Array[untyped]
+
+  def raw_setting: () -> untyped
+
+  def verbose_bypass_log: () -> bool
 end
 
 
@@ -387,41 +397,41 @@ end
 
 class ProconBypassMan::Procon::MacroRegistry
   class Macro
-    attr_accessor name: untyped
+    attr_accessor name: Symbol
 
     attr_accessor steps: untyped
 
-    def initialize: (name: untyped name, steps: untyped steps) -> untyped
+    def initialize: (name: untyped Symbol, steps: Symbol) -> void
 
-    def next_step: () -> untyped
+    def next_step: () -> Symbol
 
-    def finished?: () -> untyped
+    def finished?: () -> bool
 
-    def ongoing?: () -> untyped
+    def ongoing?: () -> bool
   end
 
-  PRESETS: ::Hash[untyped, untyped]
+  PRESETS: ::Hash[Symbol, Array[Symbol]]
 
   def self.install_plugin: (untyped klass) -> untyped
 
-  def self.load: (untyped name) -> untyped
+  def self.load: (Symbol name) -> untyped
 
-  def self.reset!: () -> untyped
+  def self.reset!: () -> void
 
-  def self.plugins: () -> untyped
+  def self.plugins: () -> ::Hash[Symbol, Array[Symbol]]
 end
 
 class ProconBypassMan::Procon::ModeRegistry
   class Mode
-    attr_accessor name: untyped
+    attr_accessor name: Symbol
 
-    attr_accessor binaries: untyped
+    attr_accessor binaries: Array[String]
 
-    attr_accessor source_binaries: untyped
+    attr_accessor source_binaries: Array[String]
 
-    def initialize: (name: untyped name, binaries: untyped binaries) -> untyped
+    def initialize: (name: Symbol, binaries: Array[String]) -> void
 
-    def next_binary: () -> untyped
+    def next_binary: () -> String
   end
 
   PRESETS: ::Hash[untyped, untyped]
@@ -435,30 +445,20 @@ class ProconBypassMan::Procon::ModeRegistry
   def self.plugins: () -> untyped
 end
 
-module ProconBypassMan::Procon::PressedButtonHelper
-  module Static
-    def pressed_button?: (untyped button) -> untyped
-  end
-end
-
 class ProconBypassMan::Procon
   class UserOperation
     include LayerChangeable
 
-    include PressedButtonHelper::Static
-
     attr_reader binary: untyped
 
     def initialize: (untyped binary) -> untyped
 
-    ZERO_BIT: untyped
-
     ASCII_ENCODING: ::String
 
     # @depilicate
     def binary=: (untyped binary) -> untyped
 
-    def set_no_action!: () -> untyped
+    def set_no_action!: () -> void
 
     def unpress_button: (untyped button) -> untyped
 
@@ -496,7 +496,7 @@ module ProconBypassMan
     end
 
     # 5秒後がタイムアウト
-    def initialize: (?timeout: untyped timeout) -> untyped
+    def initialize: (?timeout: untyped timeout) -> void
 
     def throw_if_timeout!: () -> untyped
   end
@@ -508,7 +508,7 @@ module ProconBypassMan
     def self.from_boot: () -> Integer
 
     # @param [String] uptime_cmd_result
-    def initialize: (uptime_cmd_result: String uptime_cmd_result) -> void
+    def initialize: (uptime_cmd_result: String) -> void
 
     # @return [Integer]
     def from_boot: () -> Integer
@@ -518,3 +518,174 @@ end
 module ProconBypassMan
   VERSION: ::String
 end
+
+module ProconBypassMan
+  module Domains
+    module Binary
+    end
+  end
+end
+
+class ProconBypassMan::Domains::Binary::Base
+  # @param [String] binary
+  def initialize: (binary: untyped binary) -> void
+
+  # @return [String] バイナリ
+  def binary: () -> untyped
+
+  # @return [String]
+  def raw: () -> ::String
+
+  def unpack: () -> Array[::String]
+
+  # @return [ProconBypassMan::ProconReader]
+  def to_procon_reader: () -> untyped
+end
+
+module ProconBypassMan::Domains::HasImmutableBinary
+  def binary: () -> untyped
+end
+
+module ProconBypassMan::Domains::HasMutableBinary
+  def binary: () -> untyped
+end
+
+class ProconBypassMan::Domains::InboundProconBinary < ProconBypassMan::Domains::Binary::Base
+  include ProconBypassMan::Domains::HasImmutableBinary
+
+  # @return [Boolean]
+  def user_operation_data?: () -> bool
+end
+
+# バイナリの書き換えのみをする
+class ProconBypassMan::Domains::ProcessingProconBinary < ProconBypassMan::Domains::Binary::Base
+  include ProconBypassMan::Domains::HasMutableBinary
+
+  ALL_ZERO_BIT: ::String
+
+  def set_no_action!: () -> untyped
+
+  # @param [ProconBypassMan::Domains::ProcessingProconBinary]
+  # @return [ProconBypassMan::Domains::ProcessingProconBinary]
+  # アナログスティックは上書きし、ボタンだけマージする
+  def write_as_merge!: (untyped target_binary) -> ProconBypassMan::Domains::ProcessingProconBinary
+
+  # @param [Symbol] button
+  def write_as_press_button: (Symbol button) -> void
+
+  # @param [Symbol] button
+  def write_as_unpress_button: (Symbol  button) -> void
+
+  # @param [Symbol] button
+  def write_as_press_button_only: (Symbol button) -> void
+
+  # @param [Integer] cap
+  def write_as_apply_left_analog_stick_cap: (cap: Integer cap) -> void
+end
+
+module ProconBypassMan
+  class HttpClient
+    @server_pool: untyped
+    @uri: ::URI
+    @retry_on_connection_error: false
+
+    def initialize: (path: String, server_pool: untyped, ?retry_on_connection_error: false) -> void
+    def get: -> nil
+    def post: (request_body: untyped) -> nil
+    def put: (request_body: untyped) -> nil
+
+    private
+    def process_response: (untyped response) -> untyped
+    def handle_request: { -> bot } -> nil
+
+    class HttpRequest
+      class Get
+        def self.request!: (uri: ::URI) -> untyped
+      end
+
+      class Post
+        def self.request!: (uri: ::URI, ?request_body: Hash[untyped, untyped]) -> untyped
+      end
+
+      class Put
+        def self.request!: (uri: ::URI, ?request_body: {hostname: String}) -> untyped
+      end
+    end
+  end
+end
+
+module ProconBypassMan
+  class SendDeviceStatsHttpClient
+    def post: (status: ::Symbol, pbm_session_id: String) -> untyped
+  end
+end
+
+module ProconBypassMan
+  class ReportHttpClient
+    def post: (body: Hash[untyped, untyped] | String, event_type: ::Symbol) -> untyped
+  end
+end
+
+module ProconBypassMan
+  class UpdateRemotePbmActionStatusHttpClient
+    def post: (to_status: ::Symbol) -> untyped
+  end
+end
+
+module ProconBypassMan
+  class ServerPool
+    @servers: Array[String]
+    @index: Integer?
+
+    def initialize: (servers: Array[String]) -> void
+    def pick: -> String?
+    def server: -> String?
+    def next!: -> nil
+
+    private
+    def reset: -> Integer
+    def inc_index: -> Integer
+  end
+end
+
+module ProconBypassMan
+  class CompressArray
+    @array: [String]
+
+    def initialize: ([String] array) -> void
+    def compress: -> Array[String?]
+
+    class CompressibleValue
+      @prev: String?
+      @current: String
+
+      def initialize: (String? prev, String current) -> void
+      def compress?: -> bool
+      def to_s_with_mark: -> String?
+    end
+  end
+end
+
+module ProconBypassMan
+  module Callbacks
+    def run_callbacks: (untyped kind) -> untyped
+    def get_callbacks: (untyped kind) -> untyped
+    def set_callbacks: (untyped name, untyped callbacks) -> untyped
+
+    class CallbacksChain
+      @block: nil
+
+      attr_accessor filter: untyped
+      attr_accessor chain_method: untyped
+      def initialize: (filter: untyped, chain_method: untyped, block: nil) -> void
+    end
+
+    module M
+    end
+
+    module ClassMethods
+      def define_callbacks: (untyped name) -> untyped
+      def set_callback: (untyped kind, untyped filter, untyped chain_method) -> CallbacksChain
+    end
+  end
+end

data/sig/on_memory_cache.rbs

@@ -0,0 +1,16 @@
+class ProconBypassMan::OnMemoryCache
+  class CacheValue
+    # @param [Time]
+    attr_accessor expired_at: Time
+
+    attr_accessor value: untyped
+
+    def initialize: (expired_at: Time, value: untyped) -> void
+  end
+
+  def initialize: () -> void
+
+  # @param [Integer] expires_in 秒数
+  # @param [String] key
+  def fetch: (key: string, expires_in: Time) { () -> untyped } -> untyped
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.16.1
+  version: 0.1.17
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -77,6 +77,7 @@ files:
 - bin/dev_api_server.rb
 - bin/setup
 - docs/how_to_connect_procon.md
+- docs/setting/left-analogstick-cap.md
 - docs/setup_raspi.md
 - docs/setup_raspi.mitamae.rb
 - docs/setup_raspi_by_mitamae.md
@@ -175,6 +176,7 @@ files:
 - project_template/web.rb
 - sig/README.md
 - sig/main.rbs
+- sig/on_memory_cache.rbs
 homepage: https://github.com/splaplapla/procon_bypass_man
 licenses:
 - MIT
@@ -197,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: An extension for Nintendo Switch Pro Controller