procon_bypass_man 0.1.15 → 0.1.18

data/lib/procon_bypass_man/procon.rb

@@ -1,7 +1,9 @@
 class ProconBypassMan::Procon
   require "procon_bypass_man/procon/consts"
   require "procon_bypass_man/procon/mode_registry"
+  require "procon_bypass_man/procon/macro"
   require "procon_bypass_man/procon/macro_registry"
+  require "procon_bypass_man/procon/macro_builder"
   require "procon_bypass_man/procon/layer_changer"
   require "procon_bypass_man/procon/button_collection"
   require "procon_bypass_man/procon/user_operation"
@@ -20,8 +22,11 @@ class ProconBypassMan::Procon
   end
   reset!
 
+  # @param [string] binary
   def initialize(binary)
-    self.user_operation = ProconBypassMan::Procon::UserOperation.new(binary.dup)
+    self.user_operation = ProconBypassMan::Procon::UserOperation.new(
+      binary.dup
+    )
   end
 
   def status; @@status[:buttons]; end
@@ -43,7 +48,7 @@ class ProconBypassMan::Procon
 
     if ongoing_macro.finished?
       current_layer.macros.each do |macro_name, options|
-        if options[:if_pressed].all? { |b| user_operation.pressed_button?(b) }
+        if user_operation.pressing_all_buttons?(options[:if_pressed])
           @@status[:ongoing_macro] = MacroRegistry.load(macro_name)
         end
       end
@@ -60,7 +65,7 @@ class ProconBypassMan::Procon
           next
         end
 
-        if options[:if_pressed] && options[:if_pressed].all? { |b| user_operation.pressed_button?(b) }
+        if options[:if_pressed] && user_operation.pressing_all_buttons?(options[:if_pressed])
           FlipCache.fetch(key: button, expires_in: options[:flip_interval]) do
             status[button] = !status[button]
           end
@@ -75,7 +80,7 @@ class ProconBypassMan::Procon
         @@status[:ongoing_mode] = ProconBypassMan::Procon::ModeRegistry.load(current_layer.mode)
       end
       if(binary = ongoing_mode.next_binary)
-        self.user_operation.merge(target_binary: binary)
+        self.user_operation.merge([binary].pack("H*"))
       end
       return
     end
@@ -83,28 +88,28 @@ class ProconBypassMan::Procon
     status
   end
 
-  # @return [String<binary>]
+  # @return [ProconBypassMan::Domains::ProcessingProconBinary]
   def to_binary
     if ongoing_mode.name != :manual
-      return user_operation.binary
+      return user_operation.binary.raw
     end
 
     if ongoing_macro.ongoing?
-      step = ongoing_macro.next_step or return(user_operation.binary)
+      step = ongoing_macro.next_step or return(user_operation.binary.raw)
       user_operation.press_button_only(step)
-      return user_operation.binary
+      return user_operation.binary.raw
     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|
+    current_layer.left_analog_stick_caps.each do |config|
+      if config[:if_pressed].nil? || user_operation.pressing_all_buttons?(config[:if_pressed])
+        config[:force_neutral]&.each do |force_neutral_button|
           user_operation.unpress_button(force_neutral_button)
         end
-        user_operation.apply_left_analog_stick_cap(cap: options[:cap])
+        user_operation.apply_left_analog_stick_cap(cap: config[:cap])
       end
     end
 
@@ -116,7 +121,7 @@ class ProconBypassMan::Procon
       end
 
       # 押している時だけ連打
-      if options[:if_pressed] && options[:if_pressed].all? { |b| user_operation.pressed_button?(b) }
+      if options[:if_pressed] && user_operation.pressing_all_buttons?(options[:if_pressed])
         if !status[button]
           user_operation.unpress_button(button)
         end
@@ -128,16 +133,15 @@ class ProconBypassMan::Procon
     end
 
     current_layer.remaps.each do |from_button, to_buttons|
-      if user_operation.pressed_button?(from_button)
+      if user_operation.pressing_button?(from_button)
         user_operation.unpress_button(from_button)
-        # TODO 2重でpressしないようにしたい
         to_buttons[:to].each do |to_button|
           user_operation.press_button(to_button)
         end
       end
     end
 
-    user_operation.binary
+    user_operation.binary.raw
   end
 
   private

data/lib/procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb

@@ -5,7 +5,7 @@ module ProconBypassMan
       def action_content(args: )
         require "pbmenv"
         ProconBypassMan.logger.info "execute RestorePbmSettingAction!"
