procon_bypass_man 0.1.14 → 0.1.17

data/lib/procon_bypass_man/procon/layer_changer.rb

@@ -1,6 +1,7 @@
 class ProconBypassMan::Procon::LayerChanger
+  # @param [ProconBypassMan::Domains::ProcessingProconBinary] binary
   def initialize(binary: )
-    @procon_reader = ProconBypassMan::ProconReader.new(binary: binary).freeze
+    @procon_reader = binary.to_procon_reader
   end
 
   # @return [Symbol]
@@ -35,6 +36,6 @@ class ProconBypassMan::Procon::LayerChanger
 
   # @return [Boolean]
   def pressed?(button: )
-    @procon_reader.pressed.include?(button)
+    @procon_reader.pressing.include?(button)
   end
 end

data/lib/procon_bypass_man/procon/macro_registry.rb

@@ -24,15 +24,18 @@ class ProconBypassMan::Procon::MacroRegistry
     null: [],
   }
 
-  def self.install_plugin(klass)
-    if plugins[klass.name]
-      raise "すでに登録済みです"
+  def self.install_plugin(klass, steps: nil)
+    if plugins[klass.to_s.to_sym]
+      raise "#{klass} macro is already registered"
     end
-    plugins[klass.name] = klass.steps
+
+    plugins[klass.to_s.to_sym] = ->{
+      ProconBypassMan::Procon::ButtonCollection.normalize(steps || klass.steps)
+    }
   end
 
   def self.load(name)
-    steps = PRESETS[name] || plugins[name] || raise("unknown macro")
+    steps = PRESETS[name] || plugins[name].call || raise("unknown macro")
     Macro.new(name: name, steps: steps.dup)
   end
 

data/lib/procon_bypass_man/procon/mode_registry.rb

@@ -23,14 +23,14 @@ class ProconBypassMan::Procon::ModeRegistry
   }
 
   def self.install_plugin(klass)
-    if plugins[klass.name.to_sym]
-      raise "すでに登録済みです"
+    if plugins[klass.to_s.to_sym]
+      raise "#{klass} mode is already registered"
     end
-    plugins[klass.name.to_sym] = klass.binaries
+    plugins[klass.to_s.to_sym] = ->{ klass.binaries }
   end
 
   def self.load(name)
-    b = PRESETS[name] || plugins[name] || raise("unknown mode")
+    b = PRESETS[name] || plugins[name]&.call || raise("#{name} is unknown mode")
     Mode.new(name: name, binaries: b.dup)
   end
 

data/lib/procon_bypass_man/procon/press_button_aware.rb

@@ -1,13 +1,15 @@
-class ProconBypassMan::PpressButtonAware
+class ProconBypassMan::PressButtonAware
+  BIT_ON = '1'.freeze
+
   def initialize(binary)
     @binary = binary
   end
 
-  def pressed_button?(button)
-    @binary[
-      ::ProconBypassMan::Procon::ButtonCollection.load(button).byte_position
-    ].unpack("H*").first.to_i(16).to_s(2).reverse[
-      ::ProconBypassMan::Procon::ButtonCollection.load(button).bit_position
-    ] == '1'
+  # @param [Symbol]
+  # @return [Boolean]
+  def pressing_button?(button)
+    button_obj = ProconBypassMan::Procon::Button.new(button)
+    byte = @binary[button_obj.byte_position].unpack("C").first.to_s(2).reverse
+    byte[button_obj.bit_position] == BIT_ON
   end
 end

data/lib/procon_bypass_man/procon/user_operation.rb

@@ -1,77 +1,60 @@
-class ProconBypassMan::Procon
-  class UserOperation
-    attr_reader :binary
+# ボタンを押しているか判断するクラス。バイナリの書き換えはしない
+class ProconBypassMan::Procon::UserOperation
+  attr_reader :binary
 
-    ::ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.each do |button, _value|
-      define_method "pressed_#{button}?" do
-        pressed_button?(button)
-      end
-    end
+  ASCII_ENCODING = "ASCII-8BIT"
 
