procon_bypass_man 0.1.15 → 0.1.18

data/sig/main.rbs

@@ -34,7 +34,13 @@ module ProconBypassMan
 
   def self.root=: (untyped path) -> untyped
 
+  def self.pid: () -> Integer
+
   def self.digest_path: () -> ::String
+
+  def self.session_id: () -> ::String
+
+  def self.device_id: () -> ::String
 end
 
 class ProconBypassMan::Bypass
@@ -166,42 +172,60 @@ end
 
 class ProconBypassMan::Configuration
   module ClassMethods
-    def root: () -> untyped
+    def root: () -> String
 
-    def logger: () -> untyped
+    def logger: () -> Logger
 
     def error_logger: () -> untyped
 
-    def pid_path: () -> untyped
+    def pid_path: () -> String
 
-    def digest_path: () -> untyped
+    def digest_path: () -> String
 
-    def cache: () -> untyped
+    def cache: () -> ProconBypassMan::OnMemoryCache
 
-    def config: () -> untyped
+    def config: () -> ProconBypassMan::Configuration
   end
 
   attr_reader api_server: untyped
   attr_reader api_servers: untyped
 
-  attr_accessor enable_critical_error_logging: untyped
+  attr_accessor enable_critical_error_logging: bool
 
-  def root=: (untyped path) -> untyped
+  def root=: (String path) -> ProconBypassMan::Configuration
 
-  def root: () -> untyped
+  def root: () -> String
 
   def api_server=: (untyped api_server) -> untyped
 
-  def logger=: (untyped logger) -> untyped
+  def logger=: (Logger logger) -> ProconBypassMan::Configuration
 
-  def logger: () -> untyped
+  def logger: () -> Logger
 
-  def error_logger: () -> untyped
+  def error_logger: () -> Logger
 
-  def digest_path: () -> ::String
+  def digest_path: () -> String
 
   # @return [String] pbm-webの接続先
-  def internal_api_servers: () -> untyped
+  def current_server: () -> String
+
+  def current_ws_server: () -> (String | nil)
+
+  def current_ws_server_url: () -> ::String
+
+  def enable_ws?: () -> bool
+
+  def server_pool: () -> untyped
+
+  def internal_server_pool: () -> untyped
+
+  def internal_servers: () -> ::Array[string | nil]
+
+  def internal_api_servers: () -> ::Array[untyped]
+
+  def raw_setting: () -> untyped
+
+  def verbose_bypass_log: () -> bool
 end
 
 
@@ -373,41 +397,41 @@ end
 
 class ProconBypassMan::Procon::MacroRegistry
   class Macro
-    attr_accessor name: untyped
+    attr_accessor name: Symbol
 
     attr_accessor steps: untyped
 
-    def initialize: (name: untyped name, steps: untyped steps) -> untyped
+    def initialize: (name: untyped Symbol, steps: Symbol) -> void
 
-    def next_step: () -> untyped
+    def next_step: () -> Symbol
 
-    def finished?: () -> untyped
+    def finished?: () -> bool
 
-    def ongoing?: () -> untyped
+    def ongoing?: () -> bool
   end
 
-  PRESETS: ::Hash[untyped, untyped]
+  PRESETS: ::Hash[Symbol, Array[Symbol]]
 
   def self.install_plugin: (untyped klass) -> untyped
 
-  def self.load: (untyped name) -> untyped
+  def self.load: (Symbol name) -> untyped
 
-  def self.reset!: () -> untyped
+  def self.reset!: () -> void
 
-  def self.plugins: () -> untyped
+  def self.plugins: () -> ::Hash[Symbol, Array[Symbol]]
 end
 
 class ProconBypassMan::Procon::ModeRegistry
   class Mode
-    attr_accessor name: untyped
+    attr_accessor name: Symbol
 
-    attr_accessor binaries: untyped
+    attr_accessor binaries: Array[String]
 
-    attr_accessor source_binaries: untyped
+    attr_accessor source_binaries: Array[String]
 
-    def initialize: (name: untyped name, binaries: untyped binaries) -> untyped
+    def initialize: (name: Symbol, binaries: Array[String]) -> void
 
-    def next_binary: () -> untyped
+    def next_binary: () -> String
   end
 
   PRESETS: ::Hash[untyped, untyped]
@@ -421,30 +445,20 @@ class ProconBypassMan::Procon::ModeRegistry
   def self.plugins: () -> untyped
 end
 
-module ProconBypassMan::Procon::PressedButtonHelper
-  module Static
-    def pressed_button?: (untyped button) -> untyped
-  end
-end
-
 class ProconBypassMan::Procon
   class UserOperation
     include LayerChangeable
 
