procon_bypass_man 0.1.11 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ead44cd36352dba5f4bd97af9c99936657a1a896fb9793a6735ce730a045b6f1
-  data.tar.gz: b8d115ef493d0b58a064fc7a0a7348a66e9e331e8173edd7543d96e9e213daba
+  metadata.gz: 7820b087d86ac7338128dbfdebba48f8e3100d4a2163894962296e6526ea6b6e
+  data.tar.gz: 43d3bd4d0b3d18a61edc2df29320ad345f6d9313de79b6bb732a2bf526a18e5a
 SHA512:
-  metadata.gz: 3229e5e9f0fef53072b4869af2c6469b55703804d12bd8a9d077fe7c413d2198f747d482b30134daa4da55a0c5309eeda45d9928e46cd7778391ed865720ca00
-  data.tar.gz: 2de07a44334162b54ca8ba2464286c12a7a21d6ef74cb36b39a97bd5e22a833a5a6a5af2dac5ba6382da99a8635cdd9bd196a98d7f63dac311a4e61c2387ecad
+  metadata.gz: 78f98474a1a3d6bf7a6a6420c36c51bc4c9ba835d35361b5bcd45623b3c9c5e3b8ef173d341bd026d324f78787bc020b6536e6deff658c8f073767d3ff0f664e
+  data.tar.gz: 341d4645b6650594533dcf23b32e24a8e5acd8413fea428d21fa2d2a2b4af1636d312a1ebc3472d5dbcbce193157a4da459eb1314619c27342b93dd30b8a96b3

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/.gitignore

@@ -12,3 +12,4 @@ todo.local.md
 .setting_yaml_digest
 pbm_pid
 setting.yml
+device_id

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [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
+- 起動ログなどを設定した外部サーバに送信できるようにしました
+
 ## [0.1.11] - 2021-11-05
 - PBM-WEB(>= 0.1.3)でボタンの入力を見るためのスレッドが動くようになりました
 

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,7 +1,8 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.11)
+    procon_bypass_man (0.1.15)
+      pbmenv
 
 GEM
   remote: https://rubygems.org/
@@ -17,7 +18,7 @@ GEM
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     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 +28,10 @@ GEM
     minitest (5.14.4)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    parallel (1.20.1)
+    parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
+    pbmenv (0.1.6)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -41,7 +43,7 @@ GEM
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (1.6.2)
+    rbs (1.7.1)
     regexp_parser (2.1.1)
     rexml (3.2.5)
     rspec (3.10.0)
@@ -56,17 +58,17 @@ 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.13.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -90,9 +92,9 @@ 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)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   arm-linux
@@ -104,7 +106,7 @@ PLATFORMS
 DEPENDENCIES
   procon_bypass_man!
   pry
-  rake (~> 13.0)
+  rake
   rbs
   rspec
   rubocop
@@ -114,4 +116,4 @@ DEPENDENCIES
   webrick
 
 BUNDLED WITH
-   2.2.22
+   2.2.30

data/README.md

@@ -28,8 +28,8 @@ 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
@@ -52,6 +52,8 @@ Switch <-- (PBM): ZR連打
     * 連射中には特定のキーの入力を無視したり、複数のキーをトリガーに連射することができます
 * どうしてsudoが必要なの？
     * 操作するdeviceファイルの所有者がrootだから
+* 市販されているサードパーティ製連射機との違いは？
+    * サードパーティ製のコントローラーは、設定方法や形状が特殊で買い換えるたびに学習・設定コストが発生します。本ツールを使えば、設定内容はテキストで管理することができ、使い慣れたプロコンで同等のことができます。
 
 ## TODO
 * レコーディング機能(プロコンの入力をマクロとして登録ができる)
@@ -59,20 +61,18 @@ Switch <-- (PBM): ZR連打
 * 設定ファイル マクロの引数に、ボタンを取れるようにする
 
 ## 開発系
-* pbmenvで生成するapp.rbに開発用ブランチを参照してください
-
 ### プロコンとの接続を維持したまま、現在の設定ファイルをPBMに反映する
 ```shell
 sudo kill -USR2 `cat ./pbm_pid`
 ```
 
 ### 起動ログをサーバに送信する
