procon_bypass_man 0.1.20.2 → 0.1.23

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

@@ -1,18 +1,13 @@
 module ProconBypassMan
   module Websocket
-    module PbmJobClient
+    module Client
       CHANNEL = 'PbmJobChannel'
 
       def self.start!
         return unless ProconBypassMan.config.enable_ws?
 
         Thread.start do
-          loop do
-            run
-          rescue => e
-            ProconBypassMan.logger.error("websocket client: #{e.full_message}")
-            retry
-          end
+          Forever.run { run }
         end
       end
 
@@ -25,7 +20,7 @@ module ProconBypassMan
           )
 
           client.connected {
-            ProconBypassMan.logger.info('websocket client: successfully connected in ProconBypassMan::Websocket::PbmJobClient')
+            ProconBypassMan.logger.info('websocket client: successfully connected in ProconBypassMan::Websocket::Client')
           }
           client.subscribed { |msg|
             ProconBypassMan.logger.info('websocket client: subscribed')
@@ -55,6 +50,8 @@ module ProconBypassMan
             sleep 2
           }
           client.pinged { |msg|
+            Watchdog.active!
+
             ProconBypassMan.cache.fetch key: 'ws_pinged', expires_in: 10 do
               ProconBypassMan.logger.info('websocket client: pinged!!')
               ProconBypassMan.logger.info(msg)
@@ -66,17 +63,22 @@ module ProconBypassMan
       # @param [Hash] data
       def self.dispatch(data: , client: )
         pbm_job_hash = data.dig("message")
-        if pbm_job_hash['action'] == "ping"
+        case pbm_job_hash['action']
+        when "ping"
           client.perform('pong', { device_id: ProconBypassMan.device_id, message: 'hello from pbm' })
+        when ProconBypassMan::RemoteMacro::ACTION_KEY
+          validate_and_run_remote_macro(data: data)
+        when *ProconBypassMan::RemotePbmAction::ACTIONS
+          validate_and_run_remote_pbm_action(data: data)
         else
-          validate_and_run(data: data)
+          ProconBypassMan.logger.error "unknown action"
         end
       end
 
       # @raise [ProconBypassMan::RemotePbmActionObject::ValidationError]
       # @param [Hash] data
       # @return [Void]
-      def self.validate_and_run(data: )
+      def self.validate_and_run_remote_pbm_action(data: )
         pbm_job_hash = data.dig("message")
         begin
           pbm_job_object = ProconBypassMan::RemotePbmActionObject.new(action: pbm_job_hash["action"],
@@ -86,7 +88,8 @@ module ProconBypassMan
                                                                       job_args: pbm_job_hash["args"])
           pbm_job_object.validate!
         rescue ProconBypassMan::RemotePbmActionObject::ValidationError => e
-          raise
+          ProconBypassMan::SendErrorCommand.execute(error: e)
+          return
         end
 
         ProconBypassMan::RunRemotePbmActionDispatchCommand.execute(
@@ -95,6 +98,25 @@ module ProconBypassMan
           job_args: pbm_job_object.job_args
         )
       end
+
+      def self.validate_and_run_remote_macro(data: )
+        pbm_job_hash = data.dig("message")
+        begin
+          remote_macro_object = ProconBypassMan::RemoteMacroObject.new(name: pbm_job_hash["name"],
+                                                                       uuid: pbm_job_hash["uuid"],
+                                                                       steps: pbm_job_hash["steps"])
+          remote_macro_object.validate!
+        rescue ProconBypassMan::RemoteMacroObject::ValidationError => e
+          ProconBypassMan::SendErrorCommand.execute(error: e)
+          return
+        end
+
+        ProconBypassMan::RemoteMacroSender.execute(
+          name: remote_macro_object.name,
+          uuid: remote_macro_object.uuid,
+          steps: remote_macro_object.steps,
+        )
+      end
     end
   end
 end

data/lib/procon_bypass_man/websocket/forever.rb

@@ -0,0 +1,47 @@
+module ProconBypassMan
+  module Websocket
+    class Forever
+      # 動作確認方法
+      # - 10秒ごとにrefreshするのでタイムアウトは起きない
+      #   - ProconBypassMan::Websocket::Forever.run { loop { puts(:hi); sleep(10); ProconBypassMan::Websocket::Watchdog.active!  } }
+      # - タイムアウトが起きること
+      #   - ProconBypassMan::Websocket::Forever.run { puts(:hi); sleep(3000);  }
+      # - ブロックを1回評価するとThreadが死ぬので100秒後にタイムアウトが起きること
+      #   - ProconBypassMan::Websocket::Forever.run { puts(:hi); sleep(10); ProconBypassMan::Websocket::Watchdog.active!  }
+      def self.run(&block)
+        loop do
+          new.run(&block)
+        end
+      end
+
+      def run(&block)
+        raise("need a block") unless block_given?
+
+        ws_thread = work_one(callable: block)
+        wait_and_kill_if_outdated(ws_thread)
+      end
+
+      # @return [Thread]
+      def work_one(callable: )
+        Thread.start do
+          callable.call
+        rescue => e
+          ProconBypassMan.logger.error("websocket client with forever: #{e.full_message}")
+        end
+      end
+
+      def wait_and_kill_if_outdated(thread)
+        loop do
+          if Watchdog.outdated?
+            Watchdog.active!
+            ProconBypassMan.logger.error("watchdog timeout!!")
+            thread.kill
+            return
+          end
+
+          sleep(10)
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/websocket/watchdog.rb

@@ -0,0 +1,19 @@
+module ProconBypassMan
+  module Websocket
+    class Watchdog
+      def self.outdated?
+        @@time < Time.now
+      end
+
+      def self.time
+        @@time
+      end
+
+      def self.active!
+        @@time = Time.now + 100
+      end
+
+      active!
+    end
+  end
+end

data/lib/procon_bypass_man.rb

@@ -13,6 +13,10 @@ require "pbmenv"
 
 require_relative "procon_bypass_man/version"
 require_relative "procon_bypass_man/remote_pbm_action"
+require_relative "procon_bypass_man/remote_macro"
+require_relative "procon_bypass_man/support/usb_device_controller"
+require_relative "procon_bypass_man/support/device_procon_finder"
+require_relative "procon_bypass_man/support/device_mouse_finder"
 require_relative "procon_bypass_man/support/signal_handler"
 require_relative "procon_bypass_man/support/callbacks"
 require_relative "procon_bypass_man/support/yaml_writer"
@@ -22,31 +26,32 @@ require_relative "procon_bypass_man/support/uptime"
 require_relative "procon_bypass_man/support/on_memory_cache"
 require_relative "procon_bypass_man/support/http_client"
 require_relative "procon_bypass_man/support/report_http_client"
+require_relative "procon_bypass_man/support/remote_macro_http_client"
 require_relative "procon_bypass_man/support/update_remote_pbm_action_status_http_client"
 require_relative "procon_bypass_man/support/send_device_stats_http_client"
 require_relative "procon_bypass_man/support/server_pool"
+require_relative "procon_bypass_man/support/analog_stick_hypotenuse_tilting_power_scaler"
+require_relative "procon_bypass_man/support/never_exit_accidentally"
+require_relative "procon_bypass_man/support/cycle_sleep"
 require_relative "procon_bypass_man/background"
 require_relative "procon_bypass_man/commands"
 require_relative "procon_bypass_man/bypass"
-require_relative "procon_bypass_man/domains"
-require_relative "procon_bypass_man/never_exit_accidentally"
 require_relative "procon_bypass_man/device_connector"
-require_relative "procon_bypass_man/device_procon_finder"
 require_relative "procon_bypass_man/device_status"
-require_relative "procon_bypass_man/usb_device_controller"
 require_relative "procon_bypass_man/runner"
 require_relative "procon_bypass_man/processor"
 require_relative "procon_bypass_man/configuration"
 require_relative "procon_bypass_man/buttons_setting_configuration"
 require_relative "procon_bypass_man/procon"
 require_relative "procon_bypass_man/procon/button"
-require_relative "procon_bypass_man/procon/value_objects/analog_stick"
-require_relative "procon_bypass_man/procon/value_objects/procon_reader"
 require_relative "procon_bypass_man/procon/analog_stick_cap"
+require_relative "procon_bypass_man/procon/analog_stick_manipulator"
 require_relative "procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_action_object"
 require_relative "procon_bypass_man/scheduler"
 require_relative "procon_bypass_man/plugins"
-require_relative "procon_bypass_man/websocket/pbm_job_client"
+require_relative "procon_bypass_man/websocket/client"
+require_relative "procon_bypass_man/websocket/watchdog"
+require_relative "procon_bypass_man/websocket/forever"
 
 STDOUT.sync = true
 Thread.abort_on_exception = true
@@ -56,15 +61,14 @@ module ProconBypassMan
   extend ProconBypassMan::NeverExitAccidentally
 
   class CouldNotLoadConfigError < StandardError; end
-  class ConnectionError < StandardError; end
-  class FirstConnectionError < ConnectionError; end
-  class EternalConnectionError < ConnectionError; end
+  class EternalConnectionError < StandardError; end
 
   # @return [void]
   def self.run(setting_path: nil)
     ProconBypassMan::Scheduler.start!
     ProconBypassMan::Background::JobRunner.start!
-    ProconBypassMan::Websocket::PbmJobClient.start!
+    ProconBypassMan::Websocket::Client.start!
+    ProconBypassMan::QueueOverProcess.start!
 
     ProconBypassMan::PrintMessageCommand.execute(text: "PBMを起動しています")
     initialize_pbm
@@ -73,32 +77,30 @@ module ProconBypassMan
     Runner.new(gadget: gadget, procon: procon).run # ここでblockingする
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     FileUtils.rm_rf(ProconBypassMan.digest_path)
+    ProconBypassMan::QueueOverProcess.shutdown
   rescue ProconBypassMan::CouldNotLoadConfigError
     ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。設定ファイルの読み込みに失敗しました")
     ProconBypassMan::DeviceStatus.change_to_setting_syntax_error_and_shutdown!
+    # TODO シグナルトラップをしていないのでUSR2を送ったときにプロセスが停止している. 明示的にハンドリングするべき.
     ProconBypassMan.exit_if_allow(1) do
       FileUtils.rm_rf(ProconBypassMan.pid_path)
       FileUtils.rm_rf(ProconBypassMan.digest_path)
+      ProconBypassMan::QueueOverProcess.shutdown
     end
   rescue ProconBypassMan::ConnectDeviceCommand::NotFoundProconError
     ProconBypassMan::SendErrorCommand.execute(error: "プロコンが見つかりませんでした。")
     ProconBypassMan::DeviceStatus.change_to_procon_not_found_error!
+    # TODO シグナルトラップをしていないのでUSR2を送ったときにプロセスが停止している. 明示的にハンドリングするべき.
     ProconBypassMan.exit_if_allow(1) do
       FileUtils.rm_rf(ProconBypassMan.pid_path)
       FileUtils.rm_rf(ProconBypassMan.digest_path)
+      ProconBypassMan::QueueOverProcess.shutdown
     end
-  rescue ProconBypassMan::ConnectionError
-    begin
-      raise
-    rescue ProconBypassMan::EternalConnectionError
-      ProconBypassMan::SendErrorCommand.execute(error: "接続の見込みがないのでsleepしまくります")
-      ProconBypassMan::DeviceStatus.change_to_connected_but_sleeping!
-      FileUtils.rm_rf(ProconBypassMan.pid_path)
-      eternal_sleep
-    rescue ProconBypassMan::FirstConnectionError
-      ProconBypassMan::SendErrorCommand.execute(error: "接続を確立できませんでした。やりなおします。")
-      retry
-    end
+  rescue ProconBypassMan::EternalConnectionError
+    ProconBypassMan::SendErrorCommand.execute(error: "接続の見込みがないのでsleepしまくります")
+    ProconBypassMan::DeviceStatus.change_to_connected_but_sleeping!
+    FileUtils.rm_rf(ProconBypassMan.pid_path)
+    eternal_sleep
   end
 
   def self.configure(&block)

data/procon_bypass_man.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/splaplapla/procon_bypass_man"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

data/project_template/app.rb

@@ -2,10 +2,19 @@
 
 require 'bundler/inline'
 
-gemfile do
-  source 'https://rubygems.org'
-  git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-  gem 'procon_bypass_man', '0.1.20.2'
+begin
+  gemfile do
+    source 'https://rubygems.org'
+    git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+    gem 'procon_bypass_man', '0.1.23'
+  end
+rescue Bundler::Source::Git::GitCommandError => e
+  # install中に強制終了するとgitの管理ファイルが不正状態になり、次のエラーが起きるので発生したらcache directoryを削除する
+  #"Git error: command `git fetch --force --quiet --tags https://github.com/splaplapla/procon_bypass_man refs/heads/\\*:refs/heads/\\*` in directory /home/pi/.rbenv/versions/3.0.1/lib/ruby/gems/3.0.0/cache/bundler/git/procon_bypass_man-ae4c9016d76b667658c8ba66f3bbd2eebf2656af has failed.\n\nIf this error persists you could try removing the cache directory '/home/pi/.rbenv/versions/3.0.1/lib/ruby/gems/3.0.0/cache/bundler/git/procon_bypass_man-ae4c9016d76b667658c8ba66f3bbd2eebf2656af'"
+  if /try removing the cache directory '([^']+)'/ =~ e.message
+    FileUtils.rm_rf($1)
+    retry
+  end
 end
 
 ProconBypassMan.configure do |config|

