procon_bypass_man 0.1.12 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42551d494786247ae06f81c416f522360001fb0a78ffdd67311520aafb56587a
-  data.tar.gz: 92da20f533512ec4e1fdebe93f2c064f5ae1513fd6f26d3c4f34f2a0d488dffd
+  metadata.gz: ece30577af00d56afa2e2e0be7e09d8328c9d7f8cc96c2e49d207a2bb423b867
+  data.tar.gz: faf86731651a110fd63ce977f65b76f46c31fe6215a2512d4c3a1ba545fd4f81
 SHA512:
-  metadata.gz: b52fde78831c29dc1b56b56217a604e421b6c0cdf5859b997732b36d94b9b7dc9d02f3906835d41df5f7168a2b694c2c457d3f96fd235903fc4827f42e74422b
-  data.tar.gz: 50defecca29919fca30680469deddc5adc5c41d0c4f02f084c0a73f9633aa8e11101a5f07e863ea4e0b6481178d4f11e0d466a4bf2d9954f08cb5407d3cb10dd
+  metadata.gz: 313d36b543a7c539effaabb6fca121a5112b4076a196ad52386924f3e043ad25e52c5c880a710c1d8aafc66d4a647b3387cebe0b82391eb4ccffa10dd1f4af65
+  data.tar.gz: 55e7a87c35f972e8537654b86a1f5e1815ed22144a4097e1993ad986666f1111972ce8ce1a744e56196c16957a56c328ba510b6b19af4ff8961ac989d216af20

data/.github/workflows/release.yml

@@ -0,0 +1,33 @@
+name: Publish to RubyGems
+
+on:
+  [workflow_dispatch]
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Set up Ruby 2.6
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+        bundler-cache: true
+    - name: Publish to RubyGems
+      run: |
+        git config --local user.email "action@github.com"
+        git config --local user.name "GitHub Action"
+
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${RUBYGEMS_API_TOKEN}\n" > $HOME/.gem/credentials
+        bundle exec rake release
+      env:
+        RUBYGEMS_API_TOKEN: "${{secrets.RUBYGEMS_API_TOKEN}}"
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [0.1.16] - 202
+- websocket経由で外部サーバからの命令を受け取れるようになりました
+
+## [0.1.15] - 2021-12-08
+- 外部サーバから設定ファイルのリストアができるようになりました
+- splatoon2 pluginのネームスペースを変更しました
+
+## [0.1.14] - 2021-12-02
+- 外部サーバからOSの再起動やprocon_bypass_manのバージョンアップができるようになりました
+
+## [0.1.13] - 2021-11-24
+- 起動を早くするために、procon_bypass_man-splatoon2を同梱しました
+
 ## [0.1.12] - 2021-11-18
 - 起動ログなどを設定した外部サーバに送信できるようにしました
 

data/Gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in procon_bypass_man.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
+gem "rake"
 gem "rspec"
 gem "pry"
 gem "timecop"

data/Gemfile.lock

@@ -1,11 +1,16 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.12)
+    procon_bypass_man (0.1.16)
+      action_cable_client
+      pbmenv
+      sorted_set
 
 GEM
   remote: https://rubygems.org/
   specs:
+    action_cable_client (3.1.0)
+      websocket-eventmachine-client (>= 1.2.0)
     activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
@@ -16,8 +21,9 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
+    eventmachine (1.2.7)
     ffi (1.15.4)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     language_server-protocol (3.16.0.3)
     listen (3.7.0)
@@ -27,9 +33,10 @@ GEM
     minitest (5.14.4)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    parallel (1.21.0)
+    parser (3.0.3.2)
       ast (~> 2.4.1)
+    pbmenv (0.1.6)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -41,8 +48,9 @@ GEM
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (1.6.2)
-    regexp_parser (2.1.1)
+    rbs (1.7.1)
+    rbtree (0.4.4)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -56,33 +64,37 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.20.0)
+    rspec-support (3.10.3)
+    rubocop (1.23.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.11.0)
+    rubocop-ast (1.14.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
+    set (1.0.2)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    steep (0.46.0)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
+    steep (0.47.0)
       activesupport (>= 5.1)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
       parallel (>= 1.0.0)
       parser (>= 3.0)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 1.2.0)
