procon_bypass_man 0.1.13 → 0.1.16.1

data/lib/procon_bypass_man/support/http_client.rb

@@ -0,0 +1,102 @@
+module ProconBypassMan
+  class HttpClient
+    class HttpRequest
+      class Get
+        def self.request!(uri: )
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = uri.scheme === "https"
+          http.get(uri.path, { "Content-Type" => "application/json" })
+        end
+      end
+
+      class Post
+        def self.request!(uri: , request_body: {})
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = uri.scheme === "https"
+          http.post(uri.path, request_body.to_json, { "Content-Type" => "application/json" })
+        end
+      end
+
+      class Put
+        def self.request!(uri: , request_body: {})
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = uri.scheme === "https"
+          http.put(uri.path, request_body.to_json, { "Content-Type" => "application/json" })
+        end
+      end
+    end
+
+    def initialize(path: , server_pool: , retry_on_connection_error: false)
+      @server_pool = server_pool
+      @uri = URI.parse("#{server_pool.server}#{path}")
+      @retry_on_connection_error = retry_on_connection_error
+    end
+
+    def get
+      handle_request do
+        response = HttpRequest::Get.request!(
+          uri: @uri,
+        )
+        break process_response(response)
+      end
+    end
+
+    def post(request_body: )
+      handle_request do
+        body = {}.merge!(request_body)
+        response = HttpRequest::Post.request!(
+          uri: @uri,
+          request_body: body,
+        )
+        break process_response(response)
+      end
+    end
+
+    def put(request_body: )
+      handle_request do
+        body = {
+          hostname: `hostname`.chomp,
+        }.merge!(request_body)
+        response = HttpRequest::Put.request!(
+          uri: @uri,
+          request_body: body,
+        )
+        break process_response(response)
+      end
+    end
+
+    private
+
+    def process_response(response)
+      case response.code
+      when /^200/
+        begin
+          return JSON.parse(response.body)
+        rescue JSON::ParserError
+          return response.body
+        end
+      else
+        @server_pool.next!
+        ProconBypassMan.logger.error("#{@uri}から200以外(#{response.code})が帰ってきました. #{response.body}")
+      end
+    end
+
+    def handle_request
+      raise "need block" unless block_given?
+      if @server_pool.server.nil?
+        ProconBypassMan.logger.info('送信先が未設定なのでスキップしました')
+        return
+      end
+      return yield
+    rescue SocketError => e
+      ProconBypassMan.logger.error(e)
+      if @retry_on_connection_error
+        sleep(10)
+        retry
+      end
+    rescue => e
+      puts e
+      ProconBypassMan.logger.error(e)
+    end
+  end
+end

data/lib/procon_bypass_man/support/report_http_client.rb

@@ -0,0 +1,19 @@
+module ProconBypassMan
+  class ReportHttpClient < HttpClient
+    def post(body: , event_type: )
+      if body.is_a?(Hash)
+        b = body
+      else
+        b = { text: body }
+      end
+
+      super(request_body: {
+        session_id: ProconBypassMan.session_id,
+        device_id: ProconBypassMan.device_id,
+        hostname: `hostname`.chomp,
+        event_type: event_type,
+        body: b,
+      })
+    end
+  end
+end

data/lib/procon_bypass_man/support/send_device_stats_http_client.rb

@@ -0,0 +1,9 @@
+module ProconBypassMan
+  class SendDeviceStatsHttpClient < HttpClient
+    def post(status: , pbm_session_id: )
+      super(request_body: {
+        body: { status: status, pbm_session_id: pbm_session_id },
+      })
+    end
+  end
+end

data/lib/procon_bypass_man/{background/has_server_pool.rb → support/server_pool.rb}

@@ -1,4 +1,4 @@
-module ProconBypassMan::Background::HasServerPool
+module ProconBypassMan
   class ServerPool
     def initialize(servers: )
       if servers.nil? || servers.empty?
@@ -29,6 +29,8 @@ module ProconBypassMan::Background::HasServerPool
       end
     end
 
+    private
+
     def reset
       @index = 0
     end
@@ -37,18 +39,4 @@ module ProconBypassMan::Background::HasServerPool
       @index = @index + 1
     end
   end
-
-  def reset_server_pool!
-    @pool_server = nil
-  end
-
-  def pool_server
-    @pool_server ||= ServerPool.new(
-      servers: servers
-    )
-  end
-
-  def servers
-    raise NotImplementedError, nil
-  end
 end

