procon_bypass_man 0.1.14 → 0.1.17

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/bypass/usb_hid_logger.rb

@@ -28,10 +28,12 @@ class ProconBypassMan::Bypass
         end
       end
 
-      ProconBypassMan.cache.fetch key: 'pressed_buttons_reporter', expires_in: 5 do
-        ProconBypassMan::ReportPressedButtonsJob.perform_async(
-          ProconBypassMan::ProconReader.new(binary: bypass_value.binary).to_hash
-        )
+      if ProconBypassMan.config.enable_reporting_pressed_buttons
+        ProconBypassMan.cache.fetch key: 'pressed_buttons_reporter', expires_in: 5 do
+          ProconBypassMan::ReportPressedButtonsJob.perform_async(
+            bypass_value.binary.to_procon_reader.to_hash
+          )
+        end
       end
     end
   end

data/lib/procon_bypass_man/bypass.rb

@@ -5,7 +5,7 @@ class ProconBypassMan::Bypass
 
   class BypassValue < Struct.new(:binary, :sent)
     def to_text
-      "#{binary.unpack("H*").first} #{'x' unless sent}"
+      "#{binary.unpack.first} #{'x' unless sent}"
     end
   end
 
@@ -21,14 +21,14 @@ class ProconBypassMan::Bypass
   def send_gadget_to_procon!
     monitor.record(:start_function)
     input = nil
-    self.bypass_value = BypassValue.new(input, sent = false)
+    self.bypass_value = BypassValue.new(nil, sent = false)
 
     run_callbacks(:send_gadget_to_procon) do
       begin
         break if $will_terminate_token
         # TODO blocking readにしたいが、接続時のフェーズによって長さが違うので厳しい
         input = self.gadget.read_nonblock(64)
-        self.bypass_value.binary = input
+        self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: input)
       rescue IO::EAGAINWaitReadable
         monitor.record(:eagain_wait_readable_on_read)
         sleep(0.001)
@@ -50,14 +50,14 @@ class ProconBypassMan::Bypass
   def send_procon_to_gadget!
     monitor.record(:start_function)
     output = nil
-    self.bypass_value = BypassValue.new(output, sent = false)
+    self.bypass_value = BypassValue.new(nil, sent = false)
 
     run_callbacks(:send_procon_to_gadget) do
       begin
         break if $will_terminate_token
         Timeout.timeout(1) do
           output = self.procon.read(64)
-          self.bypass_value.binary = output
+          self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: output)
         end
       rescue Timeout::Error
         ProconBypassMan.logger.debug { "read timeout! do sleep. by send_procon_to_gadget!" }
@@ -72,8 +72,15 @@ class ProconBypassMan::Bypass
         retry
       end
 
+      # blocking readをしているのでnilが入ることはないが、雑なテストでnilが通るので分岐を入れる。できれば消したい
+      break if output.nil?
+
       begin
-        self.gadget.write_nonblock(ProconBypassMan::Processor.new(output).process)
+        self.gadget.write_nonblock(
+          ProconBypassMan::Processor.new(
+            ProconBypassMan::Domains::InboundProconBinary.new(binary: output)
+          ).process
+        )
         self.bypass_value.sent = true
       rescue IO::EAGAINWaitReadable
         monitor.record(:eagain_wait_readable_on_write)

data/lib/procon_bypass_man/commands/print_boot_message_command.rb

@@ -1,7 +1,56 @@
 class ProconBypassMan::PrintBootMessageCommand
