procon_bypass_man 0.1.22 → 0.2.1

data/lib/procon_bypass_man/procon/macro_builder.rb

@@ -5,9 +5,11 @@ class ProconBypassMan::Procon::MacroBuilder
         return subjects.first.to_steps
       end
 
-      base = subjects.first
-      remain = subjects[1..-1]
-      remain.map { |x| base.to_steps.zip(x.to_steps) }.first
+      subjects.inject([[], []]) do |acc, item|
+        acc[0] << item.to_steps[0]
+        acc[1] << item.to_steps[1]
+        acc
+      end
     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/procon_display/http_request.rb

@@ -0,0 +1,31 @@
+module ProconBypassMan::ProconDisplay
+  # NOTE Support GET only
+  class HttpRequest
+    def self.parse(conn)
+      headers = {}
+      loop do
+        line = conn.gets("\n")&.strip
+        break if line.nil? || line.strip.empty?
+        key, value = line.split(/:\s/, 2)
+        headers[key] = value
+      end
+
+      new(headers)
+    end
+
+    def initialize(headers)
+      @headers = headers
+    end
+
+    def path
+      request_method_and_path = @headers.detect { |key, _value| key.start_with?("GET") }.first
+      if request_method_and_path =~ /(?:GET) ([^ ]+)/ && (path = $1)
+        return path
+      end
+    end
+
+    def to_hash
+      { "PATH" => path }
+    end
+  end
+end

data/lib/procon_bypass_man/procon_display/http_response.rb

@@ -0,0 +1,23 @@
+module ProconBypassMan::ProconDisplay
+  class HttpResponse
+    def initialize(body, status: , format: "text/json")
+      @body = body&.to_json
+      @status = status
+      @format = format
+    end
+
+    def to_s
+      <<~EOH
+        HTTP/1.1 #{@status}
+        Content-Length: #{@body&.bytes&.size || 0}
+        Content-Type: #{@format}
+        Access-Control-Allow-Origin: *
+        Access-Control-Allow-Methods: GET
+        Access-Control-Allow-Private-Network：true
+        Connection: close
+
+        #{@body}
+      EOH
+    end
+  end
+end

data/lib/procon_bypass_man/procon_display/server.rb

@@ -0,0 +1,33 @@
+require 'socket'
+
+module ProconBypassMan::ProconDisplay
+  class Server
+    PORT = 9900
+
+    def self.start!
+      Thread.new do
+        new.start_with_foreground
+      end
+    end
+
+    def initialize
+      @server = TCPServer.new('0.0.0.0', PORT)
+    end
+
+    def start_with_foreground
+      loop do
+        conn = @server.accept
+        response = ServerApp.new(
+          HttpRequest.parse(conn).to_hash
+        ).call
+        conn.write(response)
+        conn.close
+      end
+    rescue Errno::EADDRINUSE => e
+      ProconBypassMan::SendErrorCommand.execute(error: e)
+    rescue => e
+      ProconBypassMan::SendErrorCommand.execute(error: e)
+      retry
+    end
+  end
+end

data/lib/procon_bypass_man/procon_display/server_app.rb

@@ -0,0 +1,17 @@
+module ProconBypassMan::ProconDisplay
+  class ServerApp
+    def initialize(env)
+      @env = env
+    end
+
+    def call
+      case @env["PATH"]
+      when "/input"
+        response = ProconBypassMan::ProconDisplay::Status.instance.current
+        HttpResponse.new(response, status: 200).to_s
+      else
+        HttpResponse.new(nil, status: 404).to_s
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/procon_display/status.rb

@@ -0,0 +1,20 @@
+require 'singleton'
+
+class ProconBypassMan::ProconDisplay::Status
+  include Singleton
+
+  # @return [Hash]
+  def current
+    @current || {}
+  end
+
+  # @return [void]
+  # @param [Hash] value
+  def current=(value)
+    if value.is_a?(Hash)
+      @current = value
+    else
+      @current = nil
+    end
+  end
+end

data/lib/procon_bypass_man/procon_display.rb

@@ -0,0 +1,10 @@
+# 入力表示用
+
+module ProconBypassMan::ProconDisplay
+end
+
+require "procon_bypass_man/procon_display/server"
+require "procon_bypass_man/procon_display/server_app"
+require "procon_bypass_man/procon_display/status"
+require "procon_bypass_man/procon_display/http_response"
+require "procon_bypass_man/procon_display/http_request"

data/lib/procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb

@@ -17,7 +17,8 @@ module ProconBypassMan
           path: ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
           content: setting,
         )
