procon_bypass_man 0.1.11 → 0.1.12

data/lib/procon_bypass_man/configuration.rb

@@ -1,5 +1,5 @@
 class ProconBypassMan::Configuration
-  module ClassAttributes
+  module ClassMethods
     def root
       config.root
     end
@@ -23,10 +23,20 @@ class ProconBypassMan::Configuration
     def cache
       @@cache_table ||= ProconBypassMan::OnMemoryCache.new
     end
+
+    # @return [String]
+    def session_id
+      ProconBypassMan::WriteSessionIdCommand.execute
+    end
+
+    # @return [String]
+    def device_id
+      ProconBypassMan::WriteDeviceIdCommand.execute
+    end
   end
 
-  attr_reader :api_server
-  attr_accessor :enable_critical_error_logging
+  attr_accessor :enable_critical_error_logging, :raw_setting
+  attr_writer :verbose_bypass_log
 
   def root=(path)
     @root = path
@@ -41,8 +51,8 @@ class ProconBypassMan::Configuration
     end
   end
 
-  def api_server=(api_server)
-    @api_server = api_server
+  def api_servers=(api_servers)
+    @api_servers = api_servers
     return self
   end
 
@@ -86,4 +96,16 @@ class ProconBypassMan::Configuration
       ].compact
     end
   end
+
+  def api_servers
+    if !!ENV["API_SERVER"]
+      [ENV["API_SERVER"]].reject(&:nil?)
+    else
+      [@api_servers].flatten.reject(&:nil?)
+    end
+  end
+
+  def verbose_bypass_log
+    @verbose_bypass_log || !!ENV["VERBOSE_BYPASS_LOG"]
+  end
 end

data/lib/procon_bypass_man/device_connector.rb

@@ -309,8 +309,7 @@ class ProconBypassMan::DeviceConnector
     end
   rescue Errno::ENXIO => e
     # /dev/hidg0 をopenできないときがある
-    ProconBypassMan.logger.error "Errno::ENXIO (No such device or address @ rb_sysopen - /dev/hidg0)が起きました。resetします"
-    ProconBypassMan.logger.error e
+    ProconBypassMan::SendErrorCommand.execute(error: "Errno::ENXIO (No such device or address @ rb_sysopen - /dev/hidg0)が起きました。resetします. #{e.full_message}")
     system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
     system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
     sleep 2

data/lib/procon_bypass_man/io_monitor.rb

@@ -1,11 +1,12 @@
 module ProconBypassMan
   class Counter
-    attr_accessor :label, :table, :previous_table
+    attr_accessor :label, :table, :previous_table, :active
 
     def initialize(label: )
       self.label = label
       self.table = {}
       self.previous_table = {}
+      self.active = true
     end
 
     # アクティブなバケットは1つだけ
@@ -24,7 +25,7 @@ module ProconBypassMan
       self
     end
 
-    def formated_previous_table
+    def formatted_previous_table
       t = previous_table.dup
       start_function = t[:start_function] || 0
       end_function = t[:end_function] || 0
@@ -32,6 +33,10 @@ module ProconBypassMan
       eagain_wait_readable_on_write = t[:eagain_wait_readable_on_write] || 0
       "(#{(end_function / start_function.to_f * 100).floor(1)}%(#{end_function}/#{start_function}), loss: #{eagain_wait_readable_on_read}, #{eagain_wait_readable_on_write})"
     end
+
+    def shutdown
+      self.active = false
+    end
   end
 
   module IOMonitor
@@ -51,14 +56,14 @@ module ProconBypassMan
       Thread.start do
         max_output_length = 0
         loop do
-          list = @@list.dup
+          list = @@list.select(&:active).dup
           unless list.all? { |x| x&.previous_table.is_a?(Hash) }
             sleep 0.5
             next
           end
 
           line = list.map { |counter|
-            "#{counter.label}(#{counter.formated_previous_table})"
+            "#{counter.label}(#{counter.formatted_previous_table})"
           }.join(", ")
           max_output_length = line.length
           sleep 0.7

