procon_bypass_man 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ca0c509c42d13cd0a9177c80b09c7f31bbeb6fad810e0f85210811cd69bffa2
-  data.tar.gz: ae97eb1796fb709840dcac7138e8ac8a2fd8be15f134585da8538f3958fb3442
+  metadata.gz: b867d9fe101999d57ded64ff71be83610f04fde36c1c1fffa43ca8495902fb0b
+  data.tar.gz: 8eb0b7506c7bdb5d4601fb0e6f33cff79cb71a4975449d0c84bcd6a2c0b6303a
 SHA512:
-  metadata.gz: 33f58604e017bc01b6f7057877ab79045456f7fb10ff880fe640b47195374c8f170f5d5e7f97f643148d5b06313a3b9c6cfbd77d0e2701875e3bd1e6d4e397b1
-  data.tar.gz: d69d376c75ef7692ae7d2c74e8715aa00bea4dfbe2ff6d7359b69bbdff5ef65cd39132f82dcaa297c60fd3459ac9aff66f0751d2cc2e818e613bbd53cef2f829
+  metadata.gz: a37867fc758ecb8aa45698fbb79be8b48cc221cd218bf6c29646b04587ae66514846709cd1bf951a651ec1ba737cab5dbae010334cb125bc8dca1644d19aa30e
+  data.tar.gz: d2cf7935350a3085251deb495051586b52b422d388bfd07da7842c09fbc3f50fa0b6090a41652e662d15e367863c76e0b3a2e9e061e87a7e100f3d1e7d9be58e

data/.github/workflows/gitleacks.yml

@@ -5,6 +5,7 @@ on: [push]
 jobs:
   gitleaks:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     steps:
     - uses: actions/checkout@v1
     - name: gitleaks-action

data/.github/workflows/release.yml

@@ -6,6 +6,7 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       contents: write
 

data/.github/workflows/ruby.yml

@@ -12,8 +12,8 @@ on:
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     strategy:
       matrix:
         ruby-version: ['3.0.1', '3.1.1']

data/CHANGELOG.md

@@ -1,5 +1,10 @@
+## [0.2.1] - 2022-05-29
+- 入力表示機能を提供するSwitchProconInputViewerに対応しました
+  - https://github.com/splaplapla/switch-procon-input-viewer
+- app.rb内のバグ修正, ログファイルとして残る世代を減らしました
+
 ## [0.2.0] - 2022-05-20
-- 3つ以上のボタンを操作するマクロに対応する
+- 3つ以上のボタンを操作するマクロに対応しました
 - IOに関するログをデフォルトで無効にしました
   - 有効にする場合はapp.rbに `config.io_monitor_logging = true` を記述してください
 - 接続が安定化するまでの時間が短くなりました

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.2.0)
+    procon_bypass_man (0.2.1)
       action_cable_client
       pbmenv (>= 0.1.9)
       sorted_set
@@ -40,7 +40,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-protection (2.2.0)
       rack
     rainbow (3.0.0)

data/docs/getting_started.md

