procon_bypass_man 0.1.5 → 0.1.9

data/lib/procon_bypass_man/procon/user_operation.rb

@@ -1,7 +1,6 @@
 class ProconBypassMan::Procon
   class UserOperation
     include LayerChangeable
-    include PushedButtonHelper::Static
     extend PushedButtonHelper::Dynamic
 
     attr_reader :binary
@@ -33,13 +32,17 @@ class ProconBypassMan::Procon
 
     def unpress_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 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)
       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
 
@@ -68,5 +71,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

@@ -7,6 +7,7 @@ class ProconBypassMan::Procon
   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
 
@@ -94,6 +95,15 @@ class ProconBypassMan::Procon
       return user_operation.binary
     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.pressed_button?(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]
@@ -123,7 +133,11 @@ class ProconBypassMan::Procon
       end
     end
 
-    user_operation.binary
+    b = user_operation.binary
+    ProconBypassMan.cache.fetch key: 'user_operation.binary', expires_in: 60 do
+      ProconBypassMan::Procon::DebugDumper.new(binary: b).dump_analog_sticks
+    end
+    b
   end
 
   private

data/lib/procon_bypass_man/reporter.rb

@@ -0,0 +1,42 @@
+require "net/http"
+require "json"
+
+class ProconBypassMan::Reporter
+  PATH = "/api/reports" # POST
+
+  class Client
+    def initialize
+      @server = ProconBypassMan.api_server
+      @hostname = `hostname`.chomp
+    end
+
+    def post(body: )
+      # TODO ここでvalidationする
+      if @server.nil?
+        ProconBypassMan.logger.info('送信先が未設定なのでスキップしました')
+        return
+      end
+
+      uri = URI.parse("#{@server}#{PATH}")
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = uri.scheme === "https"
+      response = http.post(
+        uri.path,
+        { report: body.to_json, hostname: @hostname }.to_json,
+        { "Content-Type" => "application/json" },
+      )
+      unless response.code == /^20/
+        ProconBypassMan.logger.error(response.body)
+      end
+    rescue => e
+      puts e
+      ProconBypassMan.logger.error(e)
+    end
+  end
+
+  def self.report(body: )
+    Client.new.post(body: body)
+  rescue => e
+    ProconBypassMan.logger.error(e)
+  end
+end

data/lib/procon_bypass_man/runner.rb

@@ -1,13 +1,10 @@
 require_relative "io_monitor"
+require_relative "uptime"
+require_relative "boot_message"
 
 class ProconBypassMan::Runner
   class InterruptForRestart < StandardError; end
 
-  def initialize
-    $will_interval_0_0_0_5 = 0
-    $will_interval_1_6 = 0
-  end
-
   def run
     first_negotiation
     print_booted_message
@@ -28,7 +25,7 @@ class ProconBypassMan::Runner
       main_loop_pid = fork { main_loop }
 
       begin
-        while readable_io = IO.select([self_read])
+        while(readable_io = IO.select([self_read]))
           signal = readable_io.first[0].gets.strip
           handle_signal(signal)
         end
@@ -51,6 +48,7 @@ class ProconBypassMan::Runner
         @gadget&.close
         @procon&.close
         FileUtils.rm_rf(ProconBypassMan.pid_path)
+        FileUtils.rm_rf(ProconBypassMan.digest_path)
         exit 1
       end
     end
@@ -59,13 +57,6 @@ 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!
     # gadget => procon
     # 遅くていい
@@ -73,17 +64,27 @@ class ProconBypassMan::Runner
     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を終了します"
+        puts "10秒経過したのでThread1を終了します"
+        break
+      rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError => e
+        ProconBypassMan.logger.error "Proconが切断されました.終了処理を開始します"
+        Process.kill "TERM", Process.ppid
+      rescue Errno::ETIMEDOUT => e
+        # TODO まれにこれが発生する. 再接続したい
+        ProconBypassMan::ErrorReporter.report(body: e)
+        ProconBypassMan.logger.error "Switchとの切断されました.終了処理を開始します"
+        Process.kill "TERM", Process.ppid
       end