data/sig/main.rbs

@@ -11,9 +11,6 @@ module ProconBypassMan
   class CouldNotLoadConfigError < StandardError
   end
 
-  class FirstConnectionError < StandardError
-  end
-
   class EternalConnectionError < StandardError
   end
 
@@ -255,21 +252,12 @@ class ProconBypassMan::DeviceConnector
 
   def self.connect: () -> ::Array[untyped]
 
-  def initialize: (?throw_error_if_timeout: bool throw_error_if_timeout, ?throw_error_if_mismatch: bool throw_error_if_mismatch, ?enable_at_exit: bool enable_at_exit) -> untyped
+  def initialize: (?throw_error_if_timeout: bool throw_error_if_timeout, ?throw_error_if_mismatch: bool throw_error_if_mismatch) -> untyped
 
   def add: (untyped values, read_from: untyped read_from) -> untyped
 
   def drain_all: () -> untyped
 
-  # switchに任意の命令を入力して、switchから読み取る
-  def write_switch: (untyped data, ?only_write: bool only_write) -> untyped
-
-  def write_procon: (untyped data, ?only_write: bool only_write) -> untyped
-
-  def read_procon: (?only_read: bool only_read) -> untyped
-
-  def read_switch: (?only_read: bool only_read) -> untyped
-
   def from_device: (untyped item) -> untyped
 
   # fromの対になる
