procon_bypass_man 0.1.20 → 0.1.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ce5a36623cb9c5ec02d78df78f1c50d8b6f23f54cedf4297bfe76d122def428
-  data.tar.gz: 6d459721f4dcbf4bde02c62e1ffb0aba296a39718e95d7cb5bbbbc6d27c845a3
+  metadata.gz: 29c989ae104586849ff797f9086b997294925372a2997797da279c6b2178098a
+  data.tar.gz: d23be38b1c10f9f856407fa65db924e4f8528d453c5fe59f8bdc0832dc3e93f0
 SHA512:
-  metadata.gz: 3a15285db88ece865db72a73d94f8f5dceff3958bc1fccd6422e5b63441e9c9f6238d080883220b934b14bd5d7a25ce0509cce00ca2995e7385dce90c8297584
-  data.tar.gz: f4cbd2665d0733016eb2311b95578360a6f111f847f32bf79a798b215d0e0a59d914fe743b4fd9c3fdeedb8e2d4fefdd3fc442de4c9c285fad7cf56f6a708b5a
+  metadata.gz: 53a8875027f7b2e172bbb1873d1b76ff7ec191531e36c43dd044cc26e9bb54c80c2e1c9b63e5c9c0ec9f42829fd502f3cdbd9ac2ba41862c7835b97c8d3b66ac
+  data.tar.gz: 5476c22c2648861968b08ace121eef62993c3c05685ecbd08829ab5bdae7a66045a96eb3b22c50af154393edf7f9b027e91a66d70e10f4d1db67bf8d8b240822

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [0.1.20.1] - 2022-02-13
+- Switchからプロコンへ送信するバイパスのインターバルを設定できるようにしました（切断対策）
+
 ## [0.1.20] - 2022-02-13
 - pbm-cloudから再起動・設定ファイルの適用指示があったときにackイベントを返すようになりました
 - 起動オプションにnever_exit_accidentallyを追加しました。これを有効にすると想定外のエラーが起きたときにプロセスが停止しなくなります。デフォルトで無効です。

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.20)
+    procon_bypass_man (0.1.20.1)
       action_cable_client
       pbmenv
       sorted_set

data/lib/procon_bypass_man/bypass/bypass_mode.rb

@@ -0,0 +1,21 @@
+class ProconBypassMan::BypassMode
+  TYPE_NORMAL = :normal
+  TYPE_AGGRESSIVE = :aggressive
+  TYPES = [TYPE_NORMAL, TYPE_AGGRESSIVE]
+
+  DEFAULT_GADGET_TO_PROCON_INTERVAL = 0.5
+
+  attr_accessor :mode, :gadget_to_procon_interval
+
+  def self.default_value
+    new(
+      mode: TYPE_NORMAL,
+      gadget_to_procon_interval: DEFAULT_GADGET_TO_PROCON_INTERVAL,
+    )
+  end
+
+  def initialize(mode: , gadget_to_procon_interval: )
+    @mode = mode.to_sym
+    @gadget_to_procon_interval = gadget_to_procon_interval
+  end
+end

data/lib/procon_bypass_man/bypass.rb

@@ -1,4 +1,5 @@
 require "procon_bypass_man/bypass/usb_hid_logger"
+require "procon_bypass_man/bypass/bypass_mode"
 
 class ProconBypassMan::Bypass
   include ProconBypassMan::Bypass::UsbHidLogger

data/lib/procon_bypass_man/commands/bypass_command.rb

@@ -27,12 +27,31 @@ class ProconBypassMan::BypassCommand
     monitor1 = ProconBypassMan::IOMonitor.new(label: "switch -> procon")
     monitor2 = ProconBypassMan::IOMonitor.new(label: "procon -> switch")
     ProconBypassMan.logger.info "Thread1を起動します"
+
+    @send_interval = 0.005
+
     t1 = Thread.new do
-      bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor1)
+      timer = ProconBypassMan::SafeTimeout.new(timeout: Time.now + 10)
+      @did_first_step = false
       loop do
+        bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor1)
         break if $will_terminate_token
+        !@did_first_step && timer.throw_if_timeout!
         bypass.send_gadget_to_procon!
-        sleep(0.02)
+        sleep(@send_interval)
+      rescue ProconBypassMan::SafeTimeout::Timeout
+        case ProconBypassMan.config.bypass_mode.mode
+        when ProconBypassMan::BypassMode::TYPE_AGGRESSIVE
+          ProconBypassMan.logger.info "10秒経過したのでThread1を終了します"
+          monitor1.shutdown
+          break
+        when ProconBypassMan::BypassMode::TYPE_NORMAL
+          ProconBypassMan.logger.info "10秒経過したのでsend_intervalを長くします"
+          @send_interval = ProconBypassMan.config.bypass_mode.gadget_to_procon_interval
+        else
+          raise "unknown type"
+        end
+        @did_first_step = true
       rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN => e
         ProconBypassMan::SendErrorCommand.execute(error: "Switchとの切断されました.終了処理を開始します. #{e.full_message}")
         Process.kill "TERM", Process.ppid

data/lib/procon_bypass_man/configuration.rb

@@ -65,6 +65,17 @@ class ProconBypassMan::Configuration
     end
   end
 
+  def bypass_mode=(value)
+    @bypass_mode = ProconBypassMan::BypassMode.new(
+      mode: value[:mode],
+      gadget_to_procon_interval: value[:gadget_to_procon_interval],
+    )
+  end
+
+  def bypass_mode
+    @bypass_mode || ProconBypassMan::BypassMode.default_value
+  end
+
   def api_servers=(api_servers)
     @api_servers = api_servers
     return self
@@ -156,6 +167,10 @@ class ProconBypassMan::Configuration
     end
   end
 
+  def has_api_server?
+    not api_servers.length.zero?
+  end
+
   def verbose_bypass_log
     @verbose_bypass_log || !!ENV["VERBOSE_BYPASS_LOG"]
   end

data/lib/procon_bypass_man/scheduler.rb

@@ -74,7 +74,7 @@ module ProconBypassMan
           args: [->{ ProconBypassMan::DeviceStatus.current }],
           interval: 60,
         )
-      )
+      ) if ProconBypassMan.config.has_api_server?
     end
 
     # @param [Schedule] schedule

data/lib/procon_bypass_man/version.rb

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

data/project_template/app.rb

@@ -5,7 +5,7 @@ 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'
+  gem 'procon_bypass_man', '0.1.20.1'
 end
 
 ProconBypassMan.configure do |config|
@@ -17,6 +17,8 @@ ProconBypassMan.configure do |config|
   config.enable_critical_error_logging = true
   # pbm-cloudで使う場合はnever_exitにtrueをセットしてください. trueがセットされている場合、不慮の事故が発生してもプロセスが終了しなくなります
   config.never_exit_accidentally = true
+  # 操作が高頻度で固まるときは、 gadget_to_procon_interval の数値は大きくしてください
+  config.bypass_mode = { mode: :normal, gadget_to_procon_interval: 0.5 }
 end
 
 ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.20.1
 platform: ruby
 authors:
 - jiikko
@@ -109,6 +109,7 @@ files:
 - lib/procon_bypass_man/buttons_setting_configuration/loader.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