-    include PressedButtonHelper::Static
-
     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 set_no_action!: () -> void
 
     def unpress_button: (untyped button) -> untyped
 
@@ -482,7 +496,7 @@ module ProconBypassMan
     end
 
     # 5秒後がタイムアウト
-    def initialize: (?timeout: untyped timeout) -> untyped
+    def initialize: (?timeout: untyped timeout) -> void
 
     def throw_if_timeout!: () -> untyped
   end
@@ -494,7 +508,7 @@ module ProconBypassMan
     def self.from_boot: () -> Integer
 
     # @param [String] uptime_cmd_result
-    def initialize: (uptime_cmd_result: String uptime_cmd_result) -> void
+    def initialize: (uptime_cmd_result: String) -> void
 
     # @return [Integer]
     def from_boot: () -> Integer
@@ -504,3 +518,174 @@ end
 module ProconBypassMan
   VERSION: ::String
 end
+
+module ProconBypassMan
+  module Domains
+    module Binary
+    end
+  end
+end
+
+class ProconBypassMan::Domains::Binary::Base
+  # @param [String] binary
+  def initialize: (binary: untyped binary) -> void
+
+  # @return [String] バイナリ
+  def binary: () -> untyped
+
+  # @return [String]
+  def raw: () -> ::String
+
+  def unpack: () -> Array[::String]
+
+  # @return [ProconBypassMan::ProconReader]
+  def to_procon_reader: () -> untyped
+end
+
+module ProconBypassMan::Domains::HasImmutableBinary
+  def binary: () -> untyped
+end
+
+module ProconBypassMan::Domains::HasMutableBinary
+  def binary: () -> untyped
+end
+
+class ProconBypassMan::Domains::InboundProconBinary < ProconBypassMan::Domains::Binary::Base
+  include ProconBypassMan::Domains::HasImmutableBinary
+
+  # @return [Boolean]
+  def user_operation_data?: () -> bool
+end
+
+# バイナリの書き換えのみをする
+class ProconBypassMan::Domains::ProcessingProconBinary < ProconBypassMan::Domains::Binary::Base
+  include ProconBypassMan::Domains::HasMutableBinary
+
+  ALL_ZERO_BIT: ::String
+
+  def set_no_action!: () -> untyped
+
+  # @param [ProconBypassMan::Domains::ProcessingProconBinary]
+  # @return [ProconBypassMan::Domains::ProcessingProconBinary]
+  # アナログスティックは上書きし、ボタンだけマージする
+  def write_as_merge!: (untyped target_binary) -> ProconBypassMan::Domains::ProcessingProconBinary
+
+  # @param [Symbol] button
+  def write_as_press_button: (Symbol button) -> void
+
+  # @param [Symbol] button
+  def write_as_unpress_button: (Symbol  button) -> void
+
+  # @param [Symbol] button
+  def write_as_press_button_only: (Symbol button) -> void
+
+  # @param [Integer] cap
+  def write_as_apply_left_analog_stick_cap: (cap: Integer cap) -> void
+end
+
+module ProconBypassMan
+  class HttpClient
+    @server_pool: untyped
+    @uri: ::URI
+    @retry_on_connection_error: false
+
+    def initialize: (path: String, server_pool: untyped, ?retry_on_connection_error: false) -> void
+    def get: -> nil
+    def post: (request_body: untyped) -> nil
+    def put: (request_body: untyped) -> nil
+
+    private
+    def process_response: (untyped response) -> untyped
+    def handle_request: { -> bot } -> nil
+
+    class HttpRequest
+      class Get
+        def self.request!: (uri: ::URI) -> untyped
+      end
+
+      class Post
+        def self.request!: (uri: ::URI, ?request_body: Hash[untyped, untyped]) -> untyped
+      end
+
+      class Put
+        def self.request!: (uri: ::URI, ?request_body: {hostname: String}) -> untyped
+      end
+    end
+  end
+end
+
+module ProconBypassMan
+  class SendDeviceStatsHttpClient
+    def post: (status: ::Symbol, pbm_session_id: String) -> untyped
+  end
+end
+
+module ProconBypassMan
+  class ReportHttpClient
+    def post: (body: Hash[untyped, untyped] | String, event_type: ::Symbol) -> untyped
+  end
+end
+
+module ProconBypassMan
+  class UpdateRemotePbmActionStatusHttpClient
+    def post: (to_status: ::Symbol) -> untyped
+  end
+end
+
+module ProconBypassMan
+  class ServerPool
+    @servers: Array[String]
+    @index: Integer?
+
+    def initialize: (servers: Array[String]) -> void
+    def pick: -> String?
+    def server: -> String?
+    def next!: -> nil
+
+    private
+    def reset: -> Integer
+    def inc_index: -> Integer
+  end
+end
+
+module ProconBypassMan
+  class CompressArray
+    @array: [String]
+
+    def initialize: ([String] array) -> void
+    def compress: -> Array[String?]
+
+    class CompressibleValue
+      @prev: String?
+      @current: String
+
+      def initialize: (String? prev, String current) -> void
+      def compress?: -> bool
+      def to_s_with_mark: -> String?
+    end
+  end
+end
+
+module ProconBypassMan
+  module Callbacks
+    def run_callbacks: (untyped kind) -> untyped
+    def get_callbacks: (untyped kind) -> untyped
+    def set_callbacks: (untyped name, untyped callbacks) -> untyped
+
+    class CallbacksChain
+      @block: nil
+
+      attr_accessor filter: untyped
+      attr_accessor chain_method: untyped
+      def initialize: (filter: untyped, chain_method: untyped, block: nil) -> void
+    end
+
+    module M
+    end
+
+    module ClassMethods
+      def define_callbacks: (untyped name) -> untyped
+      def set_callback: (untyped kind, untyped filter, untyped chain_method) -> CallbacksChain
+    end
+  end
+end