-        setting = args["setting"] or raise(ProconBypassMan::RemotePbmAction::NeedPbmVersionError, "settingが必要です, #{args.inspect}")
+        setting = args.dig("setting") or raise(ProconBypassMan::RemotePbmAction::NeedPbmVersionError, "settingが必要です, #{args.inspect}")
         File.write(
           ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
           setting.to_yaml,

data/lib/procon_bypass_man/remote_pbm_action.rb

@@ -5,7 +5,7 @@ module ProconBypassMan
     require "procon_bypass_man/remote_pbm_action/reboot_os_action"
     require "procon_bypass_man/remote_pbm_action/stop_pbm_action"
     require "procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb"
-    require "procon_bypass_man/remote_pbm_action/lib/update_remote_pbm_action_status_command"
+    require "procon_bypass_man/remote_pbm_action/commands/update_remote_pbm_action_status_command"
 
     ACTION_CHANGE_PBM_VERSION = "change_pbm_version"
     ACTION_REBOOT_OS = "reboot_os"

data/lib/procon_bypass_man/runner.rb

@@ -1,5 +1,4 @@
 require_relative "io_monitor"
-require_relative "boot_message"
 
 class ProconBypassMan::Runner
   class InterruptForRestart < StandardError; end
@@ -31,6 +30,7 @@ class ProconBypassMan::Runner
       main_loop_pid = Kernel.fork { ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute }
 
       begin
+        # TODO 小プロセスが消滅した時に、メインプロセスは生き続けてしまい、何もできなくなる問題がある
         while(readable_io = IO.select([self_read]))
           signal = readable_io.first[0].gets.strip
           handle_signal(signal)
@@ -39,14 +39,14 @@ class ProconBypassMan::Runner
         $will_terminate_token = true
         Process.kill("TERM", main_loop_pid)
         Process.wait
-        ProconBypassMan.logger.info("Reloading config file")
+        ProconBypassMan::PrintMessageCommand.execute(text: "Reloading config file")
         begin
           ProconBypassMan::ButtonsSettingConfiguration::Loader.reload_setting
           ProconBypassMan::SendReloadConfigEventCommand.execute
         rescue ProconBypassMan::CouldNotLoadConfigError
           ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。再読み込みができませんでした")
         end
-        ProconBypassMan.logger.info("バイパス処理を再開します")
+        ProconBypassMan::PrintMessageCommand.execute(text: "バイパス処理を再開します")
       rescue Interrupt
         $will_terminate_token = true
         Process.kill("TERM", main_loop_pid)

data/lib/procon_bypass_man/scheduler.rb

@@ -68,13 +68,6 @@ module ProconBypassMan
     end
 
     def self.register_schedules
-      register(
-        schedule: Schedule.new(
-          klass: ProconBypassMan::FetchAndRunRemotePbmActionJob,
-          args: [],
-          interval: 3,
-        )
-      )
       register(
         schedule: Schedule.new(
           klass: ProconBypassMan::SyncDeviceStatsJob,

data/lib/procon_bypass_man/support/compress_array.rb

@@ -54,3 +54,8 @@ module ProconBypassMan
     end
   end
 end
+
+
+if $0 == __FILE__
+  ProconBypassMan::CompressArray.new([''])
+end

data/lib/procon_bypass_man/support/http_client.rb

@@ -100,3 +100,7 @@ module ProconBypassMan
     end
   end
 end
+
+if $0 == __FILE__
+  ProconBypassMan::HttpClient.new(path: '/', server_pool: nil, retry_on_connection_error: false).get(response_body: '')
+end

data/lib/procon_bypass_man/support/on_memory_cache.rb

@@ -1,6 +1,8 @@
 class ProconBypassMan::OnMemoryCache
   class CacheValue
-    attr_accessor :expired_at, :value
+    # @param [Time]
+    attr_accessor :expired_at
+    attr_accessor :value
 
     def initialize(expired_at: , value: )
       self.expired_at = expired_at

data/lib/procon_bypass_man/support/server_pool.rb

@@ -40,3 +40,7 @@ module ProconBypassMan
     end
   end
 end
+
+if $0 == __FILE__
+  ProconBypassMan::ServerPool.new(servers: ['http://example.com'])
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/websocket/pbm_job_client.rb

@@ -0,0 +1,90 @@
+module ProconBypassMan
+  module Websocket
+    module PbmJobClient
+      CHANNEL = 'PbmJobChannel'
+
+      def self.start!
+        return unless ProconBypassMan.config.enable_ws?
+
+        Thread.start do
+          loop do
+            run
+          rescue
+            retry
+          end
+        end
+      end
+
+      def self.run
+        EventMachine.run do
+          client = ActionCableClient.new(
+            ProconBypassMan.config.current_ws_server_url, {
+              channel: CHANNEL, device_id: ProconBypassMan.device_id,
+            }
+          )
+
+          client.connected {
+            ProconBypassMan.logger.info('successfully connected in ProconBypassMan::Websocket::PbmJobClient')
+          }
+          client.subscribed { |msg|
+            puts({ event: :subscribed, msg: msg })
+            ProconBypassMan::SyncDeviceStatsJob.perform(ProconBypassMan::DeviceStatus.current)
+          }
+
+          client.received do |data|
+            ProconBypassMan.logger.info(data)
+
+            dispatch(data: data, client: client)
+          rescue => e
+            ProconBypassMan::SendErrorCommand.execute(error: e)
+          end
+
+          client.disconnected {
+            puts :disconnected
+            client.reconnect!
+            sleep 2
+          }
+          client.errored { |msg|  puts :errored; puts msg }
+          client.pinged { |msg|
+            ProconBypassMan.cache.fetch key: 'ws_pinged', expires_in: 10 do
+              ProconBypassMan.logger.info(msg)
+            end
+          }
+        end
+      end
+
+      # @param [Hash] data
+      def self.dispatch(data: , client: )
+        pbm_job_hash = data.dig("message")
+        if pbm_job_hash['action'] == "ping"
+          client.perform('pong', { device_id: ProconBypassMan.device_id, message: 'hello from pbm' })
+        else
+          validate_and_run(data: data)
+        end
+      end
+
+      # @raise [ProconBypassMan::RemotePbmActionObject::ValidationError]
+      # @param [Hash] data
+      # @return [Void]
+      def self.validate_and_run(data: )
+        pbm_job_hash = data.dig("message")
+        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!
+        rescue ProconBypassMan::RemotePbmActionObject::ValidationError => e
+          raise
+        end
+
+        ProconBypassMan::RunRemotePbmActionDispatchCommand.execute(
+          action: pbm_job_object.action,
+          uuid: pbm_job_object.uuid,
+          job_args: pbm_job_object.job_args
+        )
+      end
+    end
+  end
+end

data/lib/procon_bypass_man.rb

@@ -4,6 +4,10 @@ require "json"
 require "net/http"
 require "fileutils"
 require "securerandom"
+require 'em/pure_ruby'
+require "action_cable_client"
+require "ext/em_pure_ruby"
+require "ext/module"
 
 require_relative "procon_bypass_man/version"
 require_relative "procon_bypass_man/remote_pbm_action"
@@ -21,6 +25,7 @@ require_relative "procon_bypass_man/support/server_pool"
 require_relative "procon_bypass_man/background"
 require_relative "procon_bypass_man/commands"
 require_relative "procon_bypass_man/bypass"
+require_relative "procon_bypass_man/domains"
 require_relative "procon_bypass_man/device_connector"
 require_relative "procon_bypass_man/device_status"
 require_relative "procon_bypass_man/runner"
@@ -28,12 +33,14 @@ 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_reader"
-require_relative "procon_bypass_man/procon/analog_stick"
+require_relative "procon_bypass_man/procon/button"
+require_relative "procon_bypass_man/procon/value_objects/analog_stick"
+require_relative "procon_bypass_man/procon/value_objects/procon_reader"
 require_relative "procon_bypass_man/procon/analog_stick_cap"
-require_relative "procon_bypass_man/value_objects/remote_pbm_action_object"
+require_relative "procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_action_object"
 require_relative "procon_bypass_man/scheduler"
-require_relative "procon_bypass_man/plugin"
+require_relative "procon_bypass_man/plugins"
+require_relative "procon_bypass_man/websocket/pbm_job_client"
 
 STDOUT.sync = true
 Thread.abort_on_exception = true
@@ -51,9 +58,9 @@ module ProconBypassMan
   def self.run(setting_path: nil)
     ProconBypassMan::Scheduler.start!
     ProconBypassMan::Background::JobRunner.start!
+    ProconBypassMan::Websocket::PbmJobClient.start!
 
-    ProconBypassMan.logger.info "PBMを起動しています"
-    puts "PBMを起動しています"
+    ProconBypassMan::PrintMessageCommand.execute(text: "PBMを起動しています")
     ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting_path)
     initialize_pbm
     gadget, procon = ProconBypassMan::ConnectDeviceCommand.execute!

data/procon_bypass_man.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["jiikko"]
   spec.email         = ["n905i.1214@gmail.com"]
 
-  spec.summary       = "An extension for Nintendo Switch Pro Controller"
+  spec.summary       = "A programmable converter for Nintendo Switch Pro Controller"
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/splaplapla/procon_bypass_man"
   spec.license       = "MIT"
@@ -29,6 +29,8 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "pbmenv"
+  spec.add_dependency "action_cable_client"
+  spec.add_dependency "sorted_set"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/project_template/README.md

@@ -1,11 +1,16 @@
 # Project Template
-これらは https://github.com/splaplapla/pbmenv がinstallするときに配備するファイルです
+* これらは https://github.com/splaplapla/pbmenv がinstallするときに配備するファイルです
+* pbm_webはオプショナルです
 
 ## 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
-* sudo systemctl enable pbm.service
-* sudo systemctl enable pbm_web.service
+systemctl enableした後は、次回のOS起動時にserviceも自動起動します
+
+* pbm
+  * sudo systemctl link /usr/share/pbm/current/systemd_units/pbm.service
+  * sudo systemctl enable pbm.service
+* pbm_web
+  * sudo systemctl link /usr/share/pbm/current/systemd_units/pbm_web.service
+  * sudo systemctl enable pbm_web.service
 
 ## systemdを使ってサービスから解除する方法
 * sudo systemctl disable pbm.service

data/project_template/app.rb

@@ -5,14 +5,15 @@ 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.15'
+  gem 'procon_bypass_man', '0.1.18'
 end
 
 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
-  # config.api_servers = ['https://...']
+  # webからProconBypassManを操作できるwebサービス
+  # config.api_servers = ['https://pbm-cloud.herokuapp.com']
   config.enable_critical_error_logging = true
 end