procon_bypass_man 0.1.10 → 0.1.14

data/lib/procon_bypass_man/remote_pbm_action/lib/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,17 @@
+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
+    end
+  end
+end

data/lib/procon_bypass_man/remote_pbm_action/stop_pbm_action.rb

@@ -0,0 +1,17 @@
+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
+    end
+  end
+end

data/lib/procon_bypass_man/remote_pbm_action.rb

@@ -0,0 +1,31 @@
+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/lib/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_setting" # TODO
+
+    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,14 +1,19 @@
 require_relative "io_monitor"
-require_relative "uptime"
 require_relative "boot_message"
 
 class ProconBypassMan::Runner
   class InterruptForRestart < StandardError; end
 
-  def run
-    first_negotiation
-    print_booted_message
+  include ProconBypassMan::SignalHandler
+
+  def initialize(gadget: , procon: )
+    @gadget = gadget
+    @procon = procon
+
+    ProconBypassMan::PrintBootMessageCommand.execute
+  end
 
+  def run
     self_read, self_write = IO.pipe
     %w(TERM INT USR1 USR2).each do |sig|
       begin
@@ -16,13 +21,14 @@ class ProconBypassMan::Runner
           self_write.puts(sig)
         end
       rescue ArgumentError
-        ProconBypassMan.logger.error("Signal #{sig} not supported")
+        ProconBypassMan::SendErrorCommand.execute(error: "Signal #{sig} not supported")
       end
     end
 
     loop do
       $will_terminate_token = false
-      main_loop_pid = fork { main_loop }
+      # TODO forkしないでThreadでいいのでは？
+      main_loop_pid = Kernel.fork { ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute }
 
       begin
         while(readable_io = IO.select([self_read]))
@@ -36,9 +42,9 @@ class ProconBypassMan::Runner
         ProconBypassMan.logger.info("Reloading config file")
         begin
           ProconBypassMan::ButtonsSettingConfiguration::Loader.reload_setting
-          puts "設定ファイルの再読み込みができました"
+          ProconBypassMan::SendReloadConfigEventCommand.execute
         rescue ProconBypassMan::CouldNotLoadConfigError
-          ProconBypassMan.logger.error "設定ファイルが不正です。再読み込みができませんでした"
+          ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。再読み込みができませんでした")
         end
         ProconBypassMan.logger.info("バイパス処理を再開します")
       rescue Interrupt
@@ -53,108 +59,4 @@ class ProconBypassMan::Runner
       end
     end
   end
-
-  private
-
-  def main_loop
-    ProconBypassMan::IOMonitor.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を終了します"
-        puts "10秒経過したのでThread1を終了します"
-        break
-      rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
-        ProconBypassMan.logger.error "Proconが切断されました.終了処理を開始します"
-        Process.kill "TERM", Process.ppid
-      rescue Errno::ETIMEDOUT => e
-        # TODO まれにこれが発生する. 再接続したい
-        ProconBypassMan::ErrorReporter.report(body: e)
-        ProconBypassMan.logger.error "Switchとの切断されました.終了処理を開始します"
-        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.logger.error "Proconと通信ができませんでした.終了処理を開始します"
-        Process.kill "TERM", Process.ppid
-      rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
-        ProconBypassMan.logger.error "Proconが切断されました。終了処理を開始します"
-        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 first_negotiation
-    @gadget, @procon = ProconBypassMan::DeviceConnector.connect
-  rescue ProconBypassMan::Timer::Timeout
-    ::ProconBypassMan.logger.error "デバイスとの通信でタイムアウトが起きて接続ができませんでした。"
-    @gadget&.close
-    @procon&.close
-    raise ::ProconBypassMan::EternalConnectionError
-  end
-
-  def handle_signal(sig)
-    ProconBypassMan.logger.info "#{$$}で#{sig}を受け取りました"
-    case sig
-    when 'USR2'
-      raise InterruptForRestart
-    when 'INT', 'TERM'
-      raise Interrupt
-    end
-  end
-
-  # @return [void]
-  def print_booted_message
-    message = ProconBypassMan::BootMessage.new
-    ProconBypassMan.logger.info(message.to_s)
-    Thread.new { ProconBypassMan::Reporter.report(body: message.to_hash) }
-    puts message.to_s
-  end
 end

data/lib/procon_bypass_man/scheduler.rb

@@ -0,0 +1,92 @@
+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::FetchAndRunRemotePbmActionJob,
+          args: [],
+          interval: 3,
+        )
+      )
+      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/splatoon2/macro/fast_return.rb

