procon_bypass_man 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b58b7076f8ae670534f5de02a4d4f08ce85b0e8f32942146c156cbd86e0f6c9f
-  data.tar.gz: 47a0d06e49d43c5d9add37212b63a14dcf28016738a34219b6b33534e71bb0af
+  metadata.gz: '019476402097b5b57976cd88c61d41b23c9eb7e6195a0f49240d4d89db9622a6'
+  data.tar.gz: '0590db283b885d28994ab318393876c2fc1acc3082960dbe7adaaec5c7080d21'
 SHA512:
-  metadata.gz: 7007fe181dffb3d6357d73e1b5f8880647d92e54216ca65d24573c9cadde2bd40bfed977ec5cff8344570d468298b196becd8d7ed36d1ecac9fa54d8250817a4
-  data.tar.gz: 490791b8522adc71b10354dc4628bc8e51988ef04e11e82dd9b5ed2a40112dc71e6bc93f9fb9116efd03a3ba1dbb16a67b05ce6e466ef8be26ae27021cd51eba
+  metadata.gz: e0e858601e6a4d98c5e7cd6eafafccf3e123c3ea956f70398d3382c6239aef888b84210a028b18b763cf8865b4b645181fa9c5f3d9f29047cd639a706979b0eb
+  data.tar.gz: 455638d194448fa0a535915e585519486b423828251de66f345e3888269b15f34c459cb55266ec08f271aa114a92f927195b1ef0e9621422695cfea356548a35

data/.circleci/config.yml

@@ -27,7 +27,8 @@ commands:
             - gem-cache-v1-<< parameters.ruby-version >>-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
             - gem-cache-v1-<< parameters.ruby-version >>-{{ arch }}-{{ .Branch }}
             - gem-cache-v1
-      - run: gem i bundler && bundle install --path vendor/bundle --jobs 100 && bundle clean
+      # NOTE: ruby2.5だとbundler2.4系に対応していないのでバージョンを固定する
+      - run: gem i bundler -v 2.3.26 && bundle install --path vendor/bundle --jobs 100 && bundle clean
       - save_cache:
           key: gem-cache-v1-<< parameters.ruby-version >>-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
           paths:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.3.4] - 2022-12-26
+* 左スティックを1回転するマクロを追加しました
+    * 詳しい設定方法については docs/setting/splatoon3_rotation_forward_stick.md を参照してください
+* プログラムの停止時・再読み込み時に時間がかかってた不具合を修正しました
+
+## [0.3.3.1] - 2022-11-13
+* setting.ymlにmacroを使って「スプラ用マクロ、惰性キャンセル」の閾値を設定できない不具合を修正しました
+
 ## [0.3.3] - 2022-11-13
 * 以前に削除した「スプラ用マクロ、惰性キャンセル」を使えるようにしました
     * docs/setting/splatoon2_macro_dasei_cancel.md, docs/setting/splatoon3_macro_dasei_cancel.md を参照してください
@@ -11,7 +19,7 @@
 * レイヤーを変更しているときにコントローラーを振動できるようになりました
     * setting.yml で `enable(:rumble_on_layer_change)` と記述してください
 * イカロールをするマクロを追加しました
-    * 詳しい設定方法については docs/setting/splatoon2_macro_forward_ikarole.md を参照してください
+    * 詳しい設定方法については docs/setting/splatoon3_macro_forward_ikarole.md を参照してください
 * スプラ用マクロ、惰性キャンセルを削除しました
 
 ## [0.3.0] - 2022-9-9

data/Gemfile

@@ -12,6 +12,7 @@ gem "timecop"
 gem "rubocop", require: false
 gem "sinatra", require: false
 gem "webrick", require: false
+gem "stackprof", require: false
 
 if Gem::Version.new(RUBY_VERSION) > Gem::Version.new("2.6.0")
   gem 'typeprof', require: false

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.3.3)
+    procon_bypass_man (0.3.4)
       action_cable_client
-      blue_green_process
+      blue_green_process (= 0.1.4.2)
       pbmenv (>= 0.1.9)
       sorted_set
 
