procon_bypass_man 0.1.3 → 0.1.7

data/lib/procon_bypass_man/procon/button_collection.rb

@@ -24,7 +24,7 @@ class ProconBypassMan::Procon::ButtonCollection
     3 => [:zr, :r, :sr, :sl, :a, :b, :x, :y],
     4 => [:grip, :_undefined_key, :cap, :home, :thumbl, :thumbr, :plus, :minus],
     5 => [:zl, :l, :sl, :sr, :left, :right, :up, :down],
-  }
+  }.freeze
 
   BUTTONS_MAP = BYTES_MAP.reduce({}) { |acc, value|
     next acc if value[1].nil?
@@ -32,7 +32,8 @@ class ProconBypassMan::Procon::ButtonCollection
       acc[button] = { byte_position: value[0], bit_position: index }
     end
     acc
-  }
+  }.freeze
+  BUTTONS = ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.keys.freeze
 
   def self.load(button_key)
     Button.new(button_key)

data/lib/procon_bypass_man/procon/flip_cache.rb

@@ -0,0 +1,22 @@
+class ProconBypassMan::Procon
+  class FlipCache
+    def self.fetch(key: , expires_in: , &block)
+      if expires_in.nil?
+        block.call
+      else
+        @@previous_flips_at_table[key] ||= Time.now
+        if @@previous_flips_at_table[key] < Time.now
+          @@previous_flips_at_table[key] = Time.now + expires_in
+          block.call
+        end
+      end
+    end
+
+    # for testing
+    def self.reset!
+      @@previous_flips_at_table = {}
+    end
+
+    reset!
+  end
+end

data/lib/procon_bypass_man/procon/pressed_button_helper.rb

@@ -13,7 +13,7 @@ module ProconBypassMan::Procon::PushedButtonHelper
     @@compiled = false
     def compile_if_not_compile_yet!
       unless @@compiled
-        ::ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.each do |button, value|
+        ::ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.each do |button, _value|
           define_method "pressed_#{button}?" do
             pressed_button?(button)
           end

data/lib/procon_bypass_man/procon.rb

@@ -1,14 +1,16 @@
 class ProconBypassMan::Procon
+  require "procon_bypass_man/procon/data"
   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/button_collection"
   require "procon_bypass_man/procon/pressed_button_helper"
   require "procon_bypass_man/procon/user_operation"
+  require "procon_bypass_man/procon/flip_cache"
 
   attr_accessor :user_operation
 
-  def self.reset_cvar!
+  def self.reset!
     @@status = {
       buttons: {},
       current_layer_key: :up,
@@ -16,7 +18,6 @@ class ProconBypassMan::Procon
       ongoing_mode: ModeRegistry.load(:manual),
     }
   end
-  def self.reset!; reset_cvar!; end
   reset!
 
   def initialize(binary)
@@ -51,15 +52,21 @@ class ProconBypassMan::Procon
     when :manual
       @@status[:ongoing_mode] = ModeRegistry.load(:manual)
       current_layer.flip_buttons.each do |button, options|
-        unless options[:if_pressed]
-          status[button] = !status[button]
+        if !options[:if_pressed]
+          FlipCache.fetch(key: button, expires_in: options[:flip_interval]) do
+            status[button] = !status[button]
+          end
           next
         end
 
         if options[:if_pressed] && options[:if_pressed].all? { |b| user_operation.pressed_button?(b) }
-          status[button] = !status[button]
+          FlipCache.fetch(key: button, expires_in: options[:flip_interval]) do
+            status[button] = !status[button]
+          end
         else
-          status[button] = false
+          FlipCache.fetch(key: button, expires_in: options[:flip_interval]) do
+            status[button] = false
+          end
         end
       end
     else
@@ -99,18 +106,20 @@ class ProconBypassMan::Procon
         if !status[button]
           user_operation.unpress_button(button)
         end
-        if options[:force_neutral] && user_operation.pressed_button?(options[:force_neutral])
-          button = options[:force_neutral]
-          user_operation.unpress_button(button)
+
+        options[:force_neutral]&.each do |force_neutral_button|
+          user_operation.pressed_button?(force_neutral_button) && user_operation.unpress_button(force_neutral_button)
         end
       end
     end
 
-    current_layer.remaps.each do |from_button, to_button|
+    current_layer.remaps.each do |from_button, to_buttons|
       if user_operation.pressed_button?(from_button)
         user_operation.unpress_button(from_button)
         # TODO 2重でpressしないようにしたい
-        user_operation.press_button(to_button) unless user_operation.pressed_button?(to_button)
+        to_buttons[:to].each do |to_button|
+          user_operation.press_button(to_button) unless user_operation.pressed_button?(to_button)
+        end
       end
     end
 

data/lib/procon_bypass_man/runner.rb

@@ -3,10 +3,7 @@ require_relative "io_monitor"
 class ProconBypassMan::Runner
   class InterruptForRestart < StandardError; end
 
-  def initialize(gadget: , procon: )
-    @gadget = gadget
-    @procon = procon
-
+  def initialize
     $will_interval_0_0_0_5 = 0
     $will_interval_1_6 = 0
   end
@@ -22,7 +19,7 @@ class ProconBypassMan::Runner
           self_write.puts(sig)
         end
       rescue ArgumentError
-        ProconBypassMan.logger.info("Signal #{sig} not supported")
+        ProconBypassMan.logger.error("Signal #{sig} not supported")
       end
     end
 
@@ -31,7 +28,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
@@ -53,6 +50,8 @@ class ProconBypassMan::Runner
         Process.wait
         @gadget&.close
         @procon&.close
+        FileUtils.rm_rf(ProconBypassMan.pid_path)
+        FileUtils.rm_rf(ProconBypassMan.digest_path)
         exit 1
       end
     end