data/lib/procon_bypass_man/support/update_remote_pbm_action_status_http_client.rb

@@ -0,0 +1,9 @@
+module ProconBypassMan
+  class UpdateRemotePbmActionStatusHttpClient < HttpClient
+    def put(to_status: )
+      super(request_body: {
+        body: { status: to_status },
+      })
+    end
+  end
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/websocket/pbm_job_client.rb

@@ -0,0 +1,79 @@
+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|
+            validate_and_run(data: data)
+          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
+
+      # @raise [ProconBypassMan::RemotePbmActionObject::ValidationError]
+      # @param [Hash] data
+      # @return [Void]
+      def self.validate_and_run(data: )
+        ProconBypassMan.logger.debug { 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,27 +4,42 @@ require "json"
 require "net/http"
 require "fileutils"
 require "securerandom"
+require 'em/pure_ruby'
+require "action_cable_client"
+require "ext/em_pure_ruby"
 
 require_relative "procon_bypass_man/version"
+require_relative "procon_bypass_man/remote_pbm_action"
 require_relative "procon_bypass_man/support/signal_handler"
 require_relative "procon_bypass_man/support/callbacks"
 require_relative "procon_bypass_man/support/safe_timeout"
 require_relative "procon_bypass_man/support/compress_array"
 require_relative "procon_bypass_man/support/uptime"
 require_relative "procon_bypass_man/support/on_memory_cache"
+require_relative "procon_bypass_man/support/http_client"
+require_relative "procon_bypass_man/support/report_http_client"
+require_relative "procon_bypass_man/support/update_remote_pbm_action_status_http_client"
+require_relative "procon_bypass_man/support/send_device_stats_http_client"
+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"
 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/splatoon2"
+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/plugins"
+require_relative "procon_bypass_man/websocket/pbm_job_client"
 
 STDOUT.sync = true
 Thread.abort_on_exception = true
@@ -33,44 +48,46 @@ module ProconBypassMan
   extend ProconBypassMan::Configuration::ClassMethods
 
   class CouldNotLoadConfigError < StandardError; end
-  class FirstConnectionError < StandardError; end
-  class EternalConnectionError < StandardError; end
-
-  def self.buttons_setting_configure(setting_path: nil, &block)
-    unless setting_path
-      logger.warn "setting_pathが未設定です。設定ファイルのライブリロードが使えません。"
-    end
-
-    if block_given?
-      ProconBypassMan::ButtonsSettingConfiguration.instance.instance_eval(&block)
-    else
-      ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting_path)
-    end
-  end
+  class NotFoundProconError < StandardError; end
+  class ConnectionError < StandardError; end
+  class FirstConnectionError < ConnectionError; end
+  class EternalConnectionError < ConnectionError; end
 
   # @return [void]
-  def self.run(setting_path: nil, &block)
-    ProconBypassMan.logger.info "PBMを起動しています"
-    puts "PBMを起動しています"
-    buttons_setting_configure(setting_path: setting_path, &block)
-    initialize_pbm
-    File.write(pid_path, $$)
-    ProconBypassMan::WriteSessionIdCommand.execute
+  def self.run(setting_path: nil)
+    ProconBypassMan::Scheduler.start!
     ProconBypassMan::Background::JobRunner.start!
+    ProconBypassMan::Websocket::PbmJobClient.start!
+
+    ProconBypassMan::PrintMessageCommand.execute(text: "PBMを起動しています")
+    ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting_path)
+    initialize_pbm
     gadget, procon = ProconBypassMan::ConnectDeviceCommand.execute!
     Runner.new(gadget: gadget, procon: procon).run
-  rescue CouldNotLoadConfigError
+  rescue ProconBypassMan::CouldNotLoadConfigError
     ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。設定ファイルの読み込みに失敗しました")
+    ProconBypassMan::DeviceStatus.change_to_setting_syntax_error_and_shutdown!
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     FileUtils.rm_rf(ProconBypassMan.digest_path)
     exit 1
-  rescue EternalConnectionError
-    ProconBypassMan::SendErrorCommand.execute(error: "接続の見込みがないのでsleepしまくります")
+  rescue ProconBypassMan::NotFoundProconError
+    ProconBypassMan::SendErrorCommand.execute(error: "プロコンが見つかりませんでした。終了します。")
+    ProconBypassMan::DeviceStatus.change_to_procon_not_found_error!
     FileUtils.rm_rf(ProconBypassMan.pid_path)
