procon_bypass_man 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f213faf13081ece91f62fb64af88e63672d035d29740b9c98c832f89921d8f9d
-  data.tar.gz: 3ec15d612dfaa91b085fef0a9e8810625b79b3a2a0781c57a56a39cc0b2d6be4
+  metadata.gz: f0250a1a8546982fa0d1924606cfeb65b0376b1f0bbd2849a8c6faba39551c1a
+  data.tar.gz: 94301f2c9540d370e55479f9ae818de0b0e64ece99b7ad7b44698f8828e241d4
 SHA512:
-  metadata.gz: 3570d9025f546e14e13b441a60568d58ec2ae728805061f7152c34e544e142a5c75ac37e893af96cafa5c956a8063eff41ddf6585b044c87e003e1ea4ba1902d
-  data.tar.gz: 4a1dceca2806e28ac8cb9ca859f82adc5dc09ce9071c743df0ee7d4e2a4f761386a43057660f930d4d105c3898ba48496658c6a7eb3e86fc2d60e86f0df5cd8d
+  metadata.gz: 8819eed593368519dde453cdb44168c4d05066ec6a52d22b8ca61f57a4f67d59307b41d4cb814a9b89dc2590cab17036ab2c2acf6c460213193cecf3380f8cb7
+  data.tar.gz: 5ba74b2733493a2efb74fd9f73ffa5d6a9103acb5e1bd2d050e5c14146e739da4b48e25e84431cab1655e3d9a48a5f8249974f66da5ecc55f8efb4a66c3e86e7

data/.circleci/config.yml

@@ -40,7 +40,7 @@ jobs:
       tag: 3.0.1
     steps:
       - checkout
-      - run: GEM_VERSION=$(grep -o -E '[0-9.]+' lib/procon_bypass_man/version.rb) && GEM_VERSION_IN_BUNDER=$(grep procon_bypass_man project_template/app.rb | grep -o -E '[0-9.]+') && test "$GEM_VERSION" = "$GEM_VERSION_IN_BUNDER"
+      - run: GEM_VERSION=$(grep -o -E '[0-9.]+' lib/procon_bypass_man/version.rb) && GEM_VERSION_IN_BUNDER=$(grep procon_bypass_man project_template/app.rb | grep "gem 'procon_bypass_man'" | grep -o -E '[0-9.]+') && test "$GEM_VERSION" = "$GEM_VERSION_IN_BUNDER"
 
   syntax_check:
     parameters:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.1.23] - 2022-05-04
+- プロセスを停止するとプロコンがBluetooth経由でSwitchと接続するようになりました
+- 起動時に表示するdevice_idを一部のみ表示するようになりました
+- ライブリロードが不安定になっていたのを修正しました
+- コントローラのバイブレーションを無効にしました
+- プロセスを停止後、再接続しやすくなりました
+
 ## [0.1.22] - 2022-04-09
 * スティックを左右に入れるマクロが使えるようになりました
   * スプラトゥーン2でのタンサンボムのチャージに使えます

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.22)
+    procon_bypass_man (0.1.23)
       action_cable_client
       pbmenv (>= 0.1.9)
       sorted_set
@@ -41,7 +41,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     rack (2.2.3)
-    rack-protection (2.1.0)
+    rack-protection (2.2.0)
       rack
     rainbow (3.0.0)
     rake (13.0.6)
