procon_bypass_man 0.1.2 → 0.1.6

data/lib/procon_bypass_man/io_monitor.rb

@@ -10,7 +10,6 @@ module ProconBypassMan
 
     # アクティブなバケットは1つだけ
     def record(event_name)
-      return unless $is_stable
       key = Time.now.strftime("%S").to_i
       if table[key].nil?
         self.previous_table = table.values.first
@@ -58,13 +57,6 @@ module ProconBypassMan
             next
           end
 
-          s_to_p = list.detect { |x| x.label == "switch -> procon" }
-          previous_table = s_to_p&.previous_table.dup
-          if previous_table && previous_table.dig(:eagain_wait_readable_on_read) && previous_table.dig(:eagain_wait_readable_on_read) > 300
-            # ProconBypassMan.logger.debug { "接続の確立ができません" }
-            # Process.kill("USR1", Process.ppid)
-          end
-
           line = list.map { |counter|
             "#{counter.label}(#{counter.formated_previous_table})"
           }.join(", ")

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/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/runner.rb

@@ -2,19 +2,15 @@ require_relative "io_monitor"
 
 class ProconBypassMan::Runner
   class InterruptForRestart < StandardError; end
-  class InterruptForCouldNotConnect < 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
 
   def run
     first_negotiation
-    $is_stable = false
+    print_booted_message
 
     self_read, self_write = IO.pipe
     %w(TERM INT USR1 USR2).each do |sig|
@@ -23,27 +19,19 @@ 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
 
-    FileUtils.mkdir_p "tmp"
-    File.write "tmp/pid", $$
-
     loop do
       $will_terminate_token = false
       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
-      rescue InterruptForCouldNotConnect
-        $will_terminate_token = true
-        Process.kill("TERM", main_loop_pid)
-        Process.wait
-        raise ProconBypassMan::CouldNotConnectDeviceError
       rescue InterruptForRestart
         $will_terminate_token = true
         Process.kill("TERM", main_loop_pid)
@@ -62,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
@@ -72,10 +62,9 @@ class ProconBypassMan::Runner
   def main_loop
     # TODO 接続確立完了をswitchを読み取るようにして、この暫定で接続完了sleepを消す
     Thread.new do
-      sleep(10)
+      sleep(5)
       $will_interval_0_0_0_5 = 0.005
       $will_interval_1_6 = 1.6
-      $is_stable = true
     end
 
     ProconBypassMan::IOMonitor.start!
@@ -107,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を終了します"
@@ -128,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
@@ -142,30 +134,39 @@ 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
+    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)
     ProconBypassMan.logger.info "#{$$}で#{sig}を受け取りました"
     case sig
-    when 'USR1'
-      raise InterruptForCouldNotConnect
     when 'USR2'
       raise InterruptForRestart
     when 'INT', 'TERM'
       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}
+      ----
+    EOF
+    ProconBypassMan.logger.info(booted_message)
+    puts booted_message
+  end
 end

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.2"
+  VERSION = "0.1.6"
 end

data/procon_bypass_man.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.authors       = ["jiikko"]
   spec.email         = ["n905i.1214@gmail.com"]
 
-  spec.summary       = "rasberrypi's software for procon"
+  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")
 

metadata

@@ -1,27 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - jiikko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-26 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies: []
-description: rasberrypi's software for procon
+description: extension for Nintendo Switch Pro Controller
 email:
 - n905i.1214@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -31,6 +32,7 @@ files:
 - bin/setup
 - docs/how_to_connect_procon.md
 - docs/setup_raspi.md
+- examples/pbm.service
 - examples/practical/app.rb
 - examples/practical/setting.yml
 - examples/simple.rb
@@ -40,26 +42,28 @@ files:
 - lib/procon_bypass_man/configuration/layer.rb
 - lib/procon_bypass_man/configuration/loader.rb
 - lib/procon_bypass_man/configuration/validator.rb
-- lib/procon_bypass_man/device_registry.rb
+- lib/procon_bypass_man/device_connector.rb
 - lib/procon_bypass_man/io_monitor.rb
 - lib/procon_bypass_man/processor.rb
 - lib/procon_bypass_man/procon.rb
 - lib/procon_bypass_man/procon/button_collection.rb
 - lib/procon_bypass_man/procon/data.rb
+- lib/procon_bypass_man/procon/flip_cache.rb
 - lib/procon_bypass_man/procon/layer_changeable.rb
 - lib/procon_bypass_man/procon/macro_registry.rb
 - lib/procon_bypass_man/procon/mode_registry.rb
 - lib/procon_bypass_man/procon/pressed_button_helper.rb
 - lib/procon_bypass_man/procon/user_operation.rb
 - lib/procon_bypass_man/runner.rb
+- lib/procon_bypass_man/timer.rb
 - lib/procon_bypass_man/version.rb
 - procon_bypass_man.gemspec
-homepage: https://github.com/splaspla-hacker/procon_bypass_man
+homepage: https://github.com/splaplapla/procon_bypass_man
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/splaspla-hacker/procon_bypass_man
-  source_code_uri: https://github.com/splaspla-hacker/procon_bypass_man
+  homepage_uri: https://github.com/splaplapla/procon_bypass_man
+  source_code_uri: https://github.com/splaplapla/procon_bypass_man
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -78,5 +82,5 @@ requirements: []
 rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
-summary: rasberrypi's software for procon
+summary: extension for Nintendo Switch Pro Controller
 test_files: []

data/CODE_OF_CONDUCT.md

@@ -1,84 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at n905i.1214@gmail.com. All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
-available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.