procon_bypass_man 0.1.21 → 0.1.22

data/lib/procon_bypass_man/procon/user_operation.rb

@@ -33,22 +33,22 @@ class ProconBypassMan::Procon::UserOperation
     binary.write_as_press_button(button)
   end
 
-  # @param [Symbol, Array<Symbol>] button
-  def press_button_only(button)
-    if button.is_a?(Array)
-      binary.set_no_action!
-      button.uniq.each do |b|
-        unless ProconBypassMan::Procon::MacroBuilder::RESERVED_WORD_NONE == b
-          binary.write_as_press_button(b)
-        end
-      end
-      return
-    end
+  # @param [Symbol, Array<Symbol>] macro_step
+  def press_button_only_or_tilt_sticks(macro_step)
+    macro_step = [macro_step] if not macro_step.is_a?(Array)
+    # スティック操作の時はボタン入力を通す
+    binary.set_no_action! if is_button?(macro_step)
+
+    macro_step.uniq.each do |ms|
+      next if ProconBypassMan::Procon::MacroBuilder::RESERVED_WORD_NONE == ms
 
-    if ProconBypassMan::Procon::MacroBuilder::RESERVED_WORD_NONE == button
-      binary.set_no_action!
-    else
-      binary.write_as_press_button_only(button)
+      if is_button?(ms)
+        binary.write_as_press_button(ms)
+      elsif is_stick?(ms)
+        binary.write_as_tilt_left_stick(ms)
+      else
+        warn "知らないmacro stepです"
+      end
     end
   end
 
@@ -71,4 +71,18 @@ class ProconBypassMan::Procon::UserOperation
     aware = ProconBypassMan::PressButtonAware.new(@binary.raw)
     buttons.all? { |b| aware.pressing_button?(b) }
   end
+
+  # @return [Boolean]
+  def is_button?(button)
+    button = [button] if not button.is_a?(Array)
+
+    button.all? do |b|
+      !!ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP[b.to_sym] || b.to_sym == ProconBypassMan::Procon::MacroBuilder::RESERVED_WORD_NONE
+    end
+  end
+
+  # @return [Boolean]
+  def is_stick?(step)
+    !!(step =~ /\Atilt_/)
+  end
 end

data/lib/procon_bypass_man/procon.rb

@@ -1,3 +1,5 @@
+require "procon_bypass_man/procon/macro_plugin_map"
+
 class ProconBypassMan::Procon
   require "procon_bypass_man/procon/consts"
   require "procon_bypass_man/procon/mode_registry"
@@ -78,12 +80,22 @@ class ProconBypassMan::Procon
         end
 
         if user_operation.pressing_all_buttons?(options[:if_pressed])
-          @@status[:ongoing_macro] = MacroRegistry.load(macro_name)
+          @@status[:ongoing_macro] = MacroRegistry.load(macro_name, force_neutral_buttons: options[:force_neutral])
           break
         end
       end
     end
 
+    # remote macro
+    if task = ProconBypassMan::RemoteMacro::TaskQueueInProcess.non_blocking_shift
+      ProconBypassMan::Procon::MacroRegistry.cleanup_remote_macros!
+      macro_name = task.name || "RemoteMacro-#{task.steps.join}".to_sym
+      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::PostCompletedRemoteMacroJob.perform_async(task.uuid)
+      end
+    end
+
     case current_layer.mode
     when :manual
       @@status[:ongoing_mode] = ModeRegistry.load(:manual)
@@ -124,9 +136,11 @@ class ProconBypassMan::Procon
       return user_operation.binary.raw
     end
 
-    if ongoing_macro.ongoing?
-      step = ongoing_macro.next_step or return(user_operation.binary.raw)
-      user_operation.press_button_only(step)
+    if ongoing_macro.ongoing? && (step = ongoing_macro.next_step)
+      ongoing_macro.force_neutral_buttons&.each do |force_neutral_button|
+        user_operation.unpress_button(force_neutral_button)
+      end
+      user_operation.press_button_only_or_tilt_sticks(step)
       return user_operation.binary.raw
     end
 
@@ -135,7 +149,7 @@ class ProconBypassMan::Procon
     end
 
     current_layer.left_analog_stick_caps.each do |config|
-      if config[:if_pressed].nil? || user_operation.pressing_all_buttons?(config[:if_pressed])
+      if !config[:if_pressed] || user_operation.pressing_all_buttons?(config[:if_pressed])
         config[:force_neutral]&.each do |force_neutral_button|
           user_operation.unpress_button(force_neutral_button)
         end

data/lib/procon_bypass_man/remote_macro/queue_over_process.rb

