procon_bypass_man 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4ffa6c5a0eca5298143505c133f6895f7bb33b6061a36e6123c27e19a0ffcbb
-  data.tar.gz: 74e77a823d913769a75b2dd698991bb1fed6a62a1da9a65928e00b86773e90df
+  metadata.gz: 2f19608c134a980243f4e45da1a1685367dd4bffc114482682b5d8d6bef03a90
+  data.tar.gz: c0ce801d735e63e5d6a385854ad83abb08fe044342bda63b5d70d2d50b3589f4
 SHA512:
-  metadata.gz: 90cbb299a402bbab3fae219fc17b359155b48c67cf34761ad69c63ee5ba72ed7cf356d5829ee003d19558c7418f07444d7f35619d82bebc124975ab1c40cb85f
-  data.tar.gz: f03f39550078285114b0a7ac209938dee7b335c99689cba48ed4d4f4d62e659b0fb1fcea51bd800acfe61839cc92c235f5112e3adc5a3896e033f5dbfa224373
+  metadata.gz: 11e84f9b7fa368adc1cbbb8593aca61d2a1a362453a13c5b226912d490c82933d476072f11ecb36226657107aa68b08be734ac19ec8901b56a00deb980d218b9
+  data.tar.gz: 642a6813619dccbb9d28f634bb7bb866ec92a2ed34fac254336562ed462512b1e9eb6ec2672dae17727e9c6790651f4e481e24a9a919dbd87381e4a457c62796

data/CHANGELOG.md

@@ -1,7 +1,10 @@
-## [0.3.5] - 2022-2-9
-* 設定ファイルに起動な必要なPBMのバージョンを表記できるようになりました
+## [0.3.6] 2023-03-12
+- プロコンの入力状態をpbm-cloudサーバに送信できるようになりました
+
+## [0.3.5] - 2023-2-9
+* 設定ファイルに起動に必要なPBMのバージョンを表記できるようになりました
   * https://github.com/splaplapla/procon_bypass_man/pull/238
-* レイヤー変更ボタン(prefix_keys_for_changing_layer)が空欄の時に設定ファイルをエラーにしないようになりました
+* レイヤー変更ボタン(prefix_keys_for_changing_layer)が空欄の時に設定ファイルをエラーが起きないようにしました
 * PBM-CloudからPBMをアップグレードするときに、古いバージョンを削除するようにしました
 
 ## [0.3.4] - 2022-12-26

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.3.5)
+    procon_bypass_man (0.3.6)
       action_cable_client
       blue_green_process (= 0.1.4.2)
       pbmenv (>= 0.1.11)

data/Steepfile

@@ -40,7 +40,6 @@ target :lib do
   check 'lib/procon_bypass_man/support/on_memory_cache'
   check 'lib/procon_bypass_man/support/uptime.rb'
   check 'lib/procon_bypass_man/support/safe_timeout'
-  check 'lib/procon_bypass_man/support/update_remote_pbm_action_status_http_client'
   check 'lib/procon_bypass_man/support/compress_array'
 
   signature 'sig'

data/bin/generate_output_report

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "procon_bypass_man"
+require "pry"
+
+# \x30のみ生成する
+# Usage:
+#  $ `generate_output_report x zl y` のように、引数にボタン名を渡す
+
+no_action_binary = ["30f28100800078c77448287509550274ff131029001b0022005a0271ff191028001e00210064027cff1410280020002100000000000000000000000000000000"].pack("H*")
+user_operation = ProconBypassMan::Procon::UserOperation.new(no_action_binary)
+
+ARGV.map { |x| x.to_sym }.each do |button|
+  user_operation.press_button(button)
+end
+
+puts user_operation.binary.unpack.first

data/lib/procon_bypass_man/background/jobs/post_completed_remote_action_job.rb

@@ -0,0 +1,20 @@
+class ProconBypassMan::PostCompletedRemoteActionJob < ProconBypassMan::BaseJob
+  extend ProconBypassMan::HasExternalApiSetting
+
+  # @param [Symbol] status
+  def self.perform(job_id)
+    ProconBypassMan::RemoteMacroHttpClient.new(
+      path: path,
+      server: api_server,
+    ).post(job_id: job_id)
+  end
+
+  def self.path
+    device_id = ProconBypassMan.device_id
+    "/api/devices/#{ProconBypassMan.device_id}/completed_pbm_remote_macro_jobs"
+  end
+
+  def self.re_enqueue_if_failed
+    true
+  end
+end

data/lib/procon_bypass_man/background/jobs/report_info_log_job.rb

