procon_bypass_man 0.1.20.1 → 0.1.22

data/lib/procon_bypass_man/support/analog_stick_hypotenuse_tilting_power_scaler.rb

@@ -0,0 +1,59 @@
+class ProconBypassMan::AnalogStickTiltingPowerScaler
+  DEFAULT_THRESHOLD = 500
+
+  class PowerChunk
+    def initialize(list)
+      @list = list
+    end
+
+    def moving_power
+      max = @list.max
+      min = @list.min
+      moving_power = (max - min).abs
+    end
+
+    def tilting?(threshold: DEFAULT_THRESHOLD, current_position_x: , current_position_y: )
+      # スティックがニュートラルな時
+      if (-200..200).include?(current_position_x) && (-200..200).include?(current_position_y)
+        return false
+      end
+
+      moving_power >= threshold
+    end
+  end
+
+  def initialize
+    @map = {}
+  end
+
+  # @return [NilClass, Chunk] ローテトしたらvalueを返す
+  def add_sample(value)
+    rotated = nil
+    current_key = key
+    if @map[current_key].nil?
+      rotated = rotate
+      @map = { current_key => [] } # renew or initialize
+    end
+
+    @map[current_key] << value
+    rotated
+  end
+
+  private
+
+  # 0.1sec刻みで進行する
+  def key
+    time = Time.now
+    m1 = time.strftime('%L')[0]
+    [time.to_i, m1].join.to_i
+  end
+
+  def rotate
+    list = @map.values.first
+    if list
+      return PowerChunk.new(list)
+    else
+      return nil
+    end
+  end
+end

data/lib/procon_bypass_man/support/remote_macro_http_client.rb

@@ -0,0 +1,9 @@
+module ProconBypassMan
+  class RemoteMacroHttpClient < HttpClient
+    def post(job_id: )
+      super(request_body: {
+        job_id: job_id,
+      })
+    end
+  end
+end

data/lib/procon_bypass_man/usb_device_controller.rb

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

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/websocket/{pbm_job_client.rb → client.rb}

@@ -1,17 +1,13 @@
 module ProconBypassMan
   module Websocket
-    module PbmJobClient
+    module Client
       CHANNEL = 'PbmJobChannel'
 
       def self.start!
         return unless ProconBypassMan.config.enable_ws?
 
         Thread.start do
-          loop do
-            run
-          rescue
-            retry
-          end
+          Forever.run { run }
         end
       end
 
@@ -24,14 +20,16 @@ module ProconBypassMan
           )
 
           client.connected {
-            ProconBypassMan.logger.info('successfully connected in ProconBypassMan::Websocket::PbmJobClient')
+            ProconBypassMan.logger.info('websocket client: successfully connected in ProconBypassMan::Websocket::Client')
           }
           client.subscribed { |msg|
+            ProconBypassMan.logger.info('websocket client: subscribed')
             puts({ event: :subscribed, msg: msg })
             ProconBypassMan::SyncDeviceStatsJob.perform(ProconBypassMan::DeviceStatus.current)
           }
 
           client.received do |data|
+            ProconBypassMan.logger.info('websocket client: received!!')
             ProconBypassMan.logger.info(data)
 
             dispatch(data: data, client: client)
@@ -40,13 +38,22 @@ module ProconBypassMan
           end
 
           client.disconnected {
+            ProconBypassMan.logger.info('websocket client: disconnected!!')
             puts :disconnected
             client.reconnect!
             sleep 2
           }
-          client.errored { |msg|  puts :errored; puts msg }
+          client.errored { |msg|
+            ProconBypassMan.logger.error("websocket client: errored!!, #{msg}")
+            puts :errored
+            client.reconnect!
+            sleep 2
+          }
           client.pinged { |msg|
+            Watchdog.active!
+
             ProconBypassMan.cache.fetch key: 'ws_pinged', expires_in: 10 do
+              ProconBypassMan.logger.info('websocket client: pinged!!')
               ProconBypassMan.logger.info(msg)
             end
           }
@@ -56,17 +63,22 @@ module ProconBypassMan
       # @param [Hash] data
       def self.dispatch(data: , client: )
         pbm_job_hash = data.dig("message")
-        if pbm_job_hash['action'] == "ping"
+        case pbm_job_hash['action']
+        when "ping"
           client.perform('pong', { device_id: ProconBypassMan.device_id, message: 'hello from pbm' })
+        when ProconBypassMan::RemoteMacro::ACTION_KEY
+          validate_and_run_remote_macro(data: data)
+        when *ProconBypassMan::RemotePbmAction::ACTIONS
+          validate_and_run_remote_pbm_action(data: data)
         else
