procon_bypass_man 0.1.12 → 0.1.16

data/lib/procon_bypass_man/procon.rb

@@ -20,8 +20,11 @@ class ProconBypassMan::Procon
   end
   reset!
 
+  # @param [string] binary
   def initialize(binary)
-    self.user_operation = ProconBypassMan::Procon::UserOperation.new(binary.dup)
+    self.user_operation = ProconBypassMan::Procon::UserOperation.new(
+      binary.dup
+    )
   end
 
   def status; @@status[:buttons]; end
@@ -43,7 +46,7 @@ class ProconBypassMan::Procon
 
     if ongoing_macro.finished?
       current_layer.macros.each do |macro_name, options|
-        if options[:if_pressed].all? { |b| user_operation.pressed_button?(b) }
+        if user_operation.pressing_all_buttons?(options[:if_pressed])
           @@status[:ongoing_macro] = MacroRegistry.load(macro_name)
         end
       end
@@ -60,7 +63,7 @@ class ProconBypassMan::Procon
           next
         end
 
-        if options[:if_pressed] && options[:if_pressed].all? { |b| user_operation.pressed_button?(b) }
+        if options[:if_pressed] && user_operation.pressing_all_buttons?(options[:if_pressed])
           FlipCache.fetch(key: button, expires_in: options[:flip_interval]) do
             status[button] = !status[button]
           end
@@ -75,7 +78,7 @@ class ProconBypassMan::Procon
         @@status[:ongoing_mode] = ProconBypassMan::Procon::ModeRegistry.load(current_layer.mode)
       end
       if(binary = ongoing_mode.next_binary)
-        self.user_operation.merge(target_binary: binary)
+        self.user_operation.merge([binary].pack("H*"))
       end
       return
     end
@@ -83,24 +86,24 @@ class ProconBypassMan::Procon
     status
   end
 
-  # @return [String<binary>]
+  # @return [ProconBypassMan::Domains::ProcessingProconBinary]
   def to_binary
     if ongoing_mode.name != :manual
-      return user_operation.binary
+      return user_operation.binary.raw
     end
 
     if ongoing_macro.ongoing?
-      step = ongoing_macro.next_step or return(user_operation.binary)
+      step = ongoing_macro.next_step or return(user_operation.binary.raw)
       user_operation.press_button_only(step)
-      return user_operation.binary
+      return user_operation.binary.raw
     end
 
     current_layer.disables.each do |button|
       user_operation.unpress_button(button)
     end
 
-    current_layer.left_analog_stick_caps.each do |button, options|
-      if button.nil? || button.all? { |b| user_operation.pressed_button?(b) }
+    current_layer.left_analog_stick_caps.each do |buttons, options|
+      if buttons.nil? || user_operation.pressing_all_buttons?(buttons)
         options[:force_neutral]&.each do |force_neutral_button|
           user_operation.unpress_button(force_neutral_button)
         end
@@ -116,7 +119,7 @@ class ProconBypassMan::Procon
       end
 
       # 押している時だけ連打
-      if options[:if_pressed] && options[:if_pressed].all? { |b| user_operation.pressed_button?(b) }
+      if options[:if_pressed] && user_operation.pressing_all_buttons?(options[:if_pressed])
         if !status[button]
           user_operation.unpress_button(button)
         end
@@ -128,16 +131,15 @@ class ProconBypassMan::Procon
     end
 
     current_layer.remaps.each do |from_button, to_buttons|
-      if user_operation.pressed_button?(from_button)
+      if user_operation.pressing_button?(from_button)
         user_operation.unpress_button(from_button)
-        # TODO 2重でpressしないようにしたい
         to_buttons[:to].each do |to_button|
           user_operation.press_button(to_button)
         end
       end
     end
 
-    user_operation.binary
+    user_operation.binary.raw
   end
 
   private

data/lib/procon_bypass_man/remote_pbm_action/base_action.rb

@@ -0,0 +1,53 @@
+module ProconBypassMan
+  module RemotePbmAction
+    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::UpdateRemotePbmActionStatusCommand.new(pbm_job_uuid: pbm_job_uuid).execute(to_status: :failed)
+      end
+
+      # @return [void]
+      def be_in_progress
+        ProconBypassMan::UpdateRemotePbmActionStatusCommand.new(pbm_job_uuid: pbm_job_uuid).execute(to_status: :in_progress)
+      end
+
+      # @return [void]
+      def be_processed
+        ProconBypassMan::UpdateRemotePbmActionStatusCommand.new(pbm_job_uuid: pbm_job_uuid).execute(to_status: :processed)
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/remote_pbm_action/change_pbm_version_action.rb