@@ -0,0 +1,62 @@
+class ProconBypassMan::QueueOverProcess
+  attr_reader :drb
+
+  @@drb_server = nil
+  @@drb_server_thread = nil
+
+  def self.start!
+    return unless ProconBypassMan.config.enable_remote_macro?
+    require 'drb/drb'
+
+    FileUtils.rm_rf(file_path) if File.exist?(file_path)
+    begin
+      @@drb_server = DRb.start_service(url, Queue.new, safe_level: 1)
+    rescue Errno::EADDRINUSE => e
+      ProconBypassMan.logger.error e
+      raise
+    end
+
+    @@drb_server_thread =
+      Thread.new do
+        DRb.thread.join
+      end
+  end
+
+  def self.shutdown
+    if @@drb_server
+      @@drb_server_thread.kill
+      @@drb_server.stop_service
+    end
+  end
+
+  def self.push(value)
+    return unless ProconBypassMan.config.enable_remote_macro?
+
+    drb.push(value)
+  end
+
+  def self.pop
+    return unless ProconBypassMan.config.enable_remote_macro?
+
+    drb.pop
+  end
+
+  def self.drb
+    return unless ProconBypassMan.config.enable_remote_macro?
+
+    @@drb ||= new.drb
+  end
+
+  PROTOCOL = "drbunix"
+  def self.url
+    "#{PROTOCOL}:/tmp/procon_bypass_man_queue"
+  end
+
+  def self.file_path
+    url.gsub("#{PROTOCOL}:", "")
+  end
+
+  def initialize
+    @drb = DRbObject.new_with_uri(self.class.url)
+  end
+end

data/lib/procon_bypass_man/remote_macro/remote_macro_object.rb

@@ -0,0 +1,30 @@
+module ProconBypassMan
+  class RemoteMacroObject
+    # valueobjectがvalidatorの責務も持っている. 今度分離する
+    class ValidationError < StandardError; end
+    class MustBeNotNilError < ValidationError; end
+    class NonSupportAction < ValidationError; end
+
+    attr_accessor :name, :uuid, :steps
+
+    # @param [String] name
+    # @param [String] uuid
+    # @param [Array] steps
+    def initialize(name: , uuid:, steps: )
+      @name = name
+      @uuid = uuid
+      @steps = steps
+      freeze
+    end
+
+    # @raise [MustBeNotNilError]
+    # @raise [NonSupportAction]
+    # @return [void]
+    def validate!
+      self.uuid or raise MustBeNotNilError, "uuidは値が必須です"
+      unless self.steps.is_a?(Array)
+        raise ValidationError, "stepsは配列です"
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/remote_macro/remote_macro_receiver.rb

@@ -0,0 +1,37 @@
+class ProconBypassMan::RemoteMacroReceiver
+  # forkしたプロセスで動かすクラス。sock経由で命令を受け取ってmacoのキューに積んでいく
+  def self.start_with_foreground!
+    return unless ProconBypassMan.config.enable_remote_macro?
+
+    run
+  end
+
+  def self.start!
+    return unless ProconBypassMan.config.enable_remote_macro?
+
+    Thread.start do
+      start_with_foreground!
+    end
+  end
+
+  def self.run
+    while(task = ProconBypassMan::QueueOverProcess.pop)
+      receive(task)
+    end
+    shutdown
+  rescue Errno::ENOENT, Errno::ECONNRESET, Errno::ECONNREFUSED => e
+    ProconBypassMan.logger.debug(e)
+  end
+
+
+  # @param [ProconBypassMan::RemoteMacro::Task] task
+  def self.receive(task)
+    ProconBypassMan.logger.info "[remote macro][receiver] name: #{task.name}, uuid: #{task.uuid}, steps: #{task.steps}"
+    ProconBypassMan::RemoteMacro::TaskQueueInProcess.push(task)
+    true
+  end
+
+  def self.shutdown
+    ProconBypassMan.logger.info("ProconBypassMan::RemoteMacroReceiverを終了します。")
+  end
+end

data/lib/procon_bypass_man/remote_macro/remote_macro_sender.rb

@@ -0,0 +1,8 @@
+class ProconBypassMan::RemoteMacroSender
+  def self.execute(name: , uuid: , steps: )
+    ProconBypassMan.logger.info "[remote macro][sender] name: #{name}, uuid: #{uuid}, steps: #{steps}"
+    ProconBypassMan::QueueOverProcess.push(
+      ProconBypassMan::RemoteMacro::Task.new(name, uuid, steps)
+    )
+  end
+end

data/lib/procon_bypass_man/remote_macro/task.rb

@@ -0,0 +1,6 @@
+module ProconBypassMan
+  module RemoteMacro
+    class Task < Struct.new(:name, :uuid, :steps)
+    end
+  end
+end

