procon_bypass_man 0.1.20.2 → 0.1.23

data/lib/procon_bypass_man/procon.rb

@@ -1,4 +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"
@@ -9,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
 
@@ -19,6 +29,7 @@ class ProconBypassMan::Procon
       ongoing_macro: MacroRegistry.load(:null),
       ongoing_mode: ModeRegistry.load(:manual),
     }
+    @@left_stick_tilting_power_scaler = ProconBypassMan::AnalogStickTiltingPowerScaler.new
   end
   reset!
 
@@ -38,6 +49,7 @@ class ProconBypassMan::Procon
     ProconBypassMan::ButtonsSettingConfiguration.instance.layers[current_layer_key]
   end
 
+  # 内部ステータスを書き換えるフェーズ
   def apply!
     layer_changer = ProconBypassMan::Procon::LayerChanger.new(binary: user_operation.binary)
     if layer_changer.change_layer?
@@ -46,14 +58,52 @@ class ProconBypassMan::Procon
       return
     end
 
-    if ongoing_macro.finished?
+    analog_stick = ProconBypassMan::Procon::AnalogStick.new(binary: user_operation.binary.raw)
+    dumped_tilting_power = @@left_stick_tilting_power_scaler.add_sample(analog_stick.relative_hypotenuse)
+
+    enable_all_macro = true
+    enable_macro_map = Hash.new {|h,k| h[k] = true }
+    current_layer.disable_macros.each do |disable_macro|
+      if (disable_macro[:if_pressed] == [true] || user_operation.pressing_all_buttons?(disable_macro[:if_pressed]))
+        if disable_macro[:name] == :all
+          enable_all_macro = false
+        else
+          enable_macro_map[disable_macro[:name]] = false
+        end
+      end
+    end
+
+    if ongoing_macro.finished? && enable_all_macro
       current_layer.macros.each do |macro_name, options|
+        next unless enable_macro_map[macro_name]
+
+        if(if_tilted_left_stick_value = options[:if_tilted_left_stick])
+          threshold = (if_tilted_left_stick_value.is_a?(Hash) && if_tilted_left_stick_value[:threshold]) || ProconBypassMan::AnalogStickTiltingPowerScaler::DEFAULT_THRESHOLD
+          if dumped_tilting_power&.tilting?(threshold: threshold, current_position_x: analog_stick.relative_x, current_position_y: analog_stick.relative_y) && user_operation.pressing_all_buttons?(options[:if_pressed])
+            @@status[:ongoing_macro] = MacroRegistry.load(macro_name)
+            break
+          end
+
+          next
+        end
+
         if user_operation.pressing_all_buttons?(options[:if_pressed])
-          @@status[:ongoing_macro] = MacroRegistry.load(macro_name)
+          @@status[:ongoing_macro] = MacroRegistry.load(macro_name, force_neutral_buttons: options[:force_neutral])
+          break
         end
       end
     end
 
+    # remote macro
+    if task = ProconBypassMan::RemoteMacro::TaskQueueInProcess.non_blocking_shift
+      ProconBypassMan::Procon::MacroRegistry.cleanup_remote_macros!
+      macro_name = task.name || "RemoteMacro-#{task.steps.join}".to_sym
+      ProconBypassMan::Procon::MacroRegistry.install_plugin(macro_name, steps: task.steps, macro_type: :remote)
+      @@status[:ongoing_macro] = MacroRegistry.load(macro_name, macro_type: :remote) do
+        ProconBypassMan::PostCompletedRemoteMacroJob.perform_async(task.uuid)
+      end
+    end
+
     case current_layer.mode
     when :manual
       @@status[:ongoing_mode] = ModeRegistry.load(:manual)
@@ -88,15 +138,17 @@ class ProconBypassMan::Procon
     status
   end
 
-  # @return [ProconBypassMan::Domains::ProcessingProconBinary]
+  # @return [String]
   def to_binary
     if ongoing_mode.name != :manual
       return user_operation.binary.raw
     end
 
-    if ongoing_macro.ongoing?
-      step = ongoing_macro.next_step or return(user_operation.binary.raw)
-      user_operation.press_button_only(step)
+    if ongoing_macro.ongoing? && (step = ongoing_macro.next_step)
+      ongoing_macro.force_neutral_buttons&.each do |force_neutral_button|
+        user_operation.unpress_button(force_neutral_button)
+      end
+      user_operation.press_button_only_or_tilt_sticks(step)
       return user_operation.binary.raw
     end
 
@@ -105,7 +157,7 @@ class ProconBypassMan::Procon
     end
 
     current_layer.left_analog_stick_caps.each do |config|
-      if config[:if_pressed].nil? || user_operation.pressing_all_buttons?(config[:if_pressed])
+      if !config[:if_pressed] || user_operation.pressing_all_buttons?(config[:if_pressed])
         config[:force_neutral]&.each do |force_neutral_button|
           user_operation.unpress_button(force_neutral_button)
         end
