procon_bypass_man 0.1.21 → 0.2.0

data/lib/procon_bypass_man/io_monitor.rb

@@ -1,4 +1,15 @@
 module ProconBypassMan
+  class NullCounter
+    def initialize(label: )
+    end
+
+    def record(_)
+    end
+
+    def shutdown
+    end
+  end
+
   class Counter
     attr_accessor :label, :table, :previous_table, :active
 
@@ -40,7 +51,11 @@ module ProconBypassMan
   end
 
   module IOMonitor
+    @@thread = nil
+
     def self.new(label: )
+      return NullCounter.new(label: label) if not started?
+
       counter = Counter.new(label: label)
       @@list << counter
       counter
@@ -51,9 +66,13 @@ module ProconBypassMan
       @@list
     end
 
+    def self.started?
+      !!@@thread
+    end
+
     # ここで集計する
     def self.start!
-      Thread.start do
+      @@thread = Thread.start do
         max_output_length = 0
         loop do
           list = @@list.select(&:active).dup

data/lib/procon_bypass_man/plugin/splatoon2/macro/charge_tansan_bomb.rb

@@ -0,0 +1,21 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module ChargeTansanBomb
+          def self.display_name
+            :charge_tansan_bomb
+          end
+
+          def self.steps
+            [:shake_left_stick_and_toggle_b_for_0_1sec].freeze
+          end
+
+          def self.description
+            'タンサンボムのチャージ'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/plugin/splatoon2/version.rb

@@ -3,7 +3,7 @@
 module ProconBypassMan
   module Plugin
     module Splatoon2
-      VERSION = "0.1.3"
+      VERSION = "0.1.5"
     end
   end
 end

data/lib/procon_bypass_man/plugins.rb

@@ -5,6 +5,7 @@ require_relative "plugin/splatoon2/macro/jump_to_up_key"
 require_relative "plugin/splatoon2/macro/jump_to_left_key"
 require_relative "plugin/splatoon2/macro/sokuwari_for_splash_bomb"
 require_relative "plugin/splatoon2/macro/dasei_cancel"
+require_relative "plugin/splatoon2/macro/charge_tansan_bomb"
 require_relative "plugin/splatoon2/mode/guruguru"
 
 module ProconBypassMan

data/lib/procon_bypass_man/procon/analog_stick_cap.rb

@@ -1,36 +1,17 @@
 class ProconBypassMan::Procon::AnalogStickCap
-  class Position
-    attr_accessor :x, :y
-
-    def initialize(x:, y:)
-      @x = x.to_i
-      @y = y.to_i
-    end
-
-    def to_binary
-      analog_stick_data = [
-        (@x & "0xff".to_i(16)),
-        ((@y << 4) & "0xf0".to_i(16)) | ((@x >> 8) & "0x0f".to_i(16)),
-        (@y >> 4) & "0xff".to_i(16),
-      ]
-      hex = analog_stick_data.map{ |x| x.to_s(16).rjust(2, "0") }.join
-      [hex].pack("H*")
-    end
-  end
-
   def initialize(binary)
     @binary = binary
     @analog_stick = ProconBypassMan::Procon::AnalogStick.new(binary: binary)
   end
 
-  # @return [ProconBypassMan::Procon::AnalogStickCap::Position]
+  # @return [ProconBypassMan::AnalogStickPosition]
   def capped_position(cap_hypotenuse: )
     if hypotenuse > cap_hypotenuse
       relative_capped_x = cap_hypotenuse * Math.cos(rad * Math::PI / 180).abs
       relative_capped_y = cap_hypotenuse * Math.sin(rad * Math::PI / 180).abs
       relative_capped_x = -(relative_capped_x.abs) if relative_x.negative?
       relative_capped_y = -(relative_capped_y.abs) if relative_y.negative?
