procon_bypass_man 0.1.8 → 0.1.12

data/lib/procon_bypass_man/procon/user_operation.rb

@@ -1,13 +1,14 @@
 class ProconBypassMan::Procon
   class UserOperation
-    include LayerChangeable
-    include PushedButtonHelper::Static
-    extend PushedButtonHelper::Dynamic
-
     attr_reader :binary
 
+    ::ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.each do |button, _value|
+      define_method "pressed_#{button}?" do
+        pressed_button?(button)
+      end
+    end
+
     def initialize(binary)
-      self.class.compile_if_not_compile_yet!
       unless binary.encoding.name == ASCII_ENCODING
         raise "おかしいです"
       end
@@ -17,34 +18,34 @@ class ProconBypassMan::Procon
     ZERO_BIT = ["0"].pack("H*").freeze
     ASCII_ENCODING = "ASCII-8BIT"
 
-    # @depilicate
-    def binary=(binary)
-      unless binary.encoding.name == ASCII_ENCODING
-        raise "おかしいです"
-      end
-      @binary = binary
-    end
-
     def set_no_action!
       binary[3] = ZERO_BIT
       binary[4] = ZERO_BIT
       binary[5] = ZERO_BIT
     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 unpress_button(button)
+      return if not pressed_button?(button)
+
       byte_position = ButtonCollection.load(button).byte_position
-      value = binary[byte_position].unpack("H*").first.to_i(16) - 2**ButtonCollection.load(button).bit_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
 
     def press_button(button)
+      return if pressed_button?(button)
+
       byte_position = ButtonCollection.load(button).byte_position
-      value = binary[byte_position].unpack("H*").first.to_i(16) + 2**ButtonCollection.load(button).bit_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
 
     def press_button_only(button)
-      [ProconBypassMan::Procon::Data::NO_ACTION.dup].pack("H*").tap do |no_action_binary|
+      [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
@@ -68,5 +69,9 @@ class ProconBypassMan::Procon
       binary[11] = tb[11]
       self.binary
     end
+
+    def pressed_button?(button)
+      ProconBypassMan::PpressButtonAware.new(binary).pressed_button?(button)
+    end
   end
 end

data/lib/procon_bypass_man/procon.rb

@@ -1,12 +1,12 @@
 class ProconBypassMan::Procon
-  require "procon_bypass_man/procon/data"
+  require "procon_bypass_man/procon/consts"
   require "procon_bypass_man/procon/mode_registry"
   require "procon_bypass_man/procon/macro_registry"
-  require "procon_bypass_man/procon/layer_changeable"
+  require "procon_bypass_man/procon/layer_changer"
   require "procon_bypass_man/procon/button_collection"
-  require "procon_bypass_man/procon/pressed_button_helper"
   require "procon_bypass_man/procon/user_operation"
   require "procon_bypass_man/procon/flip_cache"
+  require "procon_bypass_man/procon/press_button_aware"
 
   attr_accessor :user_operation
 
@@ -30,12 +30,13 @@ class ProconBypassMan::Procon
   def current_layer_key; @@status[:current_layer_key]; end
 
   def current_layer
-    ProconBypassMan::Configuration.instance.layers[current_layer_key]
+    ProconBypassMan::ButtonsSettingConfiguration.instance.layers[current_layer_key]
   end
 
   def apply!
-    if user_operation.change_layer?
-      @@status[:current_layer_key] = user_operation.next_layer_key if user_operation.pressed_next_layer?
+    layer_changer = ProconBypassMan::Procon::LayerChanger.new(binary: user_operation.binary)
+    if layer_changer.change_layer?
+      @@status[:current_layer_key] = layer_changer.next_layer_key if layer_changer.pressed_next_layer?
       user_operation.set_no_action!
       return
     end
@@ -94,10 +95,23 @@ class ProconBypassMan::Procon
       return user_operation.binary
     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|
+          user_operation.unpress_button(force_neutral_button)
+        end
+        user_operation.apply_left_analog_stick_cap(cap: options[:cap])
+      end
+    end
+
     current_layer.flip_buttons.each do |button, options|
       # 何もしないで常に連打
       if !options[:if_pressed] && status[button]
-        user_operation.press_button(button) unless user_operation.pressed_button?(button)
+        user_operation.press_button(button)
         next
       end
 
@@ -108,7 +122,7 @@ class ProconBypassMan::Procon
         end
 
         options[:force_neutral]&.each do |force_neutral_button|
-          user_operation.pressed_button?(force_neutral_button) && user_operation.unpress_button(force_neutral_button)
+          user_operation.unpress_button(force_neutral_button)
         end
       end
     end
@@ -118,7 +132,7 @@ class ProconBypassMan::Procon
         user_operation.unpress_button(from_button)
         # TODO 2重でpressしないようにしたい
         to_buttons[:to].each do |to_button|
-          user_operation.press_button(to_button) unless user_operation.pressed_button?(to_button)
+          user_operation.press_button(to_button)
         end
       end
     end

data/lib/procon_bypass_man/procon_reader.rb

@@ -0,0 +1,31 @@
+class ProconBypassMan::ProconReader
+  def initialize(binary: )
+    @binary = binary
+    @analog_stick = ProconBypassMan::Procon::AnalogStick.new(binary: binary)
+  end
+
+  # @return [Array<Symbol>]
+  def pressed
+    aware = ProconBypassMan::PpressButtonAware.new(@binary)
+    pressed_table = ::ProconBypassMan::Procon::ButtonCollection::BUTTONS.reduce({}) do |acc, button|
+      acc[button] = aware.pressed_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: pressed,
+    }
+  end
+end