-    def initialize(binary)
-      unless binary.encoding.name == ASCII_ENCODING
-        raise "おかしいです"
-      end
-      @binary = binary
+  # @param [String] binary
+  def initialize(binary)
+    unless binary.encoding.name == ASCII_ENCODING
+      raise "おかしいです"
     end
 
-    ZERO_BIT = ["0"].pack("H*").freeze
-    ASCII_ENCODING = "ASCII-8BIT"
-
-    def set_no_action!
-      binary[3] = ZERO_BIT
-      binary[4] = ZERO_BIT
-      binary[5] = ZERO_BIT
-    end
+    @binary = ProconBypassMan::Domains::ProcessingProconBinary.new(binary: binary)
+  end
 
-    def apply_left_analog_stick_cap(cap: )
-      binary[6..8] = ProconBypassMan::Procon::AnalogStickCap.new(binary).capped_position(cap_hypotenuse: cap).to_binary
-    end
+  def set_no_action!
+    binary.set_no_action!
+  end
 
-    def unpress_button(button)
-      return if not pressed_button?(button)
+  def apply_left_analog_stick_cap(cap: )
+    binary.write_as_apply_left_analog_stick_cap(cap: cap)
+  end
 
-      byte_position = ButtonCollection.load(button).byte_position
-      value = binary[byte_position].unpack("H*").first.to_i(16) - (2**ButtonCollection.load(button).bit_position)
-      binary[byte_position] = ["%02X" % value.to_s].pack("H*")
-    end
+  # @param [Symbol] button
+  def unpress_button(button)
+    return if not pressing_button?(button)
+    binary.write_as_unpress_button(button)
+  end
 
-    def press_button(button)
-      return if pressed_button?(button)
+  # @param [Symbol] button
+  def press_button(button)
+    return if pressing_button?(button)
+    binary.write_as_press_button(button)
+  end
 
-      byte_position = ButtonCollection.load(button).byte_position
-      value = binary[byte_position].unpack("H*").first.to_i(16) + (2**ButtonCollection.load(button).bit_position)
-      binary[byte_position] = ["%02X" % value.to_s].pack("H*")
-    end
+  # @param [Symbol] button
+  def press_button_only(button)
+    binary.write_as_press_button_only(button)
+  end
 
-    def press_button_only(button)
-      [ProconBypassMan::Procon::Consts::NO_ACTION.dup].pack("H*").tap do |no_action_binary|
-        ButtonCollection.load(button).byte_position
-        byte_position = ButtonCollection.load(button).byte_position
-        value = 2**ButtonCollection.load(button).bit_position
-        no_action_binary[byte_position] = ["%02X" % value.to_s].pack("H*")
-        binary[3] = no_action_binary[3]
-        binary[4] = no_action_binary[4]
-        binary[5] = no_action_binary[5]
-      end
-    end
+  # @return [void]
+  def merge(target_binary)
+    binary.write_as_merge!(
+      ProconBypassMan::Domains::ProcessingProconBinary.new(binary: target_binary)
+    )
+  end
 
-    def merge(target_binary: )
-      tb = [target_binary].pack("H*")
-      binary[3] = tb[3]
-      binary[4] = tb[4]
-      binary[5] = tb[5]
-      binary[6] = tb[6]
-      binary[7] = tb[7]
-      binary[8] = tb[8]
-      binary[9] = tb[9]
-      binary[10] = tb[10]
-      binary[11] = tb[11]
-      self.binary
-    end
+  # @param [Symbol] button
+  # @return [Boolean]
+  def pressing_button?(button)
+    ProconBypassMan::PressButtonAware.new(@binary.raw).pressing_button?(button)
+  end
 
-    def pressed_button?(button)
-      ProconBypassMan::PpressButtonAware.new(binary).pressed_button?(button)
-    end
+  # @param [Array<Symbol>] buttons
+  # @return [Boolean]
+  def pressing_all_buttons?(buttons)
+    aware = ProconBypassMan::PressButtonAware.new(@binary.raw)
+    buttons.all? { |b| aware.pressing_button?(b) }
   end
 end