@@ -19,7 +19,7 @@ GEM
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.2)
-    blue_green_process (0.1.3)
+    blue_green_process (0.1.4.2)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
@@ -51,7 +51,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbs (1.7.1)
-    rbtree (0.4.5)
+    rbtree (0.4.6)
     regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
@@ -89,6 +89,7 @@ GEM
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
+    stackprof (0.2.22)
     steep (0.47.0)
       activesupport (>= 5.1)
       language_server-protocol (>= 3.15, < 4.0)
@@ -134,6 +135,7 @@ DEPENDENCIES
   rspec
   rubocop
   sinatra
+  stackprof
   steep
   timecop
   typeprof

data/README.md

@@ -52,7 +52,7 @@ https://user-images.githubusercontent.com/1664497/171327108-f12f56a5-fc36-48da-9
 * 日を跨ぐ24時ちょうどになった瞬間はLinuxのcronが起動などがするようで、この時間は数秒間バイパスが激しく遅延します
   * ログファイルのローテションが少なくとも走るはずなので、不要なデーモンを停止するなどで影響を小さくすることはできると思いますが、完全に抑制することは難しいと思います
 * コントローラーから読み取ってSwitchに書き込む時間は、少なくとも0.02秒はかかります
-  * 動かしているRaspberry Piの負荷に依存するこの限りではありません
+  * 遅延は動かしているRaspberry Piの負荷に依存します
 
 <!--
 ## TODO

data/benchmarks/README.md

@@ -0,0 +1,6 @@
+# benchmark
+## Processing
+プロコンから読み取ったバイナリを加工する処理
+
+* `ruby benchmarks/bypass.rb`
+* `bundle execc stackprof tmp/stackprof.dump`

data/benchmarks/bypass.rb

@@ -0,0 +1,11 @@
+require "stackprof"
+require "procon_bypass_man"
+
+# no action
+raw_binary = ["30f28100800078c77448287509550274ff131029001b0022005a0271ff191028001e00210064027cff1410280020002100000000000000000000000000000000"].pack("H*")
+binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: raw_binary)
+StackProf.run(mode: :cpu, out: 'tmp/stackprof.dump') do
+  10000.times do
+    ProconBypassMan::Processor.new(binary).process
+  end
+end

data/docs/setting/left-analogstick-cap.md

@@ -54,7 +54,7 @@ setting: |-
   prefix_keys_for_changing_layer [:zr, :zl, :l]
   set_neutral_position 2100, 2000
 
