procon_bypass_man 0.1.20 → 0.1.21

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

@@ -10,6 +10,10 @@ module ProconBypassMan
           def self.steps
             [:x, :down, :a, :a].freeze
           end
+
+          def self.description
+            '試合中にリスポーンにスーパージャンプ'
+          end
         end
       end
     end

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

@@ -10,6 +10,10 @@ module ProconBypassMan
           def self.steps
             [:x, :left, :a, :a].freeze
           end
+
+          def self.description
+            '試合中に左キーに割り当てられている味方へのスーパージャンプ'
+          end
         end
       end
     end

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

@@ -10,6 +10,10 @@ module ProconBypassMan
           def self.steps
             [:x, :right, :a, :a].freeze
           end
+
+          def self.description
+            '試合中に右キーに割り当てられている味方へのスーパージャンプ'
+          end
         end
       end
     end

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

@@ -10,6 +10,10 @@ module ProconBypassMan
           def self.steps
             [:x, :up, :a, :a].freeze
           end
+
+          def self.description
+            '試合中に上キーに割り当てられている味方へのスーパージャンプ'
+          end
         end
       end
     end

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

@@ -15,6 +15,10 @@ module ProconBypassMan
               :toggle_r_for_1sec,
             ].freeze
           end
+
+          def self.description
+            'バブル即割'
+          end
         end
       end
     end

data/lib/procon_bypass_man/plugin/splatoon2/mode/guruguru.rb

@@ -3,6 +3,10 @@ module ProconBypassMan
     module Splatoon2
       module Mode
         module Guruguru