-      return Position.new(
+      return ProconBypassMan::AnalogStickPosition.new(
         x: relative_capped_x + @analog_stick.neutral_position.x,
         y: relative_capped_y + @analog_stick.neutral_position.y,
       )
@@ -39,9 +20,9 @@ class ProconBypassMan::Procon::AnalogStickCap
     end
   end
 
-  # @return [ProconBypassMan::Procon::AnalogStickCap::Position]
+  # @return [ProconBypassMan::AnalogStickPosition]
   def position
-    Position.new(x: abs_x, y: abs_y)
+    ProconBypassMan::AnalogStickPosition.new(x: abs_x, y: abs_y)
   end
 
   def abs_x; @analog_stick.abs_x; end # 0, 0からのx

data/lib/procon_bypass_man/procon/analog_stick_manipulator.rb

@@ -0,0 +1,36 @@
+class ProconBypassMan::Procon::AnalogStickManipulator
+  attr_accessor :manipulated_abs_x, :manipulated_abs_y
+
+  def initialize(binary, method: )
+    analog_stick = ProconBypassMan::Procon::AnalogStick.new(binary: binary)
+
+    if method =~ /tilt_left_stick_(completely)_to_(left|right)/
+      power_level = $1
+      direction = $2
+
+      case direction
+      when 'left'
+        self.manipulated_abs_x = 400
+        # yを引き継ぐとタンサンボムの溜まりが悪くなったので固定値を入れる
+        self.manipulated_abs_y = analog_stick.abs_y
+        # self.manipulated_abs_y = 1808
+      when 'right'
+        self.manipulated_abs_x = 3400
+        self.manipulated_abs_y = 1808
+      end
+    else
+      warn "error stick manipulator"
+      self.manipulated_abs_x = analog_stick.abs_x
+      self.manipulated_abs_y = analog_stick.abs_y
+    end
+  end
+
+
+  # @return [String]
+  def to_binary
+    ProconBypassMan::AnalogStickPosition.new(
+      x: self.manipulated_abs_x,
+      y: self.manipulated_abs_y,
+    ).to_binary
+  end
+end

data/lib/procon_bypass_man/procon/layer_changer.rb

@@ -24,7 +24,10 @@ class ProconBypassMan::Procon::LayerChanger
   # @return [Boolean]
   def change_layer?
     if ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.empty?
-      raise "prefix_keysが未設定です"
+      ProconBypassMan.cache.fetch key: 'unknown prefix_keys', expires_in: 60 do
+        warn "prefix_keysが未設定です"
+      end
+      return false
     end
     ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.map { |b| pressed?(button: b) }.all?
   end

data/lib/procon_bypass_man/procon/macro.rb

@@ -74,11 +74,13 @@ class ProconBypassMan::Procon::Macro
     end
   end
 
-  attr_accessor :name, :steps
+  attr_accessor :name, :steps, :after_callback_block, :force_neutral_buttons
 
-  def initialize(name: , steps: )
+  def initialize(name: , steps: , force_neutral_buttons: [], &after_callback_block)
     self.name = name
     self.steps = steps
+    self.after_callback_block = after_callback_block
+    self.force_neutral_buttons = force_neutral_buttons # 外部から呼ばれるだけ
   end
 
   def next_step
@@ -97,6 +99,7 @@ class ProconBypassMan::Procon::Macro
 
       if nested_step.over?
         steps.shift # NestedStepを破棄する
+        self.after_callback_block.call if self.after_callback_block
         return next_step
       else
         return nested_step.next_step

data/lib/procon_bypass_man/procon/macro_builder.rb

@@ -5,42 +5,42 @@ 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
 
   class Subject
     def initialize(value)
-      @button =
-        if match = value.match(/_(\w+)\z/)
-          match[1]
-        else
-          :unknown
-        end
+      if not /^shake_/ =~ value
+        @button =
+          if match = value.match(/_(\w+)\z/)
+            match[1]
+          else
+            :unknown
+          end
+      end
       @type =
         if value.start_with?("toggle_")
           :toggle
+        elsif value.start_with?("shake_left_stick")
+          :shake_left_stick
         else
           :pressing
         end
     end
 
-    def toggle?
-      @type == :toggle
-    end
-
-    def pressing?
-      not toggle?
-    end
-
     def to_steps
       case @type
       when :toggle
         [@button.to_sym, :none]
       when :pressing
         [@button.to_sym, @button.to_sym]
+      when :shake_left_stick
+        [:tilt_left_stick_completely_to_left, :tilt_left_stick_completely_to_right]
       end
     end
   end
@@ -92,7 +92,7 @@ class ProconBypassMan::Procon::MacroBuilder
       ]
     end
 