+  class BootMessage
+    def initialize
+      @table = {}
+      @table[:ruby_version] = RUBY_VERSION
+      @table[:pbm_version] = ProconBypassMan::VERSION
+      @table[:pid] = $$
+      @table[:root_path] = ProconBypassMan.root
+      @table[:pid_path] = ProconBypassMan.pid_path
+      @table[:setting_path] = ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path
+      @table[:uptime_from_boot] = ProconBypassMan::Uptime.from_boot
+      @table[:use_pbmenv] = !(!!`which pbmenv`.empty?)
+      @table[:session_id] = ProconBypassMan.session_id
+      @table[:device_id] = ProconBypassMan.device_id
+
+      # 開発中のHEADを取りたかったけど、Gem::Specification経由から取得する必要がありそう
+      # build_version = `git rev-parse --short HEAD`.chomp
+      # if build_version.empty?
+      #   @table[:build_version] = 'release version'
+      # else
+      #   @table[:build_version] = build_version
+      # end
+
+      # build version: #{@table[:build_version]}
+    end
+
+    # @return [String]
+    def to_s
+      booted_message = <<~EOF
+      ----
+      RUBY_VERSION: #{@table[:ruby_version]}
+      ProconBypassMan::VERSION: #{@table[:pbm_version]}
+      pid: #{@table[:pid]}
+      root: #{@table[:root_path]}
+      pid_path: #{@table[:pid_path]}
+      setting_path: #{@table[:setting_path]}
+      uptime from boot: #{@table[:uptime_from_boot]} sec
+      use_pbmenv: #{@table[:use_pbmenv]}
+      session_id: #{ProconBypassMan.session_id}
+      device_id: #{ProconBypassMan.device_id}
+      ----
+      EOF
+    end
+
+    # @return [Hash]
+    def to_hash
+      @table
+    end
+  end
+
   # @return [void]
   def self.execute
-    message = ProconBypassMan::BootMessage.new
+    message = BootMessage.new
     ProconBypassMan::ReportBootJob.perform_async(message.to_hash)
     ProconBypassMan::ReportLoadConfigJob.perform_async(ProconBypassMan.config.raw_setting)
     puts message.to_s

data/lib/procon_bypass_man/commands/print_message_command.rb

@@ -0,0 +1,8 @@
+class ProconBypassMan::PrintMessageCommand
+  # @return [void]
+  # @param [String] text
+  def self.execute(text: )
+    ProconBypassMan.logger.info text
+    puts text
+  end
+end

data/lib/procon_bypass_man/commands/run_remote_pbm_action_dispatch_command.rb

@@ -10,8 +10,10 @@ class ProconBypassMan::RunRemotePbmActionDispatchCommand
       ProconBypassMan::RemotePbmAction::StopPbmAction.new(pbm_job_uuid: uuid).run!(job_args: {})
     when ProconBypassMan::RemotePbmAction::ACTION_REBOOT_OS
       ProconBypassMan::RemotePbmAction::RebootOsAction.new(pbm_job_uuid: uuid).run!(job_args: {})
+    when ProconBypassMan::RemotePbmAction::ACTION_RESTORE_SETTING
+      ProconBypassMan::RemotePbmAction::RestorePbmSettingAction.new(pbm_job_uuid: uuid).run!(job_args: job_args)
     else
-      ProconBypassMan::SendErrorCommand.execute(error: "#{action}は対応していないアクションです")
+      raise "#{action}は対応していないアクションです"
     end
   rescue ProconBypassMan::RemotePbmAction::ActionUnexpectedError => e
     ProconBypassMan::SendErrorCommand.execute(error: e)

data/lib/procon_bypass_man/commands/send_reload_config_event_command.rb

@@ -1,8 +1,7 @@
 class ProconBypassMan::SendReloadConfigEventCommand
   # @return [void]
   def self.execute
-    puts "設定ファイルの再読み込みができました"
-    ProconBypassMan.logger.info "設定ファイルの再読み込みができました"
+    ProconBypassMan::PrintMessageCommand.execute(text: "設定ファイルの再読み込みができました")
     ProconBypassMan::ReportReloadConfigJob.perform_async(
       ProconBypassMan.config.raw_setting
     )

data/lib/procon_bypass_man/commands.rb

@@ -1,4 +1,5 @@
 require "procon_bypass_man/commands/print_boot_message_command"
+require "procon_bypass_man/commands/print_message_command"
 require "procon_bypass_man/commands/write_session_id_command"
 require "procon_bypass_man/commands/write_device_id_command"
 require "procon_bypass_man/commands/send_reload_config_event_command"

data/lib/procon_bypass_man/configuration.rb

@@ -41,7 +41,7 @@ class ProconBypassMan::Configuration
   end
 
   attr_accessor :enable_critical_error_logging
-  attr_writer :verbose_bypass_log, :raw_setting
+  attr_writer :verbose_bypass_log, :raw_setting, :enable_reporting_pressed_buttons
 
   def root=(path)
     @root = path