@@ -0,0 +1,11 @@
+class ProconBypassMan::ReportInfoLogJob < ProconBypassMan::ReportEventBaseJob
+  extend ProconBypassMan::HasExternalApiSetting
+
+  # @param [String] body
+  def self.perform(body)
+    ProconBypassMan::ReportHttpClient.new(
+      path: path,
+      server: api_server,
+    ).post(body: body, event_type: :info)
+  end
+end

data/lib/procon_bypass_man/background.rb

@@ -10,6 +10,7 @@ require "procon_bypass_man/background/jobs/report_error_reload_config_job"
 require "procon_bypass_man/background/jobs/report_load_config_job"
 require "procon_bypass_man/background/jobs/report_error_job"
 require "procon_bypass_man/background/jobs/report_warning_job"
+require "procon_bypass_man/background/jobs/report_info_log_job"
 require "procon_bypass_man/background/jobs/report_completed_upgrade_pbm_job"
 require "procon_bypass_man/background/jobs/report_procon_performance_measurements_job"
 require "procon_bypass_man/background/jobs/sync_device_stats_job"

data/lib/procon_bypass_man/bypass/procon_to_switch.rb

@@ -47,6 +47,9 @@ class ProconBypassMan::Bypass::ProconToSwitch
           self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: raw_output)
         end
 
+        # 後続処理で入力値を取得できるように詰めておく
+        ProconBypassMan::ProconDisplay::Status.instance.current = bypass_value.binary.to_procon_reader.to_hash
+
         result = measurement.record_write_time do
           begin
             ProconBypassMan::Retryable.retryable(tries: 5, on_no_retry: [Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN, Errno::ETIMEDOUT]) do

data/lib/procon_bypass_man/commands/send_info_log_command.rb

@@ -0,0 +1,11 @@
+class ProconBypassMan::SendInfoLogCommand
+  # @param [String] message
+  # @return [void]
+  def self.execute(message: , stdout: true)
+    body = message
+    ProconBypassMan.logger.info(body)
+    puts body if stdout
+
+    ProconBypassMan::ReportInfoLogJob.perform(body)
+  end
+end

data/lib/procon_bypass_man/commands.rb

@@ -5,3 +5,4 @@ require "procon_bypass_man/commands/write_device_id_command"
 require "procon_bypass_man/commands/send_reload_config_event_command"
 require "procon_bypass_man/commands/send_error_command"
 require "procon_bypass_man/commands/send_warning_command"
+require "procon_bypass_man/commands/send_info_log_command"

data/lib/procon_bypass_man/configuration.rb

@@ -149,7 +149,7 @@ class ProconBypassMan::Configuration
   end
 
   # @return [Boolean]
-  def enable_remote_macro?
+  def enable_remote_action?
     enable_ws?
   end
 

data/lib/procon_bypass_man/procon.rb

@@ -127,17 +127,28 @@ class ProconBypassMan::Procon
       end
     end
 
-    # remote macro
-    if task = ProconBypassMan::RemoteMacro::TaskQueueInProcess.non_blocking_shift
-      no_op_step = :wait_for_0_3 # マクロの最後に固まって最後の入力をし続けるので、無の状態を最後に注入する
-      BlueGreenProcess::SharedVariable.extend_run_on_this_process = true
-      ProconBypassMan::Procon::MacroRegistry.cleanup_remote_macros!
-      macro_name = task.name || "RemoteMacro-#{task.steps.join}".to_sym
-      task.steps << no_op_step
-      ProconBypassMan::Procon::MacroRegistry.install_plugin(macro_name, steps: task.steps, macro_type: :remote)
-      @@status[:ongoing_macro] = MacroRegistry.load(macro_name, macro_type: :remote) do
-        GC.start # NOTE: extend_run_on_this_process = true するとGCされなくなるので手動で呼び出す
-        ProconBypassMan::PostCompletedRemoteMacroJob.perform_async(task.uuid)
+    # remote macro or pbm action
+    if task = ProconBypassMan::RemoteAction::TaskQueueInProcess.non_blocking_shift
+      case task.type
+      when ProconBypassMan::RemoteAction::Task::TYPE_MACRO
+        no_op_step = :wait_for_0_3 # マクロの最後に固まって最後の入力をし続けるので、無の状態を最後に注入する
+        BlueGreenProcess::SharedVariable.extend_run_on_this_process = true
+        ProconBypassMan::Procon::MacroRegistry.cleanup_remote_macros!
+        macro_name = task.name || "RemoteMacro-#{task.steps.join}".to_sym
+        task.steps << no_op_step
+        ProconBypassMan::Procon::MacroRegistry.install_plugin(macro_name, steps: task.steps, macro_type: :remote)
+        @@status[:ongoing_macro] = MacroRegistry.load(macro_name, macro_type: :remote) do
+          GC.start # NOTE: extend_run_on_this_process = true するとGCされなくなるので手動で呼び出す
+          ProconBypassMan::PostCompletedRemoteMacroJob.perform_async(task.uuid)
+        end
+      when ProconBypassMan::RemoteAction::Task::TYPE_ACTION
+        ProconBypassMan::RemoteAction::RemotePbmJob::RunRemotePbmJobDispatchCommand.execute(
+          action: task.action,
+          uuid: task.uuid,
+          job_args: task.job_args,
+        )
+      else
+        ProconBypassMan::SendErrorCommand.execute(error: 'unknown type of remote pbm action')
       end
     end
 