data/lib/procon_bypass_man/procon/{data.rb → consts.rb}

@@ -1,5 +1,5 @@
 class ProconBypassMan::Procon
-  module Data
+  module Consts
     NO_ACTION = "30f28100800078c77448287509550274ff131029001b0022005a0271ff191028001e00210064027cff1410280020002100000000000000000000000000000000".freeze
   end
 end

data/lib/procon_bypass_man/procon/layer_changer.rb

@@ -0,0 +1,40 @@
+class ProconBypassMan::Procon::LayerChanger
+  def initialize(binary: )
+    @procon_reader = ProconBypassMan::ProconReader.new(binary: binary)
+  end
+
+  # @return [Symbol]
+  def next_layer_key
+    case
+    when pressed?(button: :up)
+      :up
+    when pressed?(button: :right)
+      :right
+    when pressed?(button: :left)
+      :left
+    when pressed?(button: :down)
+      :down
+    else
+      ProconBypassMan.logger.warn("next_layer_key is unknown")
+      :up
+    end
+  end
+
+  # @return [Boolean]
+  def change_layer?
+    if ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.empty?
+      raise "prefix_keysが未設定です"
+    end
+    ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.map { |b| pressed?(button: b) }.all?
+  end
+
+  # @return [Boolean]
+  def pressed_next_layer?
+    change_layer? && (pressed?(button: :up) || pressed?(button: :right) || pressed?(button: :left) || pressed?(button: :down))
+  end
+
+  # @return [Boolean]
+  def pressed?(button: )
+    @procon_reader.pressed.include?(button)
+  end
+end

data/lib/procon_bypass_man/procon/user_operation.rb

@@ -1,12 +1,14 @@
 class ProconBypassMan::Procon
   class UserOperation
-    include LayerChangeable
-    extend PressedButtonHelper::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
@@ -16,20 +18,16 @@ 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)
 
@@ -38,10 +36,6 @@ class ProconBypassMan::Procon
       binary[byte_position] = ["%02X" % value.to_s].pack("H*")
     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 press_button(button)
       return if pressed_button?(button)
 
@@ -51,7 +45,7 @@ class ProconBypassMan::Procon
     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

data/lib/procon_bypass_man/procon.rb

@@ -1,10 +1,9 @@
 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"
@@ -35,8 +34,9 @@ class ProconBypassMan::Procon
   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
@@ -137,13 +137,7 @@ class ProconBypassMan::Procon
       end
     end
 
-    b = user_operation.binary
-    ProconBypassMan.cache.fetch key: 'user_operation.binary', expires_in: 60 do
-      left_analog_stick = ProconBypassMan::ReadonlyProcon.new(binary: b).left_analog_stick
-      ProconBypassMan.logger.debug "x: #{left_analog_stick[:x]}, val: #{left_analog_stick[:x].to_s(2)}"
-      ProconBypassMan.logger.debug "y: #{left_analog_stick[:y]}, val: #{left_analog_stick[:y].to_s(2)}"
-    end
-    b
+    user_operation.binary
   end
 
   private

data/lib/procon_bypass_man/{readonly_procon.rb → procon_reader.rb}

@@ -1,15 +1,14 @@
-# read
-class ProconBypassMan::ReadonlyProcon
+class ProconBypassMan::ProconReader
   def initialize(binary: )
     @binary = binary
-    @user_operation = ProconBypassMan::Procon::UserOperation.new(binary.dup)
     @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] = @user_operation.pressed_button?(button)
+      acc[button] = aware.pressed_button?(button)
       acc
     end
     pressed_table.select { |_key, value| value }.keys

data/lib/procon_bypass_man/runner.rb

@@ -1,15 +1,20 @@
 require_relative "io_monitor"
 require_relative "uptime"
 require_relative "boot_message"
