procon_bypass_man 0.1.23 → 0.2.2

data/lib/procon_bypass_man/procon_display/bypass_hook.rb

@@ -0,0 +1,11 @@
+module ProconBypassMan::ProconDisplay::BypassHook
+  include ProconBypassMan::Callbacks
+
+  define_callbacks :send_procon_to_gadget
+
+  set_callback :send_procon_to_gadget, :after, :write_procon_display_Status
+
+  def write_procon_display_Status
+    ProconBypassMan::ProconDisplay::Status.instance.current = bypass_value.binary.to_procon_reader.to_hash.dup
+  end
+end

data/lib/procon_bypass_man/procon_display/http_request.rb

@@ -0,0 +1,31 @@
+module ProconBypassMan::ProconDisplay
+  # NOTE Support GET only
+  class HttpRequest
+    def self.parse(conn)
+      headers = {}
+      loop do
+        line = conn.gets("\n")&.strip
+        break if line.nil? || line.strip.empty?
+        key, value = line.split(/:\s/, 2)
+        headers[key] = value
+      end
+
+      new(headers)
+    end
+
+    def initialize(headers)
+      @headers = headers
+    end
+
+    def path
+      request_method_and_path = @headers.detect { |key, _value| key.start_with?("GET") }.first
+      if request_method_and_path =~ /(?:GET) ([^ ]+)/ && (path = $1)
+        return path
+      end
+    end
+
+    def to_hash
+      { "PATH" => path }
+    end
+  end
+end

data/lib/procon_bypass_man/procon_display/http_response.rb

@@ -0,0 +1,23 @@
+module ProconBypassMan::ProconDisplay
+  class HttpResponse
+    def initialize(body, status: , format: "text/json")
+      @body = body&.to_json
+      @status = status
+      @format = format
+    end
+
+    def to_s
+      <<~EOH
+        HTTP/1.1 #{@status}
+        Content-Length: #{@body&.bytes&.size || 0}
+        Content-Type: #{@format}
+        Access-Control-Allow-Origin: *
+        Access-Control-Allow-Methods: GET
+        Access-Control-Allow-Private-Network：true
+        Connection: close
+
+        #{@body}
+      EOH
+    end
+  end
+end

data/lib/procon_bypass_man/procon_display/server.rb

@@ -0,0 +1,33 @@
+require 'socket'
+
+module ProconBypassMan::ProconDisplay
+  class Server
+    PORT = 9900
+
+    def self.start!
+      Thread.new do
+        new.start_with_foreground
+      end
+    end
+
+    def initialize
+      @server = TCPServer.new('0.0.0.0', PORT)
+    end
+
+    def start_with_foreground
+      loop do
+        conn = @server.accept
+        response = ServerApp.new(
+          HttpRequest.parse(conn).to_hash
+        ).call
+        conn.write(response)
+        conn.close
+      end
+    rescue Errno::EADDRINUSE => e
+      ProconBypassMan::SendErrorCommand.execute(error: e)
+    rescue => e
+      ProconBypassMan::SendErrorCommand.execute(error: e)
+      retry
+    end
+  end
+end

data/lib/procon_bypass_man/procon_display/server_app.rb

@@ -0,0 +1,17 @@
+module ProconBypassMan::ProconDisplay
+  class ServerApp
+    def initialize(env)
+      @env = env
+    end
+
+    def call
+      case @env["PATH"]
+      when "/input"
+        response = ProconBypassMan::ProconDisplay::Status.instance.current
+        HttpResponse.new(response, status: 200).to_s
+      else
+        HttpResponse.new(nil, status: 404).to_s
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/procon_display/status.rb

@@ -0,0 +1,20 @@
+require 'singleton'
+
+class ProconBypassMan::ProconDisplay::Status
+  include Singleton
+
+  # @return [Hash]
+  def current
+    @current || {}
+  end
+
+  # @return [void]
+  # @param [Hash] value
+  def current=(value)
+    if value.is_a?(Hash)
+      @current = value
+    else
+      @current = nil
+    end
+  end
+end

data/lib/procon_bypass_man/procon_display.rb

@@ -0,0 +1,11 @@
+# 入力表示用
+
+module ProconBypassMan::ProconDisplay
+end
+
+require "procon_bypass_man/procon_display/server"
+require "procon_bypass_man/procon_display/server_app"
+require "procon_bypass_man/procon_display/status"
+require "procon_bypass_man/procon_display/http_response"
+require "procon_bypass_man/procon_display/http_request"
+require "procon_bypass_man/procon_display/bypass_hook"