data/lib/procon_bypass_man/procon_display/status.rb

@@ -10,6 +10,7 @@ class ProconBypassMan::ProconDisplay::Status
 
   # @return [void]
   # @param [Hash] value
+  # NOTE: valueには参照が入ってくるので変更する時はdupすること
   def current=(value)
     if value.is_a?(Hash)
       @current = value

data/lib/procon_bypass_man/procon_display.rb

@@ -8,4 +8,3 @@ require "procon_bypass_man/procon_display/server_app"
 require "procon_bypass_man/procon_display/status"
 require "procon_bypass_man/procon_display/http_response"
 require "procon_bypass_man/procon_display/http_request"
-require "procon_bypass_man/procon_display/bypass_hook"

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

@@ -1,4 +1,4 @@
-class ProconBypassMan::RemoteMacro::QueueOverProcess
+class ProconBypassMan::RemoteAction::QueueOverProcess
   extend ProconBypassMan::CanOverProcess
 
   include Singleton
@@ -7,7 +7,7 @@ class ProconBypassMan::RemoteMacro::QueueOverProcess
 
   # @override
   def self.enable?
-    ProconBypassMan.config.enable_remote_macro?
+    ProconBypassMan.config.enable_remote_action?
   end
 
   # @override

data/lib/procon_bypass_man/{remote_macro/remote_macro_object.rb → remote_action/remote_action_object.rb}

@@ -1,4 +1,4 @@
-class ProconBypassMan::RemoteMacro::RemoteMacroObject
+class ProconBypassMan::RemoteAction::RemoteActionObject
   # valueobjectがvalidatorの責務も持っている. 今度分離する
   class ValidationError < StandardError; end
   class MustBeNotNilError < ValidationError; end

data/lib/procon_bypass_man/{remote_macro/remote_macro_receiver.rb → remote_action/remote_action_receiver.rb}

@@ -1,13 +1,14 @@
-class ProconBypassMan::RemoteMacroReceiver
+# FIXME: BypassProcessSenderみたいにする
+class ProconBypassMan::RemoteActionReceiver
   # forkしたプロセスで動かすクラス。sock経由で命令を受け取ってmacoのキューに積んでいく
   def self.start_with_foreground!
-    return unless ProconBypassMan.config.enable_remote_macro?
+    return unless ProconBypassMan.config.enable_remote_action?
 
     run
   end
 
   def self.start!
-    return unless ProconBypassMan.config.enable_remote_macro?
+    return unless ProconBypassMan.config.enable_remote_action?
 
     Thread.start do
       start_with_foreground!
@@ -15,7 +16,7 @@ class ProconBypassMan::RemoteMacroReceiver
   end
 
   def self.run
-    while(task = ProconBypassMan::RemoteMacro::QueueOverProcess.pop)
+    while(task = ProconBypassMan::RemoteAction::QueueOverProcess.pop)
       receive(task)
     end
     shutdown
@@ -24,10 +25,10 @@ class ProconBypassMan::RemoteMacroReceiver
   end
 
 
-  # @param [ProconBypassMan::RemoteMacro::Task] task
+  # @param [ProconBypassMan::RemoteAction::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)
+    ProconBypassMan.logger.info "[remote macro][receiver] name: #{task.name}, uuid: #{task.uuid}, steps: #{task.steps}, type: #{task.type}"
+    ProconBypassMan::RemoteAction::TaskQueueInProcess.push(task)
     true
   end
 

data/lib/procon_bypass_man/remote_action/remote_action_sender.rb

@@ -0,0 +1,9 @@
+# FIXME: RemoteMacroSenderという名前をやめる。BypassProcessSenderみたいにする
+class ProconBypassMan::RemoteActionSender
+  def self.execute(name: , uuid: , steps: , type: )
+    ProconBypassMan.logger.info "[remote macro][sender] name: #{name}, uuid: #{uuid}, steps: #{steps}, type: #{type}"
+    ProconBypassMan::RemoteAction::QueueOverProcess.push(
+      ProconBypassMan::RemoteAction::Task.new(name, uuid, steps, type)
+    )
+  end
+end

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