+      rbs (~> 1.7.0)
       terminal-table (>= 2, < 4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -90,9 +102,17 @@ GEM
     timecop (0.9.4)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
     webrick (1.7.0)
-    zeitwerk (2.4.2)
+    websocket (1.2.9)
+    websocket-eventmachine-base (1.2.0)
+      eventmachine (~> 1.0)
+      websocket (~> 1.0)
+      websocket-native (~> 1.0)
+    websocket-eventmachine-client (1.3.0)
+      websocket-eventmachine-base (~> 1.0)
+    websocket-native (1.0.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   arm-linux
@@ -104,7 +124,7 @@ PLATFORMS
 DEPENDENCIES
   procon_bypass_man!
   pry
-  rake (~> 13.0)
+  rake
   rbs
   rspec
   rubocop

data/README.md

@@ -28,12 +28,20 @@ Switch <-- (PBM): ZR連打
 ## Usage
 * USBガジェットモードで起動するRaspberry Pi4を用意する
   * https://github.com/splaplapla/procon_bypass_man/blob/master/docs/setup_raspi.md
-* Raspberry Pi4で https://github.com/jiikko/procon_bypass_man_sample をclone して実行ファイルを動かす
-  * 実行ファイルと設定ファイルについては https://github.com/splaplapla/procon_bypass_man/wiki に詳細を書いていますが、まず動かすためにはcloneしたほうが早いです
+* Raspberry Pi4 で sudo pbmenv install latest && cd /usr/share/pbm/current && sudo ruby app.rb
+  * 動いたのを確認したらserviceとして登録にするなどしてください
 
 ## Plugins
 * https://github.com/splaplapla/procon_bypass_man-splatoon2
 
+## 関連ソフトウェア
+* サーバソフトウェア(WIP)
+  * https://github.com/splaplapla/procon_bypass_man_cloud
+  * このサーバからOS自体の再起動、設定ファイルの変更、PBMのバージョンアップができます
+  * 自分でホストティングしてください
+* pbmenv
+  * バージョンマネージャー
+
 ## FAQ
 * どうやって動かすの?
     * このツールはRaspberry Pi4をUSBガジェットモードで起動して有線でプロコンとSwitchに接続して使います
@@ -52,6 +60,8 @@ Switch <-- (PBM): ZR連打
     * 連射中には特定のキーの入力を無視したり、複数のキーをトリガーに連射することができます
 * どうしてsudoが必要なの？
     * 操作するdeviceファイルの所有者がrootだから
+* 市販されているサードパーティ製連射機との違いは？
+    * サードパーティ製のコントローラーは、設定方法や形状が特殊で買い換えるたびに学習・設定コストが発生します。本ツールを使えば、設定内容はテキストで管理することができ、使い慣れたプロコンで同等のことができます。
 
 ## TODO
 * レコーディング機能(プロコンの入力をマクロとして登録ができる)
@@ -59,21 +69,18 @@ Switch <-- (PBM): ZR連打
 * 設定ファイル マクロの引数に、ボタンを取れるようにする
 
 ## 開発系
-* pbmenvで生成するapp.rbに開発用ブランチを参照してください
-
 ### プロコンとの接続を維持したまま、現在の設定ファイルをPBMに反映する
 ```shell
 sudo kill -USR2 `cat ./pbm_pid`
 ```
 
 ### 起動ログをサーバに送信する
-* `ProconBypassMan.api_server = "http://.."` を設定すると、 `POST /api/events` に対して起動ログなどを送信するようになります
+* `ProconBypassMan.api_servers = "http://.."` を設定すると、 `POST /api/events` に対して起動ログなどを送信するようになります
 
 ### 開発環境でログの送信を確認する方法
 * `bundle exec bin/dev_api_server.rb`
-* `INTERNAL_API_SERVER=http://localhost:4567 bin/console`
-* `API_SERVER=http://localhost:4567 bin/console`
-  * `message = ProconBypassMan::BootMessage.new; ProconBypassMan::ReportBootJob.report(body: message.to_hash)`
+* `API_SERVER=http://localhost:4567 INTERNAL_API_SERVER=http://localhost:4567 bin/console`
+  * `message = ProconBypassMan::BootMessage.new; ProconBypassMan::ReportBootJob.perform(body: message.to_hash)`
 
 ### リリース手順
 * project_template/web.rb, project_template/app.rb, lib/procon_bypass_man/version.rb のバージョンをあげる
@@ -83,3 +90,7 @@ sudo kill -USR2 `cat ./pbm_pid`
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+
+## Links
+* https://discord.gg/bEcRNKf4ep

data/lib/ext/em_pure_ruby.rb

@@ -0,0 +1,25 @@
+# https://github.com/eventmachine/eventmachine/pull/929 is not released yet.
+# i will delete this patch if released.
+module EventMachine
+  # @private
+  class Reactor
+    def run_timers
+      timers_to_delete = []
+      @timers.each {|t|
+        if t.first <= @current_loop_time
+          #@timers.delete t
+          timers_to_delete << t
+          EventMachine::event_callback "", TimerFired, t.last
+        else
+          break
+        end
+      }
+      timers_to_delete.map{|c| @timers.delete c}
+      timers_to_delete = nil
+      #while @timers.length > 0 and @timers.first.first <= now
+      #  t = @timers.shift
+      #  EventMachine::event_callback "", TimerFired, t.last
+      #end
+    end
+  end
+end

data/lib/procon_bypass_man/background/job_runner.rb

@@ -8,14 +8,14 @@ module ProconBypassMan
       end
 
       # for test
-      def self.stop!
-        return unless defined?(@@thread)
-        @@thread.kill
+      def stop!
+        return unless defined?(@thread)
+        @thread.kill
       end
 
       def start!
-        return if defined?(@@thread)
-        @@thread = Thread.new do
+        return if defined?(@thread)
+        @thread = Thread.new do
           while(item = self.class.queue.pop)
             begin
               JobPerformer.new(klass: item[:reporter_class], args: item[:args]).perform
@@ -25,6 +25,7 @@ module ProconBypassMan
             end
           end
         end
+        self
       end
 
       def self.queue

data/lib/procon_bypass_man/background/jobs/base_job.rb

@@ -1,12 +1,7 @@
 class ProconBypassMan::BaseJob
-  extend ProconBypassMan::Background::HasServerPool
   extend ProconBypassMan::Background::JobRunnable
 
   def self.servers
-    ProconBypassMan.config.api_servers
-  end
-
-  def self.path
-    "/api/events"
+    raise NotImplementedError
   end
 end

data/lib/procon_bypass_man/background/jobs/concerns/has_external_api_setting.rb

@@ -0,0 +1,5 @@
+module ProconBypassMan::HasExternalApiSetting
+  def server_pool
+    ProconBypassMan.config.server_pool
+  end
+end

data/lib/procon_bypass_man/background/jobs/concerns/has_internal_api_setting.rb

@@ -0,0 +1,5 @@
+module ProconBypassMan::HasInternalApiSetting
+  def server_pool
+    ProconBypassMan.config.internal_server_pool
+  end
+end

data/lib/procon_bypass_man/background/jobs/report_boot_job.rb

@@ -1,9 +1,11 @@
-class ProconBypassMan::ReportBootJob <  ProconBypassMan::BaseJob
+class ProconBypassMan::ReportBootJob < ProconBypassMan::ReportEventBaseJob
+  extend ProconBypassMan::HasExternalApiSetting
+
   # @param [String] body
   def self.perform(body)
-    ProconBypassMan::Background::HttpClient.new(
+    ProconBypassMan::ReportHttpClient.new(
       path: path,
-      pool_server: pool_server,
+      server_pool: server_pool,
       retry_on_connection_error: true,
     ).post(body: body, event_type: :boot)
   end

data/lib/procon_bypass_man/background/jobs/report_error_job.rb

@@ -1,10 +1,11 @@
-class ProconBypassMan::ReportErrorJob < ProconBypassMan::BaseJob
+class ProconBypassMan::ReportErrorJob < ProconBypassMan::ReportEventBaseJob
+  extend ProconBypassMan::HasExternalApiSetting
+
   # @param [String] body
   def self.perform(body)
-    ProconBypassMan::Background::HttpClient.new(
+    ProconBypassMan::ReportHttpClient.new(
       path: path,
-      pool_server: pool_server,
-      retry_on_connection_error: false,
-    ).post(body: body, event_type: :error,)
+      server_pool: server_pool,
+    ).post(body: body, event_type: :error)
   end
 end

data/lib/procon_bypass_man/background/jobs/report_event_base_job.rb

@@ -0,0 +1,5 @@
+class ProconBypassMan::ReportEventBaseJob < ProconBypassMan::BaseJob
+  def self.path
+    "/api/events".freeze
+  end
+end

data/lib/procon_bypass_man/background/jobs/report_load_config_job.rb

@@ -0,0 +1,11 @@
+class ProconBypassMan::ReportLoadConfigJob < ProconBypassMan::ReportEventBaseJob
+  extend ProconBypassMan::HasExternalApiSetting
+
+  # @param [String] body
+  def self.perform(body)
+    ProconBypassMan::ReportHttpClient.new(
+      path: path,
+      server_pool: server_pool,
+    ).post(body: body, event_type: :load_config)
+  end
+end

data/lib/procon_bypass_man/background/jobs/report_pressed_buttons_job.rb

@@ -1,18 +1,15 @@
-class ProconBypassMan::ReportPressedButtonsJob
-  extend ProconBypassMan::Background::HasServerPool
-  extend ProconBypassMan::Background::JobRunnable
-
-  PATH = "/api/pressed_buttons"
+class ProconBypassMan::ReportPressedButtonsJob < ProconBypassMan::BaseJob
+  extend ProconBypassMan::HasInternalApiSetting
 
   # @param [String] body
   def self.perform(body)
-    ProconBypassMan::Background::HttpClient.new(
-      path: PATH,
-      pool_server: pool_server,
+    ProconBypassMan::ReportHttpClient.new(
+      path: path,
+      server_pool: server_pool,
     ).post(body: body, event_type: :internal)
   end
 
-  def self.servers
-    ProconBypassMan.config.internal_api_servers
+  def self.path
+    "/api/pressed_buttons"
   end
 end

data/lib/procon_bypass_man/background/jobs/report_reload_config_job.rb

@@ -1,10 +1,11 @@
-class ProconBypassMan::ReportReloadConfigJob <  ProconBypassMan::BaseJob
+class ProconBypassMan::ReportReloadConfigJob < ProconBypassMan::ReportEventBaseJob
+  extend ProconBypassMan::HasExternalApiSetting
+
   # @param [String] body
   def self.perform(body)
-    ProconBypassMan::Background::HttpClient.new(
+    ProconBypassMan::ReportHttpClient.new(
       path: path,
-      pool_server: pool_server,
-      retry_on_connection_error: false,
+      server_pool: server_pool,
     ).post(body: body, event_type: :reload_config)
   end
 end

data/lib/procon_bypass_man/background/jobs/sync_device_stats_job.rb

@@ -0,0 +1,16 @@
+class ProconBypassMan::SyncDeviceStatsJob < ProconBypassMan::BaseJob
+  extend ProconBypassMan::HasExternalApiSetting
+
+  # @param [Symbol] status
+  def self.perform(status)
+    ProconBypassMan::SendDeviceStatsHttpClient.new(
+      path: path,
+      server_pool: server_pool,
+    ).post(status: status, pbm_session_id: ProconBypassMan.session_id)
+  end
+
+  def self.path
+    device_id = ProconBypassMan.device_id
+    "/api/devices/#{ProconBypassMan.device_id}/device_statuses"
+  end
+end

data/lib/procon_bypass_man/background.rb

@@ -1,10 +1,13 @@
-require "procon_bypass_man/background/job_runnable"
+require "procon_bypass_man/background/jobs/concerns/has_internal_api_setting"
+require "procon_bypass_man/background/jobs/concerns/has_external_api_setting"
+require "procon_bypass_man/background/jobs/concerns/job_runnable"
+require "procon_bypass_man/background/job_runner"
 require "procon_bypass_man/background/job_performer"
-require "procon_bypass_man/background/has_server_pool"
-require "procon_bypass_man/background/http_client"
 require "procon_bypass_man/background/jobs/base_job"
+require "procon_bypass_man/background/jobs/report_event_base_job"
 require "procon_bypass_man/background/jobs/report_boot_job"
 require "procon_bypass_man/background/jobs/report_reload_config_job"
+require "procon_bypass_man/background/jobs/report_load_config_job"
 require "procon_bypass_man/background/jobs/report_error_job"
-require "procon_bypass_man/background/jobs/report_heartbeat_job"
 require "procon_bypass_man/background/jobs/report_pressed_buttons_job"
+require "procon_bypass_man/background/jobs/sync_device_stats_job"

data/lib/procon_bypass_man/buttons_setting_configuration/layer.rb

@@ -10,7 +10,6 @@ module ProconBypassMan
         self.remaps = {}
         self.left_analog_stick_caps = {}
         self.disables = []
-        instance_eval(&block) if block_given?
       end
 
       # @param [Symbol] button
@@ -20,21 +19,26 @@ module ProconBypassMan
           if_pressed = [button]
         when Symbol, String
           if_pressed = [if_pressed]
-        when Array, FalseClass
-          # sono mama
+        when Array
+          # if_pressed = if_pressed
+        when FalseClass, NilClass
+          # no-op
         else
           raise "not support class"
         end
+
         hash = { if_pressed: if_pressed }
-        if force_neutral
-          case force_neutral
-          when TrueClass, FalseClass
-            raise "ボタンを渡してください"
-          when Symbol, String
-            hash[:force_neutral] = [force_neutral]
-          when Array
-            hash[:force_neutral] = force_neutral
-          end
+        case force_neutral
+        when TrueClass
+          raise "ボタンを渡してください"
+        when Symbol, String
+          hash[:force_neutral] = [force_neutral]
+        when Array
+          hash[:force_neutral] = force_neutral
+        when FalseClass, NilClass
+          # no-op
+        else
+          raise "not support value"
         end
 
         if flip_interval
@@ -45,11 +49,8 @@ module ProconBypassMan
           end
           hash[:flip_interval] = interval
         end
-        if self.flips[button]
-          raise "#{button}への設定をすでに割り当て済みです"
-        else
-          self.flips[button] = hash
-        end
+
+        self.flips[button] = hash
       end
 
       def macro(name, if_pressed: )
@@ -63,7 +64,7 @@ module ProconBypassMan
 
       def remap(button, to: )
         case to
-        when TrueClass, FalseClass
+        when TrueClass, FalseClass, NilClass
           raise "ボタンを渡してください"
         when Symbol, String
           self.remaps[button] = { to: [to] }
@@ -77,27 +78,27 @@ module ProconBypassMan
         hash = { cap: cap }
 
         case if_pressed
-        when TrueClass
-          raise "not support class"
+        when TrueClass, FalseClass
+          raise "ボタンを渡してください"
         when Symbol, String
           if_pressed = [if_pressed]
-        when Array, FalseClass
-          # sono mama
-        when NilClass
-          if_pressed = nil
+        when Array, NilClass
+          # no-op
         else
-          raise "not support if_pressed"
+          raise "not support value"
         end
 
-        if force_neutral
-          case force_neutral
-          when TrueClass, FalseClass
-            raise "ボタンを渡してください"
-          when Symbol, String
-            hash[:force_neutral] = [force_neutral]
-          when Array
-            hash[:force_neutral] = force_neutral
-          end
+        case force_neutral
+        when TrueClass
+          raise "ボタンを渡してください"
+        when Symbol, String
+          hash[:force_neutral] = [force_neutral]
+        when Array
+          hash[:force_neutral] = force_neutral
+        when FalseClass, NilClass
+          # no-op
+        else
+          raise "not support value"
         end
 
         left_analog_stick_caps[if_pressed] = hash
@@ -114,7 +115,7 @@ module ProconBypassMan
         when Array
           button.each { |b| disables << b }
         else
-          raise "unknown"
+          raise "not support value"
         end
       end
 

data/lib/procon_bypass_man/buttons_setting_configuration.rb

@@ -77,7 +77,7 @@ module ProconBypassMan
     end
 
     def set_neutral_position(x, y)
-      self.neutral_position = AnalogStickPosition.new(x, y)
+      self.neutral_position = AnalogStickPosition.new(x, y).freeze
       self
     end
 
@@ -95,7 +95,7 @@ module ProconBypassMan
         left: Layer.new,
         right: Layer.new,
       }
-      @neutral_position = AnalogStickPosition.new(2124, 1808)
+      @neutral_position = AnalogStickPosition.new(2124, 1808).freeze
     end
   end
 end

data/lib/procon_bypass_man/bypass/usb_hid_logger.rb

@@ -10,7 +10,13 @@ class ProconBypassMan::Bypass
     set_callback :send_procon_to_gadget, :after, :log_procon_to_gadget
 
     def log_send_gadget_to_procon
-      ProconBypassMan.logger.debug { ">>> #{bypass_value.to_text}" }
+      if ProconBypassMan.config.verbose_bypass_log
+        ProconBypassMan.logger.debug { ">>> #{bypass_value.to_text}" }
+      else
+        ProconBypassMan.cache.fetch key: 'bypass_log', expires_in: 1 do
+          ProconBypassMan.logger.debug { ">>> #{bypass_value.to_text}" }
+        end
+      end
     end
 
     def log_procon_to_gadget
@@ -24,13 +30,9 @@ class ProconBypassMan::Bypass
 
       ProconBypassMan.cache.fetch key: 'pressed_buttons_reporter', expires_in: 5 do
         ProconBypassMan::ReportPressedButtonsJob.perform_async(
-          ProconBypassMan::ProconReader.new(binary: bypass_value.binary).to_hash
+          bypass_value.binary.to_procon_reader.to_hash
         )
       end
-
-      ProconBypassMan.cache.fetch key: 'heartbeat_reporter', expires_in: 60 do
-        ProconBypassMan::ReportHeartbeatJob.perform_async(ProconBypassMan::BootMessage.new.to_hash)
-      end
     end
   end
 end