-          validate_and_run(data: data)
+          ProconBypassMan.logger.error "unknown action"
         end
       end
 
       # @raise [ProconBypassMan::RemotePbmActionObject::ValidationError]
       # @param [Hash] data
       # @return [Void]
-      def self.validate_and_run(data: )
+      def self.validate_and_run_remote_pbm_action(data: )
         pbm_job_hash = data.dig("message")
         begin
           pbm_job_object = ProconBypassMan::RemotePbmActionObject.new(action: pbm_job_hash["action"],
@@ -76,7 +88,8 @@ module ProconBypassMan
                                                                       job_args: pbm_job_hash["args"])
           pbm_job_object.validate!
         rescue ProconBypassMan::RemotePbmActionObject::ValidationError => e
-          raise
+          ProconBypassMan::SendErrorCommand.execute(error: e)
+          return
         end
 
         ProconBypassMan::RunRemotePbmActionDispatchCommand.execute(
@@ -85,6 +98,25 @@ module ProconBypassMan
           job_args: pbm_job_object.job_args
         )
       end
+
+      def self.validate_and_run_remote_macro(data: )
+        pbm_job_hash = data.dig("message")
+        begin
+          remote_macro_object = ProconBypassMan::RemoteMacroObject.new(name: pbm_job_hash["name"],
+                                                                       uuid: pbm_job_hash["uuid"],
+                                                                       steps: pbm_job_hash["steps"])
+          remote_macro_object.validate!
+        rescue ProconBypassMan::RemoteMacroObject::ValidationError => e
+          ProconBypassMan::SendErrorCommand.execute(error: e)
+          return
+        end
+
+        ProconBypassMan::RemoteMacroSender.execute(
+          name: remote_macro_object.name,
+          uuid: remote_macro_object.uuid,
+          steps: remote_macro_object.steps,
+        )
+      end
     end
   end
 end

data/lib/procon_bypass_man/websocket/forever.rb

@@ -0,0 +1,47 @@
+module ProconBypassMan
+  module Websocket
+    class Forever
+      # 動作確認方法
+      # - 10秒ごとにrefreshするのでタイムアウトは起きない
+      #   - ProconBypassMan::Websocket::Forever.run { loop { puts(:hi); sleep(10); ProconBypassMan::Websocket::Watchdog.active!  } }
+      # - タイムアウトが起きること
+      #   - ProconBypassMan::Websocket::Forever.run { puts(:hi); sleep(3000);  }
+      # - ブロックを1回評価するとThreadが死ぬので100秒後にタイムアウトが起きること
+      #   - ProconBypassMan::Websocket::Forever.run { puts(:hi); sleep(10); ProconBypassMan::Websocket::Watchdog.active!  }
+      def self.run(&block)
+        loop do
+          new.run(&block)
+        end
+      end
+
+      def run(&block)
+        raise("need a block") unless block_given?
+
+        ws_thread = work_one(callable: block)
+        wait_and_kill_if_outdated(ws_thread)
+      end
+
+      # @return [Thread]
+      def work_one(callable: )
+        Thread.start do
+          callable.call
+        rescue => e
+          ProconBypassMan.logger.error("websocket client with forever: #{e.full_message}")
+        end
+      end
+
+      def wait_and_kill_if_outdated(thread)
+        loop do
+          if Watchdog.outdated?
+            Watchdog.active!
+            ProconBypassMan.logger.error("watchdog timeout!!")
+            thread.kill
+            return
+          end
+
+          sleep(10)
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/websocket/watchdog.rb

@@ -0,0 +1,19 @@
+module ProconBypassMan
+  module Websocket
+    class Watchdog
+      def self.outdated?
+        @@time < Time.now
+      end
+
+      def self.time
+        @@time
+      end
+
+      def self.active!
+        @@time = Time.now + 100
+      end
+
+      active!
+    end
+  end
+end

data/lib/procon_bypass_man.rb

@@ -8,9 +8,12 @@ require 'em/pure_ruby'
 require "action_cable_client"
 require "ext/em_pure_ruby"
 require "ext/module"
+require "resolv-replace"
+require "pbmenv"
 
 require_relative "procon_bypass_man/version"
 require_relative "procon_bypass_man/remote_pbm_action"
+require_relative "procon_bypass_man/remote_macro"
 require_relative "procon_bypass_man/support/signal_handler"
 require_relative "procon_bypass_man/support/callbacks"
 require_relative "procon_bypass_man/support/yaml_writer"