@@ -79,10 +79,10 @@ GEM
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     set (1.0.2)
-    sinatra (2.1.0)
+    sinatra (2.2.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
-      rack-protection (= 2.1.0)
+      rack-protection (= 2.2.0)
       tilt (~> 2.0)
     sorted_set (1.0.3)
       rbtree

data/docs/getting_started.md

@@ -180,6 +180,7 @@ discordで質問してみてください。
 https://pbm-cloud.herokuapp.com/  
 procon_bypass_man_cloudの運用をWEBで完結できるようになる無料のWEBサービスです。  
   
-procon_bypass_man_cloudとの接続が完了後、Raspberry Piを起動時にprocon_bypass_man_cloudが自動で立ち上がるように設定すれば、Raspberry Piへのログインが不要で設定ファイルの変更やprocon_bypass_man_cloudのアップグレードができます。  
+procon_bypass_man_cloudとの接続が完了後、Raspberry Piを起動時にprocon_bypass_manが自動で立ち上がるように設定すれば、Raspberry Piへのログインが不要で設定ファイルの変更やprocon_bypass_man自体のアップグレードができます。  
 セットアップ方法などでわからないことがあればdiscordで質問してみてください。  
+  
 セットアップ方法は https://pbm-cloud.herokuapp.com/faq に書いています。

data/lib/procon_bypass_man/bypass.rb

@@ -3,10 +3,10 @@ require "procon_bypass_man/bypass/usb_hid_logger"
 class ProconBypassMan::Bypass
   include ProconBypassMan::Bypass::UsbHidLogger
 
-  class BypassValue < Struct.new(:binary, :sent)
+  class BypassValue < Struct.new(:binary)
     def to_text
       return unless binary
-      "#{binary.unpack.first} #{'x' unless sent}"
+      binary.unpack.first
     end
   end
 
@@ -21,23 +21,32 @@ class ProconBypassMan::Bypass
   # ゆっくりでいい
   def send_gadget_to_procon!
     monitor.record(:start_function)
-    input = nil
-    self.bypass_value = BypassValue.new(nil, sent = false)
+    self.bypass_value = BypassValue.new(nil)
 
     run_callbacks(:send_gadget_to_procon) do
+      break if $will_terminate_token
+
+      raw_input = nil
       begin
-        break if $will_terminate_token
         # TODO blocking readにしたいが、接続時のフェーズによって長さが違うので厳しい
-        input = self.gadget.read_nonblock(64)
-        self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: input)
+        raw_input = self.gadget.read_nonblock(64)
+        self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: raw_input)
       rescue IO::EAGAINWaitReadable
         monitor.record(:eagain_wait_readable_on_read)
       end
 
-      if input
+      if self.bypass_value.binary
         begin
-          self.procon.write_nonblock(input)
-          self.bypass_value.sent = true
+          raw_data =
+            case
+            when self.bypass_value.binary.rumble_data?
+              binary = ProconBypassMan::RumbleBinary.new(binary: self.bypass_value.binary.raw)
+              binary.noop!
+              binary.raw
+            else
+              self.bypass_value.binary.raw
+            end
+          self.procon.write_nonblock(raw_data)
         rescue IO::EAGAINWaitReadable
           monitor.record(:eagain_wait_readable_on_write)
           break
@@ -50,15 +59,15 @@ class ProconBypassMan::Bypass
 
   def send_procon_to_gadget!
     monitor.record(:start_function)
-    output = nil
-    self.bypass_value = BypassValue.new(nil, sent = false)
+    self.bypass_value = BypassValue.new(nil)
 
     run_callbacks(:send_procon_to_gadget) do
+      break if $will_terminate_token
+
       begin
-        break if $will_terminate_token
         Timeout.timeout(1) do
-          output = self.procon.read(64)
-          self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: output)
+          raw_output = self.procon.read(64)
+          self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: raw_output)
         end
       rescue Timeout::Error
         ProconBypassMan.logger.debug { "read timeout! do sleep. by send_procon_to_gadget!" }
@@ -73,16 +82,10 @@ class ProconBypassMan::Bypass
         retry
       end
 
-      # blocking readをしているのでnilが入ることはないが、雑なテストでnilが通るので分岐を入れる。できれば消したい
-      break if output.nil?
-
       begin
         self.gadget.write_nonblock(
-          ProconBypassMan::Processor.new(
-            ProconBypassMan::Domains::InboundProconBinary.new(binary: output)
-          ).process
+          ProconBypassMan::Processor.new(bypass_value.binary).process
         )
-        self.bypass_value.sent = true
       rescue IO::EAGAINWaitReadable
         monitor.record(:eagain_wait_readable_on_write)
         break
@@ -90,4 +93,24 @@ class ProconBypassMan::Bypass
     end
     monitor.record(:end_function)
   end
+
+  # @return [void]
+  def direct_connect_switch_via_bluetooth
+    ProconBypassMan.logger.debug { "direct_connect_switch_via_bluetooth!" }
+    self.procon.write_nonblock(["8005"].pack("H*"))
+    self.procon.write_nonblock(["8005"].pack("H*"))
+    self.procon.write_nonblock(["8005"].pack("H*"))
+  end
+
+  # @return [void] 入力してから取り出さないと接続しっぱなしになるっぽいのでこれが必要っぽい
+  def be_empty_procon
+    timer = ProconBypassMan::SafeTimeout.new(timeout: Time.now + 5)
+    loop do
+      break if timer.timeout?
+      output = self.procon.read_nonblock(64)
+      ProconBypassMan.logger.debug { "[ProconBypassMan::Bypass#be_empty_procon] #{output.unpack("H*").first}" }
+    rescue IO::EAGAINWaitReadable
+      # no-op
+    end
+  end
 end