+          def self.description
+            '適当に動きます'
+          end
+
           def self.binaries
             [ "309481408000362d684658750968f71cfe2c0e51000001480053f71ffedf0d4b000a013d00caf6ecfd4c0d480003011c00000000000000000000000000000000",
               "30978140800037dd6748687509fdf6adfded0d6d0081005d00eef68dfdef0d6d00830059001bf791fd140e720090005400000000000000000000000000000000",

data/lib/procon_bypass_man/plugins.rb

@@ -4,6 +4,7 @@ require_relative "plugin/splatoon2/macro/jump_to_right_key"
 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/mode/guruguru"
 
 module ProconBypassMan

data/lib/procon_bypass_man/procon/button_collection.rb

@@ -37,12 +37,4 @@ class ProconBypassMan::Procon::ButtonCollection
   BUTTONS = ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.keys.freeze
 
   LEFT_ANALOG_STICK = { byte_position: 6..8 }
-
-  # @param [Array<Symbol>] buttons
-  # @return [Array<Symbol>]
-  def self.normalize(buttons)
-    buttons.select { |x|
-      !!ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP[x]
-    }
-  end
 end

data/lib/procon_bypass_man/procon/macro.rb

@@ -1,13 +1,51 @@
 class ProconBypassMan::Procon::Macro
-  class NestedStep
+  class BaseNestedStep
     def initialize(value)
       @hash = value
+    end
+
+    private
+
+    def incr_step_index!
+      if step_index
+        @hash[:step_index] += 1
+      else
+        @hash[:step_index] = 0
+      end
+    end
+
+    def current_step
+      @hash[:steps][step_index]
+    end
+  end
+
+  class OnetimeNestedStep < BaseNestedStep
+    def over?
+      current_step.nil?
+    end
+
+    def next_step
+      step = current_step
+      incr_step_index!
+      step
+    end
+
+    private
+
+    def step_index
+      @hash[:step_index] ||= 0
+    end
+  end
+
+  class NestedStep < BaseNestedStep
+    def initialize(value)
+      super
       unless @hash[:end_at]
         @hash[:end_at] = (Time.now + @hash[:continue_for]).round(4)
       end
     end
 
-    def over_end_at?
+    def over?
       (@hash[:end_at] < Time.now).tap do |result|
         if result
           ProconBypassMan.logger.debug { "[Macro] nested step is finished(#{@hash})" }
@@ -17,8 +55,6 @@ class ProconBypassMan::Procon::Macro
 
     def next_step
       incr_step_index!
-
-      debug_incr_called_count!
       if step = current_step
         return step
       else
@@ -29,30 +65,13 @@ class ProconBypassMan::Procon::Macro
 
     private
 
-    def current_step
-      @hash[:steps][step_index]
-    end
-
     def step_index
       @hash[:step_index]
     end
 
-    def incr_step_index!
-      if step_index
-        @hash[:step_index] += 1
-      else
-        @hash[:step_index] = 0
-      end
-    end
-
     def reset_step_index!
       @hash[:step_index] = 0
     end
-
-    def debug_incr_called_count!
-      @hash[:debug_called_count] ||= 0
-      @hash[:debug_called_count] += 1
-    end
   end
 
   attr_accessor :name, :steps
@@ -69,8 +88,14 @@ class ProconBypassMan::Procon::Macro
     end
 
     if step.is_a?(Hash)
-      nested_step = NestedStep.new(step)
-      if nested_step.over_end_at?
+      nested_step =
+        if step[:continue_for]
+          NestedStep.new(step)
+        else
+          OnetimeNestedStep.new(step)
+        end
+
+      if nested_step.over?
         steps.shift # NestedStepを破棄する
         return next_step
       else

data/lib/procon_bypass_man/procon/macro_builder.rb

@@ -56,7 +56,7 @@ class ProconBypassMan::Procon::MacroBuilder
 
   # @return [Arary<Symbol>]
   def build
-    steps = @steps.map { |step|
+    steps = @steps.flat_map { |step|
       if is_reserved?(step: step) || v1_format?(step: step)
         step.to_sym
       elsif value = build_if_v2_format?(step: step)
@@ -65,7 +65,8 @@ class ProconBypassMan::Procon::MacroBuilder
         nil
       end
     }
-    steps.compact.flatten
+
+    steps.compact
   end
 
   private
@@ -81,31 +82,40 @@ class ProconBypassMan::Procon::MacroBuilder
   end
 
   def build_if_v2_format?(step: )
-    # 時間指定なし
-    if(match = step.match(%r!\Atoggle_(\w+)\z!)) && (button_candidate = match[1]) && is_button(button_candidate)
-      button = button_candidate
-      return [button.to_sym, :none]
-    end
-
-    # 時間指定あり
-    if %r!^(pressing_|toggle_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|toggle_[^_]+!)) && (match = step.match(%r!_for_([\d_]+)(sec)?\z!))
-      sec = match[1]
-      return [
-        { continue_for: to_num(sec),
-          steps: SubjectMerger.merge(subjects.map { |x| Subject.new(x) }),
-        }
-      ]
-    end
-
     # no-op command
     if(match = step.match(%r!wait_for_([\d_]+)(sec)?\z!))
       sec = match[1]
       return [
-        { continue_for: to_num(sec),
+        { continue_for: to_f(sec),
           steps: [:none],
         }
       ]
     end
+
+    if %r!^(pressing_|toggle_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|toggle_[^_]+!)) && (match = step.match(%r!_for_([\d_]+)(sec)?\z!))
+      if sec = match[1]
+        return {
+          continue_for: to_f(sec),
+          steps: 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 }
+            else
+              is_button(x) || RESERVED_WORD_NONE == x
+            end
+          },
+        }
+      end
+    end
+
+    if %r!^(pressing_|toggle_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|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 }
+        else
+          is_button(x) || RESERVED_WORD_NONE == x
+        end
+      }
+    end
   end
 
   # @return [Boolean]
@@ -113,11 +123,11 @@ class ProconBypassMan::Procon::MacroBuilder
     !!ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP[step.to_sym]
   end
 
-  def to_num(value)
+  def to_f(value)
     if value.include?("_")
       value.sub("_", ".").to_f
     else
-      value.to_i
+      value.to_f
     end
   end
 end

data/lib/procon_bypass_man/procon/macro_registry.rb

@@ -13,9 +13,14 @@ class ProconBypassMan::Procon::MacroRegistry
     }
   end
 
+  # @return [ProconBypassMan::Procon::Macro]
   def self.load(name)
-    steps = PRESETS[name] || plugins[name].call || raise("unknown macro")
-    ProconBypassMan::Procon::Macro.new(name: name, steps: steps.dup)
+    if(steps = PRESETS[name] || plugins[name]&.call)
+      return ProconBypassMan::Procon::Macro.new(name: name, steps: steps.dup)
+    else
+      warn "installされていないマクロ(#{name})を使うことはできません"
+      return self.load(:null)
+    end
   end
 
   def self.reset!

data/lib/procon_bypass_man/procon/user_operation.rb