@@ -111,6 +111,33 @@ class ProconBypassMan::Configuration
     @server_pool ||= ProconBypassMan::ServerPool.new(servers: api_servers)
   end
 
+  # @return [String, NilClass]
+  def current_server
+    server_pool.server
+  end
+
+  # @return [String, NilClass]
+  def current_ws_server
+    if (uri = URI.parse(server_pool.server))
+      if uri.port == 443
+        return "ws://#{uri.host}"
+      else
+        return "ws://#{uri.host}:#{uri.port}"
+      end
+    end
+  rescue URI::InvalidURIError
+    nil
+  end
+
+  # @return [String, NilClass]
+  def current_ws_server_url
+    return unless current_ws_server
+    "#{current_ws_server}/websocket/"
+  end
+
+  # @return [Boolean]
+  def enable_ws?; !!current_server; end
+
   # @return [Array<String>]
   def api_servers
     if !!ENV["API_SERVER"]
@@ -127,4 +154,8 @@ class ProconBypassMan::Configuration
   def raw_setting
     @raw_setting ||= {}
   end
+
+  def enable_reporting_pressed_buttons
+    @enable_reporting_pressed_buttons ||= false
+  end
 end

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

@@ -0,0 +1,25 @@
+class ProconBypassMan::Domains::Binary::Base
+  # @param [String] binary
+  def initialize(binary: )
+    @binary = binary
+  end
+
+  # @return [String] バイナリ
+  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/has_immutable_binary.rb

@@ -0,0 +1,5 @@
+module ProconBypassMan::Domains::HasImmutableBinary
+  def binary
+    @binary.freeze
+  end
+end

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

@@ -0,0 +1,5 @@
+module ProconBypassMan::Domains::HasMutableBinary
+  def binary
+    @binary
+  end
+end

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

@@ -0,0 +1,9 @@
+# proconから取得したばかりのバイナリ
+class ProconBypassMan::Domains::InboundProconBinary < ProconBypassMan::Domains::Binary::Base
+  include ProconBypassMan::Domains::HasImmutableBinary
+
+  # @return [Boolean]
+  def user_operation_data?
+    binary[0] == "\x30".b
+  end
+end

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

@@ -0,0 +1,66 @@
+# バイナリの書き換えのみをする
+class ProconBypassMan::Domains::ProcessingProconBinary < ProconBypassMan::Domains::Binary::Base
+  include ProconBypassMan::Domains::HasMutableBinary
+
+  ALL_ZERO_BIT = ["0"].pack("H*").freeze
+
+  def set_no_action!
+    binary[3] = ALL_ZERO_BIT
+    binary[4] = ALL_ZERO_BIT
+    binary[5] = ALL_ZERO_BIT
+  end
+
+  # @param [ProconBypassMan::Domains::ProcessingProconBinary]
+  # @return [ProconBypassMan::Domains::ProcessingProconBinary]
+  # アナログスティックは上書きし、ボタンだけマージする
+  def write_as_merge!(target_binary)
+    current_buttons = ProconBypassMan::ProconReader.new(binary: binary).pressing
+    target_buttons = ProconBypassMan::ProconReader.new(binary: target_binary.raw).pressing
+
+    set_no_action!
+    (current_buttons + target_buttons).uniq.each do |button|
+      write_as_press_button(button)
+    end
+
+    # override analog stick
+    tb = [target_binary.raw].pack("H*")
+    binary[6] = tb[6]
+    binary[7] = tb[7]
+    binary[8] = tb[8]
+    binary[9] = tb[9]
+    binary[10] = tb[10]
+    binary[11] = tb[11]
+
+    self
+  end
+
+  # @param [Symbol] button
+  def write_as_press_button(button)
+    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("C").first + (2**button_obj.bit_position)
+    binary[button_obj.byte_position] = ["%02X" % value.to_s].pack("H*")
+  end
+
+  # @param [Symbol] button
+  def write_as_unpress_button(button)
+    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("C").first - (2**button_obj.bit_position)
+    binary[button_obj.byte_position] = ["%02X" % value.to_s].pack("H*")
+  end
+
+  # @param [Symbol] button
+  def write_as_press_button_only(button)
+    set_no_action!
+    write_as_press_button(button)
+  end
+
+  # @param [Integer] cap
+  def write_as_apply_left_analog_stick_cap(cap: )
+    analog_stick_cap = ProconBypassMan::Procon::AnalogStickCap.new(binary)
+    binary[6..8] = analog_stick_cap.capped_position(cap_hypotenuse: cap).to_binary
+  end
+end