@@ -531,6 +519,26 @@ module ProconBypassMan
   end
 end
 
+class ProconBypassMan::BypassMode
+  TYPE_NORMAL: ::Symbol
+
+  TYPE_AGGRESSIVE: ::Symbol
+
+  TYPES: ::Array[::Symbol]
+
+  DEFAULT_GADGET_TO_PROCON_INTERVAL: ::Float
+
+  attr_accessor mode: ::Symbol
+
+  attr_accessor gadget_to_procon_interval: ::Float
+
+  def self.default_value: () -> ::ProconBypassMan::BypassMode
+
+  def initialize: (mode: ::Symbol mode, gadget_to_procon_interval: ::Float gadget_to_procon_interval) -> void
+
+  def to_s: () -> ::String
+end
+
 class ProconBypassMan::Domains::Binary::Base
   # @param [String] binary
   def initialize: (binary: untyped binary) -> void

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.20.2
+  version: 0.1.23
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-19 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -79,8 +79,10 @@ files:
 - docs/getting_started.md
 - docs/how_to_connect_procon.md
 - docs/setting/left-analogstick-cap.md
+- docs/setting/splatoon2_macro_dasei_cancel.md
 - docs/setting/splatoon2_macro_sokuwari_bubble.md
 - docs/setting/splatoon2_recommended_setting.md