@@ -0,0 +1,15 @@
+module ProconBypassMan
+  module Splatoon2
+    module Macro
+      module FastReturn
+        def self.name
+          :fast_return
+        end
+
+        def self.steps
+          [:x, :down, :a, :a].freeze
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/splatoon2/macro/jump_to_left_key.rb

@@ -0,0 +1,15 @@
+module ProconBypassMan
+  module Splatoon2
+    module Macro
+      module JumpToLeftKey
+        def self.name
+          :jump_to_left_key
+        end
+
+        def self.steps
+          [:x, :left, :a, :a].freeze
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/splatoon2/macro/jump_to_right_key.rb

@@ -0,0 +1,15 @@
+module ProconBypassMan
+  module Splatoon2
+    module Macro
+      module JumpToRightKey
+        def self.name
+          :jump_to_right_key
+        end
+
+        def self.steps
+          [:x, :right, :a, :a].freeze
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/splatoon2/macro/jump_to_up_key.rb

@@ -0,0 +1,15 @@
+module ProconBypassMan
+  module Splatoon2
+    module Macro
+      module JumpToUpKey
+        def self.name
+          :jump_to_up_key
+        end
+
+        def self.steps
+          [:x, :up, :a, :a].freeze
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/splatoon2/mode/guruguru.rb

