procon_bypass_man 0.1.16.1 → 0.1.19.1

data/lib/procon_bypass_man/procon/macro_builder.rb

@@ -0,0 +1,123 @@
+class ProconBypassMan::Procon::MacroBuilder
+  class SubjectMerger
+    def self.merge(subjects)
+      if subjects.size == 1
+        return subjects.first.to_steps
+      end
+
+      base = subjects.first
+      remain = subjects[1..-1]
+      remain.map { |x| base.to_steps.zip(x.to_steps) }.first
+    end
+  end
+
+  class Subject
+    def initialize(value)
+      @button =
+        if match = value.match(/_(\w+)\z/)
+          match[1]
+        else
+          :unknown
+        end
+      @type =
+        if value.start_with?("toggle_")
+          :toggle
+        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]
+      end
+    end
+  end
+
+  RESERVED_WORD_NONE = :none
+  RESERVED_WORDS = {
+    RESERVED_WORD_NONE => true,
+  }
+
+  def initialize(steps)
+    @steps = steps.map(&:to_s)
+  end
+
+  # @return [Arary<Symbol>]
+  def build
+    steps = @steps.map { |step|
+      if is_reserved?(step: step) || v1_format?(step: step)
+        step.to_sym
+      elsif value = build_if_v2_format?(step: step)
+        value
+      else
+        nil
+      end
+    }
+    steps.compact.flatten
+  end
+
+  private
+
+  def is_reserved?(step: )
+    RESERVED_WORDS[step.to_sym]
+  end
+
+  def v1_format?(step: )
+    if is_button(step)
+      step
+    end
+  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),
+          steps: [:none],
+        }
+      ]
+    end
+  end
+
+  # @return [Boolean]
+  def is_button(step)
+    !!ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP[step.to_sym]
+  end
+
+  def to_num(value)
+    if value.include?("_")
+      value.sub("_", ".").to_f
+    else
+      value.to_i
+    end
+  end
+end

data/lib/procon_bypass_man/procon/macro_registry.rb

@@ -1,39 +1,21 @@
 class ProconBypassMan::Procon::MacroRegistry
-  class Macro
-    attr_accessor :name, :steps
-
-    def initialize(name: , steps: )
-      self.name = name
-      self.steps = steps
-    end
-
-    def next_step
-      steps.shift
-    end
-
-    def finished?
-      steps.empty?
-    end
-
-    def ongoing?
-      !finished?
-    end
-  end
-
   PRESETS = {
     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::MacroBuilder.new(steps || klass.steps).build
+    }
   end
 
   def self.load(name)
-    steps = PRESETS[name] || plugins[name] || raise("unknown macro")
-    Macro.new(name: name, steps: steps.dup)
+    steps = PRESETS[name] || plugins[name].call || raise("unknown macro")
+    ProconBypassMan::Procon::Macro.new(name: name, steps: steps.dup)
   end
 
   def self.reset!

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,14 +1,15 @@
 class ProconBypassMan::PressButtonAware
+  BIT_ON = '1'.freeze
+
   def initialize(binary)
     @binary = binary
   end
 
+  # @param [Symbol]
+  # @return [Boolean]
   def pressing_button?(button)
     button_obj = ProconBypassMan::Procon::Button.new(button)
-    @binary[
-      button_obj.byte_position
-    ].unpack("H*").first.to_i(16).to_s(2).reverse[
-      button_obj.bit_position
-    ] == '1'
+    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

@@ -33,9 +33,23 @@ class ProconBypassMan::Procon::UserOperation
     binary.write_as_press_button(button)
   end
 
-  # @param [Symbol] button
+  # @param [Symbol, Array<Symbol>] button
   def press_button_only(button)
-    binary.write_as_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
+
+    if ProconBypassMan::Procon::MacroBuilder::RESERVED_WORD_NONE == button
+      binary.set_no_action!
+    else
+      binary.write_as_press_button_only(button)
+    end
   end
 
   # @return [void]

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

@@ -5,7 +5,7 @@ class ProconBypassMan::Procon::AnalogStick
   def initialize(binary: )
     @neutral_position = ProconBypassMan::ButtonsSettingConfiguration.instance.neutral_position
     bytes = binary[ProconBypassMan::Procon::ButtonCollection::LEFT_ANALOG_STICK.fetch(:byte_position)]
-    byte6, byte7, byte8 = bytes.each_char.map { |x| x.unpack("H*").first.to_i(16).to_s(2).rjust(8, "0") }
+    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]}"

data/lib/procon_bypass_man/procon.rb

@@ -1,7 +1,9 @@
 class ProconBypassMan::Procon
   require "procon_bypass_man/procon/consts"
   require "procon_bypass_man/procon/mode_registry"
+  require "procon_bypass_man/procon/macro"
   require "procon_bypass_man/procon/macro_registry"
+  require "procon_bypass_man/procon/macro_builder"
   require "procon_bypass_man/procon/layer_changer"
   require "procon_bypass_man/procon/button_collection"
   require "procon_bypass_man/procon/user_operation"
@@ -102,12 +104,12 @@ class ProconBypassMan::Procon
       user_operation.unpress_button(button)
     end
 
-    current_layer.left_analog_stick_caps.each do |buttons, options|
-      if buttons.nil? || user_operation.pressing_all_buttons?(buttons)
-        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
 