+- docs/setting/splatoon2_shake_tansan.md
 - docs/setup_raspi.md
 - docs/setup_raspi.mitamae.rb
 - docs/setup_raspi_by_mitamae.md
@@ -95,6 +97,7 @@ files:
 - lib/procon_bypass_man/background/jobs/concerns/has_external_api_setting.rb
 - lib/procon_bypass_man/background/jobs/concerns/has_internal_api_setting.rb
 - lib/procon_bypass_man/background/jobs/concerns/job_runnable.rb
+- lib/procon_bypass_man/background/jobs/post_completed_remote_macro_job.rb
 - lib/procon_bypass_man/background/jobs/report_boot_job.rb
 - lib/procon_bypass_man/background/jobs/report_completed_upgrade_pbm_job.rb
 - lib/procon_bypass_man/background/jobs/report_error_job.rb
@@ -108,9 +111,17 @@ files:
 - lib/procon_bypass_man/buttons_setting_configuration.rb
 - lib/procon_bypass_man/buttons_setting_configuration/layer.rb
 - lib/procon_bypass_man/buttons_setting_configuration/loader.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/button.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/button_list.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/disable_macro_if_pressed.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/flip_if_pressed.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/force_neutral.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/if_pressed.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/if_pressed_allows_nil.rb
+- lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/open_macro_steps.rb
 - lib/procon_bypass_man/buttons_setting_configuration/validator.rb
 - lib/procon_bypass_man/bypass.rb
