procon_bypass_man 0.3.4 → 0.3.6

data/lib/procon_bypass_man/{remote_pbm_action/commands/update_remote_pbm_action_status_command.rb → remote_action/remote_pbm_job/commands/update_remote_pbm_job_status_command.rb}

@@ -1,5 +1,5 @@
 module ProconBypassMan
-  class UpdateRemotePbmActionStatusCommand
+  class UpdateRemotePbmJobStatusCommand
     # @param [String] pbm_job_uuid
     def initialize(pbm_job_uuid: )
       @pbm_job_uuid = pbm_job_uuid
@@ -8,7 +8,7 @@ module ProconBypassMan
     # @param [String] to_status
     # @return [void]
     def execute(to_status: )
-      ProconBypassMan::UpdateRemotePbmActionStatusHttpClient.new(
+      ProconBypassMan::UpdateRemotePbmJobStatusHttpClient.new(
         path: path,
         server: ProconBypassMan.config.api_server,
       ).put(to_status: to_status)

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

@@ -0,0 +1,24 @@
+module ProconBypassMan
+  module RemoteAction
+    module RemotePbmJob
+      class RebootOsAction < BaseAction
+
+        def action_content(_args)
+          ProconBypassMan.logger.info "execute RebootOsAction!"
+          `reboot`
+        end
+
+        private
+
+        def before_action_callback
+          ProconBypassMan::ReportStartRebootJob.perform
+          be_processed
+        end
+
+        def after_action_callback
+          # no-op
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module ProconBypassMan
+  module RemoteAction
+    module RemotePbmJob
+      class ReportProconStatusAction < BaseAction
+
+        def action_content(_args)
+          ProconBypassMan.logger.info "execute ReportProconStatusAction!"
+          ProconBypassMan::SendInfoLogCommand.execute(
+            message: ProconBypassMan::ProconDisplay::Status.instance.current.to_s
+          )
+        end
+
+        private
+
+        def before_action_callback
+          be_in_progress
+        end
+
+        def after_action_callback
+          be_processed
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+module ProconBypassMan
+  module RemoteAction
+    module RemotePbmJob
+      class RestorePbmSettingAction < BaseAction
+
+        def action_content(args: )
+          require "pbmenv"
+          ProconBypassMan.logger.info "execute RestorePbmSettingAction!"
+          setting = args.dig("setting") or raise(ProconBypassMan::RemotePbmJob::NeedPbmVersionError, "settingが必要です, #{args.inspect}")
+
+          # 復元に失敗したら戻せるように退避する
+          FileUtils.copy(
+            ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
+            ProconBypassMan.fallback_setting_path,
+          )
+
+          ProconBypassMan::YamlWriter.write(
+            path: ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
+            content: setting,
+          )
+
+          hot_reload!
+        end
+
+        private
+
+        def before_action_callback
+          be_in_progress
+        end
+
+        def after_action_callback
+          be_processed
+        end
+
+        # @return [void]
+        def hot_reload!
+          Process.kill(:USR2, ProconBypassMan.pid)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module ProconBypassMan
+  module RemoteAction
+    module RemotePbmJob
+      class StopPbmJob < BaseAction
+
+        def action_content(_args)
+          ProconBypassMan.logger.info "execute StopPbmJob!"
+          Process.kill("TERM", ProconBypassMan.pid)
+        end
+
+        private
+
+        def before_action_callback
+          be_processed
+        end
+
+        def after_action_callback
+          # no-op
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/{remote_pbm_action/value_objects/remote_pbm_action_object.rb → remote_action/remote_pbm_job/value_objects/remote_pbm_job_object.rb}

@@ -1,5 +1,5 @@
 module ProconBypassMan
-  class RemotePbmActionObject
+  class RemotePbmJobObject
     # valueobjectがvalidatorの責務も持っている. 今度分離する
     class ValidationError < StandardError; end
     class MustBeNotNilError < ValidationError; end
@@ -30,7 +30,7 @@ module ProconBypassMan
       self.status or raise MustBeNotNilError, "statusは値が必須です"
       self.uuid or raise MustBeNotNilError, "uuidは値が必須です"
 
-      unless ProconBypassMan::RemotePbmAction::ACTIONS.include?(action)
+      unless ProconBypassMan::RemoteAction::RemotePbmJob::ACTIONS.include?(action)
         raise NonSupportAction, "知らないアクションです"
       end
     end

data/lib/procon_bypass_man/remote_action/remote_pbm_job.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module ProconBypassMan
+  module RemoteAction
+    module RemotePbmJob
+      require "procon_bypass_man/remote_action/remote_pbm_job/value_objects/remote_pbm_job_object"
+
+      require "procon_bypass_man/remote_action/remote_pbm_job/base_action"
+      require "procon_bypass_man/remote_action/remote_pbm_job/change_pbm_version_action"
+      require "procon_bypass_man/remote_action/remote_pbm_job/reboot_os_action"
+      require "procon_bypass_man/remote_action/remote_pbm_job/stop_pbm_action"
+      require "procon_bypass_man/remote_action/remote_pbm_job/restore_pbm_setting"
+      require "procon_bypass_man/remote_action/remote_pbm_job/report_procon_status"
+      require "procon_bypass_man/remote_action/remote_pbm_job/commands/update_remote_pbm_job_status_command"
+      require "procon_bypass_man/remote_action/remote_pbm_job/commands/run_remote_pbm_job_dispatch_command"
+
+      ACTION_CHANGE_PBM_VERSION = "change_pbm_version"
+      ACTION_REBOOT_OS = "reboot_os"
+      ACTION_STOP_PBM = "stop_pbm"
+      ACTION_RESTORE_SETTING = "restore_pbm_setting"
+      ACTION_REPORT_PORCON_STATUS = 'report_porcon_status'
+
+      ACTIONS_IN_MASTER_PROCESS = [
+        ACTION_CHANGE_PBM_VERSION,
+        ACTION_REBOOT_OS,
+        ACTION_STOP_PBM,
+        ACTION_RESTORE_SETTING,
+      ]
+      ACTIONS_IN_BYPASS_PROCESS = [
+        ACTION_REPORT_PORCON_STATUS,
+      ]
+      ACTIONS = ACTIONS_IN_MASTER_PROCESS + ACTIONS_IN_BYPASS_PROCESS
+
+      STATUS_FAILED = :failed
+      STATUS_IN_PROGRESS = :in_progress
+      STATUS_PROCESSED = :processed
+
+      ACTION_STATUSES = [
+        STATUS_FAILED,
+        STATUS_IN_PROGRESS,
+        STATUS_PROCESSED,
+      ]
+    end
+  end
+end

data/lib/procon_bypass_man/remote_action/task.rb

@@ -0,0 +1,14 @@
+# NOTE: remote macroとpbm remote actionの両方で使う
+class ProconBypassMan::RemoteAction::Task < ::Struct.new(:name, :uuid, :steps, :type)
+  TYPE_MACRO = 'macro'
+  TYPE_ACTION = 'action'
+
+  # remote actionのためのalias
+  def action
+    name
+  end
+
+  def job_args
+    steps
+  end
+end

data/lib/procon_bypass_man/{remote_macro → remote_action}/task_queue.rb

@@ -1,4 +1,4 @@
-class ProconBypassMan::RemoteMacro::TaskQueue < ::Queue
+class ProconBypassMan::RemoteAction::TaskQueue < ::Queue
   def present?
     not empty?
   end

data/lib/procon_bypass_man/remote_action.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module ProconBypassMan
+  module RemoteAction
+    # NOTE: RemoteActionは「具体的な処理を行うジョブ」と「マクロ」を内包する
+    require "procon_bypass_man/remote_action/remote_pbm_job"
+
+    require "procon_bypass_man/remote_action/remote_action_object"
+    require "procon_bypass_man/remote_action/remote_action_receiver"
+    require "procon_bypass_man/remote_action/remote_action_sender"
+    require "procon_bypass_man/remote_action/queue_over_process"
+    require "procon_bypass_man/remote_action/task"
+    require "procon_bypass_man/remote_action/task_queue"
+
+    ACTION_MACRO = "remote_macro"
+
+    TaskQueueInProcess = ProconBypassMan::RemoteAction::TaskQueue.new
+  end
+end

data/lib/procon_bypass_man/support/callbacks.rb

@@ -24,6 +24,7 @@ module ProconBypassMan
         RUBY
       end
 
+      # TODO: 存在しないメソッドへのcallbackを登録したらエラーにする
       def set_callback(kind, filter, chain_method, &block)
         self.__callbacks ||= {}
         self.__callbacks[kind] ||= CallbackChain.new

data/lib/procon_bypass_man/support/{update_remote_pbm_action_status_http_client.rb → update_remote_pbm_job_status_http_client.rb}

@@ -1,5 +1,5 @@
 module ProconBypassMan
-  class UpdateRemotePbmActionStatusHttpClient < HttpClient
+  class UpdateRemotePbmJobStatusHttpClient < HttpClient
     def put(to_status: )
       super(request_body: {
         body: { status: to_status },

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/websocket/client.rb

@@ -59,59 +59,75 @@ module ProconBypassMan
 
       # @param [Hash] data
       def self.dispatch(data: , client: )
-        pbm_job_hash = data.dig("message")
-        case pbm_job_hash['action']
+        case data.dig("message")['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)
+        when ProconBypassMan::RemoteAction::ACTION_MACRO
+          run_remote_macro(data: data)
+        when *ProconBypassMan::RemoteAction::RemotePbmJob::ACTIONS_IN_MASTER_PROCESS
+          run_remote_pbm_job(data: data, process_to_execute: :master)
+        when *ProconBypassMan::RemoteAction::RemotePbmJob::ACTIONS_IN_BYPASS_PROCESS
+          run_remote_pbm_job(data: data, process_to_execute: :bypass)
         else
-          ProconBypassMan.logger.error "unknown action"
+          ProconBypassMan::SendErrorCommand.execute(error: 'unknown remote pbm action')
         end
       end
 
-      # @raise [ProconBypassMan::RemotePbmActionObject::ValidationError]
+      # @raise [ProconBypassMan::RemotePbmJobObject::ValidationError]
       # @param [Hash] data
+      # @param [Symbol] process_to_execute どのプロセスで実行するか
       # @return [Void]
-      def self.validate_and_run_remote_pbm_action(data: )
+      def self.run_remote_pbm_job(data: , process_to_execute: )
         pbm_job_hash = data.dig("message")
         begin
-          pbm_job_object = ProconBypassMan::RemotePbmActionObject.new(action: pbm_job_hash["action"],
+          pbm_job_object = ProconBypassMan::RemotePbmJobObject.new(action: pbm_job_hash["action"],
                                                                       status: pbm_job_hash["status"],
                                                                       uuid: pbm_job_hash["uuid"],
                                                                       created_at: pbm_job_hash["created_at"],
                                                                       job_args: pbm_job_hash["args"])
           pbm_job_object.validate!
-        rescue ProconBypassMan::RemotePbmActionObject::ValidationError => e
+        rescue ProconBypassMan::RemotePbmJobObject::ValidationError => e
           ProconBypassMan::SendErrorCommand.execute(error: e)
           return
         end
 
-        ProconBypassMan::RunRemotePbmActionDispatchCommand.execute(
-          action: pbm_job_object.action,
-          uuid: pbm_job_object.uuid,
-          job_args: pbm_job_object.job_args
-        )
+        case process_to_execute
+        when :master
+          ProconBypassMan::RemoteAction::RemotePbmJob::RunRemotePbmJobDispatchCommand.execute(
+            action: pbm_job_object.action,
+            uuid: pbm_job_object.uuid,
+            job_args: pbm_job_object.job_args
+          )
+        when :bypass
+          ProconBypassMan::RemoteAction::QueueOverProcess.push(
+            ProconBypassMan::RemoteAction::Task.new(pbm_job_object.action,
+                                                   pbm_job_object.uuid,
+                                                   pbm_job_object.job_args,
+                                                   ProconBypassMan::RemoteAction::Task::TYPE_ACTION)
+          )
+        else
+          ProconBypassMan::SendErrorCommand.execute(error: 'unknown process to execute')
+        end
       end
 
-      def self.validate_and_run_remote_macro(data: )
+      def self.run_remote_macro(data: )
         pbm_job_hash = data.dig("message")
         begin
-          remote_macro_object = ProconBypassMan::RemoteMacro::RemoteMacroObject.new(name: pbm_job_hash["name"],
-                                                                       uuid: pbm_job_hash["uuid"],
-                                                                       steps: pbm_job_hash["steps"])
-          remote_macro_object.validate!
-        rescue ProconBypassMan::RemoteMacro::RemoteMacroObject::ValidationError => e
+          remote_action_object = ProconBypassMan::RemoteAction::RemoteActionObject.new(name: pbm_job_hash["name"],
+                                                                                    uuid: pbm_job_hash["uuid"],
+                                                                                    steps: pbm_job_hash["steps"])
+          remote_action_object.validate!
+        rescue ProconBypassMan::RemoteAction::RemoteActionObject::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,
+        # TODO: インラインしたい
+        ProconBypassMan::RemoteActionSender.execute(
+          name: remote_action_object.name,
+          uuid: remote_action_object.uuid,
+          steps: remote_action_object.steps,
+          type: ProconBypassMan::RemoteAction::Task::TYPE_MACRO,
         )
       end
     end

data/lib/procon_bypass_man.rb

@@ -31,7 +31,7 @@ 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/update_remote_pbm_job_status_http_client"
 require_relative "procon_bypass_man/support/send_device_stats_http_client"
 require_relative "procon_bypass_man/support/procon_performance_http_client"
 require_relative "procon_bypass_man/support/analog_stick_hypotenuse_tilting_power_scaler"
@@ -55,7 +55,6 @@ require_relative "procon_bypass_man/device_model"
 require_relative "procon_bypass_man/procon/button"
 require_relative "procon_bypass_man/procon/analog_stick_cap"
 require_relative "procon_bypass_man/procon/analog_stick_manipulator"
-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/worker"
@@ -63,8 +62,7 @@ require_relative "procon_bypass_man/websocket/client"
 require_relative "procon_bypass_man/websocket/watchdog"
 require_relative "procon_bypass_man/websocket/forever"
 
-require_relative "procon_bypass_man/remote_pbm_action"
-require_relative "procon_bypass_man/remote_macro"
+require_relative "procon_bypass_man/remote_action"
 
 STDOUT.sync = true
 Thread.abort_on_exception = true
@@ -161,7 +159,7 @@ module ProconBypassMan
     ProconBypassMan::Background::JobQueue.start!
     ProconBypassMan::Websocket::Client.start!
     # TODO ProconBypassMan::DrbObjects.start_all! みたいな感じで書きたい
-    ProconBypassMan::RemoteMacro::QueueOverProcess.start!
+    ProconBypassMan::RemoteAction::QueueOverProcess.start!
     ProconBypassMan::Procon::PerformanceMeasurement::QueueOverProcess.start!
     ProconBypassMan::Scheduler.start!
 
@@ -193,7 +191,7 @@ module ProconBypassMan
     BlueGreenProcess.configure do |config|
       config.after_fork = -> {
         DRb.start_service if defined?(DRb)
-        ProconBypassMan::RemoteMacroReceiver.start!
+        ProconBypassMan::RemoteActionReceiver.start!
         BlueGreenProcess.config.logger = ProconBypassMan.logger
       }
       config.shared_variables = [:buttons, :current_layer_key, :recent_left_stick_hypotenuses]
@@ -204,7 +202,7 @@ module ProconBypassMan
   def self.terminate_pbm
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     FileUtils.rm_rf(ProconBypassMan.digest_path)
-    ProconBypassMan::RemoteMacro::QueueOverProcess.shutdown
+    ProconBypassMan::RemoteAction::QueueOverProcess.shutdown
     ProconBypassMan::Procon::PerformanceMeasurement::QueueOverProcess.shutdown
     self.worker&.shutdown
   end

data/procon_bypass_man.gemspec

@@ -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", ">= 0.1.9" # enable_pbm_cloud連携機能でPbmenv.installを使っている.
+  spec.add_dependency "pbmenv", ">= 0.1.11" # enable_pbm_cloud連携機能でPbmenv.install, .cleanを使っている.
   spec.add_dependency "action_cable_client"
   spec.add_dependency "sorted_set"
   spec.add_dependency "blue_green_process", '0.1.4.2'

data/project_template/app.rb

@@ -12,7 +12,7 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.3.4'
+    gem 'procon_bypass_man', '0.3.6'
   end
 rescue Bundler::Source::Git::GitCommandError => e
   retry_count_on_git_command_error = retry_count_on_git_command_error + 1

data/project_template/app.rb.erb

@@ -12,7 +12,7 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.3.4'
+    gem 'procon_bypass_man', '0.3.6'
   end
 rescue Bundler::Source::Git::GitCommandError => e
   retry_count_on_git_command_error = retry_count_on_git_command_error + 1

data/sig/main.rbs

@@ -613,12 +613,6 @@ module ProconBypassMan
   end
 end
 
-module ProconBypassMan
-  class UpdateRemotePbmActionStatusHttpClient
-    def post: (to_status: ::Symbol) -> untyped
-  end
-end
-
 module ProconBypassMan
   class CompressArray
     @array: [String]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-26 00:00:00.000000000 Z
+date: 2023-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: action_cable_client
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,7 @@ files:
 - bin/console
 - bin/dev_api_server.rb
 - bin/generate_default_app
+- bin/generate_output_report
 - bin/setup
 - docs/getting_started.md
 - docs/how_to_connect_procon.md
@@ -106,7 +107,7 @@ files:
 - docs/setting/splatoon3_macro_dasei_cancel.md
 - docs/setting/splatoon3_macro_forward_ikarole.md
 - docs/setting/splatoon3_recommended_setting.md
-- docs/setting/splatoon3_rotation_forward_stick.md
+- docs/setting/splatoon3_rotation_left_stick.md
 - docs/setup_raspi.md
 - docs/setup_raspi.mitamae.rb
 - docs/setup_raspi_by_mitamae.md
@@ -119,20 +120,24 @@ files:
 - lib/procon_bypass_man/background/jobs/base_job.rb
 - lib/procon_bypass_man/background/jobs/concerns/has_external_api_setting.rb
 - lib/procon_bypass_man/background/jobs/concerns/job_performable.rb
+- lib/procon_bypass_man/background/jobs/post_completed_remote_action_job.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
+- lib/procon_bypass_man/background/jobs/report_info_log_job.rb
 - lib/procon_bypass_man/background/jobs/report_load_config_job.rb
 - lib/procon_bypass_man/background/jobs/report_procon_performance_measurements_job.rb
 - lib/procon_bypass_man/background/jobs/report_reload_config_job.rb
 - lib/procon_bypass_man/background/jobs/report_start_reboot_job.rb
+- lib/procon_bypass_man/background/jobs/report_warning_job.rb
 - lib/procon_bypass_man/background/jobs/sync_device_stats_job.rb
 - 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/metadata_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
@@ -152,7 +157,9 @@ files:
 - lib/procon_bypass_man/commands/print_boot_message_command.rb
 - lib/procon_bypass_man/commands/print_message_command.rb
 - lib/procon_bypass_man/commands/send_error_command.rb
+- lib/procon_bypass_man/commands/send_info_log_command.rb
 - lib/procon_bypass_man/commands/send_reload_config_event_command.rb
+- lib/procon_bypass_man/commands/send_warning_command.rb
 - lib/procon_bypass_man/commands/write_device_id_command.rb
 - lib/procon_bypass_man/commands/write_session_id_command.rb
 - lib/procon_bypass_man/configuration.rb
@@ -229,28 +236,28 @@ files:
 - lib/procon_bypass_man/procon/value_objects/procon_reader.rb
 - lib/procon_bypass_man/procon/value_objects/rumble_binary.rb
 - lib/procon_bypass_man/procon_display.rb
-- lib/procon_bypass_man/procon_display/bypass_hook.rb
 - lib/procon_bypass_man/procon_display/http_request.rb
 - lib/procon_bypass_man/procon_display/http_response.rb
 - lib/procon_bypass_man/procon_display/server.rb
 - lib/procon_bypass_man/procon_display/server_app.rb
 - lib/procon_bypass_man/procon_display/status.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
-- lib/procon_bypass_man/remote_pbm_action/commands/run_remote_pbm_action_dispatch_command.rb
-- lib/procon_bypass_man/remote_pbm_action/commands/update_remote_pbm_action_status_command.rb
-- lib/procon_bypass_man/remote_pbm_action/reboot_os_action.rb
-- lib/procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb
-- lib/procon_bypass_man/remote_pbm_action/stop_pbm_action.rb
-- lib/procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_action_object.rb
+- lib/procon_bypass_man/remote_action.rb
+- lib/procon_bypass_man/remote_action/queue_over_process.rb
+- lib/procon_bypass_man/remote_action/remote_action_object.rb
+- lib/procon_bypass_man/remote_action/remote_action_receiver.rb
+- lib/procon_bypass_man/remote_action/remote_action_sender.rb
+- lib/procon_bypass_man/remote_action/remote_pbm_job.rb
+- lib/procon_bypass_man/remote_action/remote_pbm_job/base_action.rb
+- lib/procon_bypass_man/remote_action/remote_pbm_job/change_pbm_version_action.rb
+- lib/procon_bypass_man/remote_action/remote_pbm_job/commands/run_remote_pbm_job_dispatch_command.rb
+- lib/procon_bypass_man/remote_action/remote_pbm_job/commands/update_remote_pbm_job_status_command.rb
+- lib/procon_bypass_man/remote_action/remote_pbm_job/reboot_os_action.rb
+- lib/procon_bypass_man/remote_action/remote_pbm_job/report_procon_status.rb
+- lib/procon_bypass_man/remote_action/remote_pbm_job/restore_pbm_setting.rb
+- lib/procon_bypass_man/remote_action/remote_pbm_job/stop_pbm_action.rb
+- lib/procon_bypass_man/remote_action/remote_pbm_job/value_objects/remote_pbm_job_object.rb
+- lib/procon_bypass_man/remote_action/task.rb
+- lib/procon_bypass_man/remote_action/task_queue.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
@@ -271,7 +278,7 @@ files:
 - lib/procon_bypass_man/support/retryable.rb
 - lib/procon_bypass_man/support/safe_timeout.rb
 - lib/procon_bypass_man/support/send_device_stats_http_client.rb
-- lib/procon_bypass_man/support/update_remote_pbm_action_status_http_client.rb
+- lib/procon_bypass_man/support/update_remote_pbm_job_status_http_client.rb
 - lib/procon_bypass_man/support/uptime.rb
 - lib/procon_bypass_man/support/usb_device_controller.rb
 - lib/procon_bypass_man/support/yaml_loader.rb

data/lib/procon_bypass_man/procon_display/bypass_hook.rb

@@ -1,12 +0,0 @@
-module ProconBypassMan::ProconDisplay::BypassHook
-  include ProconBypassMan::Callbacks
-
-  define_callbacks :run
-
-  set_callback :run, :after, :write_procon_display_status
-
-  def write_procon_display_status
-    return unless bypass_value.binary
-    ProconBypassMan::ProconDisplay::Status.instance.current = bypass_value.binary.to_procon_reader.to_hash.dup
-  end
-end

data/lib/procon_bypass_man/remote_macro/remote_macro_sender.rb

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

data/lib/procon_bypass_man/remote_macro/task.rb

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

data/lib/procon_bypass_man/remote_macro.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-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