procon_bypass_man 0.1.7 → 0.1.11

data/lib/procon_bypass_man.rb

@@ -1,39 +1,54 @@
 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/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/configuration"
+require_relative "procon_bypass_man/buttons_setting_configuration"
+require_relative "procon_bypass_man/readonly_procon"
 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/on_memory_cache"
 
 STDOUT.sync = true
 Thread.abort_on_exception = true
 
 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)
-    configure(setting_path: setting_path, &block)
+    ProconBypassMan.logger.info "PBMを起動しています"
+    puts "PBMを起動しています"
+    buttons_setting_configure(setting_path: setting_path, &block)
     File.write(pid_path, $$)
     Runner.new.run
   rescue CouldNotLoadConfigError
@@ -52,43 +67,21 @@ module ProconBypassMan
     retry
   end
 
-  def self.logger=(logger)
-    @@logger = logger
+  def self.configure(&block)
+    @@configuration = ProconBypassMan::Configuration.new
+    @@configuration.instance_eval(&block)
+    @@configuration
   end
 
-  def self.logger
-    if defined?(@@logger)
-      @@logger
-    else
-      Logger.new(nil)
-    end
-  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.digest_path
-    "#{root}/.setting_yaml_digest"
-  end
 end

data/project_template/README.md

@@ -3,14 +3,15 @@ https://github.com/splaplapla/pbmenv で使っているファイルです
 
 ## systemd
 * sudo ln -s /usr/share/pbm/current/systemd_units/pbm.service /etc/systemd/system/pbm.service
-* commnds
+* 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
   * 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

@@ -5,14 +5,16 @@ 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', '0.1.11'
   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://...'
+  config.enable_critical_error_logging = true
 end
 
-ProconBypassMan.run(setting_path: "./setting.yml")
+ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")

data/project_template/systemd_units/pbm.service

@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=simple
 WorkingDirectory=/usr/share/pbm/current
-ExecStart=/bin/bash -c "ruby /usr/share/pbm/current/app.rb"
+ExecStart=/bin/bash -c "/home/pi/.rbenv/versions/3.0.1/bin/ruby /usr/share/pbm/current/app.rb"
 Restart=always
 Nice=-19
 

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.3'
+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/README.rb

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

data/sig/main.rbs