@@ -20,17 +23,20 @@ require_relative "procon_bypass_man/support/uptime"
 require_relative "procon_bypass_man/support/on_memory_cache"
 require_relative "procon_bypass_man/support/http_client"
 require_relative "procon_bypass_man/support/report_http_client"
+require_relative "procon_bypass_man/support/remote_macro_http_client"
 require_relative "procon_bypass_man/support/update_remote_pbm_action_status_http_client"
 require_relative "procon_bypass_man/support/send_device_stats_http_client"
 require_relative "procon_bypass_man/support/server_pool"
+require_relative "procon_bypass_man/support/analog_stick_hypotenuse_tilting_power_scaler"
+require_relative "procon_bypass_man/support/never_exit_accidentally"
 require_relative "procon_bypass_man/background"
 require_relative "procon_bypass_man/commands"
 require_relative "procon_bypass_man/bypass"
 require_relative "procon_bypass_man/domains"
-require_relative "procon_bypass_man/never_exit_accidentally"
 require_relative "procon_bypass_man/device_connector"
 require_relative "procon_bypass_man/device_procon_finder"
 require_relative "procon_bypass_man/device_status"
+require_relative "procon_bypass_man/usb_device_controller"
 require_relative "procon_bypass_man/runner"
 require_relative "procon_bypass_man/processor"
 require_relative "procon_bypass_man/configuration"
@@ -40,10 +46,13 @@ require_relative "procon_bypass_man/procon/button"
 require_relative "procon_bypass_man/procon/value_objects/analog_stick"
 require_relative "procon_bypass_man/procon/value_objects/procon_reader"
 require_relative "procon_bypass_man/procon/analog_stick_cap"
+require_relative "procon_bypass_man/procon/analog_stick_manipulator"
 require_relative "procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_action_object"
 require_relative "procon_bypass_man/scheduler"
 require_relative "procon_bypass_man/plugins"
-require_relative "procon_bypass_man/websocket/pbm_job_client"
+require_relative "procon_bypass_man/websocket/client"
+require_relative "procon_bypass_man/websocket/watchdog"
+require_relative "procon_bypass_man/websocket/forever"
 
 STDOUT.sync = true
 Thread.abort_on_exception = true
@@ -54,7 +63,6 @@ module ProconBypassMan
 
   class CouldNotLoadConfigError < StandardError; end
   class ConnectionError < StandardError; end
-  class NotFoundRequiredFilesError < StandardError; end
   class FirstConnectionError < ConnectionError; end
   class EternalConnectionError < ConnectionError; end
 
@@ -62,7 +70,8 @@ module ProconBypassMan
   def self.run(setting_path: nil)
     ProconBypassMan::Scheduler.start!
     ProconBypassMan::Background::JobRunner.start!
-    ProconBypassMan::Websocket::PbmJobClient.start!
+    ProconBypassMan::Websocket::Client.start!
+    ProconBypassMan::QueueOverProcess.start!
 
     ProconBypassMan::PrintMessageCommand.execute(text: "PBMを起動しています")
     initialize_pbm
@@ -71,24 +80,24 @@ module ProconBypassMan
     Runner.new(gadget: gadget, procon: procon).run # ここでblockingする
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     FileUtils.rm_rf(ProconBypassMan.digest_path)
-  rescue ProconBypassMan::NotFoundRequiredFilesError
-    ProconBypassMan::SendErrorCommand.execute(error: "/sys/kernel/config/usb_gadget/proconディレクトリがありませんでした。処理を終了します。")
-    FileUtils.rm_rf(ProconBypassMan.pid_path)
-    FileUtils.rm_rf(ProconBypassMan.digest_path)
-    exit 1 # 前提条件を満たしていないので絶対に落とす
+    ProconBypassMan::QueueOverProcess.shutdown
   rescue ProconBypassMan::CouldNotLoadConfigError
     ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。設定ファイルの読み込みに失敗しました")
     ProconBypassMan::DeviceStatus.change_to_setting_syntax_error_and_shutdown!
+    # TODO シグナルトラップをしていないのでUSR2を送ったときにプロセスが停止している. 明示的にハンドリングするべき.
     ProconBypassMan.exit_if_allow(1) do
       FileUtils.rm_rf(ProconBypassMan.pid_path)
       FileUtils.rm_rf(ProconBypassMan.digest_path)
+      ProconBypassMan::QueueOverProcess.shutdown
     end
   rescue ProconBypassMan::ConnectDeviceCommand::NotFoundProconError
     ProconBypassMan::SendErrorCommand.execute(error: "プロコンが見つかりませんでした。")
     ProconBypassMan::DeviceStatus.change_to_procon_not_found_error!
