procon_bypass_man 0.3.6 → 0.3.8

data/lib/procon_bypass_man.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'singleton'
 require "logger"
 require 'yaml'
 require "json"
@@ -40,6 +41,11 @@ require_relative "procon_bypass_man/support/cycle_sleep"
 require_relative "procon_bypass_man/support/can_over_process"
 require_relative "procon_bypass_man/support/retryable"
 require_relative "procon_bypass_man/support/renice_command"
+require_relative "procon_bypass_man/support/web_connectivity_checker"
+require_relative "procon_bypass_man/support/watchdog"
+require_relative "procon_bypass_man/support/forever"
+require_relative "procon_bypass_man/support/simple_tcp_server"
+require_relative "procon_bypass_man/support/proccess_cheacker"
 require_relative "procon_bypass_man/procon_display"
 require_relative "procon_bypass_man/background"
 require_relative "procon_bypass_man/commands"
@@ -59,9 +65,7 @@ require_relative "procon_bypass_man/scheduler"
 require_relative "procon_bypass_man/plugins"
 require_relative "procon_bypass_man/worker"
 require_relative "procon_bypass_man/websocket/client"
-require_relative "procon_bypass_man/websocket/watchdog"
-require_relative "procon_bypass_man/websocket/forever"
-
+require_relative "procon_bypass_man/external_input"
 require_relative "procon_bypass_man/remote_action"
 
 STDOUT.sync = true
@@ -130,6 +134,8 @@ module ProconBypassMan
   # 実行ファイル(app.rb)から呼び出している
   # @return [void]
   def self.configure(&block)
+    require_relative "procon_bypass_man/external_input"
+
     @@configuration = ProconBypassMan::Configuration.new
     @@configuration.instance_eval(&block)
     nil
@@ -155,6 +161,12 @@ module ProconBypassMan
 
   # @return [void]
   def self.initialize_pbm
+    if ProconBypassMan.pid && ProconBypassMan::ProcessChecker.running?(ProconBypassMan.pid)
+      ProconBypassMan::SendErrorCommand.execute(error: "別のプロセスでPBMがすでに起動中なので処理を停止します。")
+      raise 'テスト実行中でここに入ると調査が面倒なのでエラーにします' if ENV['PBM_ENV'] == 'test'
+      exit 1
+    end
+
     ProconBypassMan::ReniceCommand.change_priority(to: :low, pid: $$)
     ProconBypassMan::Background::JobQueue.start!
     ProconBypassMan::Websocket::Client.start!
@@ -205,6 +217,7 @@ module ProconBypassMan
     ProconBypassMan::RemoteAction::QueueOverProcess.shutdown
     ProconBypassMan::Procon::PerformanceMeasurement::QueueOverProcess.shutdown
     self.worker&.shutdown
+    ProconBypassMan::ExternalInput.shutdown
   end
 
   # @return [void]

data/project_template/app.rb

@@ -12,7 +12,11 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.3.6'
+    gem 'procon_bypass_man', '0.3.8'
+    # uncomment if you want to use master branch
+    # gem 'procon_bypass_man', github: 'splaplapla/procon_bypass_man', branch: 'master'
+    # uncomment if you want to use serial communication feature
+    # gem "serialport"
   end
 rescue Bundler::Source::Git::GitCommandError => e
   retry_count_on_git_command_error = retry_count_on_git_command_error + 1
@@ -49,6 +53,12 @@ ProconBypassMan.configure do |config|
 
   # 接続に成功したらコントローラーのHOME LEDを光らせるか
   config.enable_home_led_on_connect = true
+
+  # シリアル通信やTCP/IP経由で入力するときに設定してください
+  # config.external_input_channels = [
+  #   ProconBypassMan::ExternalInput::Channels::SerialPortChannel.new(device_path: '/dev/serial0', baud_rate: 9600),
+  #   ProconBypassMan::ExternalInput::Channels::TCPIPChannel.new(port: 9000),
+  # ]
 end
 
 ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")

data/project_template/app.rb.erb

@@ -12,7 +12,11 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.3.6'
+    gem 'procon_bypass_man', '0.3.8'
+    # uncomment if you want to use master branch
+    # gem 'procon_bypass_man', github: 'splaplapla/procon_bypass_man', branch: 'master'
+    # uncomment if you want to use serial communication feature
+    # gem "serialport"
   end
 rescue Bundler::Source::Git::GitCommandError => e
   retry_count_on_git_command_error = retry_count_on_git_command_error + 1
@@ -54,6 +58,12 @@ ProconBypassMan.configure do |config|
 
   # 接続に成功したらコントローラーのHOME LEDを光らせるか
   config.enable_home_led_on_connect = true
+
+  # シリアル通信やTCP/IP経由で入力するときに設定してください
+  # config.external_input_channels = [
+  #   ProconBypassMan::ExternalInput::Channels::SerialPortChannel.new(device_path: '/dev/serial0', baud_rate: 9600),
+  #   ProconBypassMan::ExternalInput::Channels::TCPIPChannel.new(port: 9000),
+  # ]
 end
 
 ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")

data/sig/main.rbs

@@ -210,7 +210,7 @@ class ProconBypassMan::Configuration
 
   def current_ws_server: () -> (String | nil)
 
-  def current_ws_server_url: () -> ::String
+  def current_ws_server_url: () -> (String | nil)
 
   def enable_ws?: () -> bool
 
@@ -577,7 +577,7 @@ module ProconBypassMan
     @retry_on_connection_error: false
 
     def initialize: (path: String, server: untyped, ?retry_on_connection_error: false) -> void