data/lib/procon_bypass_man/remote_macro/task_queue.rb

@@ -0,0 +1,13 @@
+module ProconBypassMan
+  module RemoteMacro
+    class TaskQueue < ::Queue
+      def present?
+        not empty?
+      end
+
+      def non_blocking_shift
+        present? && shift
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/remote_macro.rb

@@ -0,0 +1,14 @@
+module ProconBypassMan
+  module RemoteMacro
+    require "procon_bypass_man/remote_macro/remote_macro_object"
+    require "procon_bypass_man/remote_macro/remote_macro_receiver"
+    require "procon_bypass_man/remote_macro/remote_macro_sender"
+    require "procon_bypass_man/remote_macro/queue_over_process"
+    require "procon_bypass_man/remote_macro/task"
+    require "procon_bypass_man/remote_macro/task_queue"
+
+    ACTION_KEY = "remote_macro"
+
+    TaskQueueInProcess = ProconBypassMan::RemoteMacro::TaskQueue.new
+  end
+end

data/lib/procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_action_object.rb

@@ -11,7 +11,7 @@ module ProconBypassMan
     # @param [String] status
     # @param [String] #uuid
     # @param [Time] created_at
-    # @return [Hash] job_args
+    # @param [Hash] job_args
     def initialize(action: , status:, uuid:, created_at:, job_args: )
       self.action = action
       self.status = status

data/lib/procon_bypass_man/remote_pbm_action.rb

@@ -6,6 +6,7 @@ module ProconBypassMan
     require "procon_bypass_man/remote_pbm_action/stop_pbm_action"
     require "procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb"
     require "procon_bypass_man/remote_pbm_action/commands/update_remote_pbm_action_status_command"
+    require "procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_action_object"
 
     ACTION_CHANGE_PBM_VERSION = "change_pbm_version"
     ACTION_REBOOT_OS = "reboot_os"

data/lib/procon_bypass_man/runner.rb

@@ -27,7 +27,11 @@ class ProconBypassMan::Runner
     loop do
       $will_terminate_token = false
       # NOTE メインプロセスではThreadをいくつか起動しているので念のためパフォーマンスを優先するためにforkしていく
-      child_pid = Kernel.fork { ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute }
+      child_pid = Kernel.fork {
+        DRb.start_service if defined?(DRb)
+        ProconBypassMan::RemoteMacroReceiver.start!
+        ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute
+      }
 
       begin
         # TODO 小プロセスが消滅した時に、メインプロセスは生き続けてしまい、何もできなくなる問題がある

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

@@ -10,8 +10,6 @@ class ProconBypassMan::UsbDeviceController
       return if initialized?
 
       shell = <<~EOH
-        #!/bin/bash
-
         cd /sys/kernel/config/usb_gadget/
         mkdir -p procon
         cd procon

data/lib/procon_bypass_man/version.rb

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

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

@@ -1,6 +1,6 @@
 module ProconBypassMan
   module Websocket
-    module PbmJobClient
+    module Client
       CHANNEL = 'PbmJobChannel'
 
       def self.start!
@@ -20,7 +20,7 @@ module ProconBypassMan
           )
 
           client.connected {
-            ProconBypassMan.logger.info('websocket client: 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')
@@ -63,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"],
@@ -83,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(
@@ -92,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.rb

@@ -13,6 +13,7 @@ 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"
@@ -22,6 +23,7 @@ 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"
@@ -44,10 +46,11 @@ 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"
 
@@ -67,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
@@ -76,19 +80,24 @@ module ProconBypassMan
     Runner.new(gadget: gadget, procon: procon).run # ここでblockingする
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     FileUtils.rm_rf(ProconBypassMan.digest_path)
+    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

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

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.21'
+  gem 'procon_bypass_man', '0.1.22'
 end
 
 ProconBypassMan.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -82,6 +82,7 @@ files:
 - 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
@@ -96,6 +97,7 @@ 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
@@ -109,6 +111,15 @@ 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/usb_hid_logger.rb
@@ -127,6 +138,7 @@ 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
@@ -134,6 +146,7 @@ files:
 - 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/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
@@ -146,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
@@ -153,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
@@ -175,6 +197,7 @@ files:
 - 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
@@ -185,8 +208,8 @@ files:
 - 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/client.rb
 - lib/procon_bypass_man/websocket/forever.rb
-- lib/procon_bypass_man/websocket/pbm_job_client.rb
 - lib/procon_bypass_man/websocket/watchdog.rb
 - procon_bypass_man.gemspec
 - project_template/README.md
@@ -213,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:
   - - ">="