+      ProconBypassMan.logger.info "Thread1を終了します"
     end
 
     # procon => gadget
@@ -91,19 +92,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.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を終了します"
     end
 
     self_read, self_write = IO.pipe
@@ -119,7 +118,7 @@ class ProconBypassMan::Runner
 
     ProconBypassMan.logger.info "子プロセスでgraceful shutdownの準備ができました"
     begin
-      while readable_io = IO.select([self_read])
+      while(readable_io = IO.select([self_read]))
         signal = readable_io.first[0].gets.strip
         handle_signal(signal)
       end
@@ -133,9 +132,7 @@ class ProconBypassMan::Runner
   end
 
   def first_negotiation
-    return if $will_terminate_token
-
-    @gadget, @procon = ProconBypassMan::DeviceConnector.connect(throw_error_if_timeout: true, enable_at_exit: false)
+    @gadget, @procon = ProconBypassMan::DeviceConnector.connect
   rescue ProconBypassMan::Timer::Timeout
     ::ProconBypassMan.logger.error "デバイスとの通信でタイムアウトが起きて接続ができませんでした。"
     @gadget&.close
@@ -155,17 +152,9 @@ class ProconBypassMan::Runner
 
   # @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}
-      ----
-    EOF
-    ProconBypassMan.logger.info(booted_message)
-    puts 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

@@ -0,0 +1,13 @@
+require "time"
+
+module ProconBypassMan
+  class Uptime
+    def self.from_boot
+      boot_time = Time.parse(`uptime -s`.chomp).to_i
+      return Time.now.to_i - boot_time.to_i
+    rescue => e
+      ProconBypassMan.logger.error(e)
+      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.5"
+  VERSION = "0.1.9"
 end

data/lib/procon_bypass_man.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require "fileutils"
 
 require_relative "procon_bypass_man/version"
+require_relative "procon_bypass_man/analog_stick_position"
 require_relative "procon_bypass_man/timer"
 require_relative "procon_bypass_man/bypass"
 require_relative "procon_bypass_man/device_connector"
@@ -10,10 +11,20 @@ require_relative "procon_bypass_man/runner"
 require_relative "procon_bypass_man/processor"
 require_relative "procon_bypass_man/configuration"
 require_relative "procon_bypass_man/procon"
+require_relative "procon_bypass_man/procon/debug_dumper"
+require_relative "procon_bypass_man/procon/analog_stick_cap"
+require_relative "procon_bypass_man/reporter"
+require_relative "procon_bypass_man/error_reporter"
+require_relative "procon_bypass_man/on_memory_cache"
 
 STDOUT.sync = true
 Thread.abort_on_exception = true
 
+# new feature from ruby3.0
+if GC.respond_to?(:auto_compact)
+  GC.auto_compact = true
+end
+
 module ProconBypassMan
   class ProConRejected < StandardError; end
   class CouldNotLoadConfigError < StandardError; end
@@ -33,6 +44,8 @@ module ProconBypassMan
   end
 
   def self.run(setting_path: nil, &block)
+    ProconBypassMan.logger.info "PBMを起動しています"
+    puts "PBMを起動しています"
     configure(setting_path: setting_path, &block)
     File.write(pid_path, $$)
     Runner.new.run
@@ -40,12 +53,13 @@ module ProconBypassMan
     ProconBypassMan.logger.error "設定ファイルが不正です。設定ファイルの読み込みに失敗しました"
     puts "設定ファイルが不正です。設定ファイルの読み込みに失敗しました"
     FileUtils.rm_rf(ProconBypassMan.pid_path)
+    FileUtils.rm_rf(ProconBypassMan.digest_path)
     exit 1
   rescue EternalConnectionError
     ProconBypassMan.logger.error "接続の見込みがないのでsleepしまくります"
     puts "接続の見込みがないのでsleepしまくります"
     FileUtils.rm_rf(ProconBypassMan.pid_path)
-    sleep(999999999999999999)
+    sleep(999999999)
   rescue FirstConnectionError
     puts "接続を確立できませんでした。やりなおします。"
     retry