-        ProconBypassMan.hot_reload!
+
+        hot_reload!
       end
 
       private
@@ -29,6 +30,11 @@ module ProconBypassMan
       def after_action_callback
         be_processed
       end
+
+      # @return [void]
+      def hot_reload!
+        Process.kill(:USR2, ProconBypassMan.pid)
+      end
     end
   end
 end

data/lib/procon_bypass_man/remote_pbm_action.rb

@@ -6,6 +6,7 @@ module ProconBypassMan
     require "procon_bypass_man/remote_pbm_action/stop_pbm_action"
     require "procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb"
     require "procon_bypass_man/remote_pbm_action/commands/update_remote_pbm_action_status_command"
+    require "procon_bypass_man/remote_pbm_action/commands/run_remote_pbm_action_dispatch_command"
     require "procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_action_object"
 
     ACTION_CHANGE_PBM_VERSION = "change_pbm_version"

data/lib/procon_bypass_man/runner.rb

@@ -8,13 +8,11 @@ class ProconBypassMan::Runner
   def initialize(gadget: , procon: )
     @gadget = gadget
     @procon = procon
-
-    ProconBypassMan::PrintBootMessageCommand.execute
   end
 
   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,25 +23,26 @@ 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::ProconDisplay::Server.start!
+        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)
+        ProconBypassMan::PrintMessageCommand.execute(text: "設定ファイルの再読み込みを開始します")
+        Process.kill("USR2", child_pid)
         Process.wait
-        ProconBypassMan::PrintMessageCommand.execute(text: "Reloading config file")
         begin
           ProconBypassMan::ButtonsSettingConfiguration::Loader.reload_setting
           ProconBypassMan::SendReloadConfigEventCommand.execute
@@ -53,12 +52,10 @@ class ProconBypassMan::Runner
         end
         ProconBypassMan::PrintMessageCommand.execute(text: "バイパス処理を再開します")
       rescue Interrupt
-        $will_terminate_token = true
+        puts
+        ProconBypassMan::PrintMessageCommand.execute(text: "処理を終了します")
         Process.kill("TERM", child_pid)
         Process.wait
-        ProconBypassMan::PrintMessageCommand.execute(text: "処理を終了します")
-        @gadget&.close
-        @procon&.close
         break
       end
     end

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/never_exit_accidentally.rb

@@ -1,11 +1,11 @@
 module ProconBypassMan
   module NeverExitAccidentally
-    def exit_if_allow(status)
+    def self.exit_if_allow_at_config
       if ProconBypassMan.never_exit_accidentally
-        eternal_sleep
+        ProconBypassMan.eternal_sleep
       else
         yield if block_given?
-        exit(status)
+        exit 1
       end
     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,9 +1,13 @@
 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')
-      sleep 0.5
+    def reset(cooldown: 0.5)
+      [ "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 cooldown
     end
 
     def init
@@ -42,6 +46,7 @@ class ProconBypassMan::UsbDeviceController
       EOH
 
       `bash -c '#{shell}'`
+      sleep(1)
     end
 
     def initialized?

data/lib/procon_bypass_man/support/yaml_loader.rb

@@ -0,0 +1,12 @@
+class ProconBypassMan::YamlLoader
+  # @param [String] path
+  # @return [Hash]
+  def self.load(path: )
+    YAML.load_file(path).tap do |y|
+      # 行末に空白があるとto_yamlしたときに改行コードがエスケープされてしまうのでstrip
+      y.transform_values do |v|
+        v.strip! if v.is_a?(String)
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/websocket/client.rb

@@ -23,8 +23,7 @@ module ProconBypassMan
             ProconBypassMan.logger.info('websocket client: successfully connected in ProconBypassMan::Websocket::Client')
           }
           client.subscribed { |msg|
-            ProconBypassMan.logger.info('websocket client: subscribed')
-            puts({ event: :subscribed, msg: msg })
+            ProconBypassMan.logger.info("websocket client: subscribed(#{msg})")
             ProconBypassMan::SyncDeviceStatsJob.perform(ProconBypassMan::DeviceStatus.current)
           }
 
@@ -39,13 +38,11 @@ module ProconBypassMan
 
           client.disconnected {
             ProconBypassMan.logger.info('websocket client: disconnected!!')
-            puts :disconnected
             client.reconnect!
             sleep 2
           }
           client.errored { |msg|
             ProconBypassMan.logger.error("websocket client: errored!!, #{msg}")
-            puts :errored
             client.reconnect!
             sleep 2
           }