data/lib/procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb

@@ -17,7 +17,8 @@ module ProconBypassMan
           path: ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
           content: setting,
         )
-        ProconBypassMan.hot_reload!
+
+        hot_reload!
       end
 
       private
@@ -29,6 +30,11 @@ module ProconBypassMan
       def after_action_callback
         be_processed
       end
+
+      # @return [void]
+      def hot_reload!
+        Process.kill(:USR2, ProconBypassMan.pid)
+      end
     end
   end
 end

data/lib/procon_bypass_man/remote_pbm_action.rb

@@ -6,6 +6,7 @@ module ProconBypassMan
     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/commands/update_remote_pbm_action_status_command"
+    require "procon_bypass_man/remote_pbm_action/commands/run_remote_pbm_action_dispatch_command"
     require "procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_action_object"
 
     ACTION_CHANGE_PBM_VERSION = "change_pbm_version"

data/lib/procon_bypass_man/runner.rb

@@ -8,8 +8,6 @@ class ProconBypassMan::Runner
   def initialize(gadget: , procon: )
     @gadget = gadget
     @procon = procon
-
-    ProconBypassMan::PrintBootMessageCommand.execute
   end
 
   def run
@@ -30,6 +28,7 @@ class ProconBypassMan::Runner
         $will_terminate_token = false
         DRb.start_service if defined?(DRb)
         ProconBypassMan::RemoteMacroReceiver.start!
+        ProconBypassMan::ProconDisplay::Server.start!
         ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute # ここでblockingする
         next
       }
@@ -41,9 +40,9 @@ class ProconBypassMan::Runner
           handle_signal(signal)
         end
       rescue InterruptForRestart
+        ProconBypassMan::PrintMessageCommand.execute(text: "設定ファイルの再読み込みを開始します")
         Process.kill("USR2", child_pid)
         Process.wait
-        ProconBypassMan::PrintMessageCommand.execute(text: "Reloading config file")
         begin
           ProconBypassMan::ButtonsSettingConfiguration::Loader.reload_setting
           ProconBypassMan::SendReloadConfigEventCommand.execute
@@ -53,12 +52,10 @@ class ProconBypassMan::Runner
         end
         ProconBypassMan::PrintMessageCommand.execute(text: "バイパス処理を再開します")
       rescue Interrupt
+        puts
+        ProconBypassMan::PrintMessageCommand.execute(text: "処理を終了します")
         Process.kill("TERM", child_pid)
         Process.wait
-        ProconBypassMan::PrintMessageCommand.execute(text: "処理を終了します")
-        ProconBypassMan::UsbDeviceController.reset
-        @gadget&.close
-        @procon&.close
         break
       end
     end

data/lib/procon_bypass_man/support/callbacks.rb

@@ -1,21 +1,15 @@
 module ProconBypassMan
-  module Callbacks
-    class CallbacksChain
-      attr_accessor :filter, :chain_method
-      def initialize(filter: , chain_method: , block: )
-        @filter = filter
-        @chain_method = chain_method
-        @block = block
-      end
-    end
+  module CallbacksRegisterable
+    attr_accessor :callbacks
 
-    # TODO __callbacksをincludeしたクラス側で保持する. 今はnemespaceがない
-    module M
-      class << self
-        attr_accessor :__callbacks
-      end
+    def register_callback_module(mod)
+      self.callbacks ||= []
+      callbacks << mod
+      self.include(mod)
     end
+  end
 
+  module Callbacks
     module ClassMethods
       def define_callbacks(name)
         self.singleton_class.attr_accessor "_#{name}_callbacks"
@@ -29,8 +23,9 @@ module ProconBypassMan
       end
 
       def set_callback(kind, filter, chain_method, &block)