data/sig/on_memory_cache.rbs

@@ -0,0 +1,16 @@
+class ProconBypassMan::OnMemoryCache
+  class CacheValue
+    # @param [Time]
+    attr_accessor expired_at: Time
+
+    attr_accessor value: untyped
+
+    def initialize: (expired_at: Time, value: untyped) -> void
+  end
+
+  def initialize: () -> void
+
+  # @param [Integer] expires_in 秒数
+  # @param [String] key
+  def fetch: (key: string, expires_in: Time) { () -> untyped } -> untyped
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.18
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -24,7 +24,35 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: An extension for Nintendo Switch Pro Controller
+- !ruby/object:Gem::Dependency
+  name: action_cable_client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sorted_set
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A programmable converter for Nintendo Switch Pro Controller
 email:
 - n905i.1214@gmail.com
 executables: []
@@ -49,9 +77,14 @@ files:
 - bin/dev_api_server.rb
 - bin/setup
 - docs/how_to_connect_procon.md
+- docs/setting/left-analogstick-cap.md
+- docs/setting/splatoon2_macro_sokuwari_bubble.md
 - docs/setup_raspi.md
 - docs/setup_raspi.mitamae.rb
 - docs/setup_raspi_by_mitamae.md
+- docs/upgrade_pbm.md
+- lib/ext/em_pure_ruby.rb
+- lib/ext/module.rb
 - lib/procon_bypass_man.rb
 - lib/procon_bypass_man/background.rb
 - lib/procon_bypass_man/background/job_performer.rb
@@ -60,7 +93,6 @@ files:
 - lib/procon_bypass_man/background/jobs/concerns/has_external_api_setting.rb
 - lib/procon_bypass_man/background/jobs/concerns/has_internal_api_setting.rb
 - lib/procon_bypass_man/background/jobs/concerns/job_runnable.rb
-- lib/procon_bypass_man/background/jobs/fetch_and_run_remote_pbm_action_job.rb
 - lib/procon_bypass_man/background/jobs/report_boot_job.rb
 - lib/procon_bypass_man/background/jobs/report_error_job.rb
 - lib/procon_bypass_man/background/jobs/report_event_base_job.rb
@@ -68,7 +100,6 @@ files:
 - lib/procon_bypass_man/background/jobs/report_pressed_buttons_job.rb
 - lib/procon_bypass_man/background/jobs/report_reload_config_job.rb
 - lib/procon_bypass_man/background/jobs/sync_device_stats_job.rb
-- lib/procon_bypass_man/boot_message.rb
 - lib/procon_bypass_man/buttons_setting_configuration.rb
 - lib/procon_bypass_man/buttons_setting_configuration/layer.rb
 - lib/procon_bypass_man/buttons_setting_configuration/loader.rb
@@ -79,7 +110,7 @@ files:
 - lib/procon_bypass_man/commands/bypass_command.rb
 - lib/procon_bypass_man/commands/connect_device_command.rb
 - lib/procon_bypass_man/commands/print_boot_message_command.rb
-- lib/procon_bypass_man/commands/run_local_shell_command.rb
+- lib/procon_bypass_man/commands/print_message_command.rb
 - lib/procon_bypass_man/commands/run_remote_pbm_action_dispatch_command.rb
 - lib/procon_bypass_man/commands/send_error_command.rb
 - lib/procon_bypass_man/commands/send_reload_config_event_command.rb