@@ -0,0 +1,55 @@
+module ProconBypassMan
+  module RemoteAction
+    module RemotePbmJob
+      class ActionUnexpectedError < StandardError; end
+      class NeedPbmVersionError < ActionUnexpectedError; end
+
+      class BaseAction
+        attr_accessor :pbm_job_uuid
+
+        # @param [String] pbm_job_uuid
+        def initialize(pbm_job_uuid: )
+          self.pbm_job_uuid = pbm_job_uuid
+        end
+
+        # @return [void]
+        def action_content(_args)
+          raise NotImplementedError, nil
+        end
+
+        # @param [Hash] args
+        # @return [void]
+        def run!(job_args: )
+          before_action_callback
+          action_content(args: job_args)
+          after_action_callback
+        rescue => e
+          be_failed
+          ProconBypassMan::SendErrorCommand.execute(error: e)
+        end
+
+        private
+
+        # @return [void]
+        def before_action_callback; end
+        # @return [void]
+        def after_action_callback; end
+
+        # @return [void]
+        def be_failed
+          ProconBypassMan::UpdateRemotePbmJobStatusCommand.new(pbm_job_uuid: pbm_job_uuid).execute(to_status: :failed)
+        end
+
+        # @return [void]
+        def be_in_progress
+          ProconBypassMan::UpdateRemotePbmJobStatusCommand.new(pbm_job_uuid: pbm_job_uuid).execute(to_status: :in_progress)
+        end
+
+        # @return [void]
+        def be_processed
+          ProconBypassMan::UpdateRemotePbmJobStatusCommand.new(pbm_job_uuid: pbm_job_uuid).execute(to_status: :processed)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+module ProconBypassMan
+  module RemoteAction
+    module RemotePbmJob
+      class ChangePbmVersionAction < BaseAction
+
+        def action_content(args: )
+          require "pbmenv"
+          ProconBypassMan.logger.info "execute ChangePbmVersionAction!"
+          pbm_version = args["pbm_version"] or raise(ProconBypassMan::RemotePbmJob::NeedPbmVersionError, "pbm_versionが必要です, #{args.inspect}")
+          Pbmenv.uninstall(pbm_version) # 途中でシャットダウンしてしまった、とか状態が途中の状態かもしれないので一旦消す
+          Pbmenv.install(pbm_version, enable_pbm_cloud: true)
+          Pbmenv.use(pbm_version)
+          Pbmenv.clean(10)
+          ProconBypassMan.logger.info "#{pbm_version}へアップグレードしました"
+          ProconBypassMan::ReportCompletedUpgradePbmJob.perform
+          `reboot` # symlinkの参照先が変わるのでrebootする必要がある
+        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_action/remote_pbm_job/commands/run_remote_pbm_job_dispatch_command.rb

@@ -0,0 +1,29 @@
+module ProconBypassMan
+  module RemoteAction
+    module RemotePbmJob
+      class RunRemotePbmJobDispatchCommand
+        # @param [String] action
+        # @param [String] uuid
+        # @return [void]
+        def self.execute(action: , uuid: , job_args: )
+          case action
+          when ProconBypassMan::RemoteAction::RemotePbmJob::ACTION_CHANGE_PBM_VERSION
+            ProconBypassMan::RemoteAction::RemotePbmJob::ChangePbmVersionAction.new(pbm_job_uuid: uuid).run!(job_args: job_args)
+          when ProconBypassMan::RemoteAction::RemotePbmJob::ACTION_STOP_PBM
+            ProconBypassMan::RemoteAction::RemotePbmJob::StopPbmJob.new(pbm_job_uuid: uuid).run!(job_args: {})
+          when ProconBypassMan::RemoteAction::RemotePbmJob::ACTION_REBOOT_OS
+            ProconBypassMan::RemoteAction::RemotePbmJob::RebootOsAction.new(pbm_job_uuid: uuid).run!(job_args: {})
+          when ProconBypassMan::RemoteAction::RemotePbmJob::ACTION_RESTORE_SETTING
+            ProconBypassMan::RemoteAction::RemotePbmJob::RestorePbmSettingAction.new(pbm_job_uuid: uuid).run!(job_args: job_args)
+          when ProconBypassMan::RemoteAction::RemotePbmJob::ACTION_REPORT_PORCON_STATUS
+            ProconBypassMan::RemoteAction::RemotePbmJob::ReportProconStatusAction.new(pbm_job_uuid: uuid).run!(job_args: {})
+          else
+            raise "#{action}は対応していないアクションです"
+          end
+        rescue ProconBypassMan::RemoteAction::RemotePbmJob::ActionUnexpectedError => e
+          ProconBypassMan::SendErrorCommand.execute(error: e)
+        end
+      end
+    end
+  end
+end

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