-    def get: -> nil
+    def get: -> Hash[untyped, untyped]?
     def post: (request_body: untyped) -> nil
     def put: (request_body: untyped) -> nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-12 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -95,9 +95,12 @@ files:
 - bin/generate_default_app
 - bin/generate_output_report
 - bin/setup
+- bin/validate_external_input
 - docs/getting_started.md
 - docs/how_to_connect_procon.md
 - docs/run_pbm_on_my_branch.md
+- docs/setting/integration_external_input_serial_port.md
+- docs/setting/integration_external_input_serial_port_format.md
 - docs/setting/left-analogstick-cap.md
 - docs/setting/splatoon2_macro_dasei_cancel.md
 - docs/setting/splatoon2_macro_forward_ikarole.md
@@ -176,6 +179,13 @@ files:
 - lib/procon_bypass_man/device_model.rb
 - lib/procon_bypass_man/device_status.rb
 - lib/procon_bypass_man/ephemeral_configuration.rb
+- lib/procon_bypass_man/external_input.rb
+- lib/procon_bypass_man/external_input/boot_message.rb
+- lib/procon_bypass_man/external_input/channels.rb
+- lib/procon_bypass_man/external_input/channels/base.rb
+- lib/procon_bypass_man/external_input/channels/serial_port_channel.rb
+- lib/procon_bypass_man/external_input/channels/tcpip_channel.rb
+- lib/procon_bypass_man/external_input/external_data.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/charge_tansan_bomb.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/dasei_cancel.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/fast_return.rb
@@ -267,10 +277,12 @@ files:
 - lib/procon_bypass_man/support/cycle_sleep.rb
 - lib/procon_bypass_man/support/device_mouse_finder.rb
 - lib/procon_bypass_man/support/device_procon_finder.rb
+- lib/procon_bypass_man/support/forever.rb
 - lib/procon_bypass_man/support/http_client.rb
 - lib/procon_bypass_man/support/load_agv.rb
 - lib/procon_bypass_man/support/never_exit_accidentally.rb
 - lib/procon_bypass_man/support/on_memory_cache.rb
+- lib/procon_bypass_man/support/proccess_cheacker.rb
 - lib/procon_bypass_man/support/procon_performance_http_client.rb
 - lib/procon_bypass_man/support/remote_macro_http_client.rb
 - lib/procon_bypass_man/support/renice_command.rb
@@ -278,15 +290,16 @@ files:
 - lib/procon_bypass_man/support/retryable.rb
 - lib/procon_bypass_man/support/safe_timeout.rb
 - lib/procon_bypass_man/support/send_device_stats_http_client.rb
+- lib/procon_bypass_man/support/simple_tcp_server.rb
 - lib/procon_bypass_man/support/update_remote_pbm_job_status_http_client.rb
 - lib/procon_bypass_man/support/uptime.rb
 - lib/procon_bypass_man/support/usb_device_controller.rb
+- lib/procon_bypass_man/support/watchdog.rb
+- lib/procon_bypass_man/support/web_connectivity_checker.rb
 - lib/procon_bypass_man/support/yaml_loader.rb
 - lib/procon_bypass_man/support/yaml_writer.rb
 - lib/procon_bypass_man/version.rb
 - lib/procon_bypass_man/websocket/client.rb
-- lib/procon_bypass_man/websocket/forever.rb
-- lib/procon_bypass_man/websocket/watchdog.rb
 - lib/procon_bypass_man/worker.rb
 - procon_bypass_man.gemspec
 - project_template/README.md

data/lib/procon_bypass_man/websocket/forever.rb

@@ -1,47 +0,0 @@
-module ProconBypassMan
-  module Websocket
-    class Forever
-      # 動作確認方法
-      # - 10秒ごとにrefreshするのでタイムアウトは起きない
-      #   - ProconBypassMan::Websocket::Forever.run { loop { puts(:hi); sleep(10); ProconBypassMan::Websocket::Watchdog.active!  } }
-      # - タイムアウトが起きること
-      #   - ProconBypassMan::Websocket::Forever.run { puts(:hi); sleep(3000);  }
-      # - ブロックを1回評価するとThreadが死ぬので100秒後にタイムアウトが起きること
-      #   - ProconBypassMan::Websocket::Forever.run { puts(:hi); sleep(10); ProconBypassMan::Websocket::Watchdog.active!  }
-      def self.run(&block)
-        loop do
-          new.run(&block)
-        end
-      end
-
-      def run(&block)
-        raise("need a block") unless block_given?
-
-        ws_thread = work_one(callable: block)
-        wait_and_kill_if_outdated(ws_thread)
-      end
-
-      # @return [Thread]
-      def work_one(callable: )
-        Thread.start do
-          callable.call
-        rescue => e
-          ProconBypassMan.logger.error("websocket client with forever: #{e.full_message}")
-        end
-      end
-
-      def wait_and_kill_if_outdated(thread)
-        loop do
-          if Watchdog.outdated?
-            Watchdog.active!
-            ProconBypassMan.logger.error("watchdog timeout!!")
-            thread.kill
-            return
-          end
-
-          sleep(10)
-        end
-      end
-    end
-  end
-end

data/lib/procon_bypass_man/websocket/watchdog.rb

@@ -1,19 +0,0 @@
-module ProconBypassMan
-  module Websocket
-    class Watchdog
-      def self.outdated?
-        @@time < Time.now
-      end
-
-      def self.time
-        @@time
-      end
-
-      def self.active!
-        @@time = Time.now + 100
-      end
-
-      active!
-    end
-  end
-end