@@ -0,0 +1,57 @@
+module ProconBypassMan
+  module Splatoon2
+    module Mode
+      module Guruguru
+        def self.binaries
+          [ "309481408000362d684658750968f71cfe2c0e51000001480053f71ffedf0d4b000a013d00caf6ecfd4c0d480003011c00000000000000000000000000000000",
+            "30978140800037dd6748687509fdf6adfded0d6d0081005d00eef68dfdef0d6d00830059001bf791fd140e720090005400000000000000000000000000000000",
+            "309a8140800038cd67495875099af821fe120e40006400880042f8fcfdfd0d470067008900d4f7e0fdf20d4e006a008c00000000000000000000000000000000",
+            "309c8140800036ed67466875099bf878fe4a0e35005b004c00c1f875fe400e35005d004c00c4f856fe2d0e390063006c00000000000000000000000000000000",
+            "30a081408000371d6847587509b9f71bfee70d22002c002300e3f73afe150e2b003500280014f854fe300e2d0038002900000000000000000000000000000000",
+            "30a38140800039fd6743587509def70ffea10d1a0031001f00d1f70ffeb10d19002c002200c5f711feb80d18002c002500000000000000000000000000000000",
+            "30a58140800037dd6746687509d8f70bfe980d270035001200ddf70dfe980d240038001900dff70ffe9b0d1f0035001a00000000000000000000000000000000",
+            "30a98140800037ed67484875099cf7edfdb00d310020000d009ef7eefda30d310022000c00adf7f2fd980d300028000a00000000000000000000000000000000",
+            "30ac8140800036ed67484875099cf709fed40d3a002400160097f7fafdd30d39002200150096f7f0fdc80d380022001400000000000000000000000000000000",
+            "30ae8140800038fd674558750987f72efed40d360021001c0089f729fed50d39002400180092f715fed10d390022001800000000000000000000000000000000",
+            "30b18140800037dd6747487509b8f705fea90d19001d002000c5f70dfeb00d210019002200bff71efec20d280018002400000000000000000000000000000000",
+            "30b48140800038fd684868750980f7e9fdd40d0200080024007df7f1fdba0d060011001e0084f7f8fdaa0d12001a001a00000000000000000000000000000000",
+            "30b7814080003fdd694958750918f6a9fd510f0d00d1ff370024f7b0fda90e0100ecff30006cf7d1fd210efffff5ff2c00000000000000000000000000000000",
+            "30ba81408080482d744768750963f71ffe190f5e00d9fea100ccf62dfe650f510009ff980015f702fe580f4b002eff8400000000000000000000000000000000",
+            "30bd814080802f7d864758750974f70efe4c0f5e00c0fea000d1f726fe1c0f5d00c5fea30028f859fe0e0f5c00cafea800000000000000000000000000000000",
+            "30bf8140808057cc984758750961f73afe630f99009dfeae0050f738fe710f7500adfea40050f721fe720f6e00b2fea300000000000000000000000000000000",
+            "30c281408080f479bd483875092ef8b6feab0f0a0180feba00f1f798fe900f000181febd00c2f77dfe7c0fdb008efebd00000000000000000000000000000000",
+            "30c581408080ad87d846487509e1f80000a6107e0178fea2004ef88dff54106c0185fea70063f826ffe60f520182feae00000000000000000000000000000000",
+            "30c8810080800797d84868750995f8e1fe4b0f7a0161fe88000df96dffd00f700149fe990035f9cdff361088016afea000000000000000000000000000000000",
+            "30cb810080804586d848487509cef672fe8a0f6d0217ff42002df63cfe280f1d0219ff410059f61cfe070fed01f5fe4a00000000000000000000000000000000",
+            "30d08100808002c5d745687509d8f5aaff830f5e03e6fe3e01fbf55bffc30f3f03e4fe100158f600ff3e102903e5fee700000000000000000000000000000000",
+            "30d3810080807b94d14838750991f6cd00690f9903f0fff10147f6e200560f7e038fffc60101f6c900560f71033bffa901000000000000000000000000000000",
+            "30d681008080b743ca475875095af7f2009c0fca03a400320242f7ca00950fb503820028020af7b000820fa4034e001a02000000000000000000000000000000",
+            "30d9810080805be3c047587509e7f77a03c70f0e04bb00410258f79801940f0004b800410251f74401910fd803b3003602000000000000000000000000000000",
+            "30dc810080808a02b245587509c0fbd5086a10710475020a03b0fb8d085d106c042102e8027efb660876106a04bc01af02000000000000000000000000000000",
+            "30de8100808036d2a14568750970fbbf09ad103704af038003a9fb600989105c0459036103c2fb2a097210690412034603000000000000000000000000000000",
+            "30e281008000cbb18d4738750989f8b40b2812380341044c0429f99e0bef11510340043704f2f93c0b7911b0033704f003000000000000000000000000000000",
+            "30e581008000c9c18945587509a5f7ca0a2e13e400c6024c0547f7fd0a941264011703270578f74a0b6012e40168030205000000000000000000000000000000",
+            "30e781008000c6618948687509acf86909e813d0fe2801a1057cf8cf09ed130fff6301990516f8710aaa13ccff13028205000000000000000000000000000000",
+            "30ea81008000c77189475875093af93b0762136efbaeff19060cf90107b113a9fb99ff0906e1f85b07b113bafc9fffcd05000000000000000000000000000000",
+            "30ed81008000c791894568750950f9ce047c1432f900026007a5f9a6051f146ef9bb013707bff99206a813fef9ce00c606000000000000000000000000000000",
+            "30ef81008000c6d1894558750944f8ad0358143ef81c02f10780f8b403841484f84102d107ccf801049314bcf84202ad07000000000000000000000000000000",
+            "30f381008000c761884868750914f72105e4134cf6d001c00743f71a05f11391f6bf01e407a0f7c904fa13faf6b3011008000000000000000000000000000000",
+            "30f681008000c7718344587509eaf54a04c812a6f40002500627f66d041313f2f40d02940682f6a60468133ef51a02d806000000000000000000000000000000",
+            "30f881008000c4e1814668750b5cf5f803b51125f3b5000d0560f50f04e8118cf33c015d057df525042c1210f4b101cc05000000000000000000000000000000",
+            "30fb81008000c5e1814458750b19f65a02a410acf29effb804e2f5db02df10b7f2c0ffbf04a9f55c032011dcf22400d804000000000000000000000000000000",
+            "30fe8100800035e2814858750b81f65c00f80f8df231fe940471f6e6001f1088f2a6fe92044ef6b1015a1092f21fffa004000000000000000000000000000000",
+            "3001810080004b03814868750b69f6e6fdad0ffef20efdd40479f678feb40fd9f249fdc40484f6f4fec00fb0f29ffdad04000000000000000000000000000000",
+            "30048100800079e47d4858750b17f64cfb5f0f46f46afb430529f6c4fb710ff1f3d4fb300538f64bfc830fbbf315fc1d05000000000000000000000000000000",
+            "300781008000a7057e4668750bb1f5d3f9fb0e8ef5ccf96405cdf5fcf90c0f44f52dfa6505e1f52dfa210f29f550fa6305000000000000000000000000000000",
+            "30098100800041f67d4668750bcdf4b0f9ab0e21f602f955057ef5adf9d00ee1f559f95f05b1f5d3f9fb0e8ef5ccf96405000000000000000000000000000000",
+            "300d810080003d877c4838750b84f458f7dd0c89f6d0f8fc0436f4e2f7620d83f614f8430526f4c0f8a00e71f666f85c05000000000000000000000000000000",
+            "30108100800058e77a4668750bf7f2c3f57c0c9cf6abfa0a0470f30ef6790c89f65dfa420414f476f67e0c80f6d0f98a04000000000000000000000000000000",
+            "30128100800059f77a4658750b7ef249f5580cd9f69bfaa40389f269f56c0cd1f6a9fab503a3f286f5760cacf6c9faeb03000000000000000000000000000000",
+            "3016810080005b177b4868750ba9f298f4450b2cf774fa3102b8f2a5f47a0b24f765fa6e02b8f2b8f4b10b1df755faac02000000000000000000000000000000",
+            "30198100800057777a4558750b39f258f4480a80f73efaf40016f26af4940a5ef76bfa37014ef275f4d40a46f780fa8401000000000000000000000000000000",
+          ].map(&:freeze).freeze
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/splatoon2/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module ProconBypassMan
+  module Splatoon2
+    VERSION = "0.1.1"
+  end
+end

