procon_bypass_man 0.1.20 → 0.1.21

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

@@ -8,6 +8,8 @@ require 'em/pure_ruby'
 require "action_cable_client"
 require "ext/em_pure_ruby"
 require "ext/module"
+require "resolv-replace"
+require "pbmenv"
 
 require_relative "procon_bypass_man/version"
 require_relative "procon_bypass_man/remote_pbm_action"
@@ -23,14 +25,16 @@ require_relative "procon_bypass_man/support/report_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/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"
@@ -44,6 +48,8 @@ require_relative "procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_a
 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/watchdog"
+require_relative "procon_bypass_man/websocket/forever"
 
 STDOUT.sync = true
 Thread.abort_on_exception = true
@@ -54,7 +60,6 @@ module ProconBypassMan
 
   class CouldNotLoadConfigError < StandardError; end
   class ConnectionError < StandardError; end
-  class NotFoundRequiredFilesError < StandardError; end
   class FirstConnectionError < ConnectionError; end
   class EternalConnectionError < ConnectionError; end
 
@@ -71,11 +76,6 @@ module ProconBypassMan
     Runner.new(gadget: gadget, procon: procon).run # ここでblockingする
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     FileUtils.rm_rf(ProconBypassMan.digest_path)
-  rescue ProconBypassMan::NotFoundRequiredFilesError
-    ProconBypassMan::SendErrorCommand.execute(error: "/sys/kernel/config/usb_gadget/proconディレクトリがありませんでした。処理を終了します。")
-    FileUtils.rm_rf(ProconBypassMan.pid_path)
-    FileUtils.rm_rf(ProconBypassMan.digest_path)
-    exit 1 # 前提条件を満たしていないので絶対に落とす
   rescue ProconBypassMan::CouldNotLoadConfigError
     ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。設定ファイルの読み込みに失敗しました")
     ProconBypassMan::DeviceStatus.change_to_setting_syntax_error_and_shutdown!
@@ -127,6 +127,7 @@ module ProconBypassMan
   def self.initialize_pbm
     ProconBypassMan::WriteDeviceIdCommand.execute
     ProconBypassMan::WriteSessionIdCommand.execute
+    system("renice -n -20 -p #{$$}")
     File.write(pid_path, $$)
     ProconBypassMan::DeviceStatus.change_to_running!
   end

data/procon_bypass_man.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "pbmenv"
+  spec.add_dependency "pbmenv", ">= 0.1.9" # Pbmenv.installでのenable_pbm_cloudに依存している
   spec.add_dependency "action_cable_client"
   spec.add_dependency "sorted_set"
 

data/project_template/app.rb

@@ -5,18 +5,28 @@ 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.21'
 end
 
 ProconBypassMan.configure do |config|
   config.root = File.expand_path(__dir__)
   config.logger = Logger.new("#{ProconBypassMan.root}/app.log", 5, 1024 * 1024 * 10)
   config.logger.level = :debug
+
+  # バイパスするログを全部app.logに流すか
+  config.verbose_bypass_log = false
+
   # webからProconBypassManを操作できるwebサービス
   # config.api_servers = ['https://pbm-cloud.herokuapp.com']
+
+  # エラーが起きたらerror.logに書き込みます
   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: 5 }
 end
 
 ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")

data/project_template/systemd_units/pbm.service

@@ -7,7 +7,7 @@ Type=simple
 WorkingDirectory=/usr/share/pbm/current
 ExecStart=/bin/bash -c "/home/pi/.rbenv/versions/3.0.1/bin/ruby /usr/share/pbm/current/app.rb"
 Restart=always
-Nice=-19
+Nice=-20
 
 [Install]
 WantedBy=multi-user.target

data/sig/main.rbs

@@ -531,6 +531,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
+  version: 0.1.21
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-13 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: action_cable_client
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +79,7 @@ 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/setup_raspi.md
@@ -96,6 +97,7 @@ files:
 - 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/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
 - lib/procon_bypass_man/background/jobs/report_error_reload_config_job.rb
 - lib/procon_bypass_man/background/jobs/report_event_base_job.rb
@@ -130,8 +132,9 @@ files:
 - 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/domains/bypass_mode.rb
 - lib/procon_bypass_man/io_monitor.rb
-- lib/procon_bypass_man/never_exit_accidentally.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
@@ -166,9 +169,11 @@ 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/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/report_http_client.rb
 - lib/procon_bypass_man/support/safe_timeout.rb
@@ -178,8 +183,11 @@ files:
 - 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/yaml_writer.rb
+- lib/procon_bypass_man/usb_device_controller.rb
 - lib/procon_bypass_man/version.rb
+- lib/procon_bypass_man/websocket/forever.rb
 - lib/procon_bypass_man/websocket/pbm_job_client.rb
+- lib/procon_bypass_man/websocket/watchdog.rb
 - procon_bypass_man.gemspec
 - project_template/README.md
 - project_template/app.rb