-- lib/procon_bypass_man/bypass/bypass_mode.rb
 - lib/procon_bypass_man/bypass/usb_hid_logger.rb
 - lib/procon_bypass_man/commands.rb
 - lib/procon_bypass_man/commands/bypass_command.rb
@@ -124,16 +135,10 @@ files:
 - lib/procon_bypass_man/commands/write_session_id_command.rb
 - lib/procon_bypass_man/configuration.rb
 - lib/procon_bypass_man/device_connector.rb
-- lib/procon_bypass_man/device_procon_finder.rb
 - lib/procon_bypass_man/device_status.rb
-- lib/procon_bypass_man/domains.rb
-- lib/procon_bypass_man/domains/binary/base.rb
-- lib/procon_bypass_man/domains/binary/has_immutable_binary.rb
-- lib/procon_bypass_man/domains/binary/has_mutable_binary.rb
-- lib/procon_bypass_man/domains/binary/inbound_procon_binary.rb
-- lib/procon_bypass_man/domains/binary/processing_procon_binary.rb
 - lib/procon_bypass_man/io_monitor.rb
-- lib/procon_bypass_man/never_exit_accidentally.rb
+- lib/procon_bypass_man/plugin/splatoon2/macro/charge_tansan_bomb.rb
+- lib/procon_bypass_man/plugin/splatoon2/macro/dasei_cancel.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/fast_return.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_left_key.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_right_key.rb
@@ -145,6 +150,7 @@ files:
 - lib/procon_bypass_man/processor.rb
 - lib/procon_bypass_man/procon.rb
 - lib/procon_bypass_man/procon/analog_stick_cap.rb