data/lib/procon_bypass_man/commands/bypass_command.rb

@@ -1,6 +1,11 @@
 class ProconBypassMan::BypassCommand
   include ProconBypassMan::SignalHandler
 
+  module WILL_TERMINATE_TOKEN
+    TERMINATE = :terminate
+    RESTART = :restart
+  end
+
   def initialize(gadget:, procon:)
     @gadget = gadget
     @procon = procon
@@ -12,7 +17,7 @@ class ProconBypassMan::BypassCommand
 
   def execute
     self_read, self_write = IO.pipe
-    %w(TERM INT).each do |sig|
+    %w(TERM INT USR2).each do |sig|
       begin
         trap sig do
           self_write.puts(sig)
@@ -28,17 +33,19 @@ class ProconBypassMan::BypassCommand
     monitor2 = ProconBypassMan::IOMonitor.new(label: "procon -> switch")
     ProconBypassMan.logger.info "Thread1を起動します"
 
-    @send_interval = 0.005
+    cycle_sleep = ProconBypassMan::CycleSleep.new(cycle_interval: 0.005, execution_cycle: 0)
 
     t1 = Thread.new do
       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(@send_interval)
+
+        cycle_sleep.sleep_or_execute do
+          bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor1)
+          !@did_first_step && timer.throw_if_timeout!
+          bypass.send_gadget_to_procon!
+        end
       rescue ProconBypassMan::SafeTimeout::Timeout
         case ProconBypassMan.config.bypass_mode.mode
         when ProconBypassMan::BypassMode::TYPE_AGGRESSIVE
@@ -47,7 +54,7 @@ class ProconBypassMan::BypassCommand
           break
         when ProconBypassMan::BypassMode::TYPE_NORMAL
           ProconBypassMan.logger.info "10秒経過したのでsend_intervalを長くします"
-          @send_interval = ProconBypassMan.config.bypass_mode.gadget_to_procon_interval
+          cycle_sleep = ProconBypassMan::CycleSleep.new(cycle_interval: 1, execution_cycle: ProconBypassMan.config.bypass_mode.gadget_to_procon_interval)
         else
           raise "unknown type"
         end
@@ -69,7 +76,14 @@ class ProconBypassMan::BypassCommand
     t2 = Thread.new do
       bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor2)
       loop do
-        break if $will_terminate_token
+        if $will_terminate_token
+          if $will_terminate_token == WILL_TERMINATE_TOKEN::TERMINATE
+            bypass.direct_connect_switch_via_bluetooth
+            bypass.be_empty_procon
+          end
+          break
+        end
+
         bypass.send_procon_to_gadget!
       rescue EOFError => e
         ProconBypassMan::SendErrorCommand.execute(error: "Proconが切断されました。終了処理を開始します. #{e.full_message}")
@@ -87,12 +101,18 @@ class ProconBypassMan::BypassCommand
         signal = readable_io.first[0].gets.strip
         handle_signal(signal)
       end
+    rescue ProconBypassMan::Runner::InterruptForRestart
+      $will_terminate_token = WILL_TERMINATE_TOKEN::RESTART
+      [t1, t2].each(&:join)
+      @gadget&.close
+      @procon&.close
+      exit! 1 # child processなのでexitしていい
     rescue Interrupt
-      $will_terminate_token = true
+      $will_terminate_token = WILL_TERMINATE_TOKEN::TERMINATE
       [t1, t2].each(&:join)
       @gadget&.close
       @procon&.close
-      exit 1 # child processなのでexitしていい
+      exit! 1 # child processなのでexitしていい
     end
   end
 end

data/lib/procon_bypass_man/commands/print_boot_message_command.rb

@@ -42,7 +42,7 @@ class ProconBypassMan::PrintBootMessageCommand
       uptime from boot: #{@table[:uptime_from_boot]} sec
       use_pbmenv: #{@table[:use_pbmenv]}
       session_id: #{ProconBypassMan.session_id}