@@ -13,6 +13,7 @@
 * モード
 * [マクロ](#マクロ)
 * [左スティックの感度調整](#左スティックの感度調整)
+* [入力表示](#入力表示)
 * 設定ファイルの書き方
 * プラグインの書き方
 * [設定ファイルの書き方がわからない、エラーが起きるとき](#設定ファイルの書き方がわからない、エラーが起きるとき)
@@ -39,6 +40,8 @@
   * [設定方法](/docs/setting/left-analogstick-cap.md)
 * WEBから設定状態の閲覧・反映
 * ボタンリマップ
+* 入力表示
+　　* https://github.com/splaplapla/switch-procon-input-viewer
 
 ## セットアップ
 ### ラズベリーパイのセットアップ
@@ -162,6 +165,10 @@ open_macro :sokuwari, steps: [:toggle_r_for_0_2sec, :toggle_thumbr_for_0_14sec,
 ## 左スティックの感度調整
 [左スティックの感度調整](/docs/setting/left-analogstick-cap.md)
 
+## 入力表示
+* https://github.com/splaplapla/switch-procon-input-viewer
+* 後で書きます
+
 ## 設定ファイルの書き方
 * 後で書きます
 

data/lib/procon_bypass_man/bypass/usb_hid_logger.rb

@@ -32,6 +32,9 @@ class ProconBypassMan::Bypass
         end
       end
 
+      # TODO 別のコールバッククラスから実行したい
+      ProconBypassMan::ProconDisplay::Status.instance.current = bypass_value.binary.to_procon_reader.to_hash.dup
+
       if ProconBypassMan.config.enable_reporting_pressed_buttons
         ProconBypassMan.cache.fetch key: 'pressed_buttons_reporter', expires_in: 5 do
           ProconBypassMan::ReportPressedButtonsJob.perform_async(

data/lib/procon_bypass_man/bypass.rb

@@ -3,6 +3,8 @@ require "procon_bypass_man/bypass/bypass_command"
 
 class ProconBypassMan::Bypass
   include ProconBypassMan::Bypass::UsbHidLogger
+  # TODO callbackモジュールを修正して複数のメソッドをチェインできるようにする
+  # include ProconBypassMan::ProconDisplay::BypassCallback
 
   class BypassValue < Struct.new(:binary)
     def to_text
@@ -105,9 +107,4 @@ class ProconBypassMan::Bypass
     self.procon.write_nonblock(["8005"].pack("H*"))
     self.procon.write_nonblock(["8005"].pack("H*"))
   end
-
-  # @return [void] 入力してから取り出さないと接続しっぱなしになるっぽいのでこれが必要っぽい
-  def be_empty_procon
-    # タイムアウトまでブロッキングされるので、プロセスに逃す
-  end
 end

data/lib/procon_bypass_man/configuration.rb

@@ -104,7 +104,7 @@ class ProconBypassMan::Configuration
 
   def error_logger
     if enable_critical_error_logging
-      @error_logger ||= Logger.new("#{ProconBypassMan.root}/error.log", 5, 1024 * 1024 * 10)
+      @error_logger ||= Logger.new("#{ProconBypassMan.root}/error.log", 1, 1024 * 1024 * 1)
     else
       Logger.new(File.open("/dev/null"))
     end

data/lib/procon_bypass_man/device_connection/output_report_sub_command_table.rb

@@ -24,6 +24,7 @@ class ProconBypassMan::DeviceConnection::OutputReportSubCommandTable
   IGNORE_SUB_COMMANDS = {
     "48-01" => true,
     "04-00" => true,
+    "10-28" => true, # 返ってこないことがあった
   }
   # レスポンスに引数が含まれない
   SPECIAL_SUB_COMMANDS = [
@@ -46,7 +47,6 @@ class ProconBypassMan::DeviceConnection::OutputReportSubCommandTable
     "10-80",
     "10-98",
     "10-10",
-    "10-28",
     "30-",
     "40-",
     "48-", # Enable vibration

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,10 @@
+# 入力表示用
+
+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"

data/lib/procon_bypass_man/runner.rb

@@ -28,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
       }

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man.rb

@@ -36,6 +36,7 @@ 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"

data/project_template/app.rb

@@ -6,12 +6,13 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.2.0'
+    gem 'procon_bypass_man', '0.2.1'
   end
 rescue Bundler::Source::Git::GitCommandError => e
   # install中に強制終了するとgitの管理ファイルが不正状態になり、次のエラーが起きるので発生したらcache directoryを削除する
   #"Git error: command `git fetch --force --quiet --tags https://github.com/splaplapla/procon_bypass_man refs/heads/\\*:refs/heads/\\*` in directory /home/pi/.rbenv/versions/3.0.1/lib/ruby/gems/3.0.0/cache/bundler/git/procon_bypass_man-ae4c9016d76b667658c8ba66f3bbd2eebf2656af has failed.\n\nIf this error persists you could try removing the cache directory '/home/pi/.rbenv/versions/3.0.1/lib/ruby/gems/3.0.0/cache/bundler/git/procon_bypass_man-ae4c9016d76b667658c8ba66f3bbd2eebf2656af'"
   if /try removing the cache directory '([^']+)'/ =~ e.message
+    require 'fileutils'
     FileUtils.rm_rf($1)
     retry
   end
@@ -19,7 +20,7 @@ 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 = Logger.new("#{ProconBypassMan.root}/app.log", 1, 1024 * 1024 * 1)
   config.logger.level = :debug
 
   # バイパスするログを全部app.logに流すか
@@ -40,8 +41,8 @@ ProconBypassMan.configure do |config|
   # 接続に成功したらコントローラーのHOME LEDを光らせるか
   config.enable_home_led_on_connect = true
 
-  # 操作が高頻度で固まるときは、 gadget_to_procon_interval の数値は大きくしてください
-  config.bypass_mode = { mode: :normal, gadget_to_procon_interval: 5 }
+  # 操作が高頻度で固まるときは、 gadget_to_procon_interval の数値を大きくしてください
+  config.bypass_mode = { mode: :normal, gadget_to_procon_interval: 10 }
 end
 
 ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -184,6 +184,12 @@ files:
 - lib/procon_bypass_man/procon/value_objects/bypass_mode.rb
 - lib/procon_bypass_man/procon/value_objects/procon_reader.rb
 - lib/procon_bypass_man/procon/value_objects/rumble_binary.rb
+- lib/procon_bypass_man/procon_display.rb
+- lib/procon_bypass_man/procon_display/http_request.rb
+- lib/procon_bypass_man/procon_display/http_response.rb
+- lib/procon_bypass_man/procon_display/server.rb
+- lib/procon_bypass_man/procon_display/server_app.rb
+- lib/procon_bypass_man/procon_display/status.rb
 - lib/procon_bypass_man/remote_macro.rb
 - lib/procon_bypass_man/remote_macro/queue_over_process.rb
 - lib/procon_bypass_man/remote_macro/remote_macro_object.rb