@@ -62,7 +62,7 @@ class ProconBypassMan::Procon::UserOperation
   # @param [Symbol] button
   # @return [Boolean]
   def pressing_button?(button)
-    ProconBypassMan::PressButtonAware.new(@binary.raw).pressing_button?(button)
+    pressing_all_buttons?([button])
   end
 
   # @param [Array<Symbol>] buttons

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

@@ -1,6 +1,6 @@
 class ProconBypassMan::Procon::AnalogStick
   attr_accessor :neutral_position
-  attr_accessor :bin_x, :bin_y
+  attr_writer :bin_x, :bin_y
 
   def initialize(binary: )
     @neutral_position = ProconBypassMan::ButtonsSettingConfiguration.instance.neutral_position
@@ -13,18 +13,22 @@ class ProconBypassMan::Procon::AnalogStick
   end
 
   def abs_x
-    bin_x.to_i(2)
+    @bin_x.to_i(2)
   end
 
   def abs_y
-    bin_y.to_i(2)
+    @bin_y.to_i(2)
   end
 
   def relative_x
-    bin_x.to_i(2) - neutral_position.x
+    @bin_x.to_i(2) - neutral_position.x
   end
 
   def relative_y
-    bin_y.to_i(2) - neutral_position.y
+    @bin_y.to_i(2) - neutral_position.y
+  end
+
+  def relative_hypotenuse
+    Math.sqrt((relative_x**2) + (relative_y**2)).floor(6)
   end
 end

data/lib/procon_bypass_man/procon.rb

@@ -19,6 +19,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 +39,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,10 +48,38 @@ 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)
+          break
         end
       end
     end
@@ -88,7 +118,7 @@ class ProconBypassMan::Procon
     status
   end
 
-  # @return [ProconBypassMan::Domains::ProcessingProconBinary]
+  # @return [String]
   def to_binary
     if ongoing_mode.name != :manual
       return user_operation.binary.raw
@@ -143,14 +173,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_pbm_action/change_pbm_version_action.rb

@@ -6,8 +6,11 @@ module ProconBypassMan
         require "pbmenv"
         ProconBypassMan.logger.info "execute ChangePbmVersionAction!"
         pbm_version = args["pbm_version"] or raise(ProconBypassMan::RemotePbmAction::NeedPbmVersionError, "pbm_versionが必要です, #{args.inspect}")
-        Pbmenv.install(pbm_version)
+        Pbmenv.uninstall(pbm_version) # 途中でシャットダウンしてしまった、とか状態が途中の状態かもしれないので一旦消す
+        Pbmenv.install(pbm_version, enable_pbm_cloud: true)
         Pbmenv.use(pbm_version)
+        ProconBypassMan.logger.info "#{pbm_version}へアップグレードしました"
+        ProconBypassMan::ReportCompletedUpgradePbmJob.perform
         `reboot` # symlinkの参照先が変わるのでrebootする必要がある
       end
 

data/lib/procon_bypass_man/scheduler.rb

@@ -74,7 +74,7 @@ module ProconBypassMan
           args: [->{ ProconBypassMan::DeviceStatus.current }],
           interval: 60,
         )
-      )
+      ) if ProconBypassMan.config.has_api_server?
     end
 
     # @param [Schedule] schedule

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

@@ -0,0 +1,53 @@
+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
+    end
+
+    def init
+      return if initialized?
+
+      shell = <<~EOH
+        #!/bin/bash
+
+        cd /sys/kernel/config/usb_gadget/
+        mkdir -p procon
+        cd procon
+        echo 0x057e > idVendor
+        echo 0x2009 > idProduct
+        echo 0x0200 > bcdDevice
+        echo 0x0200 > bcdUSB
+        echo 0x00 > bDeviceClass
+        echo 0x00 > bDeviceSubClass
+        echo 0x00 > bDeviceProtocol
+
+        mkdir -p strings/0x409
+        echo "000000000001" > strings/0x409/serialnumber
+        echo "Nintendo Co., Ltd." > strings/0x409/manufacturer
+        echo "Pro Controller" > strings/0x409/product
+
+        mkdir -p configs/c.1/strings/0x409
+        echo "Nintendo Switch Pro Controller" > configs/c.1/strings/0x409/configuration
+        echo 500 > configs/c.1/MaxPower
+        echo 0xa0 > configs/c.1/bmAttributes
+
+        mkdir -p functions/hid.usb0
+        echo 0 > functions/hid.usb0/protocol
+        echo 0 > functions/hid.usb0/subclass
+        echo 64 > functions/hid.usb0/report_length
+        echo 050115000904A1018530050105091901290A150025017501950A5500650081020509190B290E150025017501950481027501950281030B01000100A1000B300001000B310001000B320001000B35000100150027FFFF0000751095048102C00B39000100150025073500463B0165147504950181020509190F2912150025017501950481027508953481030600FF852109017508953F8103858109027508953F8103850109037508953F9183851009047508953F9183858009057508953F9183858209067508953F9183C0 | xxd -r -ps > functions/hid.usb0/report_desc
+
+        ln -s functions/hid.usb0 configs/c.1/
+        ls /sys/class/udc > UDC
+      EOH
+
+      `bash -c '#{shell}'`
+    end
+
+    def initialized?
+      Dir.exist?("/sys/kernel/config/usb_gadget/procon")
+    end
+  end
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/websocket/forever.rb