-        ProconBypassMan::Callbacks::M.__callbacks ||= {}
-        ProconBypassMan::Callbacks::M.__callbacks[kind] = CallbacksChain.new(
+        self.__callbacks ||= {}
+        self.__callbacks[kind] ||= CallbackChain.new
+        self.__callbacks[kind].append Callback.new(
           filter: filter,
           chain_method: chain_method,
           block: block,
@@ -38,33 +33,72 @@ module ProconBypassMan
       end
     end
 
+    def self.included(mod)
+      mod.singleton_class.attr_accessor :__callbacks
+      mod.extend(ClassMethods)
+    end
+
+    class CallbackChain
+      attr_accessor :callbacks
+
+      def initialize
+        self.callbacks = {}
+      end
+
+      def empty?
+        callbacks.empty?
+      end
+
+      def append(callback)
+        self.callbacks[callback.filter] ||= []
+        self.callbacks[callback.filter] << callback
+      end
+
+      def [](filter)
+        self.callbacks[filter]
+      end
+    end
+
+    class Callback
+      attr_accessor :filter, :chain_method
+
+      def initialize(filter: , chain_method: , block: )
+        @filter = filter
+        @chain_method = chain_method
+        @block = block
+      end
+    end
+
     # TODO haltしたらcallbackを止める
-    # TODO 複数をチェインできるようにする
     def run_callbacks(kind, &block)
-      chain = get_callbacks(kind) or raise("unknown callback")
-      case chain.filter
-      when :before
-        send chain.chain_method
-        block.call
-      when :after
+      chains = get_callbacks(kind) or raise("unknown callback")
+      if chains.nil? || chains.empty?
         block.call
+        return
+      end
+
+      chains[:before]&.each do |chain|
+        send chain.chain_method
+      end
+      block.call
+      chains[:after]&.each do |chain|
         send chain.chain_method
-      else
-        raise("unknown filter")
       end
     end
 
-    # def __run_callbacks__(name, &block)
-    #   puts "called"
-    # end
-
     def get_callbacks(kind) # :nodoc:
-      ProconBypassMan::Callbacks::M.__callbacks[kind.to_sym]
-    end
+      # classに直接moduleをincludeしている場合
+      if defined?(self.class.__callbacks)
+        return self.class.__callbacks[kind.to_sym]
+      end
 
-    def set_callbacks(name, callbacks) # :nodoc:
-      send "_#{name}_callbacks=", callbacks
-      ProconBypassMan::Callbacks::M.__callbacks[kind.to_sym] = callbacks
+      list = self.class.callbacks.flat_map { |callback_mod|
+        callback_mod.__callbacks && callback_mod.__callbacks[kind.to_sym]
+      }.compact
+      table = {}
+      table[:before] = list.flat_map { |x| x[:before] }.compact
+      table[:after] = list.flat_map { |x| x[:after] }.compact
+      table
     end
   end
 end

data/lib/procon_bypass_man/support/never_exit_accidentally.rb

@@ -1,11 +1,11 @@
 module ProconBypassMan
   module NeverExitAccidentally
-    def exit_if_allow(status)
+    def self.exit_if_allow_at_config
       if ProconBypassMan.never_exit_accidentally
-        eternal_sleep
+        ProconBypassMan.eternal_sleep
       else
         yield if block_given?
-        exit(status)
+        exit 1
       end
     end
   end

data/lib/procon_bypass_man/support/usb_device_controller.rb

@@ -1,13 +1,13 @@
 class ProconBypassMan::UsbDeviceController
   class << self
-    def reset
+    def reset(cooldown: 0.5)
       [ "echo > /sys/kernel/config/usb_gadget/procon/UDC",
         "ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC",
       ].each do |shell|
         system shell
         ProconBypassMan.logger.debug { "[SHELL] #{shell}" }
       end
-      sleep 0.5
+      sleep cooldown
     end
 
     def init

data/lib/procon_bypass_man/support/yaml_loader.rb

@@ -0,0 +1,12 @@
+class ProconBypassMan::YamlLoader
+  # @param [String] path
+  # @return [Hash]
+  def self.load(path: )
+    YAML.load_file(path).tap do |y|
+      # 行末に空白があるとto_yamlしたときに改行コードがエスケープされてしまうのでstrip
+      y.transform_values do |v|
+        v.strip! if v.is_a?(String)
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/websocket/client.rb

@@ -23,8 +23,7 @@ module ProconBypassMan
             ProconBypassMan.logger.info('websocket client: successfully connected in ProconBypassMan::Websocket::Client')
           }
           client.subscribed { |msg|
-            ProconBypassMan.logger.info('websocket client: subscribed')
-            puts({ event: :subscribed, msg: msg })
+            ProconBypassMan.logger.info("websocket client: subscribed(#{msg})")
             ProconBypassMan::SyncDeviceStatsJob.perform(ProconBypassMan::DeviceStatus.current)
           }
 
@@ -39,13 +38,11 @@ module ProconBypassMan
 
           client.disconnected {
             ProconBypassMan.logger.info('websocket client: disconnected!!')
-            puts :disconnected
             client.reconnect!
             sleep 2
           }
           client.errored { |msg|
             ProconBypassMan.logger.error("websocket client: errored!!, #{msg}")
-            puts :errored
             client.reconnect!
             sleep 2
           }

data/lib/procon_bypass_man.rb

@@ -14,11 +14,14 @@ require "pbmenv"
 require_relative "procon_bypass_man/version"
 require_relative "procon_bypass_man/remote_pbm_action"
 require_relative "procon_bypass_man/remote_macro"
+
+require_relative "procon_bypass_man/device_connection"
 require_relative "procon_bypass_man/support/usb_device_controller"
 require_relative "procon_bypass_man/support/device_procon_finder"
 require_relative "procon_bypass_man/support/device_mouse_finder"
 require_relative "procon_bypass_man/support/signal_handler"
 require_relative "procon_bypass_man/support/callbacks"
+require_relative "procon_bypass_man/support/yaml_loader"
 require_relative "procon_bypass_man/support/yaml_writer"
 require_relative "procon_bypass_man/support/safe_timeout"
 require_relative "procon_bypass_man/support/compress_array"
@@ -33,16 +36,17 @@ require_relative "procon_bypass_man/support/server_pool"
 require_relative "procon_bypass_man/support/analog_stick_hypotenuse_tilting_power_scaler"
 require_relative "procon_bypass_man/support/never_exit_accidentally"
 require_relative "procon_bypass_man/support/cycle_sleep"
+require_relative "procon_bypass_man/procon_display"
 require_relative "procon_bypass_man/background"
 require_relative "procon_bypass_man/commands"
 require_relative "procon_bypass_man/bypass"
-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/device_model"
 require_relative "procon_bypass_man/procon/button"
 require_relative "procon_bypass_man/procon/analog_stick_cap"
 require_relative "procon_bypass_man/procon/analog_stick_manipulator"
@@ -61,52 +65,59 @@ module ProconBypassMan
   extend ProconBypassMan::NeverExitAccidentally
 
   class CouldNotLoadConfigError < StandardError; end
-  class EternalConnectionError < StandardError; end
+  class NotFoundProconError < StandardError; end
 
   # @return [void]
   def self.run(setting_path: nil)
-    ProconBypassMan::Scheduler.start!
-    ProconBypassMan::Background::JobRunner.start!
-    ProconBypassMan::Websocket::Client.start!
-    ProconBypassMan::QueueOverProcess.start!
-
     ProconBypassMan::PrintMessageCommand.execute(text: "PBMを起動しています")
     initialize_pbm
-    ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting_path)
-    gadget, procon = ProconBypassMan::ConnectDeviceCommand.execute!
-    Runner.new(gadget: gadget, procon: procon).run # ここでblockingする
-    FileUtils.rm_rf(ProconBypassMan.pid_path)
-    FileUtils.rm_rf(ProconBypassMan.digest_path)
-    ProconBypassMan::QueueOverProcess.shutdown
-  rescue ProconBypassMan::CouldNotLoadConfigError
-    ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。設定ファイルの読み込みに失敗しました")
-    ProconBypassMan::DeviceStatus.change_to_setting_syntax_error_and_shutdown!
-    # TODO シグナルトラップをしていないのでUSR2を送ったときにプロセスが停止している. 明示的にハンドリングするべき.
-    ProconBypassMan.exit_if_allow(1) do
-      FileUtils.rm_rf(ProconBypassMan.pid_path)
-      FileUtils.rm_rf(ProconBypassMan.digest_path)
-      ProconBypassMan::QueueOverProcess.shutdown
+
+    begin
+      ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting_path)
+    rescue ProconBypassMan::CouldNotLoadConfigError
+      ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。設定ファイルの読み込みに失敗しました")
+      ProconBypassMan::DeviceStatus.change_to_setting_syntax_error_and_shutdown!
+      # TODO シグナルトラップをしていないのでUSR2を送ったときにプロセスが停止している. 明示的にハンドリングするべき.
+      ProconBypassMan::NeverExitAccidentally.exit_if_allow_at_config do
+        terminate_pbm
+      end
+      return
     end
