procon_bypass_man 0.1.9 → 0.1.10

data/lib/procon_bypass_man/outbound/base.rb

@@ -0,0 +1,40 @@
+module ProconBypassMan
+  module Outbound
+    class Base
+      class Client
+        def initialize(path: , server: )
+          @path = path
+          if server.is_a?(Array)
+            @server = server.first
+          else
+            @server = server
+          end
+          @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
+    end
+  end
+end

data/lib/procon_bypass_man/outbound/error_reporter.rb

@@ -0,0 +1,13 @@
+require "procon_bypass_man/outbound/base"
+
+class ProconBypassMan::ErrorReporter < ProconBypassMan::Outbound::Base
+  PATH = "/api/error_reports"
+
+  def self.report(body: )
+    Client.new(
+      path: PATH,
+      server: ProconBypassMan.config.api_server,
+    ).post(body: body.full_message.to_json)
+  end
+end
+

data/lib/procon_bypass_man/outbound/reporter.rb

@@ -0,0 +1,12 @@
+require "procon_bypass_man/outbound/base"
+
+class ProconBypassMan::Reporter < ProconBypassMan::Outbound::Base
+  PATH = "/api/reports"
+
+  def self.report(body: )
+    Client.new(
+      path: PATH,
+      server: ProconBypassMan.config.api_server,
+    ).post(body: body.to_json)
+  end
+end

data/lib/procon_bypass_man/outbound/usb_hid_data_reporter.rb

@@ -0,0 +1,13 @@
+require "procon_bypass_man/outbound/base"
+
+class ProconBypassMan::UsbHidDataReporter < ProconBypassMan::Outbound::Base
+  PATH = "/api/usb_hid_chunks"
+
+  def self.report(body: )
+    Client.new(
+      path: PATH,
+      server: ProconBypassMan.config.internal_api_servers,
+    ).post(body: body.to_json)
+  end
+end
+

data/lib/procon_bypass_man/procon/analog_stick_cap.rb

@@ -22,7 +22,7 @@ class ProconBypassMan::Procon::AnalogStickCap
   attr_accessor :neutral_position
 
   def initialize(binary)
-    @neutral_position = ProconBypassMan::Configuration.instance.neutral_position
+    @neutral_position = ProconBypassMan::ButtonsSettingConfiguration.instance.neutral_position
     @binary = binary
 
     byte6 = binary[6].unpack("H*").first.to_i(16).to_s(2).rjust(8, "0")

data/lib/procon_bypass_man/procon/layer_changeable.rb

@@ -16,10 +16,10 @@ module ProconBypassMan::Procon::LayerChangeable
   end
 
   def change_layer?
-    if ProconBypassMan::Configuration.instance.prefix_keys.empty?
+    if ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.empty?
       raise "prefix_keysが未設定です"
     end
-    ProconBypassMan::Configuration.instance.prefix_keys.map { |b| pressed_button?(b) }.all?
+    ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.map { |b| pressed_button?(b) }.all?
   end
 
   def pressed_next_layer?

data/lib/procon_bypass_man/procon/macro_registry.rb

@@ -37,11 +37,11 @@ class ProconBypassMan::Procon::MacroRegistry
   end
 
   def self.reset!
-    ProconBypassMan::Configuration.instance.macro_plugins = {}
+    ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins = {}
   end
 
   def self.plugins
-    ProconBypassMan::Configuration.instance.macro_plugins
+    ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins
   end
 
   reset!

data/lib/procon_bypass_man/procon/mode_registry.rb

@@ -35,11 +35,11 @@ class ProconBypassMan::Procon::ModeRegistry
   end
 
   def self.reset!
-    ProconBypassMan::Configuration.instance.mode_plugins = {}
+    ProconBypassMan::ButtonsSettingConfiguration.instance.mode_plugins = {}
   end
 
   def self.plugins
-    ProconBypassMan::Configuration.instance.mode_plugins
+    ProconBypassMan::ButtonsSettingConfiguration.instance.mode_plugins
   end
 
   reset!

data/lib/procon_bypass_man/procon/user_operation.rb