-require_relative "background/report_thread"
+require_relative "background/job_runner"
 
 class ProconBypassMan::Runner
   class InterruptForRestart < StandardError; end
 
-  def run
-    first_negotiation
-    print_booted_message
+  def initialize(gadget: , procon: )
+    @gadget = gadget
+    @procon = procon
+
+    ProconBypassMan::PrintBootMessageCommand.execute
+    ProconBypassMan::Background::JobRunner.start!
+  end
 
+  def run
     self_read, self_write = IO.pipe
     %w(TERM INT USR1 USR2).each do |sig|
       begin
@@ -17,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
 
@@ -37,10 +42,10 @@ class ProconBypassMan::Runner
         ProconBypassMan.logger.info("Reloading config file")
         begin
           ProconBypassMan::ButtonsSettingConfiguration::Loader.reload_setting
-          puts "設定ファイルの再読み込みができました"
         rescue ProconBypassMan::CouldNotLoadConfigError
-          ProconBypassMan.logger.error "設定ファイルが不正です。再読み込みができませんでした"
+          ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。再読み込みができませんでした")
         end
+        ProconBypassMan::SendReloadConfigEventCommand.execute
         ProconBypassMan.logger.info("バイパス処理を再開します")
       rescue Interrupt
         $will_terminate_token = true
@@ -59,7 +64,7 @@ class ProconBypassMan::Runner
 
   def main_loop
     ProconBypassMan::IOMonitor.start!
-    ProconBypassMan::Background::Reporter.start!
+    ProconBypassMan::Background::JobRunner.start!
 
     # gadget => procon
     # 遅くていい
@@ -76,15 +81,15 @@ class ProconBypassMan::Runner
         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.logger.error "Proconが切断されました.終了処理を開始します"
+        ProconBypassMan::SendErrorCommand.execute(error: "Switchとの切断されました.終了処理を開始します. #{e.full_message}")
         Process.kill "TERM", Process.ppid
       rescue Errno::ETIMEDOUT => e
         # TODO まれにこれが発生する. 再接続したい
-        ProconBypassMan::ErrorReporter.report(body: e)
-        ProconBypassMan.logger.error "Switchとの切断されました.終了処理を開始します"
+        ProconBypassMan::SendErrorCommand.execute(error: "Switchと意図せず切断されました.終了処理を開始します. #{e.full_message}")
         Process.kill "TERM", Process.ppid
       end
       ProconBypassMan.logger.info "Thread1を終了します"
@@ -99,10 +104,10 @@ class ProconBypassMan::Runner
         break if $will_terminate_token
         bypass.send_procon_to_gadget!
       rescue EOFError => e
-        ProconBypassMan.logger.error "Proconと通信ができませんでした.終了処理を開始します"
+        ProconBypassMan::SendErrorCommand.execute(error: "Proconが切断されました。終了処理を開始します. #{e.full_message}")
         Process.kill "TERM", Process.ppid
       rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
-        ProconBypassMan.logger.error "Proconが切断されました。終了処理を開始します"
+        ProconBypassMan::SendErrorCommand.execute(error: "Proconが切断されました。終了処理を開始します2. #{e.full_message}")
         Process.kill "TERM", Process.ppid
       end
       ProconBypassMan.logger.info "Thread2を終了します"
@@ -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,12 +148,4 @@ class ProconBypassMan::Runner
       raise Interrupt
     end
   end
-
-  # @return [void]
-  def print_booted_message
-    message = ProconBypassMan::BootMessage.new
-    ProconBypassMan.logger.info(message.to_s)
-    Thread.new { ProconBypassMan::Reporter.report(body: message.to_hash) }
-    puts message.to_s
-  end
 end

data/lib/procon_bypass_man/uptime.rb

@@ -2,10 +2,20 @@ require "time"
 
 module ProconBypassMan
   class Uptime