data/lib/procon_bypass_man/procon/{analog_stick.rb → value_objects/analog_stick.rb}

@@ -4,13 +4,12 @@ class ProconBypassMan::Procon::AnalogStick
 
   def initialize(binary: )
     @neutral_position = ProconBypassMan::ButtonsSettingConfiguration.instance.neutral_position
-
-    byte6 = binary[6].unpack("H*").first.to_i(16).to_s(2).rjust(8, "0")
-    byte7 = binary[7].unpack("H*").first.to_i(16).to_s(2).rjust(8, "0")
-    byte8 = binary[8].unpack("H*").first.to_i(16).to_s(2).rjust(8, "0")
+    bytes = binary[ProconBypassMan::Procon::ButtonCollection::LEFT_ANALOG_STICK.fetch(:byte_position)]
+    byte6, byte7, byte8 = bytes.each_char.map { |x| x.unpack("C").first.to_s(2).rjust(8, "0") }
 
     self.bin_x = "#{byte7[4..7]}#{byte6}"
     self.bin_y = "#{byte8}#{byte7[0..3]}"
+    freeze
   end
 
   def abs_x

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

@@ -0,0 +1,34 @@
+module ProconBypassMan
+  class ProconReader
+    def initialize(binary: )
+      @binary = binary
+      @analog_stick = ProconBypassMan::Procon::AnalogStick.new(binary: binary)
+      freeze
+    end
+
+    # @return [Array<Symbol>]
+    def pressing
+      aware = ProconBypassMan::PressButtonAware.new(@binary)
+      pressed_table = ::ProconBypassMan::Procon::ButtonCollection::BUTTONS.reduce({}) do |acc, button|
+        acc[button] = aware.pressing_button?(button)
+        acc
+      end
+      pressed_table.select { |_key, value| value }.keys
+    end
+
+    def left_analog_stick
+      { x: @analog_stick.relative_x, y: @analog_stick.relative_y }
+    end
+
+    def left_analog_stick_by_abs
+      { x: @analog_stick.abs_x, y: @analog_stick.abs_y }
+    end
+
+    def to_hash
+      { left_analog_stick: left_analog_stick,
+        left_analog_stick_by_abs: left_analog_stick_by_abs,
+        buttons: pressing,
+      }
+    end
+  end
+end

data/lib/procon_bypass_man/procon.rb

@@ -20,8 +20,11 @@ class ProconBypassMan::Procon
   end
   reset!
 
+  # @param [string] binary
   def initialize(binary)
-    self.user_operation = ProconBypassMan::Procon::UserOperation.new(binary.dup)
+    self.user_operation = ProconBypassMan::Procon::UserOperation.new(
+      binary.dup
+    )
   end
 
   def status; @@status[:buttons]; end
@@ -43,7 +46,7 @@ class ProconBypassMan::Procon
 
     if ongoing_macro.finished?
       current_layer.macros.each do |macro_name, options|
-        if options[:if_pressed].all? { |b| user_operation.pressed_button?(b) }
+        if user_operation.pressing_all_buttons?(options[:if_pressed])
           @@status[:ongoing_macro] = MacroRegistry.load(macro_name)
         end
       end
@@ -60,7 +63,7 @@ class ProconBypassMan::Procon
           next
         end
 
-        if options[:if_pressed] && options[:if_pressed].all? { |b| user_operation.pressed_button?(b) }
+        if options[:if_pressed] && user_operation.pressing_all_buttons?(options[:if_pressed])
           FlipCache.fetch(key: button, expires_in: options[:flip_interval]) do
             status[button] = !status[button]
           end
@@ -75,7 +78,7 @@ class ProconBypassMan::Procon
         @@status[:ongoing_mode] = ProconBypassMan::Procon::ModeRegistry.load(current_layer.mode)
       end
       if(binary = ongoing_mode.next_binary)