@@ -88,34 +119,45 @@ files:
 - lib/procon_bypass_man/configuration.rb
 - lib/procon_bypass_man/device_connector.rb
 - lib/procon_bypass_man/device_status.rb
+- lib/procon_bypass_man/domains.rb
+- lib/procon_bypass_man/domains/binary/base.rb
+- lib/procon_bypass_man/domains/binary/has_immutable_binary.rb
+- lib/procon_bypass_man/domains/binary/has_mutable_binary.rb
+- lib/procon_bypass_man/domains/binary/inbound_procon_binary.rb
+- lib/procon_bypass_man/domains/binary/processing_procon_binary.rb
 - lib/procon_bypass_man/io_monitor.rb
-- lib/procon_bypass_man/plugin.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/fast_return.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_left_key.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_right_key.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_up_key.rb
+- lib/procon_bypass_man/plugin/splatoon2/macro/sokuwari_for_splash_bomb.rb
 - lib/procon_bypass_man/plugin/splatoon2/mode/guruguru.rb
 - lib/procon_bypass_man/plugin/splatoon2/version.rb
+- lib/procon_bypass_man/plugins.rb
 - lib/procon_bypass_man/processor.rb
 - lib/procon_bypass_man/procon.rb
-- lib/procon_bypass_man/procon/analog_stick.rb
 - lib/procon_bypass_man/procon/analog_stick_cap.rb
+- lib/procon_bypass_man/procon/button.rb
 - lib/procon_bypass_man/procon/button_collection.rb
 - lib/procon_bypass_man/procon/consts.rb
 - lib/procon_bypass_man/procon/flip_cache.rb
 - lib/procon_bypass_man/procon/layer_changer.rb
+- lib/procon_bypass_man/procon/macro.rb
+- lib/procon_bypass_man/procon/macro_builder.rb
 - lib/procon_bypass_man/procon/macro_registry.rb
 - lib/procon_bypass_man/procon/mode_registry.rb
 - lib/procon_bypass_man/procon/press_button_aware.rb
 - lib/procon_bypass_man/procon/user_operation.rb
-- lib/procon_bypass_man/procon_reader.rb
+- lib/procon_bypass_man/procon/value_objects/analog_stick.rb
+- lib/procon_bypass_man/procon/value_objects/procon_reader.rb
 - lib/procon_bypass_man/remote_pbm_action.rb
 - lib/procon_bypass_man/remote_pbm_action/base_action.rb
 - lib/procon_bypass_man/remote_pbm_action/change_pbm_version_action.rb
-- lib/procon_bypass_man/remote_pbm_action/lib/update_remote_pbm_action_status_command.rb
+- lib/procon_bypass_man/remote_pbm_action/commands/update_remote_pbm_action_status_command.rb
 - lib/procon_bypass_man/remote_pbm_action/reboot_os_action.rb
 - lib/procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb
 - lib/procon_bypass_man/remote_pbm_action/stop_pbm_action.rb
+- lib/procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_action_object.rb
 - lib/procon_bypass_man/runner.rb
 - lib/procon_bypass_man/scheduler.rb
 - lib/procon_bypass_man/support/callbacks.rb
@@ -129,8 +171,8 @@ files:
 - lib/procon_bypass_man/support/signal_handler.rb
 - lib/procon_bypass_man/support/update_remote_pbm_action_status_http_client.rb
 - lib/procon_bypass_man/support/uptime.rb
-- lib/procon_bypass_man/value_objects/remote_pbm_action_object.rb
 - lib/procon_bypass_man/version.rb
+- lib/procon_bypass_man/websocket/pbm_job_client.rb
 - procon_bypass_man.gemspec
 - project_template/README.md
 - project_template/app.rb
@@ -140,6 +182,7 @@ files:
 - project_template/web.rb
 - sig/README.md
 - sig/main.rbs
+- sig/on_memory_cache.rbs
 homepage: https://github.com/splaplapla/procon_bypass_man
 licenses:
 - MIT
@@ -162,8 +205,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
-summary: An extension for Nintendo Switch Pro Controller
+summary: A programmable converter for Nintendo Switch Pro Controller
 test_files: []

data/lib/procon_bypass_man/background/jobs/fetch_and_run_remote_pbm_action_job.rb