-      device_id: #{ProconBypassMan.device_id}
+      device_id: #{ProconBypassMan.device_id.gsub(/.{25}$/, "*"*25)}
       bypass_mode: #{ProconBypassMan.config.bypass_mode}
       ----
       EOF

data/lib/procon_bypass_man/device_connector.rb

@@ -1,17 +1,22 @@
+require "timeout"
+
 class ProconBypassMan::DeviceConnector
   class BytesMismatchError < StandardError; end
   class NotFoundProconError < StandardError; end
 
   class Value
-    attr_accessor :read_from, :values
-    def initialize(values: , read_from: )
+    attr_accessor :read_from, :values, :call_block_if_receive, :block
+
+    def initialize(values: , read_from: , call_block_if_receive: false, &block)
       @values = values
       @read_from = read_from
+      @call_block_if_receive = call_block_if_receive
+      @block = block
     end
   end
 
   def self.connect
-    s = new(throw_error_if_timeout: true, enable_at_exit: false)
+    s = new(throw_error_if_timeout: true)
     s.add([
       ["0000"],
       ["0000"],
@@ -26,23 +31,30 @@ class ProconBypassMan::DeviceConnector
     s.add([/^8102/], read_from: :procon)
     # 3
     s.add([/^0100/], read_from: :switch)
-    s.add([/^21/], read_from: :procon)
+    s.add([/^21/], read_from: :procon, call_block_if_receive: /^8101/) do |this|
+      ProconBypassMan.logger.info "(start special route)"
+      this.blocking_read_with_timeout_from_procon # <<< 810100032dbd42e9b698000
+      this.write_to_procon("8002")
+      this.blocking_read_with_timeout_from_procon # <<< 8102
+      this.write_to_procon("01000000000000000000033000000000000000000000000000000000000000000000000000000000000000000000000000")
+      this.blocking_read_with_timeout_from_procon # <<< 21
+    end
+
     # 4. Forces the Joy-Con or Pro Controller to only talk over USB HID without any timeouts. This is required for the Pro Controller to not time out and revert to Bluetooth.
     s.add([["8004"]], read_from: :switch)
     s.drain_all
     return [s.switch, s.procon]
   end
 
-  def initialize(throw_error_if_timeout: false, throw_error_if_mismatch: false , enable_at_exit: true)
-    @stack = []
+  def initialize(throw_error_if_timeout: false, throw_error_if_mismatch: false)
+    @queue = []
     @initialized_devices = false
     @throw_error_if_timeout = throw_error_if_timeout
     @throw_error_if_mismatch = throw_error_if_mismatch
-    @enable_at_exit = enable_at_exit
   end
 
-  def add(values, read_from: )
-    @stack << Value.new(values: values, read_from: read_from)
+  def add(values, read_from: , call_block_if_receive: false, &block)
+    @queue << Value.new(values: values, read_from: read_from, call_block_if_receive: call_block_if_receive, &block)
   end
 
   def drain_all
@@ -51,181 +63,47 @@ class ProconBypassMan::DeviceConnector
       init_devices
     end
 
-    while(item = @stack.shift)
+    while(item = @queue.shift)
       item.values.each do |value|
-        data = nil
+        raw_data = nil
         timer = ProconBypassMan::SafeTimeout.new
         begin
           timer.throw_if_timeout!
-          data = from_device(item).read_nonblock(64)
-          debug_log_buffer << "read_from(#{item.read_from}): #{data.unpack("H*")}"
+          raw_data = from_device(item).read_nonblock(64)
+          debug_log_buffer << "read_from(#{item.read_from}): #{raw_data.unpack("H*")}"
         rescue IO::EAGAINWaitReadable
           # debug_log_buffer << "read_from(#{item.read_from}): IO::EAGAINWaitReadable"
           retry
         end
 
+        if item.call_block_if_receive =~ raw_data.unpack("H*").first
+          raw_data = item.block.call(self)
+        end
+
         result =
           case value
           when String, Array
-            value == data.unpack("H*")
+            value == raw_data.unpack("H*")
           when Regexp
-            value =~ data.unpack("H*").first
+            value =~ raw_data.unpack("H*").first
           else
             raise "#{value}は知りません"
           end
         if result
-          ProconBypassMan.logger.info "OK(expected: #{value}, got: #{data.unpack("H*")})"
-          debug_log_buffer << "OK(expected: #{value}, got: #{data.unpack("H*")})"
+          ProconBypassMan.logger.info "OK(expected: #{value}, got: #{raw_data.unpack("H*")})"
+          debug_log_buffer << "OK(expected: #{value}, got: #{raw_data.unpack("H*")})"
         else
-          ProconBypassMan.logger.info "NG(expected: #{value}, got: #{data.unpack("H*")})"
-          debug_log_buffer << "NG(expected: #{value}, got: #{data.unpack("H*")})"
-          raise BytesMismatchError if @throw_error_if_mismatch
+          ProconBypassMan.logger.info "NG(expected: #{value}, got: #{raw_data.unpack("H*")})"
+          debug_log_buffer << "NG(expected: #{value}, got: #{raw_data.unpack("H*")})"
+          raise BytesMismatchError.new(debug_log_buffer) if @throw_error_if_mismatch
         end
-        to_device(item).write_nonblock(data)
+        to_device(item).write_nonblock(raw_data)
       end
     end
-  rescue ProconBypassMan::SafeTimeout::Timeout
-    ProconBypassMan.logger.error "timeoutになりました"
-    copressed_buffer_text = ProconBypassMan::CompressArray.new(debug_log_buffer).compress.join("\n")
-    ProconBypassMan::SendErrorCommand.execute(error: copressed_buffer_text)
-    raise if @throw_error_if_timeout
-  end
-
-  # switchに任意の命令を入力して、switchから読み取る
-  def write_switch(data, only_write: false)
-    if data.encoding.name == "UTF-8"
-      data = [data].pack("H*")
-    end
-    unless @initialized_devices
-      init_devices
-    end
-
-    timer = ProconBypassMan::SafeTimeout.new
-    data = nil
-    begin
-      timer.throw_if_timeout!
-      switch.write_nonblock(data)
-    rescue IO::EAGAINWaitReadable
-      retry
-    rescue ProconBypassMan::SafeTimeout::Timeout
-      ProconBypassMan.logger.error "writeでtimeoutになりました"
-      raise
-    end
-    return(data.unpack("H*")) if only_write
-
-    timer = ProconBypassMan::SafeTimeout.new
-    begin
-      timer.throw_if_timeout!
-      data = switch.read_nonblock(64)
-      ProconBypassMan.logger.debug { " >>> #{data.unpack("H*")})" }
-    rescue IO::EAGAINWaitReadable
-      retry
-    rescue ProconBypassMan::SafeTimeout::Timeout
-      ProconBypassMan.logger.error "readでtimeoutになりました"
-      raise
-    end
-  rescue ProconBypassMan::SafeTimeout::Timeout
-    raise if @throw_error_if_timeout
-  end
-
-  def write_procon(data, only_write: false)
-    if data.encoding.name == "UTF-8"
-      data = [data].pack("H*")
-    end
-    unless @initialized_devices
-      init_devices
-    end
-
-    timer = ProconBypassMan::SafeTimeout.new
-    begin
-      timer.throw_if_timeout!
-      procon.write_nonblock(data)
-    rescue IO::EAGAINWaitReadable
-      retry
-    rescue ProconBypassMan::SafeTimeout::Timeout
-      ProconBypassMan.logger.error "writeでtimeoutになりました"
-      raise
-    end
-    return(data.unpack("H*")) if only_write
-
-    timer = ProconBypassMan::SafeTimeout.new
-    begin
-      timer.throw_if_timeout!
-      data = procon.read_nonblock(64)
-      ProconBypassMan.logger.error " <<< #{data.unpack("H*")})"
-    rescue IO::EAGAINWaitReadable
-      retry
-    rescue ProconBypassMan::SafeTimeout::Timeout
-      ProconBypassMan.logger.error "readでtimeoutになりました"
-      raise
-    end
-  rescue ProconBypassMan::SafeTimeout::Timeout
-    raise if @throw_error_if_timeout
-  end
-
-  def read_procon(only_read: false)
-    unless @initialized_devices
-      init_devices
-    end
-
-    data = nil
-    timer = ProconBypassMan::SafeTimeout.new
-    begin
-      timer.throw_if_timeout!
-      data = procon.read_nonblock(64)
-      ProconBypassMan.logger.debug { " <<< #{data.unpack("H*")})" }
-    rescue IO::EAGAINWaitReadable
-      retry
-    rescue ProconBypassMan::SafeTimeout::Timeout
-      ProconBypassMan.logger.error "readでtimeoutになりました"
-      raise
-    end
-    return(data.unpack("H*")) if only_read
-
-    timer = ProconBypassMan::SafeTimeout.new
-    begin
-      timer.throw_if_timeout!
-      switch.write_nonblock(data)
-    rescue IO::EAGAINWaitReadable
-      retry
-    rescue ProconBypassMan::SafeTimeout::Timeout
-      ProconBypassMan.logger.error "writeでtimeoutになりました"
-      raise
-    end
-  rescue ProconBypassMan::SafeTimeout::Timeout
-    raise if @throw_error_if_timeout
-  end
-
-  def read_switch(only_read: false)
-    unless @initialized_devices
-      init_devices
-    end
-
-    data = nil
-    timer = ProconBypassMan::SafeTimeout.new
-    begin
-      timer.throw_if_timeout!
-      data = switch.read_nonblock(64)
-      ProconBypassMan.logger.debug { " >>> #{data.unpack("H*")})" }
-    rescue IO::EAGAINWaitReadable
-      retry
-    rescue ProconBypassMan::SafeTimeout::Timeout
-      ProconBypassMan.logger.error "readでtimeoutになりました"
-      raise
-    end
-    return(data.unpack("H*")) if only_read
-
-    timer = ProconBypassMan::SafeTimeout.new
-    begin
-      timer.throw_if_timeout!
-      procon.write_nonblock(data)
-    rescue IO::EAGAINWaitReadable
-      retry
-    rescue ProconBypassMan::SafeTimeout::Timeout
-      ProconBypassMan.logger.error "writeでtimeoutになりました"
-      raise
-    end
-  rescue ProconBypassMan::SafeTimeout::Timeout
+  rescue ProconBypassMan::SafeTimeout::Timeout, Timeout::Error => e
+    ProconBypassMan.logger.error "timeoutになりました(#{e.message})"
+    compressed_buffer_text = ProconBypassMan::CompressArray.new(debug_log_buffer).compress.join("\n")
+    ProconBypassMan::SendErrorCommand.execute(error: compressed_buffer_text)
     raise if @throw_error_if_timeout
   end
 
@@ -277,17 +155,23 @@ class ProconBypassMan::DeviceConnector
     ProconBypassMan::UsbDeviceController.reset
 
     @initialized_devices = true
-
-    if @enable_at_exit
-      at_exit do
-        @procon&.close
-        @gadget&.close
-      end
-    end
   rescue Errno::ENXIO => e
     # /dev/hidg0 をopenできないときがある
     ProconBypassMan::SendErrorCommand.execute(error: "Errno::ENXIO (No such device or address @ rb_sysopen - /dev/hidg0)が起きました。resetします.\n #{e.full_message}")
     ProconBypassMan::UsbDeviceController.reset
     retry
   end
+
+  def blocking_read_with_timeout_from_procon
+    Timeout.timeout(4) do
+      raw_data = procon.read(64)
+      ProconBypassMan.logger.info "<<< #{raw_data.unpack("H*").first}"
+      return raw_data
+    end
+  end
+
+  def write_to_procon(data)
+    ProconBypassMan.logger.info ">>> #{data}"
+    procon.write_nonblock([data].pack("H*"))
+  end
 end

data/lib/procon_bypass_man/procon/suppress_rumble.rb

@@ -0,0 +1,13 @@
+class ProconBypassMan::SuppressRumble
+  # @param [String] binary
+  def initialize(binary: )
+    @binary = binary
+  end
+
+  # @return [String]
+  def execute
+    new_raw = ["100c0001404000014040"].pack("H*")
+    new_raw[1] = @binary[1]
+    new_raw
+  end
+end

data/lib/procon_bypass_man/{domains → procon/value_objects}/binary/inbound_procon_binary.rb

@@ -6,4 +6,9 @@ class ProconBypassMan::Domains::InboundProconBinary < ProconBypassMan::Domains::
   def user_operation_data?
     binary[0] == "\x30".b
   end
+
+  # @return [Boolean]
+  def rumble_data?
+    binary[0] == "\x10".b
+  end
 end

data/lib/procon_bypass_man/procon/value_objects/binary.rb

@@ -0,0 +1,11 @@
+module ProconBypassMan
+  module Domains
+    module Binary; end
+  end
+end
+
+require "procon_bypass_man/procon/value_objects/binary/base"
+require "procon_bypass_man/procon/value_objects/binary/has_immutable_binary"
+require "procon_bypass_man/procon/value_objects/binary/has_mutable_binary"
+require "procon_bypass_man/procon/value_objects/binary/inbound_procon_binary"
+require "procon_bypass_man/procon/value_objects/binary/processing_procon_binary"

data/lib/procon_bypass_man/procon/value_objects/rumble_binary.rb

@@ -0,0 +1,18 @@
+class ProconBypassMan::RumbleBinary
+  # @param [String] binary
+  def initialize(binary: )
+    @binary = binary
+  end
+
+  def unpack
+    @binary.unpack("H*")
+  end
+
+  def noop!
+    @binary = ProconBypassMan::SuppressRumble.new(binary: @binary).execute
+  end
+
+  def raw
+    @binary
+  end
+end

data/lib/procon_bypass_man/procon.rb

@@ -1,6 +1,13 @@
 require "procon_bypass_man/procon/macro_plugin_map"
 
 class ProconBypassMan::Procon
+  require "procon_bypass_man/procon/value_objects/analog_stick"
+  require "procon_bypass_man/procon/value_objects/analog_stick_position"
+  require "procon_bypass_man/procon/value_objects/procon_reader"
+  require "procon_bypass_man/procon/value_objects/rumble_binary"
+  require "procon_bypass_man/procon/value_objects/binary"
+  require "procon_bypass_man/procon/value_objects/bypass_mode"
+
   require "procon_bypass_man/procon/consts"
   require "procon_bypass_man/procon/mode_registry"
   require "procon_bypass_man/procon/macro"
@@ -11,6 +18,7 @@ class ProconBypassMan::Procon
   require "procon_bypass_man/procon/user_operation"
   require "procon_bypass_man/procon/flip_cache"
   require "procon_bypass_man/procon/press_button_aware"
+  require "procon_bypass_man/procon/suppress_rumble"
 
   attr_accessor :user_operation
 

data/lib/procon_bypass_man/runner.rb

@@ -14,7 +14,7 @@ class ProconBypassMan::Runner
 
   def run
     self_read, self_write = IO.pipe
-    %w(TERM INT USR1 USR2).each do |sig|
+    %w(TERM INT USR2).each do |sig|
       begin
         trap sig do
           self_write.puts(sig)
@@ -25,23 +25,23 @@ class ProconBypassMan::Runner
     end
 
     loop do
-      $will_terminate_token = false
       # NOTE メインプロセスではThreadをいくつか起動しているので念のためパフォーマンスを優先するためにforkしていく
       child_pid = Kernel.fork {
+        $will_terminate_token = false
         DRb.start_service if defined?(DRb)
         ProconBypassMan::RemoteMacroReceiver.start!
-        ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute
+        ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute # ここでblockingする
+        next
       }
 
       begin
-        # TODO 小プロセスが消滅した時に、メインプロセスは生き続けてしまい、何もできなくなる問題がある
+        # TODO 子プロセスが消滅した時に、メインプロセスは生き続けてしまい、何もできなくなる問題がある
         while(readable_io = IO.select([self_read]))
           signal = readable_io.first[0].gets.strip
           handle_signal(signal)
         end
       rescue InterruptForRestart
-        $will_terminate_token = true
-        Process.kill("TERM", child_pid)
+        Process.kill("USR2", child_pid)
         Process.wait
         ProconBypassMan::PrintMessageCommand.execute(text: "Reloading config file")
         begin
@@ -53,10 +53,10 @@ class ProconBypassMan::Runner
         end
         ProconBypassMan::PrintMessageCommand.execute(text: "バイパス処理を再開します")
       rescue Interrupt
-        $will_terminate_token = true
         Process.kill("TERM", child_pid)
         Process.wait
         ProconBypassMan::PrintMessageCommand.execute(text: "処理を終了します")
+        ProconBypassMan::UsbDeviceController.reset
         @gadget&.close
         @procon&.close
         break

data/lib/procon_bypass_man/support/cycle_sleep.rb

@@ -0,0 +1,22 @@
+# n秒間sleepしつつ、mainスレッドをm秒間隔で動かしたい時に使う
+class ProconBypassMan::CycleSleep
+  attr_accessor :cycle_interval, :execution_cycle
+
+  def initialize(cycle_interval: , execution_cycle: )
+    @cycle_interval = cycle_interval
+    @execution_cycle = execution_cycle
+    @counter = 0
+  end
+
+  def sleep_or_execute
+    result = nil
+    if @counter >= @execution_cycle
+      @counter = 0
+      result = yield
+    else
+      @counter += 1
+    end
+    sleep(@cycle_interval)
+    return result
+  end
+end

data/lib/procon_bypass_man/support/device_mouse_finder.rb

@@ -0,0 +1,60 @@
+class ProconBypassMan::DeviceMouseFinder
+  class USBDevice < Struct.new(:display_name, :event_no)
+    # TODO bInterfaceProtocolの値を見てmouseかを判断したい
+    def mouse?
+      !!(display_name =~ /mouse/i)
+    end
+
+    def keyboard?
+      !!(display_name =~ /keyboard/i)
+    end
+
+    def event_device_path
+     "/dev/input/#{event_no}"
+    end
+  end
+
+  class Parser
+    def self.parse(shell_output)
+      instance = new
+      instance.set_usb_devices_from(shell_output)
+      instance
+    end
+
+    def set_usb_devices_from(shell_output)
+      @usb_devices =
+        shell_output.split(/\n\n/).map do |text|
+          display_name =  /N: Name="(.+?)"$/ =~ text && $1
+          event_no = /H: Handlers=.*?(event\d).*?$/ =~ text && $1
+          USBDevice.new(display_name, event_no)
+        end
+    end
+
+    def usb_devices
+      @usb_devices ||= []
+    end
+  end
+
+  def self.find
+    new.find
+  end
+
+  # @return [String, NilClass]
+  def find
+    find_path
+  end
+
+  private
+
+  def find_path
+    Parser.parse(shell_output).usb_devices.detect(&:mouse?)&.event_device_path
+  end
+
+  def shell_output
+    `bash -c '#{shell}'`
+  end
+
+  def shell
+    'cat /proc/bus/input/devices'
+  end
+end

data/lib/procon_bypass_man/support/safe_timeout.rb

@@ -7,8 +7,14 @@ module ProconBypassMan
       @timeout = timeout
     end
 
+    # @raise [Timeout]
     def throw_if_timeout!
-      raise Timeout if @timeout < Time.now
+      raise Timeout if timeout?
+    end
+
+    # @return [Boolean]
+    def timeout?
+      @timeout < Time.now
     end
   end
 end

data/lib/procon_bypass_man/{usb_device_controller.rb → support/usb_device_controller.rb}

@@ -1,8 +1,12 @@
 class ProconBypassMan::UsbDeviceController
   class << self
     def reset
-      system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
-      system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
+      [ "echo > /sys/kernel/config/usb_gadget/procon/UDC",
+        "ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC",
+      ].each do |shell|
+        system shell
+        ProconBypassMan.logger.debug { "[SHELL] #{shell}" }
+      end
       sleep 0.5
     end
 
@@ -42,6 +46,7 @@ class ProconBypassMan::UsbDeviceController
       EOH
 
       `bash -c '#{shell}'`
+      sleep(1)
     end
 
     def initialized?

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man.rb

@@ -14,6 +14,9 @@ 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"
@@ -29,22 +32,18 @@ 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/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"
@@ -62,9 +61,7 @@ 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)
@@ -99,18 +96,11 @@ module ProconBypassMan
       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/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.22'
+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の対になる

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-09 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -135,16 +135,7 @@ 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/analog_stick_position.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/domains/bypass_mode.rb
 - lib/procon_bypass_man/io_monitor.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/charge_tansan_bomb.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/dasei_cancel.rb
@@ -171,9 +162,19 @@ files:
 - 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
@@ -194,6 +195,9 @@ files:
 - 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
@@ -205,8 +209,8 @@ 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/client.rb
 - lib/procon_bypass_man/websocket/forever.rb

data/lib/procon_bypass_man/domains.rb

@@ -1,13 +0,0 @@
-module ProconBypassMan
-  module Domains
-    module Binary; end
-  end
-end
-
-require_relative "domains/bypass_mode"
-require_relative "domains/analog_stick_position"
-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"