data/lib/procon_bypass_man/domains.rb

@@ -0,0 +1,11 @@
+module ProconBypassMan
+  module Domains
+    module Binary; end
+  end
+end
+
+require_relative "domains/binary/base"
+require_relative "domains/binary/has_mutable_binary"
+require_relative "domains/binary/has_immutable_binary"
+require_relative "domains/binary/inbound_procon_binary"
+require_relative "domains/binary/processing_procon_binary"

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

@@ -0,0 +1,17 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module FastReturn
+          def self.display_name
+            :fast_return
+          end
+
+          def self.steps
+            [:x, :down, :a, :a].freeze
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module JumpToLeftKey
+          def self.display_name
+            :jump_to_left_key
+          end
+
+          def self.steps
+            [:x, :left, :a, :a].freeze
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module JumpToRightKey
+          def self.display_name
+            :jump_to_right_key
+          end
+
+          def self.steps
+            [:x, :right, :a, :a].freeze
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module JumpToUpKey
+          def self.display_name
+            :jump_to_up_key
+          end
+
+          def self.steps
+            [:x, :up, :a, :a].freeze
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Mode
+        module Guruguru
+          def self.binaries
+            [ "309481408000362d684658750968f71cfe2c0e51000001480053f71ffedf0d4b000a013d00caf6ecfd4c0d480003011c00000000000000000000000000000000",
+              "30978140800037dd6748687509fdf6adfded0d6d0081005d00eef68dfdef0d6d00830059001bf791fd140e720090005400000000000000000000000000000000",
+              "309a8140800038cd67495875099af821fe120e40006400880042f8fcfdfd0d470067008900d4f7e0fdf20d4e006a008c00000000000000000000000000000000",
+              "309c8140800036ed67466875099bf878fe4a0e35005b004c00c1f875fe400e35005d004c00c4f856fe2d0e390063006c00000000000000000000000000000000",
+              "30a081408000371d6847587509b9f71bfee70d22002c002300e3f73afe150e2b003500280014f854fe300e2d0038002900000000000000000000000000000000",
+              "30a38140800039fd6743587509def70ffea10d1a0031001f00d1f70ffeb10d19002c002200c5f711feb80d18002c002500000000000000000000000000000000",
+              "30a58140800037dd6746687509d8f70bfe980d270035001200ddf70dfe980d240038001900dff70ffe9b0d1f0035001a00000000000000000000000000000000",
+              "30a98140800037ed67484875099cf7edfdb00d310020000d009ef7eefda30d310022000c00adf7f2fd980d300028000a00000000000000000000000000000000",
+              "30ac8140800036ed67484875099cf709fed40d3a002400160097f7fafdd30d39002200150096f7f0fdc80d380022001400000000000000000000000000000000",
+              "30ae8140800038fd674558750987f72efed40d360021001c0089f729fed50d39002400180092f715fed10d390022001800000000000000000000000000000000",
+              "30b18140800037dd6747487509b8f705fea90d19001d002000c5f70dfeb00d210019002200bff71efec20d280018002400000000000000000000000000000000",
+              "30b48140800038fd684868750980f7e9fdd40d0200080024007df7f1fdba0d060011001e0084f7f8fdaa0d12001a001a00000000000000000000000000000000",
+              "30b7814080003fdd694958750918f6a9fd510f0d00d1ff370024f7b0fda90e0100ecff30006cf7d1fd210efffff5ff2c00000000000000000000000000000000",
+              "30ba81408080482d744768750963f71ffe190f5e00d9fea100ccf62dfe650f510009ff980015f702fe580f4b002eff8400000000000000000000000000000000",
+              "30bd814080802f7d864758750974f70efe4c0f5e00c0fea000d1f726fe1c0f5d00c5fea30028f859fe0e0f5c00cafea800000000000000000000000000000000",
+              "30bf8140808057cc984758750961f73afe630f99009dfeae0050f738fe710f7500adfea40050f721fe720f6e00b2fea300000000000000000000000000000000",
+              "30c281408080f479bd483875092ef8b6feab0f0a0180feba00f1f798fe900f000181febd00c2f77dfe7c0fdb008efebd00000000000000000000000000000000",
+              "30c581408080ad87d846487509e1f80000a6107e0178fea2004ef88dff54106c0185fea70063f826ffe60f520182feae00000000000000000000000000000000",
+              "30c8810080800797d84868750995f8e1fe4b0f7a0161fe88000df96dffd00f700149fe990035f9cdff361088016afea000000000000000000000000000000000",
+              "30cb810080804586d848487509cef672fe8a0f6d0217ff42002df63cfe280f1d0219ff410059f61cfe070fed01f5fe4a00000000000000000000000000000000",
+              "30d08100808002c5d745687509d8f5aaff830f5e03e6fe3e01fbf55bffc30f3f03e4fe100158f600ff3e102903e5fee700000000000000000000000000000000",
+              "30d3810080807b94d14838750991f6cd00690f9903f0fff10147f6e200560f7e038fffc60101f6c900560f71033bffa901000000000000000000000000000000",
+              "30d681008080b743ca475875095af7f2009c0fca03a400320242f7ca00950fb503820028020af7b000820fa4034e001a02000000000000000000000000000000",
+              "30d9810080805be3c047587509e7f77a03c70f0e04bb00410258f79801940f0004b800410251f74401910fd803b3003602000000000000000000000000000000",
+              "30dc810080808a02b245587509c0fbd5086a10710475020a03b0fb8d085d106c042102e8027efb660876106a04bc01af02000000000000000000000000000000",
+              "30de8100808036d2a14568750970fbbf09ad103704af038003a9fb600989105c0459036103c2fb2a097210690412034603000000000000000000000000000000",
+              "30e281008000cbb18d4738750989f8b40b2812380341044c0429f99e0bef11510340043704f2f93c0b7911b0033704f003000000000000000000000000000000",
+              "30e581008000c9c18945587509a5f7ca0a2e13e400c6024c0547f7fd0a941264011703270578f74a0b6012e40168030205000000000000000000000000000000",
+              "30e781008000c6618948687509acf86909e813d0fe2801a1057cf8cf09ed130fff6301990516f8710aaa13ccff13028205000000000000000000000000000000",
+              "30ea81008000c77189475875093af93b0762136efbaeff19060cf90107b113a9fb99ff0906e1f85b07b113bafc9fffcd05000000000000000000000000000000",
+              "30ed81008000c791894568750950f9ce047c1432f900026007a5f9a6051f146ef9bb013707bff99206a813fef9ce00c606000000000000000000000000000000",
+              "30ef81008000c6d1894558750944f8ad0358143ef81c02f10780f8b403841484f84102d107ccf801049314bcf84202ad07000000000000000000000000000000",
+              "30f381008000c761884868750914f72105e4134cf6d001c00743f71a05f11391f6bf01e407a0f7c904fa13faf6b3011008000000000000000000000000000000",
+              "30f681008000c7718344587509eaf54a04c812a6f40002500627f66d041313f2f40d02940682f6a60468133ef51a02d806000000000000000000000000000000",
+              "30f881008000c4e1814668750b5cf5f803b51125f3b5000d0560f50f04e8118cf33c015d057df525042c1210f4b101cc05000000000000000000000000000000",
+              "30fb81008000c5e1814458750b19f65a02a410acf29effb804e2f5db02df10b7f2c0ffbf04a9f55c032011dcf22400d804000000000000000000000000000000",
+              "30fe8100800035e2814858750b81f65c00f80f8df231fe940471f6e6001f1088f2a6fe92044ef6b1015a1092f21fffa004000000000000000000000000000000",
+              "3001810080004b03814868750b69f6e6fdad0ffef20efdd40479f678feb40fd9f249fdc40484f6f4fec00fb0f29ffdad04000000000000000000000000000000",
+              "30048100800079e47d4858750b17f64cfb5f0f46f46afb430529f6c4fb710ff1f3d4fb300538f64bfc830fbbf315fc1d05000000000000000000000000000000",
+              "300781008000a7057e4668750bb1f5d3f9fb0e8ef5ccf96405cdf5fcf90c0f44f52dfa6505e1f52dfa210f29f550fa6305000000000000000000000000000000",
+              "30098100800041f67d4668750bcdf4b0f9ab0e21f602f955057ef5adf9d00ee1f559f95f05b1f5d3f9fb0e8ef5ccf96405000000000000000000000000000000",
+              "300d810080003d877c4838750b84f458f7dd0c89f6d0f8fc0436f4e2f7620d83f614f8430526f4c0f8a00e71f666f85c05000000000000000000000000000000",
+              "30108100800058e77a4668750bf7f2c3f57c0c9cf6abfa0a0470f30ef6790c89f65dfa420414f476f67e0c80f6d0f98a04000000000000000000000000000000",
+              "30128100800059f77a4658750b7ef249f5580cd9f69bfaa40389f269f56c0cd1f6a9fab503a3f286f5760cacf6c9faeb03000000000000000000000000000000",
+              "3016810080005b177b4868750ba9f298f4450b2cf774fa3102b8f2a5f47a0b24f765fa6e02b8f2b8f4b10b1df755faac02000000000000000000000000000000",
+              "30198100800057777a4558750b39f258f4480a80f73efaf40016f26af4940a5ef76bfa37014ef275f4d40a46f780fa8401000000000000000000000000000000",
+            ].map(&:freeze).freeze
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      VERSION = "0.1.3"
+    end
+  end
+end