@@ -143,14 +195,4 @@ class ProconBypassMan::Procon
 
     user_operation.binary.raw
   end
-
-  private
-
-  def method_missing(name)
-    if name.to_s =~ /\Apressed_[a-z]+\?\z/
-      user_operation.public_send(name)
-    else
-      super
-    end
-  end
 end

data/lib/procon_bypass_man/remote_macro/queue_over_process.rb

@@ -0,0 +1,62 @@
+class ProconBypassMan::QueueOverProcess
+  attr_reader :drb
+
+  @@drb_server = nil
+  @@drb_server_thread = nil
+
+  def self.start!
+    return unless ProconBypassMan.config.enable_remote_macro?
+    require 'drb/drb'
+
+    FileUtils.rm_rf(file_path) if File.exist?(file_path)
+    begin
+      @@drb_server = DRb.start_service(url, Queue.new, safe_level: 1)
+    rescue Errno::EADDRINUSE => e
+      ProconBypassMan.logger.error e
+      raise
+    end
+
+    @@drb_server_thread =
+      Thread.new do
+        DRb.thread.join
+      end
+  end
+
+  def self.shutdown
+    if @@drb_server
+      @@drb_server_thread.kill
+      @@drb_server.stop_service
+    end
+  end
+
+  def self.push(value)
+    return unless ProconBypassMan.config.enable_remote_macro?
+
+    drb.push(value)
+  end
+
+  def self.pop
+    return unless ProconBypassMan.config.enable_remote_macro?
+
+    drb.pop
+  end
+
+  def self.drb
+    return unless ProconBypassMan.config.enable_remote_macro?
+
+    @@drb ||= new.drb
+  end
+
+  PROTOCOL = "drbunix"
+  def self.url
+    "#{PROTOCOL}:/tmp/procon_bypass_man_queue"
+  end
+
+  def self.file_path
+    url.gsub("#{PROTOCOL}:", "")
+  end
+
+  def initialize
+    @drb = DRbObject.new_with_uri(self.class.url)
+  end
+end

data/lib/procon_bypass_man/remote_macro/remote_macro_object.rb

@@ -0,0 +1,30 @@
+module ProconBypassMan
+  class RemoteMacroObject
+    # valueobjectがvalidatorの責務も持っている. 今度分離する
+    class ValidationError < StandardError; end
+    class MustBeNotNilError < ValidationError; end
+    class NonSupportAction < ValidationError; end
+
+    attr_accessor :name, :uuid, :steps
+
+    # @param [String] name
+    # @param [String] uuid
+    # @param [Array] steps
+    def initialize(name: , uuid:, steps: )
+      @name = name
+      @uuid = uuid
+      @steps = steps
+      freeze
+    end
+
+    # @raise [MustBeNotNilError]
+    # @raise [NonSupportAction]
+    # @return [void]
+    def validate!
+      self.uuid or raise MustBeNotNilError, "uuidは値が必須です"
+      unless self.steps.is_a?(Array)
+        raise ValidationError, "stepsは配列です"
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/remote_macro/remote_macro_receiver.rb

@@ -0,0 +1,37 @@
+class ProconBypassMan::RemoteMacroReceiver
+  # forkしたプロセスで動かすクラス。sock経由で命令を受け取ってmacoのキューに積んでいく
+  def self.start_with_foreground!
+    return unless ProconBypassMan.config.enable_remote_macro?
+
+    run
+  end
+
+  def self.start!
+    return unless ProconBypassMan.config.enable_remote_macro?
+
+    Thread.start do
+      start_with_foreground!
+    end
+  end
+
+  def self.run
+    while(task = ProconBypassMan::QueueOverProcess.pop)
+      receive(task)
+    end
+    shutdown
+  rescue Errno::ENOENT, Errno::ECONNRESET, Errno::ECONNREFUSED => e
+    ProconBypassMan.logger.debug(e)
+  end
+
+
+  # @param [ProconBypassMan::RemoteMacro::Task] task
+  def self.receive(task)
+    ProconBypassMan.logger.info "[remote macro][receiver] name: #{task.name}, uuid: #{task.uuid}, steps: #{task.steps}"
+    ProconBypassMan::RemoteMacro::TaskQueueInProcess.push(task)
+    true
+  end
+
+  def self.shutdown
+    ProconBypassMan.logger.info("ProconBypassMan::RemoteMacroReceiverを終了します。")
+  end
+end

data/lib/procon_bypass_man/remote_macro/remote_macro_sender.rb