@@ -0,0 +1,25 @@
+module ProconBypassMan
+  module RemotePbmAction
+    class ChangePbmVersionAction < BaseAction
+
+      def action_content(args: )
+        require "pbmenv"
+        ProconBypassMan.logger.info "execute ChangePbmVersionAction!"
+        pbm_version = args["pbm_version"] or raise(ProconBypassMan::RemotePbmAction::NeedPbmVersionError, "pbm_versionが必要です, #{args.inspect}")
+        Pbmenv.install(pbm_version)
+        Pbmenv.use(pbm_version)
+        `reboot` # symlinkの参照先が変わるのでrebootする必要がある
+      end
+
+      private
+
+      def before_action_callback
+        be_processed
+      end
+
+      def after_action_callback
+        # no-op
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/remote_pbm_action/commands/update_remote_pbm_action_status_command.rb

@@ -0,0 +1,24 @@
+module ProconBypassMan
+  class UpdateRemotePbmActionStatusCommand
+    # @param [String] pbm_job_uuid
+    def initialize(pbm_job_uuid: )
+      @pbm_job_uuid = pbm_job_uuid
+    end
+
+    # @param [String] to_status
+    # @return [void]
+    def execute(to_status: )
+      ProconBypassMan::UpdateRemotePbmActionStatusHttpClient.new(
+        path: path,
+        server_pool: ProconBypassMan.config.server_pool,
+      ).put(to_status: to_status)
+    end
+
+    private
+
+    # @return [String]
+    def path
+      "/api/devices/#{ProconBypassMan.device_id}/pbm_jobs/#{@pbm_job_uuid}"
+    end
+  end
+end

data/lib/procon_bypass_man/remote_pbm_action/reboot_os_action.rb

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

data/lib/procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb

@@ -0,0 +1,28 @@
+module ProconBypassMan
+  module RemotePbmAction
+    class RestorePbmSettingAction < BaseAction
+
+      def action_content(args: )
+        require "pbmenv"
+        ProconBypassMan.logger.info "execute RestorePbmSettingAction!"
+        setting = args.dig("setting") or raise(ProconBypassMan::RemotePbmAction::NeedPbmVersionError, "settingが必要です, #{args.inspect}")
+        File.write(
+          ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
+          setting.to_yaml,
+        )
+        ProconBypassMan.hot_reload!
+      end
+
+      private
+
+      def before_action_callback
+        be_in_progress
+      end
+
+      def after_action_callback
+        be_processed
+      end
+    end
+  end
+end
+

data/lib/procon_bypass_man/remote_pbm_action/stop_pbm_action.rb

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

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

@@ -0,0 +1,38 @@
+module ProconBypassMan
+  class RemotePbmActionObject
+    # valueobjectがvalidatorの責務も持っている. 今度分離する
+    class ValidationError < StandardError; end
+    class MustBeNotNilError < ValidationError; end
+    class NonSupportAction < ValidationError; end
+
+    attr_accessor :action, :status, :uuid, :created_at, :job_args
+
+    # @param [String] action
+    # @param [String] status
+    # @param [String] #uuid
+    # @param [Time] created_at
+    # @return [Hash] job_args
+    def initialize(action: , status:, uuid:, created_at:, job_args: )
+      self.action = action
+      self.status = status
+      self.uuid = uuid
+      self.created_at = created_at
+      self.job_args = job_args
+
+      freeze
+    end
+
+    # @raise [MustBeNotNilError]
+    # @raise [NonSupportAction]
+    # @return [void]
+    def validate!
+      self.action or raise MustBeNotNilError, "actionは値が必須です"
+      self.status or raise MustBeNotNilError, "statusは値が必須です"
+      self.uuid or raise MustBeNotNilError, "uuidは値が必須です"
+
+      unless ProconBypassMan::RemotePbmAction::ACTIONS.include?(action)
+        raise NonSupportAction, "知らないアクションです"
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/remote_pbm_action.rb

@@ -0,0 +1,32 @@
+module ProconBypassMan
+  module RemotePbmAction
+    require "procon_bypass_man/remote_pbm_action/base_action"
+    require "procon_bypass_man/remote_pbm_action/change_pbm_version_action"
+    require "procon_bypass_man/remote_pbm_action/reboot_os_action"
+    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"
+
+    ACTION_CHANGE_PBM_VERSION = "change_pbm_version"
+    ACTION_REBOOT_OS = "reboot_os"
+    ACTION_STOP_PBM = "stop_pbm"
+    ACTION_RESTORE_SETTING = "restore_pbm_setting"
+
+    ACTIONS = [
+      ACTION_CHANGE_PBM_VERSION,
+      ACTION_REBOOT_OS,
+      ACTION_STOP_PBM,
+      ACTION_RESTORE_SETTING,
+    ]
+
+    STATUS_FAILED = :failed
+    STATUS_IN_PROGRESS = :in_progress
+    STATUS_PROCESSED = :processed
+
+    ACTION_STATUSES = [
+      STATUS_FAILED,
+      STATUS_IN_PROGRESS,
+      STATUS_PROCESSED,
+    ]
+  end
+end