-* `ProconBypassMan.api_server = "http://.."` を設定すると、 `POST /api/reports` に対して起動ログを送信するようになります
+* `ProconBypassMan.api_servers = "http://.."` を設定すると、 `POST /api/events` に対して起動ログなどを送信するようになります
 
 ### 開発環境でログの送信を確認する方法
 * `bundle exec bin/dev_api_server.rb`
-* `INTERNAL_API_SERVER=http://localhost:4567 bin/console`
-  * `message = ProconBypassMan::BootMessage.new; ProconBypassMan::Reporter.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 のバージョンをあげる
@@ -82,3 +82,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/bin/dev_api_server.rb

@@ -4,7 +4,7 @@ require "sinatra"
 require "webrick"
 require "pry"
 
-post '/api/reports' do
+post '/api/events' do
   puts JSON.parse(request.body.read)
   status 200
   body ''

data/lib/procon_bypass_man/background/job_performer.rb

@@ -0,0 +1,16 @@
+module ProconBypassMan
+  module Background
+    class JobPerformer
+      def initialize(klass: , args: )
+        @klass = klass
+        @args = args
+      end
+
+      def perform
+        @klass.perform(*@args)
+      rescue => e
+        ProconBypassMan::ReportErrorJob.perform(e)
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/background/{report_thread.rb → job_runner.rb}

@@ -1,32 +1,35 @@
 module ProconBypassMan
   module Background
-    class Reporter
+    class JobRunner
       MAX_QUEUE_SIZE = 100
 
       def self.start!
         new.start!
       end
 
+      # for test
+      def stop!
+        return unless defined?(@thread)
+        @thread.kill
+      end
+
       def start!
-        return if defined?(@@thread)
-        @@latest_request_result = { stats: true, timestamp: Time.now }
-        @@queue = Queue.new
-        @@thread = Thread.new do
-          while(item = @@queue.pop)
+        return if defined?(@thread)
+        @thread = Thread.new do
+          while(item = self.class.queue.pop)
             begin
-              result = item[:reporter_class].report(body: item[:data])
-              @@latest_request_result = { stats: result.stats, timestamp: Time.now }
+              JobPerformer.new(klass: item[:reporter_class], args: item[:args]).perform
               sleep(1)
             rescue => e
               ProconBypassMan.logger.error(e)
             end
           end
         end
+        self
       end
 
       def self.queue
-        raise "Do not start this thread yet" unless defined?(@@queue)
-        @@queue
+        @@queue ||= Queue.new
       end
 
       def self.push(hash)

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

@@ -0,0 +1,7 @@
+class ProconBypassMan::BaseJob
+  extend ProconBypassMan::Background::JobRunnable
+
+  def self.servers
+    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/concerns/job_runnable.rb

@@ -0,0 +1,16 @@
+module ProconBypassMan
+  module Background
+    module JobRunnable
+      def perform(*)
+        raise NotImplementedError, nil
+      end
+
+      def perform_async(*args)
+        ProconBypassMan::Background::JobRunner.push(
+          args: args,
+          reporter_class: self,
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+class ProconBypassMan::FetchAndRunRemotePbmActionJob < ProconBypassMan::BaseJob
+  extend ProconBypassMan::HasExternalApiSetting
+
+  def self.perform
+    pbm_jobs = ProconBypassMan::HttpClient.new(path: path, server_pool: server_pool).get
+    if pbm_jobs.nil? || pbm_jobs.size.zero?
+      # ProconBypassMan.logger.debug "remote pbm_jobsはありませんでした"
+      return
+    else
+      pbm_job_hash = pbm_jobs.first
+      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!
+        ProconBypassMan::RunRemotePbmActionDispatchCommand.execute(action: pbm_job_object.action, uuid: pbm_job_object.uuid, job_args: pbm_job_object.job_args)
+      rescue ProconBypassMan::RemotePbmActionObject::ValidationError => e
+        ProconBypassMan::SendErrorCommand.execute(error: e)
+      end
+    end
+  end
+
+  def self.path
+    device_id = ProconBypassMan.device_id
+    "/api/devices/#{device_id}/pbm_jobs"
+  end
+end

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

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

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

@@ -0,0 +1,11 @@
+class ProconBypassMan::ReportErrorJob < 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: :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

@@ -0,0 +1,15 @@
+class ProconBypassMan::ReportPressedButtonsJob < ProconBypassMan::BaseJob
+  extend ProconBypassMan::HasInternalApiSetting
+
+  # @param [String] body
+  def self.perform(body)
+    ProconBypassMan::ReportHttpClient.new(
+      path: path,
+      server_pool: server_pool,
+    ).post(body: body, event_type: :internal)
+  end
+
+  def self.path
+    "/api/pressed_buttons"
+  end
+end

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

@@ -0,0 +1,11 @@
+class ProconBypassMan::ReportReloadConfigJob < 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: :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

@@ -0,0 +1,14 @@
+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/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_pressed_buttons_job"
+require "procon_bypass_man/background/jobs/fetch_and_run_remote_pbm_action_job"
+require "procon_bypass_man/background/jobs/sync_device_stats_job"

data/lib/procon_bypass_man/boot_message.rb

@@ -8,13 +8,19 @@ class ProconBypassMan::BootMessage
     @table[:pid_path] = ProconBypassMan.pid_path
     @table[:setting_path] = ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path
     @table[:uptime_from_boot] = ProconBypassMan::Uptime.from_boot
+    @table[:use_pbmenv] = !(!!`which pbmenv`.empty?)
+    @table[:session_id] = ProconBypassMan.session_id
+    @table[:device_id] = ProconBypassMan.device_id
 
-    build_version = `git rev-parse --short HEAD`.chomp
-    if build_version.empty?
-      @table[:build_version] = 'release version'
-    else
-      @table[:build_version] = build_version
-    end
+    # 開発中のHEADを取りたかったけど、Gem::Specification経由から取得する必要がありそう
+    # build_version = `git rev-parse --short HEAD`.chomp
+    # if build_version.empty?
+    #   @table[:build_version] = 'release version'
+    # else
+    #   @table[:build_version] = build_version
+    # end
+
+    # build version: #{@table[:build_version]}
   end
 
   # @return [String]
@@ -22,13 +28,15 @@ class ProconBypassMan::BootMessage
     booted_message = <<~EOF
       ----
       RUBY_VERSION: #{@table[:ruby_version]}
-      ProconBypassMan: #{@table[:pbm_version]}
+      ProconBypassMan::VERSION: #{@table[:pbm_version]}
       pid: #{@table[:pid]}
       root: #{@table[:root_path]}
       pid_path: #{@table[:pid_path]}
       setting_path: #{@table[:setting_path]}
       uptime from boot: #{@table[:uptime_from_boot]} sec
-      build version: #{@table[:build_version]}
+      use_pbmenv: #{@table[:use_pbmenv]}
+      session_id: #{ProconBypassMan.session_id}
+      device_id: #{ProconBypassMan.device_id}
       ----
     EOF
   end

data/lib/procon_bypass_man/{configuration → buttons_setting_configuration}/layer.rb

@@ -20,21 +20,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
@@ -63,7 +68,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 +82,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 +119,7 @@ module ProconBypassMan
         when Array
           button.each { |b| disables << b }
         else
-          raise "unknown"
+          raise "not support value"
         end
       end
 

data/lib/procon_bypass_man/{configuration → buttons_setting_configuration}/loader.rb

@@ -4,10 +4,10 @@ module ProconBypassMan
       require 'digest/md5'
 
       def self.load(setting_path: )
-        ProconBypassMan::ButtonsSettingConfiguration.switch_new_context(:validation) do |validation_instance|
+        ProconBypassMan::ButtonsSettingConfiguration.switch_new_context(:validation) do |new_instance|
           yaml = YAML.load_file(setting_path) or raise "読み込みに失敗しました"
-          validation_instance.instance_eval(yaml["setting"])
-          validator = Validator.new(validation_instance)
+          new_instance.instance_eval(yaml["setting"])
+          validator = Validator.new(new_instance)
           if validator.valid?
             next
           else
@@ -19,11 +19,12 @@ module ProconBypassMan
           raise ProconBypassMan::CouldNotLoadConfigError, "yamlのシンタックスエラーです"
         end
 
-        yaml = YAML.load_file(setting_path)
         ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path = setting_path
         ProconBypassMan::ButtonsSettingConfiguration.instance.reset!
         ProconBypassMan.reset!
 
+        yaml = YAML.load_file(setting_path)
+        ProconBypassMan.config.raw_setting = yaml.dup
         case yaml["version"]
         when 1.0, nil
           ProconBypassMan::ButtonsSettingConfiguration.instance.instance_eval(yaml["setting"])