@@ -0,0 +1,507 @@
+interface _Symolize
+  def to_sym: () -> ::Symbol
+end
+
+interface _Pluginable
+  def name: () -> _Symolize
+  def respond_to?: (::Symbol) -> bool
+end
+
+module ProconBypassMan
+  class ProConRejected < StandardError
+  end
+
+  class CouldNotLoadConfigError < StandardError
+  end
+
+  class FirstConnectionError < StandardError
+  end
+
+  class EternalConnectionError < StandardError
+  end
+
+  def self.configure: (?setting_path: untyped? setting_path) { () -> untyped } -> untyped
+
+  def self.run: (?setting_path: untyped? setting_path) { () -> untyped } -> untyped
+
+  def self.logger=: (untyped logger) -> untyped
+
+  # @return [Logger]
+  def self.logger: () -> untyped
+
+  def self.pid_path: () -> untyped
+
+  def self.reset!: () -> untyped
+
+  def self.root: () -> untyped
+
+  def self.root=: (untyped path) -> untyped
+
+  def self.digest_path: () -> ::String
+end
+
+class ProconBypassMan::Bypass
+  attr_accessor gadget: untyped
+
+  attr_accessor procon: untyped
+
+  attr_accessor monitor: untyped
+
+  def initialize: (gadget: untyped gadget, procon: untyped procon, monitor: untyped monitor) -> untyped
+
+  # ゆっくりでいい
+  def send_gadget_to_procon!: () -> (nil | untyped)
+
+  def send_procon_to_gadget!: () -> (nil | untyped)
+end
+
+class AnalogStickPosition
+  attr_accessor x: Integer
+  attr_accessor y: Integer
+
+  def initialize: (x: Integer, y: Integer) -> untyped
+end
+
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    attr_accessor layers: untyped
+
+    attr_accessor setting_path: untyped
+
+    attr_accessor mode_plugins: untyped
+
+    attr_accessor macro_plugins: untyped
+
+    attr_accessor context: untyped
+
+    attr_accessor current_context_key: untyped
+
+    attr_accessor neutral_position: AnalogStickPosition
+
+    def self.instance: () -> untyped
+
+    def self.switch_new_context: (untyped key) { (untyped) -> untyped } -> untyped
+
+    def initialize: () -> untyped
+
+    MODES: ::Array[untyped]
+
+    def layer: (untyped direction, ?mode: (_Pluginable) mode) { () -> untyped } -> untyped
+
+    def install_mode_plugin: (untyped klass) -> untyped
+
+    def install_macro_plugin: (untyped klass) -> untyped
+
+    def prefix_keys_for_changing_layer: (untyped buttons) -> untyped
+
+    def prefix_keys: () -> untyped
+
+    def reset!: () -> untyped
+  end
+end
+
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    class Layer
+      attr_accessor mode: untyped
+
+      attr_accessor flips: untyped
+
+      attr_accessor macros: untyped
+
+      attr_accessor remaps: untyped
+
+      def initialize: (?mode: ::Symbol mode) -> untyped
+
+      # @param [Symbol] button
+      def flip: (untyped button, ?if_pressed: bool if_pressed, ?force_neutral: untyped? force_neutral, ?flip_interval: untyped? flip_interval) -> untyped
+
+      PRESET_MACROS: ::Array[untyped]
+
+      def macro: (untyped name, if_pressed: untyped if_pressed) -> untyped
+
+      def remap: (untyped button, to: untyped to) -> untyped
+
+      # @return [Array]
+      def flip_buttons: () -> untyped
+
+      def instance_eval: ()?{ () -> nil } -> untyped
+    end
+  end
+end
+
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module Loader
+      def self.load: (setting_path: untyped setting_path) -> untyped
+
+      def self.reload_setting: () -> untyped
+    end
+  end
+end
+
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    class Validator
+      def initialize: (untyped config) -> untyped
+
+      # @return [Boolean]
+      def valid?: () -> untyped
+
+      # @return [Boolean]
+      def invalid?: () -> untyped
+
+      # @return [Hash]
+      def errors: () -> untyped
+
+      private
+
+      def validate_config_of_button_lonely: () -> untyped
+
+      def validate_require_prefix_keys: () -> untyped
+
+      def validate_verify_button_existence: () -> untyped
+
+      def validate_flip_and_remap_are_hate_each_other: () -> untyped
+    end
+  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
+
+  class Value
+    attr_accessor read_from: untyped
+
+    attr_accessor values: untyped
+
+    def initialize: (values: untyped values, read_from: untyped read_from) -> untyped
+  end
+
+  PROCON_PATH: ::String
+
+  PROCON2_PATH: ::String
+
+  # 画面で再接続ができたが状況は変わらない
+  def self.reset_connection!: () -> untyped
+
+  def self.connect: () -> ::Array[untyped]
+
+  def initialize: (?throw_error_if_timeout: bool throw_error_if_timeout, ?throw_error_if_mismatch: bool throw_error_if_mismatch, ?enable_at_exit: bool enable_at_exit) -> untyped
+
+  def add: (untyped values, read_from: untyped read_from) -> untyped
+
+  def drain_all: () -> untyped
+
+  # switchに任意の命令を入力して、switchから読み取る
+  def write_switch: (untyped data, ?only_write: bool only_write) -> untyped
+
+  def write_procon: (untyped data, ?only_write: bool only_write) -> untyped
+
+  def read_procon: (?only_read: bool only_read) -> untyped
+
+  def read_switch: (?only_read: bool only_read) -> untyped
+
+  def from_device: (untyped item) -> untyped
+
+  # fromの対になる
+  def to_device: (untyped item) -> untyped
+
+  def switch: () -> untyped
+
+  def procon: () -> untyped
+
+  def is_available_device?: (untyped path) -> (::FalseClass | ::TrueClass | untyped)
+
+  def to_bin: (untyped string) -> untyped
+
+  def init_devices: () -> untyped
+end
+
+module ProconBypassMan
+  class Counter
+    attr_accessor label: untyped
+
+    attr_accessor table: untyped
+
+    attr_accessor previous_table: untyped
+
+    def initialize: (label: untyped label) -> untyped
+
+    # アクティブなバケットは1つだけ
+    def record: (untyped event_name) -> untyped
+
+    def formated_previous_table: () -> ::String
+  end
+
+  module IOMonitor
+    def self.new: (label: untyped label) -> untyped
+
+    # @return [Array<Counter>]
+    def self.targets: () -> untyped
+
+    # ここで集計する
+    def self.start!: () -> untyped
+
+    def self.reset!: () -> untyped
+  end
+end
+
+class ProconBypassMan::Processor
+  # @return [String] binary
+  def initialize: (untyped binary) -> untyped
+
+  # @return [String] 加工後の入力データ
+  def process: () -> untyped
+end
+
+class ProconBypassMan::Procon
+  attr_accessor user_operation: untyped
+
+  def self.reset!: () -> untyped
+
+  def initialize: (untyped binary) -> untyped
+
+  def status: () -> untyped
+
+  def ongoing_macro: () -> untyped
+
+  def ongoing_mode: () -> untyped
+
+  def current_layer_key: () -> untyped
+
+  def current_layer: () -> untyped
+
+  def apply!: () -> (nil | untyped)
+
+  # @return [String<binary>]
+  def to_binary: () -> untyped
+
+  private
+
+  def method_missing: (untyped name) -> untyped
+end
+
+class ProconBypassMan::Procon::ButtonCollection
+  class Button
+    attr_accessor byte_position: untyped
+
+    attr_accessor bit_position: untyped
+
+    def initialize: (untyped key) -> untyped
+  end
+
+  # )  ZR	R	SR(right)	SL(right)	A	B	X	Y
+  # )  Grip	(none)	Cap	Home	ThumbL	ThumbR	+	-
+  # )  ZL	L	SL(left)	SR(left)	Left	Right	Up	Down
+  # )  analog[0]
+  # )  analog[1]
+  # )  analog[2]
+  # )  analog[3]
+  # )  analog[4]
+  # )  analog[5]
+  BYTES_MAP: untyped
+
+  BUTTONS_MAP: untyped
+
+  BUTTONS: untyped
+
+  def self.load: (untyped button_key) -> untyped
+end
+
+class ProconBypassMan::Procon
+  module Data
+    NO_ACTION: untyped
+  end
+end
+
+class ProconBypassMan::Procon
+  class FlipCache
+    def self.fetch: (key: untyped key, expires_in: untyped expires_in) { () -> untyped } -> untyped
+
+    # for testing
+    def self.reset!: () -> untyped
+  end
+end
+
+module ProconBypassMan::Procon::LayerChangeable
+  def next_layer_key: () -> untyped
+
+  def change_layer?: () -> untyped
+
+  def pressed_next_layer?: () -> untyped
+end
+
+class ProconBypassMan::Procon::MacroRegistry
+  class Macro
+    attr_accessor name: untyped
+
+    attr_accessor steps: untyped
+
+    def initialize: (name: untyped name, steps: untyped steps) -> untyped
+
+    def next_step: () -> untyped
+
+    def finished?: () -> untyped
+
+    def ongoing?: () -> untyped
+  end
+
+  PRESETS: ::Hash[untyped, untyped]
+
+  def self.install_plugin: (untyped klass) -> untyped
+
+  def self.load: (untyped name) -> untyped
+
+  def self.reset!: () -> untyped
+
+  def self.plugins: () -> untyped
+end
+
+class ProconBypassMan::Procon::ModeRegistry
+  class Mode
+    attr_accessor name: untyped
+
+    attr_accessor binaries: untyped
+
+    attr_accessor source_binaries: untyped
+
+    def initialize: (name: untyped name, binaries: untyped binaries) -> untyped
+
+    def next_binary: () -> untyped
+  end
+
+  PRESETS: ::Hash[untyped, untyped]
+
+  def self.install_plugin: (untyped klass) -> untyped
+
+  def self.load: (untyped name) -> untyped
+
+  def self.reset!: () -> untyped
+
+  def self.plugins: () -> untyped
+end
+
+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
+  class UserOperation
+    include LayerChangeable
+
+    include PressedButtonHelper::Static
+
+    extend PressedButtonHelper::Dynamic
+
+    attr_reader binary: untyped
+
+    def initialize: (untyped binary) -> untyped
+
+    ZERO_BIT: untyped
+
+    ASCII_ENCODING: ::String
+
+    # @depilicate
+    def binary=: (untyped binary) -> untyped
+
+    def set_no_action!: () -> untyped
+
+    def unpress_button: (untyped button) -> untyped
+
+    def press_button: (untyped button) -> untyped
+
+    def press_button_only: (untyped button) -> untyped
+
+    def merge: (target_binary: untyped target_binary) -> untyped
+  end
+end
+
+class ProconBypassMan::Runner
+  class InterruptForRestart < StandardError
+  end
+
+  def initialize: () -> untyped
+
+  def run: () -> untyped
+
+  private
+
+  def main_loop: () -> untyped
+
+  def first_negotiation: () -> untyped
+
+  def handle_signal: (untyped sig) -> untyped
+
+  # @return [void]
+  def print_booted_message: () -> untyped
+end
+
+module ProconBypassMan
+  class Timer
+    class Timeout < StandardError
+    end
+
+    # 5秒後がタイムアウト
+    def initialize: (?timeout: untyped timeout) -> untyped
+
+    def throw_if_timeout!: () -> untyped
+  end
+end
+
+module ProconBypassMan
+  class Uptime
+    def self.from_boot: () -> untyped
+  end
+end
+
+module ProconBypassMan
+  VERSION: ::String
+end