+- lib/procon_bypass_man/procon/analog_stick_manipulator.rb
 - lib/procon_bypass_man/procon/button.rb
 - lib/procon_bypass_man/procon/button_collection.rb
 - lib/procon_bypass_man/procon/consts.rb
@@ -152,12 +158,30 @@ files:
 - lib/procon_bypass_man/procon/layer_changer.rb
 - lib/procon_bypass_man/procon/macro.rb
 - lib/procon_bypass_man/procon/macro_builder.rb
+- lib/procon_bypass_man/procon/macro_plugin_map.rb
 - lib/procon_bypass_man/procon/macro_registry.rb
 - lib/procon_bypass_man/procon/mode_registry.rb
 - lib/procon_bypass_man/procon/press_button_aware.rb
+- lib/procon_bypass_man/procon/suppress_rumble.rb
 - lib/procon_bypass_man/procon/user_operation.rb
 - lib/procon_bypass_man/procon/value_objects/analog_stick.rb
+- lib/procon_bypass_man/procon/value_objects/analog_stick_position.rb
+- lib/procon_bypass_man/procon/value_objects/binary.rb
+- lib/procon_bypass_man/procon/value_objects/binary/base.rb
+- lib/procon_bypass_man/procon/value_objects/binary/has_immutable_binary.rb
+- lib/procon_bypass_man/procon/value_objects/binary/has_mutable_binary.rb
+- lib/procon_bypass_man/procon/value_objects/binary/inbound_procon_binary.rb
+- lib/procon_bypass_man/procon/value_objects/binary/processing_procon_binary.rb
+- lib/procon_bypass_man/procon/value_objects/bypass_mode.rb
 - lib/procon_bypass_man/procon/value_objects/procon_reader.rb
+- lib/procon_bypass_man/procon/value_objects/rumble_binary.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
@@ -168,10 +192,16 @@ files:
 - lib/procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_action_object.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
 - lib/procon_bypass_man/support/callbacks.rb
 - lib/procon_bypass_man/support/compress_array.rb
+- lib/procon_bypass_man/support/cycle_sleep.rb
+- lib/procon_bypass_man/support/device_mouse_finder.rb
+- lib/procon_bypass_man/support/device_procon_finder.rb
 - lib/procon_bypass_man/support/http_client.rb
+- lib/procon_bypass_man/support/never_exit_accidentally.rb
 - lib/procon_bypass_man/support/on_memory_cache.rb
+- lib/procon_bypass_man/support/remote_macro_http_client.rb
 - lib/procon_bypass_man/support/report_http_client.rb
 - lib/procon_bypass_man/support/safe_timeout.rb
 - lib/procon_bypass_man/support/send_device_stats_http_client.rb
@@ -179,10 +209,12 @@ files:
 - lib/procon_bypass_man/support/signal_handler.rb
 - lib/procon_bypass_man/support/update_remote_pbm_action_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_writer.rb
-- lib/procon_bypass_man/usb_device_controller.rb
 - lib/procon_bypass_man/version.rb
-- lib/procon_bypass_man/websocket/pbm_job_client.rb
+- lib/procon_bypass_man/websocket/client.rb
+- lib/procon_bypass_man/websocket/forever.rb
+- lib/procon_bypass_man/websocket/watchdog.rb
 - procon_bypass_man.gemspec
 - project_template/README.md
 - project_template/app.rb
@@ -208,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/procon_bypass_man/domains.rb

@@ -1,11 +0,0 @@
-module ProconBypassMan
-  module Domains
-    module Binary; end
-  end
-end
-
-require_relative "domains/binary/base"
-require_relative "domains/binary/has_mutable_binary"
-require_relative "domains/binary/has_immutable_binary"
-require_relative "domains/binary/inbound_procon_binary"
-require_relative "domains/binary/processing_procon_binary"