-    if %r!^(pressing_|toggle_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|toggle_[^_]+!)) && (match = step.match(%r!_for_([\d_]+)(sec)?\z!))
+    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 {
           continue_for: to_f(sec),
@@ -100,14 +100,14 @@ class ProconBypassMan::Procon::MacroBuilder
             if x.is_a?(Array)
               x.select { |y| is_button(y) || RESERVED_WORD_NONE == y }
             else
-              is_button(x) || RESERVED_WORD_NONE == x
+              is_button(x) || RESERVED_WORD_NONE == x || :tilt_left_stick_completely_to_left == x || :tilt_left_stick_completely_to_right == x
             end
           },
         }
       end
     end
 
-    if %r!^(pressing_|toggle_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|toggle_[^_]+!))
+    if %r!^(pressing_|toggle_|shake_left_stick_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|shake_left_stick|toggle_[^_]+!))
       return SubjectMerger.merge(subjects.map { |x| Subject.new(x) }).select { |x|
         if x.is_a?(Array)
           x.select { |y| is_button(y) || RESERVED_WORD_NONE == y }

data/lib/procon_bypass_man/procon/macro_plugin_map.rb

@@ -0,0 +1,23 @@
+module ProconBypassMan
+  class Procon
+    # macroキーにメタデータを埋め込んでいる. 通常の処理ではメタデータを露出したくないので露出しないためのクラス
+    class MacroPluginMap < ::Hash
+      def [](value)
+        self.fetch([value, :normal], nil)
+      end
+
+      def each
+        transform_keys(&:first).each { |x| yield(x[0], x[1]) }
+      end
+
+      alias_method :original_keys, :keys
+      def keys
+        super.map(&:first)
+      end
+
+      def raw_keys
+        self.original_keys
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/procon/macro_registry.rb

@@ -3,20 +3,23 @@ class ProconBypassMan::Procon::MacroRegistry
     null: [],
   }
 
-  def self.install_plugin(klass, steps: nil)
-    if plugins[klass.to_s.to_sym]
-      raise "#{klass} macro is already registered"
+  def self.install_plugin(klass, steps: nil, macro_type: :normal)
+    if plugins.fetch([klass.to_s.to_sym, macro_type], nil)
+      Kernel.warn "#{klass} macro is already registered"
+      return
     end
 
-    plugins[klass.to_s.to_sym] = ->{
-      ProconBypassMan::Procon::MacroBuilder.new(steps || klass.steps).build
-    }
+    plugins.store(
+      [klass.to_s.to_sym, macro_type], ->{
+        ProconBypassMan::Procon::MacroBuilder.new(steps || klass.steps).build
+      }
+    )
   end
 
   # @return [ProconBypassMan::Procon::Macro]
-  def self.load(name)
-    if(steps = PRESETS[name] || plugins[name]&.call)
-      return ProconBypassMan::Procon::Macro.new(name: name, steps: steps.dup)
+  def self.load(name, macro_type: :normal, force_neutral_buttons: [], &after_callback_block)
+    if(steps = PRESETS[name] || plugins.fetch([name.to_s.to_sym, macro_type], nil)&.call)
+      return ProconBypassMan::Procon::Macro.new(name: name, steps: steps.dup, force_neutral_buttons: force_neutral_buttons, &after_callback_block)
     else
       warn "installされていないマクロ(#{name})を使うことはできません"
       return self.load(:null)
@@ -24,12 +27,20 @@ class ProconBypassMan::Procon::MacroRegistry
   end
 
   def self.reset!
-    ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins = {}
+    ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins = ProconBypassMan::Procon::MacroPluginMap.new
   end
 
   def self.plugins
     ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins
   end
 
+  def self.cleanup_remote_macros!
+    remote_keys = ProconBypassMan::Procon::MacroRegistry.plugins.original_keys.select { |_, y| y == :remote }
+    remote_keys.each do |remote_key|
+      ProconBypassMan::Procon::MacroRegistry.plugins.delete(remote_key)
+    end
+    ProconBypassMan::Procon::MacroRegistry.plugins
+  end
+
   reset!
 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/procon/user_operation.rb