data/lib/procon_bypass_man/runner.rb

@@ -1,18 +1,20 @@
 require_relative "io_monitor"
 require_relative "uptime"
+require_relative "boot_message"
+require_relative "background/job_runner"
 
 class ProconBypassMan::Runner
   class InterruptForRestart < StandardError; end
 
-  def initialize
-    $will_interval_0_0_0_5 = 0
-    $will_interval_1_6 = 0
+  def initialize(gadget: , procon: )
+    @gadget = gadget
+    @procon = procon
+
+    ProconBypassMan::PrintBootMessageCommand.execute
+    ProconBypassMan::Background::JobRunner.start!
   end
 
   def run
-    first_negotiation
-    print_booted_message
-
     self_read, self_write = IO.pipe
     %w(TERM INT USR1 USR2).each do |sig|
       begin
@@ -20,7 +22,7 @@ class ProconBypassMan::Runner
           self_write.puts(sig)
         end
       rescue ArgumentError
-        ProconBypassMan.logger.error("Signal #{sig} not supported")
+        ProconBypassMan::SendErrorCommand.execute(error: "Signal #{sig} not supported")
       end
     end
 
@@ -39,11 +41,11 @@ class ProconBypassMan::Runner
         Process.wait
         ProconBypassMan.logger.info("Reloading config file")
         begin
-          ProconBypassMan::Configuration::Loader.reload_setting
-          puts "設定ファイルの再読み込みができました"
+          ProconBypassMan::ButtonsSettingConfiguration::Loader.reload_setting
         rescue ProconBypassMan::CouldNotLoadConfigError
-          ProconBypassMan.logger.error "設定ファイルが不正です。再読み込みができませんでした"
+          ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。再読み込みができませんでした")
         end
+        ProconBypassMan::SendReloadConfigEventCommand.execute
         ProconBypassMan.logger.info("バイパス処理を再開します")
       rescue Interrupt
         $will_terminate_token = true
@@ -61,31 +63,36 @@ class ProconBypassMan::Runner
   private
 
   def main_loop
-    # TODO 接続確立完了をswitchを読み取るようにして、この暫定で接続完了sleepを消す
-    Thread.new do
-      sleep(5)
-      $will_interval_0_0_0_5 = 0.005
-      $will_interval_1_6 = 1.6
-    end
-
     ProconBypassMan::IOMonitor.start!
+    ProconBypassMan::Background::JobRunner.start!
+
     # gadget => procon
     # 遅くていい
     monitor1 = ProconBypassMan::IOMonitor.new(label: "switch -> procon")
     monitor2 = ProconBypassMan::IOMonitor.new(label: "procon -> switch")
     ProconBypassMan.logger.info "Thread1を起動します"
     t1 = Thread.new do