@@ -0,0 +1,47 @@
+module ProconBypassMan
+  module Websocket
+    class Forever
+      # 動作確認方法
+      # - 10秒ごとにrefreshするのでタイムアウトは起きない
+      #   - ProconBypassMan::Websocket::Forever.run { loop { puts(:hi); sleep(10); ProconBypassMan::Websocket::Watchdog.active!  } }
+      # - タイムアウトが起きること
+      #   - ProconBypassMan::Websocket::Forever.run { puts(:hi); sleep(3000);  }
+      # - ブロックを1回評価するとThreadが死ぬので100秒後にタイムアウトが起きること
+      #   - ProconBypassMan::Websocket::Forever.run { puts(:hi); sleep(10); ProconBypassMan::Websocket::Watchdog.active!  }
+      def self.run(&block)
+        loop do
+          new.run(&block)
+        end
+      end
+
+      def run(&block)
+        raise("need a block") unless block_given?
+
+        ws_thread = work_one(callable: block)
+        wait_and_kill_if_outdated(ws_thread)
+      end
+
+      # @return [Thread]
+      def work_one(callable: )
+        Thread.start do
+          callable.call
+        rescue => e
+          ProconBypassMan.logger.error("websocket client with forever: #{e.full_message}")
+        end
+      end
+
+      def wait_and_kill_if_outdated(thread)
+        loop do
+          if Watchdog.outdated?
+            Watchdog.active!
+            ProconBypassMan.logger.error("watchdog timeout!!")
+            thread.kill
+            return
+          end
+
+          sleep(10)
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/websocket/pbm_job_client.rb

@@ -7,11 +7,7 @@ module ProconBypassMan
         return unless ProconBypassMan.config.enable_ws?
 
         Thread.start do
-          loop do
-            run
-          rescue
-            retry
-          end
+          Forever.run { run }
         end
       end
 
@@ -24,14 +20,16 @@ module ProconBypassMan
           )
 
           client.connected {
-            ProconBypassMan.logger.info('successfully connected in ProconBypassMan::Websocket::PbmJobClient')
+            ProconBypassMan.logger.info('websocket client: successfully connected in ProconBypassMan::Websocket::PbmJobClient')
           }
           client.subscribed { |msg|
+            ProconBypassMan.logger.info('websocket client: subscribed')
             puts({ event: :subscribed, msg: msg })
             ProconBypassMan::SyncDeviceStatsJob.perform(ProconBypassMan::DeviceStatus.current)
           }
 
           client.received do |data|
+            ProconBypassMan.logger.info('websocket client: received!!')
             ProconBypassMan.logger.info(data)
 
             dispatch(data: data, client: client)
@@ -40,13 +38,22 @@ module ProconBypassMan
           end
 
           client.disconnected {
+            ProconBypassMan.logger.info('websocket client: disconnected!!')
             puts :disconnected
             client.reconnect!
             sleep 2
           }
-          client.errored { |msg|  puts :errored; puts msg }
+          client.errored { |msg|
+            ProconBypassMan.logger.error("websocket client: errored!!, #{msg}")
+            puts :errored
+            client.reconnect!
+            sleep 2
+          }
           client.pinged { |msg|
+            Watchdog.active!
+
             ProconBypassMan.cache.fetch key: 'ws_pinged', expires_in: 10 do
+              ProconBypassMan.logger.info('websocket client: pinged!!')
               ProconBypassMan.logger.info(msg)
             end
           }