-  rescue ProconBypassMan::ConnectDeviceCommand::NotFoundProconError
-    ProconBypassMan::SendErrorCommand.execute(error: "プロコンが見つかりませんでした。")
-    ProconBypassMan::DeviceStatus.change_to_procon_not_found_error!
-    # TODO シグナルトラップをしていないのでUSR2を送ったときにプロセスが停止している. 明示的にハンドリングするべき.
-    ProconBypassMan.exit_if_allow(1) do
-      FileUtils.rm_rf(ProconBypassMan.pid_path)
-      FileUtils.rm_rf(ProconBypassMan.digest_path)
-      ProconBypassMan::QueueOverProcess.shutdown
+
+    begin
+      gadget, procon = ProconBypassMan::DeviceConnection::Command.execute!
+    rescue ProconBypassMan::DeviceConnection::NotFoundProconError
+      ProconBypassMan::SendErrorCommand.execute(error: "プロコンが見つかりませんでした。")
+      ProconBypassMan::DeviceStatus.change_to_procon_not_found_error!
+      # TODO シグナルトラップをしていないので以下の状態に、USR2を送ったときにプロセスが停止してしまう
+      ProconBypassMan::NeverExitAccidentally.exit_if_allow_at_config do
+        terminate_pbm
+      end
+      return
+    rescue ProconBypassMan::DeviceConnection::TimeoutError
+      ProconBypassMan::SendErrorCommand.execute(error: "接続の見込みがないのでsleepしまくります")
+      ProconBypassMan::DeviceStatus.change_to_connected_but_sleeping!
+      %w(TERM INT).each do |sig|
+        Kernel.trap(sig) { exit 0 }
+      end
+      Kernel.trap :USR2 do
+        exit 0 # TODO retryする
+      end
+      eternal_sleep
+      return
     end