-  layer :up, mode: :manual do
+  layer :up do
     left_analog_stick_cap cap: 1100, if_pressed: [:zl, :a], force_neutral: :a
   end
 ```

data/docs/setting/splatoon3_macro_forward_ikarole.md

@@ -26,7 +26,7 @@ version: 1.0
 setting: |-
   prefix_keys_for_changing_layer [:zr, :zl, :l]
 
-  install_macro_plugin(ProconBypassMan::Plugin::Splatoon2::Macro::ForwardIkarole)
+  install_macro_plugin(ProconBypassMan::Plugin::Splatoon3::Macro::ForwardIkarole)
 
   layer :up do
     macro ProconBypassMan::Plugin::Splatoon3::Macro::ForwardIkarole, if_pressed: [:thumbl], force_neutral: []

data/docs/setting/splatoon3_rotation_forward_stick.md

@@ -0,0 +1,20 @@
+# スプラトゥーン3: 左スティック1回転 マクロの設定方法
+
+* procon_bypass_man: 0.3.4以上が必要です
+* このマクロは、左スティックを高速に1回転をします
+
+
+https://user-images.githubusercontent.com/1664497/205416889-d458668e-ab46-4867-890c-ce32ff467128.mp4
+
+
+## 設定例
+```yaml
+version: 1.0
+setting: |-
+  prefix_keys_for_changing_layer [:zr, :zl, :l]
+  install_macro_plugin(ProconBypassMan::Plugin::Splatoon2::Macro::RotationLeftStick)
+
+  layer :up do
+    macro ProconBypassMan::Plugin::Splatoon3::Macro::RotationLeftStick, if_pressed: [:left]
+  end
+```

data/lib/procon_bypass_man/buttons_setting_configuration/layer.rb

@@ -53,13 +53,13 @@ module ProconBypassMan
       end
 
       # @param [String, Class] プラグインのclass
-      # @param [Hash, NilClass] if_tilted_left_stick
+      # @param [Hash, Boolean, NilClass] if_tilted_left_stick
       def macro(name, if_pressed: nil, if_tilted_left_stick: nil, force_neutral: nil)
         case if_tilted_left_stick
         when Integer, String, Symbol, Array
           warn "macro #{name}のif_tilted_left_stickで想定外の値です"
           if_tilted_left_stick = nil
-        when TrueClass, NilClass, FalseClass
+        when TrueClass, NilClass, FalseClass, Hash
           # OK
         else
           Kernel.warn "設定ファイルに記述ミスがあります. 未対応の値を受け取りました."
@@ -91,6 +91,7 @@ module ProconBypassMan
       end
 
       # 設定ファイルに直接マクロを打ち込める
+      # @param [Hash, Boolean, NilClass] if_tilted_left_stick
       # @param [String, Class] macroの識別子
       # @paramh[Array<Symbol>] macroの本体. ボタンの配列
       def open_macro(name, steps: [], if_pressed: nil, if_tilted_left_stick: nil, force_neutral: nil)

data/lib/procon_bypass_man/bypass/bypass_command.rb

@@ -1,6 +1,5 @@
+# 子プロセスで実行する
 class ProconBypassMan::BypassCommand
-  include ProconBypassMan::SignalHandler
-
   module WILL_TERMINATE_TOKEN
     TERMINATE = :terminate
     RESTART = :restart
@@ -25,7 +24,7 @@ class ProconBypassMan::BypassCommand
 
     # gadget => procon
     # 遅くていい
-    ProconBypassMan.logger.info "Thread1を起動します"
+    ProconBypassMan.logger.info "[BYPASS] Thread1を起動します"
 
     cycle_sleep = ProconBypassMan::CycleSleep.new(cycle_interval: 1, execution_cycle: ProconBypassMan.config.bypass_mode.gadget_to_procon_interval)
 
@@ -46,14 +45,14 @@ class ProconBypassMan::BypassCommand
         Process.kill "TERM", Process.ppid
       end
 
-      ProconBypassMan.logger.info "Thread1を終了します"
+      ProconBypassMan.logger.info "[BYPASS] Thread1を終了します"
     end
 
     # procon => gadget
     # シビア
     t2 = Thread.new do
       bypass = ProconBypassMan::Bypass::ProconToSwitch.new(gadget: @gadget, procon: @procon)
-      process = BlueGreenProcess.new(worker_instance: bypass, max_work: 550)
+      process = BlueGreenProcess.new(worker_instance: bypass, max_work: 1000)
       loop do
         if $will_terminate_token
           if $will_terminate_token == WILL_TERMINATE_TOKEN::TERMINATE
@@ -67,7 +66,7 @@ class ProconBypassMan::BypassCommand
 
         process_switching_time_before_work = BlueGreenProcess.performance.process_switching_time_before_work
         if process_switching_time_before_work > 0.1
-          ProconBypassMan.logger.info("slow process_switching_time_before_work: #{process_switching_time_before_work}")
+          ProconBypassMan::PrintMessageCommand.execute(text: "slow process_switching_time_before_work: #{process_switching_time_before_work}")
         end
 
       rescue EOFError => e
@@ -81,25 +80,49 @@ class ProconBypassMan::BypassCommand
         process.shutdown
         break
       end
+
+      ProconBypassMan.logger.info "[BYPASS] Thread2を終了します"
     end
 
-    ProconBypassMan.logger.info "子プロセスでgraceful shutdownの準備ができました"
+    ProconBypassMan.logger.info "BYPASSプロセスでgraceful shutdownの準備ができました"
     begin
+      # TODO: 本当はいらないんだけど、なぜか反映されないのでここでも設定する
+      BlueGreenProcess.config.logger = ProconBypassMan.logger
+
       while(readable_io = IO.select([self_read]))
         signal = readable_io.first[0].gets.strip
-        handle_signal(signal)
+        case signal
+        when 'USR2'
+          ProconBypassMan.logger.debug "[BYPASS] BYPASSプロセスでUSR2シグナルを受け取りました"
+          raise ProconBypassMan::InterruptForRestart
+        when 'TERM'
+          ProconBypassMan.logger.debug "[BYPASS] BYPASSプロセスでTERMシグナルを受け取りました"
+          raise Interrupt
+        when 'INT'
+          ProconBypassMan.logger.debug "[BYPASS] BYPASSプロセスでINTシグナルを無視します"
+        end
       end
     rescue ProconBypassMan::InterruptForRestart
+      ProconBypassMan.logger.info "[BYPASS] BYPASSプロセスの終了処理を開始します"
       $will_terminate_token = WILL_TERMINATE_TOKEN::RESTART
+      BlueGreenProcess.terminate_workers_immediately
       [t1, t2].each(&:join)
+      ProconBypassMan.logger.info "[BYPASS] BYPASSプロセス内のThreadsが停止しました"
       @gadget&.close
       @procon&.close
+      ProconBypassMan.logger.info "[BYPASS] BYPASSプロセスを終了します"
+      DRb.stop_service if defined?(DRb)
       exit! 1 # child processなのでexitしていい
     rescue Interrupt
+      ProconBypassMan.logger.info "[BYPASS] BYPASSプロセスの終了処理を開始します"
       $will_terminate_token = WILL_TERMINATE_TOKEN::TERMINATE
+      BlueGreenProcess.terminate_workers_immediately
       [t1, t2].each(&:join)
+      ProconBypassMan.logger.info "[BYPASS] BYPASSプロセス内のThreadsが停止しました"
       @gadget&.close
       @procon&.close
+      ProconBypassMan.logger.info "[BYPASS] BYPASSプロセスを終了します"
+      DRb.stop_service if defined?(DRb)
       exit! 1 # child processなのでexitしていい
     end
   end

data/lib/procon_bypass_man/bypass/procon_to_switch.rb

@@ -29,18 +29,18 @@ class ProconBypassMan::Bypass::ProconToSwitch
       self.bypass_value = ProconBypassMan::Bypass::BypassValue.new(nil)
 
       next(run_callbacks(:work) {
-        next(false) if $will_terminate_token
+        next(false) if will_terminate?
 
         raw_output = nil
         measurement.record_read_time do
           begin
-            return(false) if $will_terminate_token
+            return(false) if will_terminate?
             raw_output = self.procon.read_nonblock(64)
           rescue IO::EAGAINWaitReadable
             sleep(0.002)
             retry
           rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN, Errno::ETIMEDOUT => e
-            return(false) if $will_terminate_token
+            return(false) if will_terminate?
             raise
           end
 
@@ -52,7 +52,7 @@ class ProconBypassMan::Bypass::ProconToSwitch
             ProconBypassMan::Retryable.retryable(tries: 5, on_no_retry: [Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN, Errno::ETIMEDOUT]) do
               begin
                 # 終了処理を希望されているのでブロックを無視してメソッドを抜けてOK
-                return(false) if $will_terminate_token # rubocop:disable Lint/NoReturnInBeginEndBlocks
+                return(false) if will_terminate? # rubocop:disable Lint/NoReturnInBeginEndBlocks
                 binary = ::ProconBypassMan::Procon::Rumbler.monitor do
                   ProconBypassMan::Processor.new(bypass_value.binary).process
                 end
@@ -69,11 +69,11 @@ class ProconBypassMan::Bypass::ProconToSwitch
 
                 next(true)
               rescue IO::EAGAINWaitReadable
-                return(false) if $will_terminate_token # rubocop:disable Lint/NoReturnInBeginEndBlocks
+                return(false) if will_terminate? # rubocop:disable Lint/NoReturnInBeginEndBlocks
                 measurement.record_write_error
                 raise CouldNotWriteToSwitchError
               rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN, Errno::ETIMEDOUT => e
-                return(false) if $will_terminate_token # rubocop:disable Lint/NoReturnInBeginEndBlocks
+                return(false) if will_terminate? # rubocop:disable Lint/NoReturnInBeginEndBlocks
                 raise
               end
             end
@@ -89,7 +89,7 @@ class ProconBypassMan::Bypass::ProconToSwitch
 
   # @return [void]
   def direct_connect_switch_via_bluetooth
-    ProconBypassMan.logger.debug { "direct_connect_switch_via_bluetooth!" }
+    ProconBypassMan.logger.debug { "[BYPASS] プロコンとSwitchを無線接続へ切り替えます" }
     self.procon.write_nonblock(["010500000000000000003800"].pack("H*")) # home led off
     self.procon.write_nonblock(["010600000000000000003800"].pack("H*")) # home led off
     self.procon.write_nonblock(["010700000000000000003800"].pack("H*")) # home led off
@@ -107,4 +107,9 @@ class ProconBypassMan::Bypass::ProconToSwitch
 
     ProconBypassMan.logger.debug { "<<< #{bypass_value.to_text}" }
   end
+
+  # @return [Boolean]
+  def will_terminate?
+    $will_terminate_token
+  end
 end

data/lib/procon_bypass_man/bypass/switch_to_procon.rb

@@ -58,9 +58,9 @@ class ProconBypassMan::Bypass::SwitchToProcon
     if ProconBypassMan.config.verbose_bypass_log
       ProconBypassMan.logger.debug { ">>> #{bypass_value.to_text}" }
     else
-      ProconBypassMan.cache.fetch key: 'bypass_log', expires_in: 1 do
-        ProconBypassMan.logger.debug { ">>> #{bypass_value.to_text}" }
-      end
+      # ProconBypassMan.cache.fetch key: 'bypass_log', expires_in: 1 do
+      #   ProconBypassMan.logger.debug { ">>> #{bypass_value.to_text}" }
+      # end
     end
   end
 end

data/lib/procon_bypass_man/plugin/splatoon3/macro/rotation_left_stick.rb

@@ -0,0 +1,21 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon3
+      module Macro
+        module RotationLeftStick
+          def self.display_name
+            :rotation_left_stick
+          end
+
+          def self.steps
+            [:rotation_left_stick]
+          end
+
+          def self.description
+            '左スティックを1回転します'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/plugins.rb

@@ -18,6 +18,7 @@ require_relative "plugin/splatoon3/macro/sokuwari_for_splash_bomb"
 require_relative "plugin/splatoon3/macro/forward_ikarole"
 require_relative "plugin/splatoon3/macro/charge_tansan_bomb"
 require_relative "plugin/splatoon3/macro/dasei_cancel"
+require_relative "plugin/splatoon3/macro/rotation_left_stick"
 require_relative "plugin/splatoon3/mode/guruguru"
 
 module ProconBypassMan

data/lib/procon_bypass_man/procon/macro_builder.rb

@@ -95,7 +95,7 @@ class ProconBypassMan::Procon::MacroBuilder
     end
 
     # NOTE: マクロ構文で生成したいけど、スティックとボタン同時押しの構文が思いつかないので、ハードコードする
-    if /forward_ikarole1/ =~ step
+    if /^forward_ikarole1/ =~ step
       # NOTE: 0degはx: 1, y: 0, 90degはx: 0, y: 1, 180degはx: -1, y: 0.
       # NOTE: スティックを前方に倒している状態で270度回転させる
       for_forward_ikarole_steps = [
@@ -105,6 +105,11 @@ class ProconBypassMan::Procon::MacroBuilder
       return { steps: for_forward_ikarole_steps }
     end
 
+    if /^rotation_left_stick/ =~ step
+      roll_left_stick_steps = 0.step(359, 17).map { |x| ["tilt_left_stick_completely_to_#{x}deg".to_sym] }
+      return { steps: roll_left_stick_steps }
+    end
+
     if %r!^(pressing_|toggle_|shake_left_stick_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|shake_left_stick|toggle_[^_]+!)) && (match = step.match(%r!_for_([\d_]+)(sec)?\z!))
       if sec = match[1]
         return {

data/lib/procon_bypass_man/runner.rb

@@ -1,6 +1,5 @@
+# フォアグラウンドで実行する
 class ProconBypassMan::Runner
-  include ProconBypassMan::SignalHandler
-
   def initialize(gadget: , procon: )
     @gadget = gadget
     @procon = procon
@@ -20,8 +19,9 @@ class ProconBypassMan::Runner
 
     loop do
       child_pid = Kernel.fork do
+        ProconBypassMan.logger.info "[BYPASS] BYPASSプロセスを起動します"
         $will_terminate_token = false
-        ProconBypassMan.after_fork_on_bypass_process
+        ProconBypassMan.run_on_after_fork_of_bypass_process
         ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute # ここでblockingする
         next
       end
@@ -30,7 +30,13 @@ class ProconBypassMan::Runner
         # TODO 子プロセスが消滅した時に、メインプロセスは生き続けてしまい、何もできなくなる問題がある
         while(readable_io = IO.select([self_read]))
           signal = readable_io.first[0].gets.strip
-          handle_signal(signal)
+          ProconBypassMan.logger.debug "[BYPASS] MASTERプロセスで#{signal}シグナルを受け取りました"
+          case signal
+          when 'USR2'
+            raise ProconBypassMan::InterruptForRestart
+          when 'INT', 'TERM'
+            raise Interrupt
+          end
         end
       rescue ProconBypassMan::InterruptForRestart
         ProconBypassMan::PrintMessageCommand.execute(text: "設定ファイルの再読み込みを開始します")
@@ -40,17 +46,20 @@ class ProconBypassMan::Runner
           ProconBypassMan::ButtonsSettingConfiguration::Loader.reload_setting
           ProconBypassMan::SendReloadConfigEventCommand.execute
         rescue ProconBypassMan::CouldNotLoadConfigError => error
-          ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。再読み込みができませんでした")
+          ProconBypassMan::SendErrorCommand.execute(error: "[MASTER] 設定ファイルが不正です。再読み込みができませんでした")
           ProconBypassMan::ReportErrorReloadConfigJob.perform_async(error.message)
         end
-        ProconBypassMan::PrintMessageCommand.execute(text: "バイパス処理を再開します")
+        ProconBypassMan::PrintMessageCommand.execute(text: "[MASTER] バイパス処理を再開します")
       rescue Interrupt
         puts
-        ProconBypassMan::PrintMessageCommand.execute(text: "処理を終了します")
+        ProconBypassMan::PrintMessageCommand.execute(text: "[MASTER] BYPASSプロセスにTERMシグナルを送信します")
         Process.kill("TERM", child_pid)
+        ProconBypassMan::PrintMessageCommand.execute(text: "[MASTER] BYPASSプロセスの終了を待ちます")
         Process.wait
         break
       end
     end
+
+    ProconBypassMan::PrintMessageCommand.execute(text: "[MASTER] メインプロセスを終了します")
   end
 end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man.rb

@@ -20,7 +20,6 @@ require_relative "procon_bypass_man/device_connection"
 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_loader"
 require_relative "procon_bypass_man/support/yaml_writer"
@@ -39,7 +38,6 @@ require_relative "procon_bypass_man/support/analog_stick_hypotenuse_tilting_powe
 require_relative "procon_bypass_man/support/never_exit_accidentally"
 require_relative "procon_bypass_man/support/cycle_sleep"
 require_relative "procon_bypass_man/support/can_over_process"
-require_relative "procon_bypass_man/support/gc"
 require_relative "procon_bypass_man/support/retryable"
 require_relative "procon_bypass_man/support/renice_command"
 require_relative "procon_bypass_man/procon_display"
@@ -182,14 +180,16 @@ module ProconBypassMan
   end
 
   # @return [void]
-  def self.after_fork_on_bypass_process
+  def self.run_on_after_fork_of_bypass_process
     ProconBypassMan::ReniceCommand.change_priority(to: :high, pid: $$)
     ::GC.start
-    DRb.start_service if defined?(DRb)
-    # GC対策することによって一時的に削除した機能
+    # GC対策することによって一時的に削除した機能. 後で有効にしたい
     # ProconBypassMan::ProconDisplay::Server.start!
-
     DRb.start_service if defined?(DRb)
+
+    # for libs setting
+    BlueGreenProcess.config.logger = ProconBypassMan.logger
+
     BlueGreenProcess.configure do |config|
       config.after_fork = -> {
         DRb.start_service if defined?(DRb)

data/procon_bypass_man.gemspec

@@ -31,8 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pbmenv", ">= 0.1.9" # enable_pbm_cloud連携機能でPbmenv.installを使っている.
   spec.add_dependency "action_cable_client"
   spec.add_dependency "sorted_set"
-  spec.add_dependency "blue_green_process"
-  # spec.add_dependency "blue_green_process"
+  spec.add_dependency "blue_green_process", '0.1.4.2'
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/project_template/app.rb

@@ -12,7 +12,7 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.3.3'
+    gem 'procon_bypass_man', '0.3.4'
   end
 rescue Bundler::Source::Git::GitCommandError => e
   retry_count_on_git_command_error = retry_count_on_git_command_error + 1

data/project_template/app.rb.erb

@@ -12,7 +12,7 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.3.3'
+    gem 'procon_bypass_man', '0.3.4'
   end
 rescue Bundler::Source::Git::GitCommandError => e
   retry_count_on_git_command_error = retry_count_on_git_command_error + 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-13 00:00:00.000000000 Z
+date: 2022-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -56,16 +56,16 @@ dependencies:
   name: blue_green_process
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4.2
 description: A programmable converter for Nintendo Switch Pro Controller
 email:
 - n905i.1214@gmail.com
@@ -88,6 +88,8 @@ files:
 - README.md
 - Rakefile
 - Steepfile
+- benchmarks/README.md
+- benchmarks/bypass.rb
 - bin/console
 - bin/dev_api_server.rb
 - bin/generate_default_app
@@ -104,6 +106,7 @@ files:
 - docs/setting/splatoon3_macro_dasei_cancel.md
 - docs/setting/splatoon3_macro_forward_ikarole.md
 - docs/setting/splatoon3_recommended_setting.md
+- docs/setting/splatoon3_rotation_forward_stick.md
 - docs/setup_raspi.md
 - docs/setup_raspi.mitamae.rb
 - docs/setup_raspi_by_mitamae.md
@@ -183,6 +186,7 @@ files:
 - lib/procon_bypass_man/plugin/splatoon3/macro/jump_to_left_key.rb
 - lib/procon_bypass_man/plugin/splatoon3/macro/jump_to_right_key.rb
 - lib/procon_bypass_man/plugin/splatoon3/macro/jump_to_up_key.rb
+- lib/procon_bypass_man/plugin/splatoon3/macro/rotation_left_stick.rb
 - lib/procon_bypass_man/plugin/splatoon3/macro/sokuwari_for_splash_bomb.rb
 - lib/procon_bypass_man/plugin/splatoon3/mode/guruguru.rb
 - lib/procon_bypass_man/plugin/splatoon3/version.rb
@@ -256,7 +260,6 @@ files:
 - 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/gc.rb
 - lib/procon_bypass_man/support/http_client.rb
 - lib/procon_bypass_man/support/load_agv.rb
 - lib/procon_bypass_man/support/never_exit_accidentally.rb
@@ -268,7 +271,6 @@ files:
 - lib/procon_bypass_man/support/retryable.rb
 - lib/procon_bypass_man/support/safe_timeout.rb
 - lib/procon_bypass_man/support/send_device_stats_http_client.rb
-- 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

data/lib/procon_bypass_man/support/gc.rb

@@ -1,8 +0,0 @@
-class ProconBypassMan::GC
-  def self.stop_gc_in(&block)
-    ::GC.disable
-    result = block.call
-    ::GC.enable
-    return result
-  end
-end

data/lib/procon_bypass_man/support/signal_handler.rb

@@ -1,11 +0,0 @@
-module ProconBypassMan::SignalHandler
-  def handle_signal(sig)
-    ProconBypassMan.logger.info "#{$$}で#{sig}を受け取りました"
-    case sig
-    when 'USR2'
-      raise ProconBypassMan::InterruptForRestart
-    when 'INT', 'TERM'
-      raise Interrupt
-    end
-  end
-end