+      timer = ProconBypassMan::Timer.new(timeout: Time.now + 10)
       bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor1)
-      begin
-        loop do
-          break if $will_terminate_token
-          bypass.send_gadget_to_procon!
-        rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
-          ProconBypassMan.logger.error "Proconが切断されました.終了処理を開始します"
-          Process.kill "TERM", Process.ppid
-        end
-        ProconBypassMan.logger.info "Thread1を終了します"
+      loop do
+        break if $will_terminate_token
+        timer.throw_if_timeout!
+        bypass.send_gadget_to_procon!
+        sleep(0.005)
+      rescue ProconBypassMan::Timer::Timeout
+        ProconBypassMan.logger.info "10秒経過したのでThread1を終了します"
+        monitor1.shutdown
+        puts "10秒経過したのでThread1を終了します"
+        break
+      rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
+        ProconBypassMan::SendErrorCommand.execute(error: "Switchとの切断されました.終了処理を開始します. #{e.full_message}")
+        Process.kill "TERM", Process.ppid
+      rescue Errno::ETIMEDOUT => e
+        # TODO まれにこれが発生する. 再接続したい
+        ProconBypassMan::SendErrorCommand.execute(error: "Switchと意図せず切断されました.終了処理を開始します. #{e.full_message}")
+        Process.kill "TERM", Process.ppid
       end
+      ProconBypassMan.logger.info "Thread1を終了します"
     end
 
     # procon => gadget
@@ -93,19 +100,17 @@ class ProconBypassMan::Runner
     ProconBypassMan.logger.info "Thread2を起動します"
     t2 = Thread.new do
       bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor2)
-      begin
-        loop do
-          break if $will_terminate_token
-          bypass.send_procon_to_gadget!
-        rescue EOFError => e
-          ProconBypassMan.logger.error "Proconと通信ができませんでした.終了処理を開始します"
-          Process.kill "TERM", Process.ppid
-        rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
-          ProconBypassMan.logger.error "Proconが切断されました。終了処理を開始します"
-          Process.kill "TERM", Process.ppid
-        end
-        ProconBypassMan.logger.info "Thread2を終了します"
+      loop do
+        break if $will_terminate_token
+        bypass.send_procon_to_gadget!
+      rescue EOFError => e
+        ProconBypassMan::SendErrorCommand.execute(error: "Proconが切断されました。終了処理を開始します. #{e.full_message}")
+        Process.kill "TERM", Process.ppid
+      rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
+        ProconBypassMan::SendErrorCommand.execute(error: "Proconが切断されました。終了処理を開始します2. #{e.full_message}")
+        Process.kill "TERM", Process.ppid
       end
+      ProconBypassMan.logger.info "Thread2を終了します"
     end
 
     self_read, self_write = IO.pipe
@@ -134,15 +139,6 @@ class ProconBypassMan::Runner
     end
   end
 
-  def first_negotiation
-    @gadget, @procon = ProconBypassMan::DeviceConnector.connect
-  rescue ProconBypassMan::Timer::Timeout
-    ::ProconBypassMan.logger.error "デバイスとの通信でタイムアウトが起きて接続ができませんでした。"
-    @gadget&.close
-    @procon&.close
-    raise ::ProconBypassMan::EternalConnectionError
-  end
-
   def handle_signal(sig)
     ProconBypassMan.logger.info "#{$$}で#{sig}を受け取りました"
     case sig
@@ -152,21 +148,4 @@ class ProconBypassMan::Runner
       raise Interrupt
     end
   end
-
-  # @return [void]
-  def print_booted_message
-    booted_message = <<~EOF
-      ----
-      RUBY_VERSION: #{RUBY_VERSION}
-      ProconBypassMan: #{ProconBypassMan::VERSION}
-      pid: #{$$}
-      root: #{ProconBypassMan.root}
-      pid_path: #{ProconBypassMan.pid_path}
-      setting_path: #{ProconBypassMan::Configuration.instance.setting_path}
-      uptime from boot: #{ProconBypassMan::Uptime.from_boot} sec
-      ----
-    EOF
-    ProconBypassMan.logger.info(booted_message)
-    puts booted_message
-  end
 end