-  rescue ProconBypassMan::EternalConnectionError
-    ProconBypassMan::SendErrorCommand.execute(error: "接続の見込みがないのでsleepしまくります")
-    ProconBypassMan::DeviceStatus.change_to_connected_but_sleeping!
-    FileUtils.rm_rf(ProconBypassMan.pid_path)
-    eternal_sleep
+
+    ready_pbm
+    Runner.new(gadget: gadget, procon: procon).run # ここでblockingする
+    terminate_pbm
   end
 
+  # 実行ファイル(app.rb)から呼び出している
+  # @return [void]
   def self.configure(&block)
     @@configuration = ProconBypassMan::Configuration.new
     @@configuration.instance_eval(&block)
-    @@configuration
+    nil
   end
 
   # @return [ProconBypassMan::Configuration]
@@ -123,20 +134,34 @@ module ProconBypassMan
     ProconBypassMan::IOMonitor.reset!
   end
 
+  # @return [void]
   def self.initialize_pbm
+    ProconBypassMan::Scheduler.start!
+    ProconBypassMan::Background::JobRunner.start!
+    ProconBypassMan::Websocket::Client.start!
+    ProconBypassMan::QueueOverProcess.start!
+
     ProconBypassMan::WriteDeviceIdCommand.execute
     ProconBypassMan::WriteSessionIdCommand.execute
-    system("renice -n -20 -p #{$$}")
+    `renice -n -20 -p #{$$}`
     File.write(pid_path, $$)
     ProconBypassMan::DeviceStatus.change_to_running!
   end
 
-  def self.eternal_sleep
-    sleep(999999999)
+  def self.ready_pbm
+    ProconBypassMan::PrintBootMessageCommand.execute
+    ProconBypassMan::ReportLoadConfigJob.perform_async(ProconBypassMan.config.raw_setting)
+  end
+
+  # @return [void]
+  def self.terminate_pbm
+    FileUtils.rm_rf(ProconBypassMan.pid_path)
+    FileUtils.rm_rf(ProconBypassMan.digest_path)
+    ProconBypassMan::QueueOverProcess.shutdown
   end
 
-  # @return [Void]
-  def self.hot_reload!
-    Process.kill(:USR2, pid)
+  # @return [void]
+  def self.eternal_sleep
+    sleep(999999999)
   end
 end

data/procon_bypass_man.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/splaplapla/procon_bypass_man"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

data/project_template/README.md

@@ -1,6 +1,5 @@
 # Project Template
 * これらは https://github.com/splaplapla/pbmenv がinstallするときに配備するファイルです
-* pbm_webはオプショナルです
 
 ## systemdを使ってサービスに登録する方法
 systemctl enableした後は、次回のOS起動時にserviceも自動起動します
@@ -8,13 +7,9 @@ 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
-* sudo systemctl disable pbm_web.service
 
 ### CheatSheet
 * systemctl daemon-reload