@@ -97,8 +96,11 @@ class ProconBypassMan::Runner
         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が切断されました.終了処理を開始します"
+          ProconBypassMan.logger.error "Proconが切断されました。終了処理を開始します"
           Process.kill "TERM", Process.ppid
         end
         ProconBypassMan.logger.info "Thread2を終了します"
@@ -118,7 +120,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
@@ -132,38 +134,14 @@ class ProconBypassMan::Runner
   end
 
   def first_negotiation
-    loop do
-      begin
-        input = @gadget.read_nonblock(128)
-        ProconBypassMan.logger.debug { ">>> #{input.unpack("H*")}" }
-        @procon.write_nonblock(input)
-        if input[0] == "\x80".b && input[1] == "\x01".b
-          ProconBypassMan.logger.info("first negotiation is over")
-          break
-        end
-        break if $will_terminate_token
-      rescue IO::EAGAINWaitReadable
-      end
-    end
-
-    # ...
-    #   switch) 8001
-    #   procon) 8101
-    #   switch) 8002
-    # が返ってくるプロトコルがあって、これができていないならやり直す
-    loop do
-      begin
-        data = @procon.read_nonblock(128)
-        if data[0] == "\x81".b && data[1] == "\x01".b
-          ProconBypassMan.logger.debug { "接続を確認しました" }
-          @gadget.write_nonblock(data)
-          break
-        else
-          raise ::ProconBypassMan::FirstConnectionError
-        end
-      rescue IO::EAGAINWaitReadable
-      end
-    end
+    return if $will_terminate_token
+
+    @gadget, @procon = ProconBypassMan::DeviceConnector.connect
+  rescue ProconBypassMan::Timer::Timeout
+    ::ProconBypassMan.logger.error "デバイスとの通信でタイムアウトが起きて接続ができませんでした。"
+    @gadget&.close
+    @procon&.close
+    raise ::ProconBypassMan::EternalConnectionError
   end
 
   def handle_signal(sig)
@@ -179,10 +157,14 @@ class ProconBypassMan::Runner
   # @return [void]
   def print_booted_message
     booted_message = <<~EOF
+      ----
+      RUBY_VERSION: #{RUBY_VERSION}
       ProconBypassMan: #{ProconBypassMan::VERSION}
-      pid_path: #{ProconBypassMan.pid_path}
       pid: #{$$}
-      project_path: #{ProconBypassMan.root}
+      root: #{ProconBypassMan.root}
+      pid_path: #{ProconBypassMan.pid_path}
+      setting_path: #{ProconBypassMan::Configuration.instance.setting_path}
+      ----
     EOF
     ProconBypassMan.logger.info(booted_message)
     puts booted_message

data/lib/procon_bypass_man/timer.rb

@@ -0,0 +1,14 @@
+module ProconBypassMan
+  class Timer
+    class Timeout < StandardError; end
+
+    # 5秒後がタイムアウト
+    def initialize(timeout: Time.now + 5)
+      @timeout = timeout
+    end
+
+    def throw_if_timeout!
+      raise Timeout if @timeout < Time.now
+    end
+  end
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man.rb

@@ -3,11 +3,11 @@ require 'yaml'
 require "fileutils"
 
 require_relative "procon_bypass_man/version"
-require_relative "procon_bypass_man/device_registry"
+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/procon/data"
 require_relative "procon_bypass_man/configuration"
 require_relative "procon_bypass_man/procon"
 
@@ -18,6 +18,7 @@ module ProconBypassMan
   class ProConRejected < StandardError; end
   class CouldNotLoadConfigError < StandardError; end
   class FirstConnectionError < StandardError; end
+  class EternalConnectionError < StandardError; end
 
   def self.configure(setting_path: nil, &block)
     unless setting_path
@@ -33,14 +34,19 @@ module ProconBypassMan
 
   def self.run(setting_path: nil, &block)
     configure(setting_path: setting_path, &block)
-    at_exit { FileUtils.rm_rf(pid_path) }
     File.write(pid_path, $$)
-    registry = ProconBypassMan::DeviceRegistry.new
-    Runner.new(gadget: registry.gadget, procon: registry.procon).run
+    Runner.new.run
   rescue CouldNotLoadConfigError
     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(999999999)
   rescue FirstConnectionError
     puts "接続を確立できませんでした。やりなおします。"
     retry
@@ -58,9 +64,8 @@ module ProconBypassMan
     end
   end
 
-  DEFAULT_PID_PATH = File.expand_path('../pbm_pid', __dir__).freeze
   def self.pid_path
-    @@pid_path ||= DEFAULT_PID_PATH
+    @@pid_path ||= File.expand_path("#{root}/pbm_pid", __dir__).freeze
   end
 
   def self.reset!
@@ -72,6 +77,18 @@ module ProconBypassMan
   end
 
   def self.root
-    File.expand_path('..', __dir__).freeze
+    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"
   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,16 @@
+# Project Template
+https://github.com/splaplapla/pbmenv で使っているファイルです
+
+## systemd
+* sudo ln -s /usr/share/pbm/current/systemd_units/pbm.service /etc/systemd/system/pbm.service
+* commnds
+  * systemctl daemon-reload
+  * systemctl enable pbm.service
+  * systemctl disable pbm.service
+  * systemctl start pbm.service
+  * systemctl status pbm.service
+  * systemctl restart pbm.service
+
+### ログ
+* journalctl -xe -f
+

data/project_template/app.rb

@@ -0,0 +1,18 @@
+#!/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.7'
+  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
+end
+
+ProconBypassMan.run(setting_path: "./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 "ruby /usr/share/pbm/current/app.rb"
+Restart=always
+Nice=-19
+
+[Install]
+WantedBy=multi-user.target