data/lib/procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb

@@ -6,9 +6,9 @@ module ProconBypassMan
         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::YamlWriter.write(
+          path: ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
+          content: setting,
         )
         ProconBypassMan.hot_reload!
       end

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/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/support/yaml_writer.rb

@@ -0,0 +1,16 @@
+class ProconBypassMan::YamlWriter
+  # @return [void]
+  def self.write(path: , content: )
+    File.write(
+      path,
+      content.transform_values { |x|
+        case x
+        when String
+          x.gsub("\r\n", "\n")
+        else
+          x
+        end
+      }.to_yaml
+    )
+  end
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/websocket/pbm_job_client.rb

@@ -32,7 +32,9 @@ module ProconBypassMan
           }
 
           client.received do |data|
-            validate_and_run(data: data)
+            ProconBypassMan.logger.info(data)
+
+            dispatch(data: data, client: client)
           rescue => e
             ProconBypassMan::SendErrorCommand.execute(error: e)
           end
@@ -51,11 +53,20 @@ module ProconBypassMan
         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: )
-        ProconBypassMan.logger.debug { data }
         pbm_job_hash = data.dig("message")
         begin
           pbm_job_object = ProconBypassMan::RemotePbmActionObject.new(action: pbm_job_hash["action"],

data/lib/procon_bypass_man.rb

@@ -7,11 +7,13 @@ require "securerandom"
 require 'em/pure_ruby'
 require "action_cable_client"
 require "ext/em_pure_ruby"
+require "ext/module"
 
 require_relative "procon_bypass_man/version"
 require_relative "procon_bypass_man/remote_pbm_action"
 require_relative "procon_bypass_man/support/signal_handler"
 require_relative "procon_bypass_man/support/callbacks"
+require_relative "procon_bypass_man/support/yaml_writer"
 require_relative "procon_bypass_man/support/safe_timeout"
 require_relative "procon_bypass_man/support/compress_array"
 require_relative "procon_bypass_man/support/uptime"

data/procon_bypass_man.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["jiikko"]
   spec.email         = ["n905i.1214@gmail.com"]
 
-  spec.summary       = "An extension for Nintendo Switch Pro Controller"
+  spec.summary       = "A programmable converter for Nintendo Switch Pro Controller"
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/splaplapla/procon_bypass_man"
   spec.license       = "MIT"

data/project_template/app.rb

@@ -5,14 +5,15 @@ require 'bundler/inline'
 gemfile do
   source 'https://rubygems.org'
   git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-  gem 'procon_bypass_man', '0.1.16.1'
+  gem 'procon_bypass_man', '0.1.19.1'
 end
 
 ProconBypassMan.configure do |config|
   config.root = File.expand_path(__dir__)
   config.logger = Logger.new("#{ProconBypassMan.root}/app.log", 5, 1024 * 1024 * 10)
   config.logger.level = :debug
-  # config.api_servers = ['https://...']
+  # webからProconBypassManを操作できるwebサービス
+  # config.api_servers = ['https://pbm-cloud.herokuapp.com']
   config.enable_critical_error_logging = true
 end
 

data/project_template/setting.yml

@@ -1,35 +1,28 @@
 version: 1.0
 setting: |-
-  fast_return = ProconBypassMan::Plugin::Splatoon2::Macro::FastReturn
-  guruguru = ProconBypassMan::Plugin::Splatoon2::Mode::Guruguru
-
-  install_macro_plugin fast_return
+  install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::FastReturn
   install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::JumpToUpKey
   install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::JumpToRightKey
   install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::JumpToLeftKey
-  install_mode_plugin guruguru
+  install_mode_plugin ProconBypassMan::Plugin::Splatoon2::Mode::Guruguru
 
   prefix_keys_for_changing_layer [:zr, :zl, :l]
 
   layer :up, mode: :manual do
-    # flip :zr, if_pressed: :zr, force_neutral: :zl
     flip :zr, if_pressed: :zr, force_neutral: :zl
     flip :zl, if_pressed: [:y, :b, :zl]
     flip :a, if_pressed: [:a]
     flip :down, if_pressed: :down
-    macro fast_return.name, if_pressed: [:y, :b, :down]
+    macro ProconBypassMan::Plugin::Splatoon2::Macro::FastReturn, if_pressed: [:y, :b, :down]
     macro ProconBypassMan::Plugin::Splatoon2::Macro::JumpToUpKey, if_pressed: [:y, :b, :up]
     macro ProconBypassMan::Plugin::Splatoon2::Macro::JumpToRightKey, if_pressed: [:y, :b, :right]
     macro ProconBypassMan::Plugin::Splatoon2::Macro::JumpToLeftKey, if_pressed: [:y, :b, :left]
     remap :l, to: :zr
   end
-  layer :right, mode: guruguru.name
+  layer :right, mode: ProconBypassMan::Plugin::Splatoon2::Mode::Guruguru
   layer :left do
-  # flip :zr, if_pressed: :zr, force_neutral: :zl
     remap :l, to: :zr
   end
   layer :down do
-    # flip :zl
-    # flip :zr, if_pressed: :zr, force_neutral: :zl, flip_interval: "1F"
     remap :l, to: :zr
   end