+    # @return [Integer]
     def self.from_boot
-      result = `uptime -s`.chomp
-      return -1 if result == '' # darwin系だとsオプションが使えない
-      boot_time = result.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)

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require "json"
 require "net/http"
 require "fileutils"
+require "securerandom"
 
 require_relative "procon_bypass_man/version"
 require_relative "procon_bypass_man/callbacks"
@@ -13,22 +14,20 @@ 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/readonly_procon"
+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/outbound/reporter"
-require_relative "procon_bypass_man/outbound/error_reporter"
-require_relative "procon_bypass_man/outbound/pressed_buttons_reporter"
+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
 
 module ProconBypassMan
-  extend ProconBypassMan::Configuration::ClassAttributes
+  extend ProconBypassMan::Configuration::ClassMethods
 
-  class ProConRejected < StandardError; end
   class CouldNotLoadConfigError < StandardError; end
   class FirstConnectionError < StandardError; end
   class EternalConnectionError < StandardError; end
@@ -45,25 +44,27 @@ module ProconBypassMan
     end
   end
 
+  # @return [void]
   def self.run(setting_path: nil, &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
 
@@ -73,10 +74,12 @@ module ProconBypassMan
     @@configuration
   end
 
+  # @return [ProconBypassMan::Configuration]
   def self.config
     @@configuration ||= ProconBypassMan::Configuration.new
   end
 
+  # @return [void]
   def self.reset!
     ProconBypassMan::Procon::MacroRegistry.reset!
     ProconBypassMan::Procon::ModeRegistry.reset!
@@ -84,4 +87,8 @@ module ProconBypassMan
     ProconBypassMan::ButtonsSettingConfiguration.instance.reset!
     ProconBypassMan::IOMonitor.reset!
   end
+
+  def self.initialize_pbm
+    ProconBypassMan::WriteDeviceIdCommand.execute
+  end
 end

data/project_template/app.rb

@@ -5,7 +5,7 @@ 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.11'
+  gem 'procon_bypass_man', '0.1.12'
   gem 'procon_bypass_man-splatoon2', github: 'splaplapla/procon_bypass_man-splatoon2', tag: "0.1.1"
 end
 
@@ -13,7 +13,7 @@ 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
-  # pbm.api_server = 'https://...'
+  # config.api_servers = ['https://...']
   config.enable_critical_error_logging = true
 end
 

data/sig/main.rbs

@@ -8,9 +8,6 @@ interface _Pluginable
 end
 
 module ProconBypassMan
-  class ProConRejected < StandardError
-  end
-
   class CouldNotLoadConfigError < StandardError
   end
 
@@ -168,7 +165,7 @@ module ProconBypassMan
 end
 
 class ProconBypassMan::Configuration
-  module ClassAttributes
+  module ClassMethods
     def root: () -> untyped
 
     def logger: () -> untyped
@@ -427,10 +424,6 @@ module ProconBypassMan::Procon::PressedButtonHelper
   module Static
     def pressed_button?: (untyped button) -> untyped
   end
-
-  module Dynamic
-    def compile_if_not_compile_yet!: () -> untyped
-  end
 end
 
 class ProconBypassMan::Procon
@@ -439,8 +432,6 @@ class ProconBypassMan::Procon
 
     include PressedButtonHelper::Static
 
-    extend PressedButtonHelper::Dynamic
-
     attr_reader binary: untyped
 
     def initialize: (untyped binary) -> untyped
@@ -498,7 +489,14 @@ end
 
 module ProconBypassMan
   class Uptime
-    def self.from_boot: () -> untyped
+    # @return [Integer]
+    def self.from_boot: () -> Integer
+
+    # @param [String] uptime_cmd_result
+    def initialize: (uptime_cmd_result: String uptime_cmd_result) -> void
+
+    # @return [Integer]
+    def from_boot: () -> Integer
   end
 end