@@ -55,14 +69,31 @@ module ProconBypassMan
     @@logger = logger
   end
 
+  # @return [Logger]
   def self.logger
-    if defined?(@@logger)
+    if ENV["PBM_ENV"] == 'test'
+      return Logger.new($stdout)
+    end
+
+    if defined?(@@logger) && @@logger.is_a?(Logger)
       @@logger
     else
       Logger.new(nil)
     end
   end
 
+  def self.enable_critical_error_logging!
+    @@enable_critical_error_logging = true
+  end
+
+  def self.error_logger
+    if defined?(@@enable_critical_error_logging)
+      @@error_logger ||= Logger.new("#{ProconBypassMan.root}/error.log", 5, 1024 * 1024 * 10)
+    else
+      Logger.new(nil)
+    end
+  end
+
   def self.pid_path
     @@pid_path ||= File.expand_path("#{root}/pbm_pid", __dir__).freeze
   end
@@ -86,4 +117,24 @@ module ProconBypassMan
   def self.root=(path)
     @@root = path
   end
+
+  def self.api_server=(api_server)
+    @@api_server = api_server
+  end
+
+  def self.api_server
+    if defined?(@@api_server)
+      @@api_server
+    else
+      nil
+    end
+  end
+
+  def self.cache
+    @@cache_table ||= ProconBypassMan::OnMemoryCache.new
+  end
+
+  def self.digest_path
+    "#{root}/.setting_yaml_digest"
+  end
 end

data/procon_bypass_man.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "extension for Nintendo Switch Pro Controller"
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/splaspla-hacker/procon_bypass_man"
+  spec.homepage      = "https://github.com/splaplapla/procon_bypass_man"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 

data/project_template/README.md

@@ -0,0 +1,17 @@
+# Project Template
+https://github.com/splaplapla/pbmenv で使っているファイルです
+
+## systemd
+* sudo ln -s /usr/share/pbm/current/systemd_units/pbm.service /etc/systemd/system/pbm.service
+* commands
+  * systemctl daemon-reload
+  * systemctl enable pbm.service
+  * systemctl disable pbm.service
+  * systemctl start pbm.service
+  * systemctl status pbm.service
+  * systemctl restart pbm.service
+  * systemctl list-unit-files --type=service
+
+### ログ
+* journalctl -xe -f
+

data/project_template/app.rb

@@ -0,0 +1,20 @@
+#!/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', '0.1.9'
+  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
+  # pbm.api_server = 'https://...'
+  pbm.enable_critical_error_logging!
+end
+
+ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")

data/project_template/setting.yml

@@ -0,0 +1,35 @@
+version: 1.0
+setting: |-
+  fast_return = ProconBypassMan::Splatoon2::Macro::FastReturn
+  guruguru = ProconBypassMan::Splatoon2::Mode::Guruguru
+
+  install_macro_plugin fast_return
+  install_macro_plugin ProconBypassMan::Splatoon2::Macro::JumpToUpKey
+  install_macro_plugin ProconBypassMan::Splatoon2::Macro::JumpToRightKey
+  install_macro_plugin ProconBypassMan::Splatoon2::Macro::JumpToLeftKey
+  install_mode_plugin 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::Splatoon2::Macro::JumpToUpKey, if_pressed: [:y, :b, :up]
+    macro ProconBypassMan::Splatoon2::Macro::JumpToRightKey, if_pressed: [:y, :b, :right]
+    macro ProconBypassMan::Splatoon2::Macro::JumpToLeftKey, if_pressed: [:y, :b, :left]
+    remap :l, to: :zr
+  end
+  layer :right, mode: guruguru.name
+  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

data/project_template/systemd_units/pbm.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=PBM
+After=network.target
+
+[Service]
+Type=simple
+WorkingDirectory=/usr/share/pbm/current
+ExecStart=/bin/bash -c "/home/pi/.rbenv/versions/3.0.1/bin/ruby /usr/share/pbm/current/app.rb"
+Restart=always
+Nice=-19
+
+[Install]
+WantedBy=multi-user.target

data/sig/README.rb

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