@@ -31,6 +31,8 @@ class ProconBypassMan::Procon
     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)
       binary[byte_position] = ["%02X" % value.to_s].pack("H*")
@@ -41,6 +43,8 @@ class ProconBypassMan::Procon
     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)
       binary[byte_position] = ["%02X" % value.to_s].pack("H*")

data/lib/procon_bypass_man/procon.rb

@@ -31,7 +31,7 @@ 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!
@@ -95,10 +95,14 @@ 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.pressed_button?(force_neutral_button) && user_operation.unpress_button(force_neutral_button)
+          user_operation.unpress_button(force_neutral_button)
         end
         user_operation.apply_left_analog_stick_cap(cap: options[:cap])
       end
@@ -107,7 +111,7 @@ class ProconBypassMan::Procon
     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
 
@@ -118,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
@@ -128,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/runner.rb

@@ -35,7 +35,7 @@ class ProconBypassMan::Runner
         Process.wait
         ProconBypassMan.logger.info("Reloading config file")
         begin
-          ProconBypassMan::Configuration::Loader.reload_setting
+          ProconBypassMan::ButtonsSettingConfiguration::Loader.reload_setting
           puts "設定ファイルの再読み込みができました"
         rescue ProconBypassMan::CouldNotLoadConfigError
           ProconBypassMan.logger.error "設定ファイルが不正です。再読み込みができませんでした"

data/lib/procon_bypass_man/uptime.rb

@@ -3,7 +3,9 @@ require "time"
 module ProconBypassMan
   class Uptime
     def self.from_boot
-      boot_time = Time.parse(`uptime -s`.chomp).to_i
+      result = `uptime -s`.chomp
+      return -1 if result == '' # darwin系だとsオプションが使えない
+      boot_time = 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.9"
+  VERSION = "0.1.10"
 end

data/lib/procon_bypass_man.rb

@@ -1,8 +1,11 @@
 require "logger"
 require 'yaml'
+require "json"
+require "net/http"
 require "fileutils"
 
 require_relative "procon_bypass_man/version"
+require_relative "procon_bypass_man/callbacks"
 require_relative "procon_bypass_man/analog_stick_position"
 require_relative "procon_bypass_man/timer"
 require_relative "procon_bypass_man/bypass"
@@ -10,43 +13,42 @@ 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"
 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/outbound/reporter"
+require_relative "procon_bypass_man/outbound/error_reporter"
+require_relative "procon_bypass_man/outbound/usb_hid_data_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
+  extend ProconBypassMan::Configuration::ClassAttributes
+
   class ProConRejected < StandardError; end
   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
 
   def self.run(setting_path: nil, &block)
     ProconBypassMan.logger.info "PBMを起動しています"
     puts "PBMを起動しています"
-    configure(setting_path: setting_path, &block)
+    buttons_setting_configure(setting_path: setting_path, &block)
     File.write(pid_path, $$)
     Runner.new.run
   rescue CouldNotLoadConfigError
@@ -65,76 +67,21 @@ module ProconBypassMan
     retry
   end
 
-  def self.logger=(logger)
-    @@logger = logger
-  end
-
-  # @return [Logger]
-  def self.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
+  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
+  def self.config
+    @@configuration ||= ProconBypassMan::Configuration.new
   end
 
   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.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/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

@@ -9,12 +9,12 @@ gemfile do
   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
   # pbm.api_server = 'https://...'
-  pbm.enable_critical_error_logging!
+  config.enable_critical_error_logging!
 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.2'
+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/main.rbs

@@ -63,7 +63,7 @@ class AnalogStickPosition
 end
 
 module ProconBypassMan
-  class Configuration
+  class ButtonsSettingConfiguration
     attr_accessor layers: untyped
 
     attr_accessor setting_path: untyped
@@ -101,7 +101,7 @@ module ProconBypassMan
 end
 
 module ProconBypassMan
-  class Configuration
+  class ButtonsSettingConfiguration
     class Layer
       attr_accessor mode: untyped
 
@@ -131,7 +131,7 @@ module ProconBypassMan
 end
 
 module ProconBypassMan