data/lib/procon_bypass_man/splatoon2.rb

@@ -0,0 +1,11 @@
+require_relative "splatoon2/version"
+require_relative "splatoon2/macro/fast_return"
+require_relative "splatoon2/macro/jump_to_right_key"
+require_relative "splatoon2/macro/jump_to_up_key"
+require_relative "splatoon2/macro/jump_to_left_key"
+require_relative "splatoon2/mode/guruguru"
+
+module ProconBypassMan
+  module Splatoon2
+  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

data/lib/procon_bypass_man/support/http_client.rb

@@ -0,0 +1,102 @@
+module ProconBypassMan
+  class HttpClient
+    class HttpRequest
+      class Get
+        def self.request!(uri: )
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = uri.scheme === "https"
+          http.get(uri.path, { "Content-Type" => "application/json" })
+        end
+      end
+
+      class Post
+        def self.request!(uri: , request_body: {})
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = uri.scheme === "https"
+          http.post(uri.path, request_body.to_json, { "Content-Type" => "application/json" })
+        end
+      end
+
+      class Put
+        def self.request!(uri: , request_body: {})
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = uri.scheme === "https"
+          http.put(uri.path, request_body.to_json, { "Content-Type" => "application/json" })
+        end
+      end
+    end
+
+    def initialize(path: , server_pool: , retry_on_connection_error: false)
+      @server_pool = server_pool
+      @uri = URI.parse("#{server_pool.server}#{path}")
+      @retry_on_connection_error = retry_on_connection_error
+    end
+
+    def get
+      handle_request do
+        response = HttpRequest::Get.request!(
+          uri: @uri,
+        )
+        break process_response(response)
+      end
+    end
+
+    def post(request_body: )
+      handle_request do
+        body = {}.merge!(request_body)
+        response = HttpRequest::Post.request!(
+          uri: @uri,
+          request_body: body,
+        )
+        break process_response(response)
+      end
+    end
+
+    def put(request_body: )
+      handle_request do
+        body = {
+          hostname: `hostname`.chomp,
+        }.merge!(request_body)
+        response = HttpRequest::Put.request!(
+          uri: @uri,
+          request_body: body,
+        )
+        break process_response(response)
+      end
+    end
+
+    private
+
+    def process_response(response)
+      case response.code
+      when /^200/
+        begin
+          return JSON.parse(response.body)
+        rescue JSON::ParserError
+          return response.body
+        end
+      else
+        @server_pool.next!
+        ProconBypassMan.logger.error("#{@uri}から200以外(#{response.code})が帰ってきました. #{response.body}")
+      end
+    end
+
+    def handle_request
+      raise "need block" unless block_given?
+      if @server_pool.server.nil?
+        ProconBypassMan.logger.info('送信先が未設定なのでスキップしました')
+        return
+      end
+      return yield
+    rescue SocketError => e
+      ProconBypassMan.logger.error(e)
+      if @retry_on_connection_error
+        sleep(10)
+        retry
+      end
+    rescue => e
+      puts e
+      ProconBypassMan.logger.error(e)
+    end
+  end
+end

data/lib/procon_bypass_man/support/report_http_client.rb

@@ -0,0 +1,19 @@
+module ProconBypassMan
+  class ReportHttpClient < HttpClient
+    def post(body: , event_type: )
+      if body.is_a?(String)
+        b = { text: body }
+      else
+        b = body
+      end
+
+      super(request_body: {
+        session_id: ProconBypassMan.session_id,
+        device_id: ProconBypassMan.device_id,
+        hostname: `hostname`.chomp,
+        event_type: event_type,
+        body: b,
+      })
+    end
+  end
+end

data/lib/procon_bypass_man/{timer.rb → support/safe_timeout.rb}

@@ -1,5 +1,5 @@
 module ProconBypassMan
-  class Timer
+  class SafeTimeout
     class Timeout < StandardError; end
 
     # 5秒後がタイムアウト