data/lib/procon_bypass_man/plugins.rb

@@ -0,0 +1,11 @@
+require_relative "plugin/splatoon2/version"
+require_relative "plugin/splatoon2/macro/fast_return"
+require_relative "plugin/splatoon2/macro/jump_to_right_key"
+require_relative "plugin/splatoon2/macro/jump_to_up_key"
+require_relative "plugin/splatoon2/macro/jump_to_left_key"
+require_relative "plugin/splatoon2/mode/guruguru"
+
+module ProconBypassMan
+  module Plugin
+  end
+end

data/lib/procon_bypass_man/processor.rb

@@ -1,16 +1,15 @@
 class ProconBypassMan::Processor
-  # @return [String] binary
+
+  # @param [ProconBypassMan::Domains::InboundProconBinary] binary
   def initialize(binary)
     @binary = binary
   end
 
   # @return [String] 加工後の入力データ
   def process
-    unless @binary[0] == "\x30".b
-      return @binary
-    end
+    return @binary.raw unless @binary.user_operation_data?
 
-    procon = ProconBypassMan::Procon.new(@binary)
+    procon = ProconBypassMan::Procon.new(@binary.raw)
     procon.apply!
     procon.to_binary
   end

data/lib/procon_bypass_man/procon/button.rb

@@ -0,0 +1,11 @@
+class ProconBypassMan::Procon::Button
+  class UnknownButtonFoundError < StandardError; end
+
+  attr_accessor :byte_position, :bit_position
+
+  def initialize(key)
+    b = ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP[key] or raise(UnknownButtonFoundError, '定義にないボタンです')
+    self.byte_position = b[:byte_position]
+    self.bit_position = b[:bit_position]
+  end
+end

data/lib/procon_bypass_man/procon/button_collection.rb

@@ -1,13 +1,4 @@
 class ProconBypassMan::Procon::ButtonCollection
-  class Button
-    attr_accessor :byte_position, :bit_position
-    def initialize(key)
-      b = BUTTONS_MAP[key] or raise("undefined button")
-      self.byte_position = b[:byte_position]
-      self.bit_position = b[:bit_position]
-    end
-  end
-
   # https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/ac8093c84194b3232acb675ac1accce9bcb456a3/bluetooth_hid_notes.md
   #0) Input report ID
   #1) Timer. Increments very fast. Can be used to estimate excess Bluetooth latency.
@@ -42,9 +33,16 @@ class ProconBypassMan::Procon::ButtonCollection
     end
     acc
   }.freeze
+
   BUTTONS = ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.keys.freeze
 
-  def self.load(button_key)
-    Button.new(button_key)
+  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