-  class Configuration
+  class ButtonsSettingConfiguration
     module Loader
       def self.load: (setting_path: untyped setting_path) -> untyped
 
@@ -141,7 +141,7 @@ module ProconBypassMan
 end
 
 module ProconBypassMan
-  class Configuration
+  class ButtonsSettingConfiguration
     class Validator
       def initialize: (untyped config) -> untyped
 
@@ -167,6 +167,46 @@ module ProconBypassMan
   end
 end
 
+class ProconBypassMan::Configuration
+  module ClassAttributes
+    def root: () -> untyped
+
+    def logger: () -> untyped
+
+    def error_logger: () -> untyped
+
+    def pid_path: () -> untyped
+
+    def digest_path: () -> untyped
+
+    def cache: () -> untyped
+
+    def config: () -> untyped
+  end
+
+  attr_reader api_server: untyped
+
+  attr_accessor enable_critical_error_logging: untyped
+
+  def root=: (untyped path) -> untyped
+
+  def root: () -> untyped
+
+  def api_server=: (untyped api_server) -> untyped
+
+  def logger=: (untyped logger) -> untyped
+
+  def logger: () -> untyped
+
+  def error_logger: () -> untyped
+
+  def digest_path: () -> ::String
+
+  # @return [String] pbm-webの接続先
+  def internal_api_servers: () -> untyped
+end
+
+
 class ProconBypassMan::DeviceConnector
   class BytesMismatchError < StandardError
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - jiikko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies: []
 description: extension for Nintendo Switch Pro Controller
 email:
@@ -42,15 +42,21 @@ files:
 - lib/procon_bypass_man.rb
 - lib/procon_bypass_man/analog_stick_position.rb
 - lib/procon_bypass_man/boot_message.rb
+- lib/procon_bypass_man/buttons_setting_configuration.rb
 - lib/procon_bypass_man/bypass.rb
+- lib/procon_bypass_man/bypass/usb_hid_logger.rb
+- lib/procon_bypass_man/callbacks.rb
 - lib/procon_bypass_man/configuration.rb
 - 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_connector.rb
-- lib/procon_bypass_man/error_reporter.rb
 - lib/procon_bypass_man/io_monitor.rb
 - lib/procon_bypass_man/on_memory_cache.rb
+- lib/procon_bypass_man/outbound/base.rb
+- lib/procon_bypass_man/outbound/error_reporter.rb
+- lib/procon_bypass_man/outbound/reporter.rb
+- lib/procon_bypass_man/outbound/usb_hid_data_reporter.rb
 - lib/procon_bypass_man/processor.rb
 - lib/procon_bypass_man/procon.rb
 - lib/procon_bypass_man/procon/analog_stick_cap.rb
@@ -64,7 +70,6 @@ files:
 - lib/procon_bypass_man/procon/press_button_aware.rb
 - lib/procon_bypass_man/procon/pressed_button_helper.rb
 - lib/procon_bypass_man/procon/user_operation.rb
-- lib/procon_bypass_man/reporter.rb
 - lib/procon_bypass_man/runner.rb
 - lib/procon_bypass_man/timer.rb
 - lib/procon_bypass_man/uptime.rb
@@ -74,6 +79,8 @@ files:
 - project_template/app.rb
 - project_template/setting.yml
 - project_template/systemd_units/pbm.service
+- project_template/systemd_units/pbm_web.service
+- project_template/web.rb
 - sig/README.rb
 - sig/main.rbs
 homepage: https://github.com/splaplapla/procon_bypass_man

data/lib/procon_bypass_man/error_reporter.rb

@@ -1,44 +0,0 @@
-require "net/http"
-require "json"
-
-class ProconBypassMan::ErrorReporter
-  PATH = "/api/error_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.full_message.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: )
-    ProconBypassMan.logger.error(body)
-    Client.new.post(body: body)
-  rescue => e
-    ProconBypassMan.logger.error(e)
-  end
-end
-

data/lib/procon_bypass_man/reporter.rb

@@ -1,42 +0,0 @@
-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