@@ -0,0 +1,8 @@
+class ProconBypassMan::RemoteMacroSender
+  def self.execute(name: , uuid: , steps: )
+    ProconBypassMan.logger.info "[remote macro][sender] name: #{name}, uuid: #{uuid}, steps: #{steps}"
+    ProconBypassMan::QueueOverProcess.push(
+      ProconBypassMan::RemoteMacro::Task.new(name, uuid, steps)
+    )
+  end
+end

data/lib/procon_bypass_man/remote_macro/task.rb

@@ -0,0 +1,6 @@
+module ProconBypassMan
+  module RemoteMacro
+    class Task < Struct.new(:name, :uuid, :steps)
+    end
+  end
+end

data/lib/procon_bypass_man/remote_macro/task_queue.rb

@@ -0,0 +1,13 @@
+module ProconBypassMan
+  module RemoteMacro
+    class TaskQueue < ::Queue
+      def present?
+        not empty?
+      end
+
+      def non_blocking_shift
+        present? && shift
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/remote_macro.rb

@@ -0,0 +1,14 @@
+module ProconBypassMan
+  module RemoteMacro
+    require "procon_bypass_man/remote_macro/remote_macro_object"
+    require "procon_bypass_man/remote_macro/remote_macro_receiver"
+    require "procon_bypass_man/remote_macro/remote_macro_sender"
+    require "procon_bypass_man/remote_macro/queue_over_process"
+    require "procon_bypass_man/remote_macro/task"
+    require "procon_bypass_man/remote_macro/task_queue"
+
+    ACTION_KEY = "remote_macro"
+
+    TaskQueueInProcess = ProconBypassMan::RemoteMacro::TaskQueue.new
+  end
+end

data/lib/procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_action_object.rb

@@ -11,7 +11,7 @@ module ProconBypassMan
     # @param [String] status
     # @param [String] #uuid
     # @param [Time] created_at
-    # @return [Hash] job_args
+    # @param [Hash] job_args
     def initialize(action: , status:, uuid:, created_at:, job_args: )
       self.action = action
       self.status = status

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/value_objects/remote_pbm_action_object"
 
     ACTION_CHANGE_PBM_VERSION = "change_pbm_version"
     ACTION_REBOOT_OS = "reboot_os"

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,19 +25,23 @@ class ProconBypassMan::Runner
     end
 
     loop do
-      $will_terminate_token = false
       # NOTE メインプロセスではThreadをいくつか起動しているので念のためパフォーマンスを優先するためにforkしていく
-      child_pid = Kernel.fork { ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute }
+      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 # ここで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
@@ -49,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/analog_stick_hypotenuse_tilting_power_scaler.rb

@@ -0,0 +1,59 @@
+class ProconBypassMan::AnalogStickTiltingPowerScaler
+  DEFAULT_THRESHOLD = 500
+
+  class PowerChunk
+    def initialize(list)
+      @list = list
+    end
+
+    def moving_power
+      max = @list.max
+      min = @list.min
+      moving_power = (max - min).abs
+    end
+
+    def tilting?(threshold: DEFAULT_THRESHOLD, current_position_x: , current_position_y: )
+      # スティックがニュートラルな時
+      if (-200..200).include?(current_position_x) && (-200..200).include?(current_position_y)
+        return false
+      end
+
+      moving_power >= threshold
+    end
+  end
+
+  def initialize
+    @map = {}
+  end
+
+  # @return [NilClass, Chunk] ローテトしたらvalueを返す
+  def add_sample(value)
+    rotated = nil
+    current_key = key
+    if @map[current_key].nil?
+      rotated = rotate
+      @map = { current_key => [] } # renew or initialize
+    end
+
+    @map[current_key] << value
+    rotated
+  end
+
+  private
+
+  # 0.1sec刻みで進行する
+  def key
+    time = Time.now
+    m1 = time.strftime('%L')[0]
+    [time.to_i, m1].join.to_i
+  end
+
+  def rotate
+    list = @map.values.first
+    if list
+      return PowerChunk.new(list)
+    else
+      return nil
+    end
+  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/{device_procon_finder.rb → support/device_procon_finder.rb}

@@ -31,8 +31,6 @@ class ProconBypassMan::DeviceProconFinder
 
   def get_list_shell
     <<~SHELL
-      #!/bin/bash
-
       FILES=/dev/hidraw*
       for f in $FILES
       do

data/lib/procon_bypass_man/support/remote_macro_http_client.rb

@@ -0,0 +1,9 @@
+module ProconBypassMan
+  class RemoteMacroHttpClient < HttpClient
+    def post(job_id: )
+      super(request_body: {
+        job_id: job_id,
+      })
+    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,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
 
@@ -10,8 +14,6 @@ class ProconBypassMan::UsbDeviceController
       return if initialized?
 
       shell = <<~EOH
-        #!/bin/bash
-
         cd /sys/kernel/config/usb_gadget/
         mkdir -p procon
         cd procon
@@ -44,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.20.2"
+  VERSION = "0.1.23"
 end