-        self.user_operation.merge(target_binary: binary)
+        self.user_operation.merge([binary].pack("H*"))
       end
       return
     end
@@ -83,28 +86,28 @@ class ProconBypassMan::Procon
     status
   end
 
-  # @return [String<binary>]
+  # @return [ProconBypassMan::Domains::ProcessingProconBinary]
   def to_binary
     if ongoing_mode.name != :manual
-      return user_operation.binary
+      return user_operation.binary.raw
     end
 
     if ongoing_macro.ongoing?
-      step = ongoing_macro.next_step or return(user_operation.binary)
+      step = ongoing_macro.next_step or return(user_operation.binary.raw)
       user_operation.press_button_only(step)
-      return user_operation.binary
+      return user_operation.binary.raw
     end
 
     current_layer.disables.each do |button|
       user_operation.unpress_button(button)
     end
 
-    current_layer.left_analog_stick_caps.each do |button, options|
-      if button.nil? || button.all? { |b| user_operation.pressed_button?(b) }
-        options[:force_neutral]&.each do |force_neutral_button|
+    current_layer.left_analog_stick_caps.each do |config|
+      if config[:if_pressed].nil? || user_operation.pressing_all_buttons?(config[:if_pressed])
+        config[:force_neutral]&.each do |force_neutral_button|
           user_operation.unpress_button(force_neutral_button)
         end
-        user_operation.apply_left_analog_stick_cap(cap: options[:cap])
+        user_operation.apply_left_analog_stick_cap(cap: config[:cap])
       end
     end
 
@@ -116,7 +119,7 @@ class ProconBypassMan::Procon
       end
 
       # 押している時だけ連打
-      if options[:if_pressed] && options[:if_pressed].all? { |b| user_operation.pressed_button?(b) }
+      if options[:if_pressed] && user_operation.pressing_all_buttons?(options[:if_pressed])
         if !status[button]
           user_operation.unpress_button(button)
         end
@@ -128,16 +131,15 @@ class ProconBypassMan::Procon
     end
 
     current_layer.remaps.each do |from_button, to_buttons|
-      if user_operation.pressed_button?(from_button)
+      if user_operation.pressing_button?(from_button)
         user_operation.unpress_button(from_button)
-        # TODO 2重でpressしないようにしたい
         to_buttons[:to].each do |to_button|
           user_operation.press_button(to_button)
         end
       end
     end
 
-    user_operation.binary
+    user_operation.binary.raw
   end
 
   private

data/lib/procon_bypass_man/remote_pbm_action/change_pbm_version_action.rb

@@ -16,6 +16,10 @@ module ProconBypassMan
       def before_action_callback
         be_processed
       end
+
+      def after_action_callback
+        # no-op
+      end
     end
   end
 end

data/lib/procon_bypass_man/remote_pbm_action/reboot_os_action.rb

@@ -12,6 +12,10 @@ module ProconBypassMan
       def before_action_callback
         be_processed
       end
+
+      def after_action_callback
+        # no-op
+      end
     end
   end
 end

data/lib/procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb

@@ -0,0 +1,28 @@
+module ProconBypassMan
+  module RemotePbmAction
+    class RestorePbmSettingAction < BaseAction
+
+      def action_content(args: )
+        require "pbmenv"
+        ProconBypassMan.logger.info "execute RestorePbmSettingAction!"
+        setting = args.dig("setting") or raise(ProconBypassMan::RemotePbmAction::NeedPbmVersionError, "settingが必要です, #{args.inspect}")
+        File.write(
+          ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
+          setting.to_yaml,
+        )
+        ProconBypassMan.hot_reload!
+      end
+
+      private
+
+      def before_action_callback
+        be_in_progress
+      end
+
+      def after_action_callback
+        be_processed
+      end
+    end
+  end
+end
+

data/lib/procon_bypass_man/remote_pbm_action/stop_pbm_action.rb