@@ -1,29 +0,0 @@
-class ProconBypassMan::FetchAndRunRemotePbmActionJob < ProconBypassMan::BaseJob
-  extend ProconBypassMan::HasExternalApiSetting
-
-  def self.perform
-    pbm_jobs = ProconBypassMan::HttpClient.new(path: path, server_pool: server_pool).get
-    if pbm_jobs.nil? || pbm_jobs.size.zero?
-      # ProconBypassMan.logger.debug "remote pbm_jobsはありませんでした"
-      return
-    else
-      pbm_job_hash = pbm_jobs.first
-      begin
-        pbm_job_object = ProconBypassMan::RemotePbmActionObject.new(action: pbm_job_hash["action"],
-                                                                    status: pbm_job_hash["status"],
-                                                                    uuid: pbm_job_hash["uuid"],
-                                                                    created_at: pbm_job_hash["created_at"],
-                                                                    job_args: pbm_job_hash["args"])
-        pbm_job_object.validate!
-        ProconBypassMan::RunRemotePbmActionDispatchCommand.execute(action: pbm_job_object.action, uuid: pbm_job_object.uuid, job_args: pbm_job_object.job_args)
-      rescue ProconBypassMan::RemotePbmActionObject::ValidationError => e
-        ProconBypassMan::SendErrorCommand.execute(error: e)
-      end
-    end
-  end
-
-  def self.path
-    device_id = ProconBypassMan.device_id
-    "/api/devices/#{device_id}/pbm_jobs"
-  end
-end

data/lib/procon_bypass_man/boot_message.rb

@@ -1,48 +0,0 @@
-class ProconBypassMan::BootMessage
-  def initialize
-    @table = {}
-    @table[:ruby_version] = RUBY_VERSION
-    @table[:pbm_version] = ProconBypassMan::VERSION
-    @table[:pid] = $$
-    @table[:root_path] = ProconBypassMan.root
-    @table[:pid_path] = ProconBypassMan.pid_path
-    @table[:setting_path] = ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path
-    @table[:uptime_from_boot] = ProconBypassMan::Uptime.from_boot
-    @table[:use_pbmenv] = !(!!`which pbmenv`.empty?)
-    @table[:session_id] = ProconBypassMan.session_id
-    @table[:device_id] = ProconBypassMan.device_id
-
-    # 開発中のHEADを取りたかったけど、Gem::Specification経由から取得する必要がありそう
-    # build_version = `git rev-parse --short HEAD`.chomp
-    # if build_version.empty?
-    #   @table[:build_version] = 'release version'
-    # else
-    #   @table[:build_version] = build_version
-    # end
-
-    # build version: #{@table[:build_version]}
-  end
-
-  # @return [String]
-  def to_s
-    booted_message = <<~EOF
-      ----
-      RUBY_VERSION: #{@table[:ruby_version]}
-      ProconBypassMan::VERSION: #{@table[:pbm_version]}
-      pid: #{@table[:pid]}
-      root: #{@table[:root_path]}
-      pid_path: #{@table[:pid_path]}
-      setting_path: #{@table[:setting_path]}
-      uptime from boot: #{@table[:uptime_from_boot]} sec
-      use_pbmenv: #{@table[:use_pbmenv]}
-      session_id: #{ProconBypassMan.session_id}
-      device_id: #{ProconBypassMan.device_id}
-      ----
-    EOF
-  end
-
-  # @return [Hash]
-  def to_hash
-    @table
-  end
-end

data/lib/procon_bypass_man/commands/run_local_shell_command.rb

@@ -1,6 +0,0 @@
-class ProconBypassMan::RunLocalShellCommand
-  class LocalCommandError < StandardError; end
-
-  def self.execute(action: , uuid: )
-  end
-end

data/lib/procon_bypass_man/procon_reader.rb

@@ -1,31 +0,0 @@
-class ProconBypassMan::ProconReader
-  def initialize(binary: )
-    @binary = binary
-    @analog_stick = ProconBypassMan::Procon::AnalogStick.new(binary: binary)
-  end
-
-  # @return [Array<Symbol>]
-  def pressed
-    aware = ProconBypassMan::PpressButtonAware.new(@binary)
-    pressed_table = ::ProconBypassMan::Procon::ButtonCollection::BUTTONS.reduce({}) do |acc, button|
-      acc[button] = aware.pressed_button?(button)
-      acc
-    end
-    pressed_table.select { |_key, value| value }.keys
-  end
-
-  def left_analog_stick
-    { x: @analog_stick.relative_x, y: @analog_stick.relative_y }
-  end
-
-  def left_analog_stick_by_abs
-    { x: @analog_stick.abs_x, y: @analog_stick.abs_y }
-  end
-
-  def to_hash
-    { left_analog_stick: left_analog_stick,
-      left_analog_stick_by_abs: left_analog_stick_by_abs,
-      buttons: pressed,
-    }
-  end
-end