+    # TODO シグナルトラップをしていないのでUSR2を送ったときにプロセスが停止している. 明示的にハンドリングするべき.
     ProconBypassMan.exit_if_allow(1) do
       FileUtils.rm_rf(ProconBypassMan.pid_path)
       FileUtils.rm_rf(ProconBypassMan.digest_path)
+      ProconBypassMan::QueueOverProcess.shutdown
     end
   rescue ProconBypassMan::ConnectionError
     begin
@@ -127,6 +136,7 @@ module ProconBypassMan
   def self.initialize_pbm
     ProconBypassMan::WriteDeviceIdCommand.execute
     ProconBypassMan::WriteSessionIdCommand.execute
+    system("renice -n -20 -p #{$$}")
     File.write(pid_path, $$)
     ProconBypassMan::DeviceStatus.change_to_running!
   end

data/procon_bypass_man.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/splaplapla/procon_bypass_man"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "pbmenv"
+  spec.add_dependency "pbmenv", ">= 0.1.9" # Pbmenv.installでのenable_pbm_cloudに依存している
   spec.add_dependency "action_cable_client"
   spec.add_dependency "sorted_set"
 

data/project_template/app.rb

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

data/project_template/systemd_units/pbm.service

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

data/sig/main.rbs

@@ -531,6 +531,26 @@ module ProconBypassMan
   end
 end
 
+class ProconBypassMan::BypassMode
+  TYPE_NORMAL: ::Symbol
+
+  TYPE_AGGRESSIVE: ::Symbol
+
+  TYPES: ::Array[::Symbol]
+
+  DEFAULT_GADGET_TO_PROCON_INTERVAL: ::Float
+
+  attr_accessor mode: ::Symbol
+
+  attr_accessor gadget_to_procon_interval: ::Float
+
+  def self.default_value: () -> ::ProconBypassMan::BypassMode
+
+  def initialize: (mode: ::Symbol mode, gadget_to_procon_interval: ::Float gadget_to_procon_interval) -> void
+
+  def to_s: () -> ::String
+end
+
 class ProconBypassMan::Domains::Binary::Base
   # @param [String] binary
   def initialize: (binary: untyped binary) -> void

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.20.1
+  version: 0.1.22
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-13 00:00:00.000000000 Z
+date: 2022-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: action_cable_client
   requirement: !ruby/object:Gem::Requirement
@@ -79,8 +79,10 @@ files:
 - docs/getting_started.md
 - docs/how_to_connect_procon.md
 - docs/setting/left-analogstick-cap.md
+- docs/setting/splatoon2_macro_dasei_cancel.md
 - docs/setting/splatoon2_macro_sokuwari_bubble.md
 - docs/setting/splatoon2_recommended_setting.md
+- docs/setting/splatoon2_shake_tansan.md
 - docs/setup_raspi.md
 - docs/setup_raspi.mitamae.rb
 - docs/setup_raspi_by_mitamae.md
@@ -95,7 +97,9 @@ files:
 - lib/procon_bypass_man/background/jobs/concerns/has_external_api_setting.rb
 - lib/procon_bypass_man/background/jobs/concerns/has_internal_api_setting.rb
 - lib/procon_bypass_man/background/jobs/concerns/job_runnable.rb
+- lib/procon_bypass_man/background/jobs/post_completed_remote_macro_job.rb
 - lib/procon_bypass_man/background/jobs/report_boot_job.rb
+- lib/procon_bypass_man/background/jobs/report_completed_upgrade_pbm_job.rb
 - lib/procon_bypass_man/background/jobs/report_error_job.rb
 - lib/procon_bypass_man/background/jobs/report_error_reload_config_job.rb
 - lib/procon_bypass_man/background/jobs/report_event_base_job.rb
@@ -107,9 +111,17 @@ files:
 - lib/procon_bypass_man/buttons_setting_configuration.rb
 - lib/procon_bypass_man/buttons_setting_configuration/layer.rb
 - lib/procon_bypass_man/buttons_setting_configuration/loader.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/button.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/button_list.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/disable_macro_if_pressed.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/flip_if_pressed.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/force_neutral.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/if_pressed.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/if_pressed_allows_nil.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/open_macro_steps.rb
 - lib/procon_bypass_man/buttons_setting_configuration/validator.rb
 - lib/procon_bypass_man/bypass.rb