data/lib/procon_bypass_man/runner.rb

@@ -1,17 +1,15 @@
 require_relative "io_monitor"
-require_relative "uptime"
-require_relative "boot_message"
-require_relative "background/job_runner"
 
 class ProconBypassMan::Runner
   class InterruptForRestart < StandardError; end
 
+  include ProconBypassMan::SignalHandler
+
   def initialize(gadget: , procon: )
     @gadget = gadget
     @procon = procon
 
     ProconBypassMan::PrintBootMessageCommand.execute
-    ProconBypassMan::Background::JobRunner.start!
   end
 
   def run
@@ -28,9 +26,11 @@ class ProconBypassMan::Runner
 
     loop do
       $will_terminate_token = false
-      main_loop_pid = fork { main_loop }
+      # NOTE メインプロセスではThreadをいくつか起動しているので念のためパフォーマンスを優先するためにforkしていく
+      main_loop_pid = Kernel.fork { ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute }
 
       begin
+        # TODO 小プロセスが消滅した時に、メインプロセスは生き続けてしまい、何もできなくなる問題がある
         while(readable_io = IO.select([self_read]))
           signal = readable_io.first[0].gets.strip
           handle_signal(signal)
@@ -39,14 +39,14 @@ class ProconBypassMan::Runner
         $will_terminate_token = true
         Process.kill("TERM", main_loop_pid)
         Process.wait
-        ProconBypassMan.logger.info("Reloading config file")
+        ProconBypassMan::PrintMessageCommand.execute(text: "Reloading config file")
         begin
           ProconBypassMan::ButtonsSettingConfiguration::Loader.reload_setting
+          ProconBypassMan::SendReloadConfigEventCommand.execute
         rescue ProconBypassMan::CouldNotLoadConfigError
           ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。再読み込みができませんでした")
         end
-        ProconBypassMan::SendReloadConfigEventCommand.execute
-        ProconBypassMan.logger.info("バイパス処理を再開します")
+        ProconBypassMan::PrintMessageCommand.execute(text: "バイパス処理を再開します")
       rescue Interrupt
         $will_terminate_token = true
         Process.kill("TERM", main_loop_pid)
@@ -59,93 +59,4 @@ class ProconBypassMan::Runner
       end
     end
   end
-
-  private
-
-  def main_loop
-    ProconBypassMan::IOMonitor.start!
-    ProconBypassMan::Background::JobRunner.start!
-
-    # gadget => procon
-    # 遅くていい
-    monitor1 = ProconBypassMan::IOMonitor.new(label: "switch -> procon")
-    monitor2 = ProconBypassMan::IOMonitor.new(label: "procon -> switch")
-    ProconBypassMan.logger.info "Thread1を起動します"
-    t1 = Thread.new do
-      timer = ProconBypassMan::Timer.new(timeout: Time.now + 10)
-      bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor1)
-      loop do
-        break if $will_terminate_token
-        timer.throw_if_timeout!
-        bypass.send_gadget_to_procon!
-        sleep(0.005)
-      rescue ProconBypassMan::Timer::Timeout
-        ProconBypassMan.logger.info "10秒経過したのでThread1を終了します"
-        monitor1.shutdown
-        puts "10秒経過したのでThread1を終了します"
-        break
-      rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
-        ProconBypassMan::SendErrorCommand.execute(error: "Switchとの切断されました.終了処理を開始します. #{e.full_message}")
-        Process.kill "TERM", Process.ppid
-      rescue Errno::ETIMEDOUT => e
-        # TODO まれにこれが発生する. 再接続したい
-        ProconBypassMan::SendErrorCommand.execute(error: "Switchと意図せず切断されました.終了処理を開始します. #{e.full_message}")
-        Process.kill "TERM", Process.ppid
-      end
-      ProconBypassMan.logger.info "Thread1を終了します"
-    end
-
-    # procon => gadget
-    # シビア
-    ProconBypassMan.logger.info "Thread2を起動します"
-    t2 = Thread.new do
-      bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor2)
-      loop do
-        break if $will_terminate_token
-        bypass.send_procon_to_gadget!
-      rescue EOFError => e
-        ProconBypassMan::SendErrorCommand.execute(error: "Proconが切断されました。終了処理を開始します. #{e.full_message}")
-        Process.kill "TERM", Process.ppid
-      rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
-        ProconBypassMan::SendErrorCommand.execute(error: "Proconが切断されました。終了処理を開始します2. #{e.full_message}")
-        Process.kill "TERM", Process.ppid
-      end
-      ProconBypassMan.logger.info "Thread2を終了します"
-    end
-
-    self_read, self_write = IO.pipe
-    %w(TERM INT).each do |sig|
-      begin
-        trap sig do
-          self_write.puts(sig)
-        end
-      rescue ArgumentError
-        puts "プロセスでSignal #{sig} not supported"
-      end
-    end
-
-    ProconBypassMan.logger.info "子プロセスでgraceful shutdownの準備ができました"
-    begin
-      while(readable_io = IO.select([self_read]))
-        signal = readable_io.first[0].gets.strip
-        handle_signal(signal)
-      end
-    rescue Interrupt
-      $will_terminate_token = true
-      [t1, t2].each(&:join)
-      @gadget&.close
-      @procon&.close
-      exit 1
-    end
-  end
-
-  def handle_signal(sig)
-    ProconBypassMan.logger.info "#{$$}で#{sig}を受け取りました"
-    case sig
-    when 'USR2'
-      raise InterruptForRestart
-    when 'INT', 'TERM'
-      raise Interrupt
-    end
-  end
 end