data/lib/procon_bypass_man/uptime.rb

@@ -2,12 +2,24 @@ require "time"
 
 module ProconBypassMan
   class Uptime
+    # @return [Integer]
     def self.from_boot
-      boot_time = Time.parse(`uptime -s`.chomp).to_i
+      new(uptime_cmd_result: `uptime -s`.chomp).from_boot
+    end
+
+    # @param [String] uptime_cmd_result
+    def initialize(uptime_cmd_result: )
+      @result = uptime_cmd_result
+    end
+
+    # @return [Integer]
+    def from_boot
+      return -1 if @result == '' # darwin系だとsオプションが使えない
+      boot_time = Time.parse(@result).to_i
       return Time.now.to_i - boot_time.to_i
     rescue => e
       ProconBypassMan.logger.error(e)
-      return "error!"
+      return -1
     end
   end
 end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man.rb

@@ -1,99 +1,94 @@
 require "logger"
 require 'yaml'
+require "json"
+require "net/http"
 require "fileutils"
+require "securerandom"
 
 require_relative "procon_bypass_man/version"
+require_relative "procon_bypass_man/callbacks"
 require_relative "procon_bypass_man/timer"
 require_relative "procon_bypass_man/bypass"
 require_relative "procon_bypass_man/device_connector"
 require_relative "procon_bypass_man/runner"
 require_relative "procon_bypass_man/processor"
 require_relative "procon_bypass_man/configuration"
+require_relative "procon_bypass_man/buttons_setting_configuration"
+require_relative "procon_bypass_man/procon_reader"
 require_relative "procon_bypass_man/procon"
+require_relative "procon_bypass_man/procon/analog_stick"
+require_relative "procon_bypass_man/procon/analog_stick_cap"
+require_relative "procon_bypass_man/background"
+require_relative "procon_bypass_man/commands"
+require_relative "procon_bypass_man/on_memory_cache"
 
 STDOUT.sync = true
 Thread.abort_on_exception = true
 
-# new feature from ruby3.0's
-if GC.respond_to?(:auto_compact)
-  GC.auto_compact = true
-end
-
 module ProconBypassMan
-  class ProConRejected < StandardError; end
+  extend ProconBypassMan::Configuration::ClassMethods
+
   class CouldNotLoadConfigError < StandardError; end
   class FirstConnectionError < StandardError; end
   class EternalConnectionError < StandardError; end
 
-  def self.configure(setting_path: nil, &block)
+  def self.buttons_setting_configure(setting_path: nil, &block)
     unless setting_path
       logger.warn "setting_pathが未設定です。設定ファイルのライブリロードが使えません。"
     end
 
     if block_given?
-      ProconBypassMan::Configuration.instance.instance_eval(&block)
+      ProconBypassMan::ButtonsSettingConfiguration.instance.instance_eval(&block)
     else
-      ProconBypassMan::Configuration::Loader.load(setting_path: setting_path)
+      ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting_path)
     end
   end
 
+  # @return [void]
   def self.run(setting_path: nil, &block)
-    configure(setting_path: setting_path, &block)
+    ProconBypassMan.logger.info "PBMを起動しています"
+    puts "PBMを起動しています"
+    buttons_setting_configure(setting_path: setting_path, &block)
+    initialize_pbm
     File.write(pid_path, $$)
-    Runner.new.run
+    ProconBypassMan::WriteSessionIdCommand.execute
+    gadget, procon = ProconBypassMan::ConnectDeviceCommand.execute!
+    Runner.new(gadget: gadget, procon: procon).run
   rescue CouldNotLoadConfigError
-    ProconBypassMan.logger.error "設定ファイルが不正です。設定ファイルの読み込みに失敗しました"
-    puts "設定ファイルが不正です。設定ファイルの読み込みに失敗しました"
+    ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。設定ファイルの読み込みに失敗しました")
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     FileUtils.rm_rf(ProconBypassMan.digest_path)
     exit 1
   rescue EternalConnectionError