@@ -12,6 +12,10 @@ module ProconBypassMan
       def before_action_callback
         be_processed
       end
+
+      def after_action_callback
+        # no-op
+      end
     end
   end
 end

data/lib/procon_bypass_man/remote_pbm_action.rb

@@ -4,12 +4,13 @@ module ProconBypassMan
     require "procon_bypass_man/remote_pbm_action/change_pbm_version_action"
     require "procon_bypass_man/remote_pbm_action/reboot_os_action"
     require "procon_bypass_man/remote_pbm_action/stop_pbm_action"
-    require "procon_bypass_man/remote_pbm_action/lib/update_remote_pbm_action_status_command"
+    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"
 
     ACTION_CHANGE_PBM_VERSION = "change_pbm_version"
     ACTION_REBOOT_OS = "reboot_os"
     ACTION_STOP_PBM = "stop_pbm"
-    ACTION_RESTORE_SETTING = "restore_setting" # TODO
+    ACTION_RESTORE_SETTING = "restore_pbm_setting"
 
     ACTIONS = [
       ACTION_CHANGE_PBM_VERSION,

data/lib/procon_bypass_man/runner.rb

@@ -1,5 +1,4 @@
 require_relative "io_monitor"
-require_relative "boot_message"
 
 class ProconBypassMan::Runner
   class InterruptForRestart < StandardError; end
@@ -27,10 +26,11 @@ class ProconBypassMan::Runner
 
     loop do
       $will_terminate_token = false
-      # TODO forkしないでThreadでいいのでは？
+      # NOTE メインプロセスではThreadをいくつか起動しているので念のためパフォーマンスを優先するためにforkしていく
       main_loop_pid = Kernel.fork { ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute }
 
       begin
+        # TODO 小プロセスが消滅した時に、メインプロセスは生き続けてしまい、何もできなくなる問題がある
         while(readable_io = IO.select([self_read]))
           signal = readable_io.first[0].gets.strip
           handle_signal(signal)
@@ -39,14 +39,14 @@ class ProconBypassMan::Runner
         $will_terminate_token = true
         Process.kill("TERM", main_loop_pid)
         Process.wait
-        ProconBypassMan.logger.info("Reloading config file")
+        ProconBypassMan::PrintMessageCommand.execute(text: "Reloading config file")
         begin
           ProconBypassMan::ButtonsSettingConfiguration::Loader.reload_setting
           ProconBypassMan::SendReloadConfigEventCommand.execute
         rescue ProconBypassMan::CouldNotLoadConfigError
           ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。再読み込みができませんでした")
         end
-        ProconBypassMan.logger.info("バイパス処理を再開します")
+        ProconBypassMan::PrintMessageCommand.execute(text: "バイパス処理を再開します")
       rescue Interrupt
         $will_terminate_token = true
         Process.kill("TERM", main_loop_pid)

data/lib/procon_bypass_man/scheduler.rb

@@ -68,13 +68,6 @@ module ProconBypassMan
     end
 
     def self.register_schedules
-      register(
-        schedule: Schedule.new(
-          klass: ProconBypassMan::FetchAndRunRemotePbmActionJob,
-          args: [],
-          interval: 3,
-        )
-      )
       register(
         schedule: Schedule.new(
           klass: ProconBypassMan::SyncDeviceStatsJob,

data/lib/procon_bypass_man/support/compress_array.rb

@@ -54,3 +54,8 @@ module ProconBypassMan
     end
   end
 end
+
+
+if $0 == __FILE__
+  ProconBypassMan::CompressArray.new([''])
+end

data/lib/procon_bypass_man/support/http_client.rb

@@ -100,3 +100,7 @@ module ProconBypassMan
     end
   end
 end
+
+if $0 == __FILE__
+  ProconBypassMan::HttpClient.new(path: '/', server_pool: nil, retry_on_connection_error: false).get(response_body: '')
+end

data/lib/procon_bypass_man/support/on_memory_cache.rb

@@ -1,6 +1,8 @@
 class ProconBypassMan::OnMemoryCache
   class CacheValue
-    attr_accessor :expired_at, :value
+    # @param [Time]
+    attr_accessor :expired_at
+    attr_accessor :value
 
     def initialize(expired_at: , value: )
       self.expired_at = expired_at

data/lib/procon_bypass_man/support/report_http_client.rb

@@ -1,10 +1,10 @@
 module ProconBypassMan
   class ReportHttpClient < HttpClient
     def post(body: , event_type: )
-      if body.is_a?(String)
-        b = { text: body }
-      else
+      if body.is_a?(Hash)
         b = body
+      else
+        b = { text: body }
       end
 
       super(request_body: {

data/lib/procon_bypass_man/support/server_pool.rb

@@ -40,3 +40,7 @@ module ProconBypassMan
     end
   end
 end
+
+if $0 == __FILE__
+  ProconBypassMan::ServerPool.new(servers: ['http://example.com'])
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/websocket/pbm_job_client.rb

@@ -0,0 +1,90 @@
+module ProconBypassMan
+  module Websocket
+    module PbmJobClient
+      CHANNEL = 'PbmJobChannel'
+
+      def self.start!
+        return unless ProconBypassMan.config.enable_ws?
+
+        Thread.start do
+          loop do
+            run
+          rescue
+            retry
+          end
+        end
+      end
+
+      def self.run
+        EventMachine.run do
+          client = ActionCableClient.new(
+            ProconBypassMan.config.current_ws_server_url, {
+              channel: CHANNEL, device_id: ProconBypassMan.device_id,
+            }
+          )
+
+          client.connected {
+            ProconBypassMan.logger.info('successfully connected in ProconBypassMan::Websocket::PbmJobClient')
+          }
+          client.subscribed { |msg|
+            puts({ event: :subscribed, msg: msg })
+            ProconBypassMan::SyncDeviceStatsJob.perform(ProconBypassMan::DeviceStatus.current)
+          }
+
+          client.received do |data|
+            ProconBypassMan.logger.info(data)
+
+            dispatch(data: data, client: client)
+          rescue => e
+            ProconBypassMan::SendErrorCommand.execute(error: e)
+          end
+
+          client.disconnected {
+            puts :disconnected
+            client.reconnect!
+            sleep 2
+          }
+          client.errored { |msg|  puts :errored; puts msg }
+          client.pinged { |msg|
+            ProconBypassMan.cache.fetch key: 'ws_pinged', expires_in: 10 do
+              ProconBypassMan.logger.info(msg)
+            end
+          }
+        end
+      end
+
+      # @param [Hash] data
+      def self.dispatch(data: , client: )
+        pbm_job_hash = data.dig("message")
+        if pbm_job_hash['action'] == "ping"
+          client.perform('pong', { device_id: ProconBypassMan.device_id, message: 'hello from pbm' })
+        else
+          validate_and_run(data: data)
+        end
+      end
+
+      # @raise [ProconBypassMan::RemotePbmActionObject::ValidationError]
+      # @param [Hash] data
+      # @return [Void]
+      def self.validate_and_run(data: )
+        pbm_job_hash = data.dig("message")
+        begin
+          pbm_job_object = ProconBypassMan::RemotePbmActionObject.new(action: pbm_job_hash["action"],
+                                                                      status: pbm_job_hash["status"],
+                                                                      uuid: pbm_job_hash["uuid"],
+                                                                      created_at: pbm_job_hash["created_at"],
+                                                                      job_args: pbm_job_hash["args"])
+          pbm_job_object.validate!
+        rescue ProconBypassMan::RemotePbmActionObject::ValidationError => e
+          raise
+        end
+
+        ProconBypassMan::RunRemotePbmActionDispatchCommand.execute(
+          action: pbm_job_object.action,
+          uuid: pbm_job_object.uuid,
+          job_args: pbm_job_object.job_args
+        )
+      end
+    end
+  end
+end