-    sleep(999999999)
-  rescue FirstConnectionError
-    ProconBypassMan::SendErrorCommand.execute(error: "接続を確立できませんでした。やりなおします。")
-    retry
+    FileUtils.rm_rf(ProconBypassMan.digest_path)
+    exit 1
+  rescue ProconBypassMan::ConnectionError
+    begin
+      raise
+    rescue ProconBypassMan::EternalConnectionError
+      ProconBypassMan::SendErrorCommand.execute(error: "接続の見込みがないのでsleepしまくります")
+      ProconBypassMan::DeviceStatus.change_to_connected_but_sleeping!
+      FileUtils.rm_rf(ProconBypassMan.pid_path)
+      eternal_sleep
+    rescue ProconBypassMan::FirstConnectionError
+      ProconBypassMan::SendErrorCommand.execute(error: "接続を確立できませんでした。やりなおします。")
+      retry
+    end
   end
 
   def self.configure(&block)
@@ -95,5 +112,17 @@ module ProconBypassMan
 
   def self.initialize_pbm
     ProconBypassMan::WriteDeviceIdCommand.execute
+    ProconBypassMan::WriteSessionIdCommand.execute
+    File.write(pid_path, $$)
+    ProconBypassMan::DeviceStatus.change_to_running!
+  end
+
+  def self.eternal_sleep
+    sleep(999999999)
+  end
+
+  # @return [Void]
+  def self.hot_reload!
+    Process.kill(:USR2, pid)
   end
 end

data/procon_bypass_man.gemspec

@@ -28,7 +28,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
+  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,7 +5,7 @@ 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.13'
+  gem 'procon_bypass_man', '0.1.16.1'
 end
 
 ProconBypassMan.configure do |config|

data/project_template/setting.yml

@@ -1,12 +1,12 @@
 version: 1.0
 setting: |-
-  fast_return = ProconBypassMan::Splatoon2::Macro::FastReturn
-  guruguru = ProconBypassMan::Splatoon2::Mode::Guruguru
+  fast_return = ProconBypassMan::Plugin::Splatoon2::Macro::FastReturn
+  guruguru = ProconBypassMan::Plugin::Splatoon2::Mode::Guruguru
 
   install_macro_plugin fast_return
-  install_macro_plugin ProconBypassMan::Splatoon2::Macro::JumpToUpKey
-  install_macro_plugin ProconBypassMan::Splatoon2::Macro::JumpToRightKey
-  install_macro_plugin ProconBypassMan::Splatoon2::Macro::JumpToLeftKey
+  install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::JumpToUpKey
+  install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::JumpToRightKey
+  install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::JumpToLeftKey
   install_mode_plugin guruguru
 
   prefix_keys_for_changing_layer [:zr, :zl, :l]
@@ -18,9 +18,9 @@ setting: |-
     flip :a, if_pressed: [:a]
     flip :down, if_pressed: :down
     macro fast_return.name, if_pressed: [:y, :b, :down]
-    macro ProconBypassMan::Splatoon2::Macro::JumpToUpKey, if_pressed: [:y, :b, :up]
-    macro ProconBypassMan::Splatoon2::Macro::JumpToRightKey, if_pressed: [:y, :b, :right]
-    macro ProconBypassMan::Splatoon2::Macro::JumpToLeftKey, if_pressed: [:y, :b, :left]
+    macro ProconBypassMan::Plugin::Splatoon2::Macro::JumpToUpKey, if_pressed: [:y, :b, :up]
+    macro ProconBypassMan::Plugin::Splatoon2::Macro::JumpToRightKey, if_pressed: [:y, :b, :right]
+    macro ProconBypassMan::Plugin::Splatoon2::Macro::JumpToLeftKey, if_pressed: [:y, :b, :left]
     remap :l, to: :zr
   end
   layer :right, mode: guruguru.name

data/sig/main.rbs

@@ -182,6 +182,7 @@ class ProconBypassMan::Configuration
   end
 
   attr_reader api_server: untyped
+  attr_reader api_servers: untyped
 
   attr_accessor enable_critical_error_logging: untyped
 
@@ -200,7 +201,21 @@ class ProconBypassMan::Configuration
   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]
 end