data/lib/procon_bypass_man/scheduler.rb

@@ -0,0 +1,85 @@
+module ProconBypassMan
+  class Scheduler
+    class Schedule
+      attr_accessor :klass, :args, :interval, :next_enqueue_at
+
+      # @param [any] klass
+      # @param [Array] args
+      # @param [Integer] interval
+      def initialize(klass: , args: , interval: )
+        self.klass = klass
+        self.args = args
+        self.interval = interval
+        self.next_enqueue_at = Time.now
+      end
+
+      # @return [void]
+      def enqueue
+        klass.perform_async(*unwrap_args(args))
+        set_next_enqueue_at!
+      end
+
+      # @return [boolean]
+      def past_interval?
+        next_enqueue_at < Time.now
+      end
+
+      private
+
+      # @return [void]
+      def set_next_enqueue_at!
+        self.next_enqueue_at = Time.now + interval
+      end
+
+      # @param [Array] args
+      # @return [void]
+      def unwrap_args(args)
+        args.map do |arg|
+          case arg
+          when Proc
+            arg.call
+          else
+            arg
+          end
+        end
+      end
+    end
+
+    # @return [Hash]
+    def self.schedules
+      @@schedules
+    end
+
+    @@schedules = {}
+
+    def self.start!
+      register_schedules
+
+      @@thread = Thread.start do
+        loop do
+          schedules.each do |_key, schedule|
+            if schedule.past_interval?
+              schedule.enqueue
+            end
+          end
+          sleep 10
+        end
+      end
+    end
+
+    def self.register_schedules
+      register(
+        schedule: Schedule.new(
+          klass: ProconBypassMan::SyncDeviceStatsJob,
+          args: [->{ ProconBypassMan::DeviceStatus.current }],
+          interval: 60,
+        )
+      )
+    end
+
+    # @param [Schedule] schedule
+    def self.register(schedule: )
+      schedules[schedule.klass] = schedule
+    end
+  end
+end

data/lib/procon_bypass_man/support/compress_array.rb

@@ -0,0 +1,56 @@
+module ProconBypassMan
+  class CompressArray
+    class CompressibleValue
+      # @params [String] prev
+      # @params [String] current
+      def initialize(prev, current)
+        @prev = prev
+        @current = current
+      end
+
+      # @return [Boolean]
+      def compress?
+        @prev.include?(@current)
+      end
+
+      # @return [String]
+      def to_s_with_mark
+        if /^(.+) \* (\d+)/ =~ @prev
+          value = $1
+          count = $2
+          return "#{value} * #{count.to_i + 1}"
+        end
+        if /^(.+)/ =~ @prev
+          value = $1
+          return "#{value} * 1"
+        end
+      end
+    end
+
+    def initialize(array)
+      @array = array
+    end
+
+    # @return [Array<String>]
+    def compress
+      previous_value = nil
+      @array.reduce([]) do |acc, item|
+        if previous_value.nil?
+          acc << item
+          previous_value = item
+          next acc
+        end
+
+        if CompressibleValue.new(previous_value, item).compress?
+          registered_value = acc.pop
+          acc << CompressibleValue.new(registered_value, item).to_s_with_mark
+        else
+          acc << item
+        end
+
+        previous_value = item
+        next acc
+      end
+    end
+  end
+end