@@ -33,22 +33,22 @@ class ProconBypassMan::Procon::UserOperation
     binary.write_as_press_button(button)
   end
 
-  # @param [Symbol, Array<Symbol>] button
-  def press_button_only(button)
-    if button.is_a?(Array)
-      binary.set_no_action!
-      button.uniq.each do |b|
-        unless ProconBypassMan::Procon::MacroBuilder::RESERVED_WORD_NONE == b
-          binary.write_as_press_button(b)
-        end
-      end
-      return
-    end
+  # @param [Symbol, Array<Symbol>] macro_step
+  def press_button_only_or_tilt_sticks(macro_step)
+    macro_step = [macro_step] if not macro_step.is_a?(Array)
+    # スティック操作の時はボタン入力を通す
+    binary.set_no_action! if is_button?(macro_step)
+
+    macro_step.uniq.each do |ms|
+      next if ProconBypassMan::Procon::MacroBuilder::RESERVED_WORD_NONE == ms
 
-    if ProconBypassMan::Procon::MacroBuilder::RESERVED_WORD_NONE == button
-      binary.set_no_action!
-    else
-      binary.write_as_press_button_only(button)
+      if is_button?(ms)
+        binary.write_as_press_button(ms)
+      elsif is_stick?(ms)
+        binary.write_as_tilt_left_stick(ms)
+      else
+        warn "知らないmacro stepです"
+      end
     end
   end
 
@@ -71,4 +71,18 @@ class ProconBypassMan::Procon::UserOperation
     aware = ProconBypassMan::PressButtonAware.new(@binary.raw)
     buttons.all? { |b| aware.pressing_button?(b) }
   end
+
+  # @return [Boolean]
+  def is_button?(button)
+    button = [button] if not button.is_a?(Array)
+
+    button.all? do |b|
+      !!ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP[b.to_sym] || b.to_sym == ProconBypassMan::Procon::MacroBuilder::RESERVED_WORD_NONE
+    end
+  end
+
+  # @return [Boolean]
+  def is_stick?(step)
+    !!(step =~ /\Atilt_/)
+  end
 end

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

@@ -0,0 +1,18 @@
+class ProconBypassMan::AnalogStickPosition
+  attr_accessor :x, :y
+
+  def initialize(x:, y:)
+    @x = x.to_i
+    @y = y.to_i
+  end
+
+  def to_binary
+    analog_stick_data = [
+      (@x & "0xff".to_i(16)),
+      ((@y << 4) & "0xf0".to_i(16)) | ((@x >> 8) & "0x0f".to_i(16)),
+      (@y >> 4) & "0xff".to_i(16),
+    ]
+    hex = analog_stick_data.map{ |x| x.to_s(16).rjust(2, "0") }.join
+    [hex].pack("H*")
+  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/{domains → procon/value_objects}/binary/processing_procon_binary.rb

@@ -36,13 +36,18 @@ class ProconBypassMan::Domains::ProcessingProconBinary < ProconBypassMan::Domain
 
   # @param [Symbol] button
   def write_as_press_button(button)
-    raise "already pressing button(#{button})" if ProconBypassMan::PressButtonAware.new(binary).pressing_button?(button)
+    return if ProconBypassMan::PressButtonAware.new(binary).pressing_button?(button)
 
     button_obj = ProconBypassMan::Procon::Button.new(button)
     value = binary[button_obj.byte_position].unpack("C").first + (2**button_obj.bit_position)
     binary[button_obj.byte_position] = ["%02X" % value.to_s].pack("H*")
   end
 
+  # @param [Symbol] stick method
+  def write_as_tilt_left_stick(step)
+    binary[6..8] = ProconBypassMan::Procon::AnalogStickManipulator.new(binary, method: step).to_binary
+  end
+
   # @param [Symbol] button
   def write_as_unpress_button(button)
     raise "do not press button(#{button}) yet" if not ProconBypassMan::PressButtonAware.new(binary).pressing_button?(button)

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,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
 
@@ -78,12 +88,22 @@ class ProconBypassMan::Procon
         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)
@@ -124,9 +144,11 @@ class ProconBypassMan::Procon
       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
 
@@ -135,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

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