-    ProconBypassMan.logger.error "接続の見込みがないのでsleepしまくります"
-    puts "接続の見込みがないのでsleepしまくります"
+    ProconBypassMan::SendErrorCommand.execute(error: "接続の見込みがないのでsleepしまくります")
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     sleep(999999999)
   rescue FirstConnectionError
-    puts "接続を確立できませんでした。やりなおします。"
+    ProconBypassMan::SendErrorCommand.execute(error: "接続を確立できませんでした。やりなおします。")
     retry
   end
 
-  def self.logger=(logger)
-    @@logger = logger
-  end
-
-  def self.logger
-    if defined?(@@logger)
-      @@logger
-    else
-      Logger.new(nil)
-    end
+  def self.configure(&block)
+    @@configuration = ProconBypassMan::Configuration.new
+    @@configuration.instance_eval(&block)
+    @@configuration
   end
 
-  def self.pid_path
-    @@pid_path ||= File.expand_path("#{root}/pbm_pid", __dir__).freeze
+  # @return [ProconBypassMan::Configuration]
+  def self.config
+    @@configuration ||= ProconBypassMan::Configuration.new
   end
 
+  # @return [void]
   def self.reset!
     ProconBypassMan::Procon::MacroRegistry.reset!
     ProconBypassMan::Procon::ModeRegistry.reset!
     ProconBypassMan::Procon.reset!
-    ProconBypassMan::Configuration.instance.reset!
+    ProconBypassMan::ButtonsSettingConfiguration.instance.reset!
     ProconBypassMan::IOMonitor.reset!
   end
 
-  def self.root
-    if defined?(@@root)
-      @@root
-    else
-      File.expand_path('..', __dir__).freeze
-    end
-  end
-
-  def self.root=(path)
-    @@root = path
-  end
-
-  def self.digest_path
-    "#{root}/.setting_yaml_digest"
+  def self.initialize_pbm
+    ProconBypassMan::WriteDeviceIdCommand.execute
   end
 end

data/project_template/README.md

@@ -3,6 +3,7 @@ https://github.com/splaplapla/pbmenv で使っているファイルです
 
 ## systemd
 * sudo ln -s /usr/share/pbm/current/systemd_units/pbm.service /etc/systemd/system/pbm.service
+* sudo ln -s /usr/share/pbm/current/systemd_units/pbm_web.service /etc/systemd/system/pbm_web.service
 * commands
   * systemctl daemon-reload
   * systemctl enable pbm.service
@@ -14,4 +15,3 @@ https://github.com/splaplapla/pbmenv で使っているファイルです
 
 ### ログ
 * journalctl -xe -f
-

data/project_template/app.rb

@@ -5,14 +5,16 @@ 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.8'
+  gem 'procon_bypass_man', '0.1.12'
   gem 'procon_bypass_man-splatoon2', github: 'splaplapla/procon_bypass_man-splatoon2', tag: "0.1.1"
 end
 
-ProconBypassMan.tap do |pbm|
-  pbm.root = File.expand_path(__dir__)
-  pbm.logger = Logger.new("#{ProconBypassMan.root}/app.log", 5, 1024 * 1024 * 10)
-  pbm.logger.level = :debug
+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://...']
+  config.enable_critical_error_logging = true
 end
 
 ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")

data/project_template/systemd_units/pbm_web.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=PBM WEB
+
+[Service]
+Type=simple
+WorkingDirectory=/home/pi/src/procon_bypass_man_sample
+ExecStart=/bin/bash -c "/home/pi/.rbenv/versions/3.0.1/bin/ruby /usr/share/pbm/current/web.rb"
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

data/project_template/web.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+  gem 'procon_bypass_man-web', '0.1.3'
+end
+
+ProconBypassMan::Web.configure do |config|
+  config.root = File.expand_path(__dir__)
+  config.logger = Logger.new("#{ProconBypassMan::Web.root}/web.log", 1, 1024 * 1024 * 10)
+end
+
+ProconBypassMan::Web::Server.start

data/sig/README.rb

@@ -0,0 +1,4 @@
+# SIG
+```
+bundle exec rbs prototype rb lib/**/*.rb > sig/main.rbs
+```