-- lib/procon_bypass_man/bypass/bypass_mode.rb
 - lib/procon_bypass_man/bypass/usb_hid_logger.rb
 - lib/procon_bypass_man/commands.rb
 - lib/procon_bypass_man/commands/bypass_command.rb
@@ -126,13 +138,16 @@ files:
 - lib/procon_bypass_man/device_procon_finder.rb
 - lib/procon_bypass_man/device_status.rb
 - lib/procon_bypass_man/domains.rb
+- lib/procon_bypass_man/domains/analog_stick_position.rb
 - lib/procon_bypass_man/domains/binary/base.rb
 - lib/procon_bypass_man/domains/binary/has_immutable_binary.rb
 - lib/procon_bypass_man/domains/binary/has_mutable_binary.rb
 - lib/procon_bypass_man/domains/binary/inbound_procon_binary.rb
 - lib/procon_bypass_man/domains/binary/processing_procon_binary.rb
+- lib/procon_bypass_man/domains/bypass_mode.rb
 - lib/procon_bypass_man/io_monitor.rb
-- lib/procon_bypass_man/never_exit_accidentally.rb
+- lib/procon_bypass_man/plugin/splatoon2/macro/charge_tansan_bomb.rb
+- lib/procon_bypass_man/plugin/splatoon2/macro/dasei_cancel.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/fast_return.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_left_key.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_right_key.rb
@@ -144,6 +159,7 @@ files:
 - lib/procon_bypass_man/processor.rb
 - lib/procon_bypass_man/procon.rb
 - lib/procon_bypass_man/procon/analog_stick_cap.rb
+- lib/procon_bypass_man/procon/analog_stick_manipulator.rb
 - lib/procon_bypass_man/procon/button.rb
 - lib/procon_bypass_man/procon/button_collection.rb
 - lib/procon_bypass_man/procon/consts.rb
@@ -151,12 +167,20 @@ files:
 - lib/procon_bypass_man/procon/layer_changer.rb
 - 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/press_button_aware.rb
 - lib/procon_bypass_man/procon/user_operation.rb
 - lib/procon_bypass_man/procon/value_objects/analog_stick.rb
 - lib/procon_bypass_man/procon/value_objects/procon_reader.rb
+- lib/procon_bypass_man/remote_macro.rb
+- lib/procon_bypass_man/remote_macro/queue_over_process.rb
+- lib/procon_bypass_man/remote_macro/remote_macro_object.rb
+- lib/procon_bypass_man/remote_macro/remote_macro_receiver.rb
+- lib/procon_bypass_man/remote_macro/remote_macro_sender.rb
+- lib/procon_bypass_man/remote_macro/task.rb
+- lib/procon_bypass_man/remote_macro/task_queue.rb
 - lib/procon_bypass_man/remote_pbm_action.rb
 - lib/procon_bypass_man/remote_pbm_action/base_action.rb
 - lib/procon_bypass_man/remote_pbm_action/change_pbm_version_action.rb
@@ -167,10 +191,13 @@ files:
 - lib/procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_action_object.rb
 - lib/procon_bypass_man/runner.rb
 - lib/procon_bypass_man/scheduler.rb
+- lib/procon_bypass_man/support/analog_stick_hypotenuse_tilting_power_scaler.rb
 - lib/procon_bypass_man/support/callbacks.rb
 - lib/procon_bypass_man/support/compress_array.rb
 - lib/procon_bypass_man/support/http_client.rb
+- lib/procon_bypass_man/support/never_exit_accidentally.rb
 - lib/procon_bypass_man/support/on_memory_cache.rb
+- lib/procon_bypass_man/support/remote_macro_http_client.rb
 - lib/procon_bypass_man/support/report_http_client.rb
 - lib/procon_bypass_man/support/safe_timeout.rb
 - lib/procon_bypass_man/support/send_device_stats_http_client.rb
@@ -179,8 +206,11 @@ files:
 - lib/procon_bypass_man/support/update_remote_pbm_action_status_http_client.rb
 - lib/procon_bypass_man/support/uptime.rb
 - lib/procon_bypass_man/support/yaml_writer.rb
+- lib/procon_bypass_man/usb_device_controller.rb
 - lib/procon_bypass_man/version.rb
-- lib/procon_bypass_man/websocket/pbm_job_client.rb
+- lib/procon_bypass_man/websocket/client.rb
+- lib/procon_bypass_man/websocket/forever.rb
+- lib/procon_bypass_man/websocket/watchdog.rb
 - procon_bypass_man.gemspec
 - project_template/README.md
 - project_template/app.rb
@@ -206,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="