procon_bypass_man 0.1.18 → 0.1.20.1

data/lib/procon_bypass_man/buttons_setting_configuration.rb

@@ -10,8 +10,6 @@ module ProconBypassMan
       :setting_path,
       :mode_plugins,
       :macro_plugins,
-      :context,
-      :current_context_key,
       :neutral_position
 
     def self.instance
@@ -27,22 +25,22 @@ module ProconBypassMan
       @@context[current_context_key] = val
     end
 
-    def self.switch_new_context(key)
-      @@context[key] = new
+    def self.switch_new_context(new_context_key)
+      @@context[new_context_key] = new
       previous_key = current_context_key
       if block_given?
-        @@current_context_key = key
-        value = yield(@@context[key])
-        @@current_context_key = previous_key
+        @@current_context_key = new_context_key
+        value = yield(@@context[new_context_key])
         return value
       else
-        @@current_context_key = key
+        @@current_context_key = new_context_key
       end
+    ensure
+      @@current_context_key = previous_key
     end
 
     def initialize
       reset!
-      self.class.instance = self
     end
 
     module ManualMode
@@ -103,6 +101,8 @@ module ProconBypassMan
     def reset!
       @prefix_keys_for_changing_layer = []
       self.mode_plugins = {}
+      # プロセスを一度起動するとsetting_pathは変わらない、という想定なので適当に扱う. resetでは初期化しない
+      # self.setting_path = nil
       self.macro_plugins = {}
       self.layers = {
         up: Layer.new,

data/lib/procon_bypass_man/bypass/bypass_mode.rb

@@ -0,0 +1,21 @@
+class ProconBypassMan::BypassMode
+  TYPE_NORMAL = :normal
+  TYPE_AGGRESSIVE = :aggressive
+  TYPES = [TYPE_NORMAL, TYPE_AGGRESSIVE]
+
+  DEFAULT_GADGET_TO_PROCON_INTERVAL = 0.5
+
+  attr_accessor :mode, :gadget_to_procon_interval
+
+  def self.default_value
+    new(
+      mode: TYPE_NORMAL,
+      gadget_to_procon_interval: DEFAULT_GADGET_TO_PROCON_INTERVAL,
+    )
+  end
+
+  def initialize(mode: , gadget_to_procon_interval: )
+    @mode = mode.to_sym
+    @gadget_to_procon_interval = gadget_to_procon_interval
+  end
+end

data/lib/procon_bypass_man/bypass.rb

@@ -1,10 +1,12 @@
 require "procon_bypass_man/bypass/usb_hid_logger"
+require "procon_bypass_man/bypass/bypass_mode"
 
 class ProconBypassMan::Bypass
   include ProconBypassMan::Bypass::UsbHidLogger
 
   class BypassValue < Struct.new(:binary, :sent)
     def to_text
+      return unless binary
       "#{binary.unpack.first} #{'x' unless sent}"
     end
   end
@@ -31,16 +33,16 @@ class ProconBypassMan::Bypass
         self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: input)
       rescue IO::EAGAINWaitReadable
         monitor.record(:eagain_wait_readable_on_read)
-        sleep(0.001)
-        retry
       end
 
-      begin
-        self.procon.write_nonblock(input)
-        self.bypass_value.sent = true
-      rescue IO::EAGAINWaitReadable
-        monitor.record(:eagain_wait_readable_on_write)
-        break
+      if input
+        begin
+          self.procon.write_nonblock(input)
+          self.bypass_value.sent = true
+        rescue IO::EAGAINWaitReadable
+          monitor.record(:eagain_wait_readable_on_write)
+          break
+        end
       end
     end
 

data/lib/procon_bypass_man/commands/bypass_command.rb

@@ -27,19 +27,31 @@ class ProconBypassMan::BypassCommand
     monitor1 = ProconBypassMan::IOMonitor.new(label: "switch -> procon")
     monitor2 = ProconBypassMan::IOMonitor.new(label: "procon -> switch")
     ProconBypassMan.logger.info "Thread1を起動します"
+
+    @send_interval = 0.005
+
     t1 = Thread.new do
       timer = ProconBypassMan::SafeTimeout.new(timeout: Time.now + 10)
-      bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor1)
+      @did_first_step = false
       loop do
+        bypass = ProconBypassMan::Bypass.new(gadget: @gadget, procon: @procon, monitor: monitor1)
         break if $will_terminate_token
-        timer.throw_if_timeout!
+        !@did_first_step && timer.throw_if_timeout!
         bypass.send_gadget_to_procon!
-        sleep(0.005)
+        sleep(@send_interval)
       rescue ProconBypassMan::SafeTimeout::Timeout
-        ProconBypassMan.logger.info "10秒経過したのでThread1を終了します"
-        monitor1.shutdown
-        puts "10秒経過したのでThread1を終了します"
-        break
+        case ProconBypassMan.config.bypass_mode.mode
+        when ProconBypassMan::BypassMode::TYPE_AGGRESSIVE
+          ProconBypassMan.logger.info "10秒経過したのでThread1を終了します"
+          monitor1.shutdown
+          break
+        when ProconBypassMan::BypassMode::TYPE_NORMAL
+          ProconBypassMan.logger.info "10秒経過したのでsend_intervalを長くします"
+          @send_interval = ProconBypassMan.config.bypass_mode.gadget_to_procon_interval
+        else
+          raise "unknown type"
+        end
+        @did_first_step = true
       rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN => e
         ProconBypassMan::SendErrorCommand.execute(error: "Switchとの切断されました.終了処理を開始します. #{e.full_message}")
         Process.kill "TERM", Process.ppid
@@ -80,7 +92,7 @@ class ProconBypassMan::BypassCommand
       [t1, t2].each(&:join)
       @gadget&.close
       @procon&.close
-      exit 1
+      exit 1 # child processなのでexitしていい
     end
   end
 end

data/lib/procon_bypass_man/commands/connect_device_command.rb

@@ -1,16 +1,28 @@
 class ProconBypassMan::ConnectDeviceCommand
+  class NotFoundProconError < StandardError; end
+
   # @return [void]
   def self.execute!
-    gadget, procon = ProconBypassMan::DeviceConnector.connect
-  rescue ProconBypassMan::DeviceConnector::NotFoundProconError => e
-    ProconBypassMan.logger.error e
-    gadget&.close
-    procon&.close
-    raise ProconBypassMan::NotFoundProconError
-  rescue ProconBypassMan::SafeTimeout::Timeout
-    ProconBypassMan.logger.error "デバイスとの通信でタイムアウトが起きて接続ができませんでした。"
-    gadget&.close
-    procon&.close
-    raise ::ProconBypassMan::EternalConnectionError
+    unless has_required_files?
+      raise ProconBypassMan::NotFoundRequiredFilesError, "there is not /sys/kernel/config/usb_gadget/procon"
+    end
+
+    begin
+      gadget, procon = ProconBypassMan::DeviceConnector.connect
+    rescue ProconBypassMan::DeviceConnector::NotFoundProconError => e
+      ProconBypassMan.logger.error e
+      gadget&.close
+      procon&.close
+      raise ProconBypassMan::ConnectDeviceCommand::NotFoundProconError
+    rescue ProconBypassMan::SafeTimeout::Timeout
+      ProconBypassMan.logger.error "デバイスとの通信でタイムアウトが起きて接続ができませんでした。"
+      gadget&.close
+      procon&.close
+      raise ProconBypassMan::EternalConnectionError
+    end
+  end
+
+  def self.has_required_files?
+    Dir.exist?("/sys/kernel/config/usb_gadget/procon")
   end
 end

data/lib/procon_bypass_man/configuration.rb

@@ -38,10 +38,19 @@ class ProconBypassMan::Configuration
     def device_id
       ENV["DEBUG_DEVICE_ID"] || ProconBypassMan::WriteDeviceIdCommand.execute
     end
+
+    # @return [Boolean]
+    def never_exit_accidentally
+      config.never_exit_accidentally
+    end
+
+    def fallback_setting_path
+      "/tmp/procon_bypass_man_fallback_setting.yaml"
+    end
   end
 
   attr_accessor :enable_critical_error_logging
-  attr_writer :verbose_bypass_log, :raw_setting, :enable_reporting_pressed_buttons
+  attr_writer :verbose_bypass_log, :raw_setting, :enable_reporting_pressed_buttons, :never_exit_accidentally
 
   def root=(path)
     @root = path
@@ -56,6 +65,17 @@ class ProconBypassMan::Configuration
     end
   end
 
+  def bypass_mode=(value)
+    @bypass_mode = ProconBypassMan::BypassMode.new(
+      mode: value[:mode],
+      gadget_to_procon_interval: value[:gadget_to_procon_interval],
+    )
+  end
+
+  def bypass_mode
+    @bypass_mode || ProconBypassMan::BypassMode.default_value
+  end
+
   def api_servers=(api_servers)
     @api_servers = api_servers
     return self
@@ -147,6 +167,10 @@ class ProconBypassMan::Configuration
     end
   end
 
+  def has_api_server?
+    not api_servers.length.zero?
+  end
+
   def verbose_bypass_log
     @verbose_bypass_log || !!ENV["VERBOSE_BYPASS_LOG"]
   end
@@ -158,4 +182,9 @@ class ProconBypassMan::Configuration
   def enable_reporting_pressed_buttons
     @enable_reporting_pressed_buttons ||= false
   end
+
+  # @return [Boolean]
+  def never_exit_accidentally
+    @never_exit_accidentally || false
+  end
 end

data/lib/procon_bypass_man/device_connector.rb

@@ -263,46 +263,19 @@ class ProconBypassMan::DeviceConnector
     @procon
   end
 
-  def is_available_device?(path)
-    return false if !File.exist?(path)
-
-    system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
-    system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
-    sleep 0.5
-
-    file = File.open(path, "w+")
-    begin
-      file.read_nonblock(64)
-    rescue EOFError
-      file.close
-      return false
-    rescue IO::EAGAINWaitReadable
-      file.close
-      return true
-    end
-  end
-
-  def to_bin(string)
-    string.unpack "H*"
-  end
-
   def init_devices
     if @initialized_devices
       return
     end
 
-    case
-    when is_available_device?(PROCON_PATH)
-      ProconBypassMan.logger.info "proconのデバイスファイルは#{PROCON_PATH}を使います"
-      @procon = File.open(PROCON_PATH, "w+b")
-      @gadget = File.open('/dev/hidg0', "w+b")
-    when is_available_device?(PROCON2_PATH)
-      ProconBypassMan.logger.info "proconのデバイスファイルは#{PROCON2_PATH}を使います"
-      @procon = File.open(PROCON2_PATH, "w+b")
-      @gadget = File.open('/dev/hidg0', "w+b")
+    if path = ProconBypassMan::DeviceProconFinder.find
+      @procon = File.open(path, "w+b")
+      ProconBypassMan.logger.info "proconのデバイスファイルは#{path}を使います"
     else
-      raise NotFoundProconError, "/dev/hidraw0, /dev/hidraw1の両方見つかりませんでした"
+      raise(ProconBypassMan::DeviceConnector::NotFoundProconError)
     end
+    @gadget = File.open('/dev/hidg0', "w+b")
+
     system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
     system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
     sleep 0.5

data/lib/procon_bypass_man/device_procon_finder.rb

@@ -0,0 +1,65 @@
+class ProconBypassMan::DeviceProconFinder
+  HID_NAME = "Nintendo Co., Ltd. Pro Controller"
+
+  def self.find
+    new.find
+  end
+
+  # @return [String, NilClass]
+  def find
+    find_device_path
+  end
+
+  private
+
+  # @return [String , NilClass]
+  def find_device_path
+    if(line = device_from_shell) && (hidraw_name = line.match(/(hidraw\d+)\s+/)[1])
+      "/dev/#{hidraw_name}"
+    end
+  end
+
+  # @return [String , NilClass]
+  def device_from_shell
+    shell_output.split("\n").detect { |o| o.include?(HID_NAME) }
+  end
+
+  # @return [String]
+  def shell_output
+    `bash -c '#{get_list_shell}'`
+  end
+
+  def get_list_shell
+    <<~SHELL
+      #!/bin/bash
+
+      FILES=/dev/hidraw*
+      for f in $FILES
+      do
+        FILE=${f##*/}
+        DEVICE="$(cat /sys/class/hidraw/${FILE}/device/uevent | grep HID_NAME | cut -d '=' -f2)"
+        printf "%s   %s\n" $FILE "$DEVICE"
+      done
+    SHELL
+  end
+
+  # これいる？
+  def is_available_device?(path)
+    return false if !File.exist?(path)
+
+    system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
+    system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
+    sleep 0.5
+
+    file = File.open(path, "w+")
+    begin
+      file.read_nonblock(64)
+    rescue EOFError
+      file.close
+      return false
+    rescue IO::EAGAINWaitReadable
+      file.close
+      return true
+    end
+  end
+end

data/lib/procon_bypass_man/never_exit_accidentally.rb

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

data/lib/procon_bypass_man/remote_pbm_action/reboot_os_action.rb

@@ -10,6 +10,7 @@ module ProconBypassMan
       private
 
       def before_action_callback
+        ProconBypassMan::ReportStartRebootJob.perform
         be_processed
       end
 

data/lib/procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb

@@ -6,9 +6,16 @@ module ProconBypassMan
         require "pbmenv"
         ProconBypassMan.logger.info "execute RestorePbmSettingAction!"
         setting = args.dig("setting") or raise(ProconBypassMan::RemotePbmAction::NeedPbmVersionError, "settingが必要です, #{args.inspect}")
-        File.write(
+
+        # 復元に失敗したら戻せるように退避する
+        FileUtils.copy(
           ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
-          setting.to_yaml,
+          ProconBypassMan.fallback_setting_path,
+        )
+
+        ProconBypassMan::YamlWriter.write(
+          path: ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
+          content: setting,
         )
         ProconBypassMan.hot_reload!
       end

data/lib/procon_bypass_man/runner.rb

@@ -27,7 +27,7 @@ class ProconBypassMan::Runner
     loop do
       $will_terminate_token = false
       # NOTE メインプロセスではThreadをいくつか起動しているので念のためパフォーマンスを優先するためにforkしていく
-      main_loop_pid = Kernel.fork { ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute }
+      child_pid = Kernel.fork { ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute }
 
       begin
         # TODO 小プロセスが消滅した時に、メインプロセスは生き続けてしまい、何もできなくなる問題がある
@@ -37,25 +37,25 @@ class ProconBypassMan::Runner
         end
       rescue InterruptForRestart
         $will_terminate_token = true
-        Process.kill("TERM", main_loop_pid)
+        Process.kill("TERM", child_pid)
         Process.wait
         ProconBypassMan::PrintMessageCommand.execute(text: "Reloading config file")
         begin
           ProconBypassMan::ButtonsSettingConfiguration::Loader.reload_setting
           ProconBypassMan::SendReloadConfigEventCommand.execute
-        rescue ProconBypassMan::CouldNotLoadConfigError
+        rescue ProconBypassMan::CouldNotLoadConfigError => error
           ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。再読み込みができませんでした")
+          ProconBypassMan::ReportErrorReloadConfigJob.perform_async(error.message)
         end
         ProconBypassMan::PrintMessageCommand.execute(text: "バイパス処理を再開します")
       rescue Interrupt
         $will_terminate_token = true
-        Process.kill("TERM", main_loop_pid)
+        Process.kill("TERM", child_pid)
         Process.wait
+        ProconBypassMan::PrintMessageCommand.execute(text: "処理を終了します")
         @gadget&.close
         @procon&.close
-        FileUtils.rm_rf(ProconBypassMan.pid_path)
-        FileUtils.rm_rf(ProconBypassMan.digest_path)
-        exit 1
+        break
       end
     end
   end

data/lib/procon_bypass_man/scheduler.rb

@@ -74,7 +74,7 @@ module ProconBypassMan
           args: [->{ ProconBypassMan::DeviceStatus.current }],
           interval: 60,
         )
-      )
+      ) if ProconBypassMan.config.has_api_server?
     end
 
     # @param [Schedule] schedule

data/lib/procon_bypass_man/support/yaml_writer.rb

@@ -0,0 +1,16 @@
+class ProconBypassMan::YamlWriter
+  # @return [void]
+  def self.write(path: , content: )
+    File.write(
+      path,
+      content.transform_values { |x|
+        case x
+        when String
+          x.gsub("\r\n", "\n")
+        else
+          x
+        end
+      }.to_yaml
+    )
+  end
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man.rb

@@ -13,6 +13,7 @@ require_relative "procon_bypass_man/version"
 require_relative "procon_bypass_man/remote_pbm_action"
 require_relative "procon_bypass_man/support/signal_handler"
 require_relative "procon_bypass_man/support/callbacks"
+require_relative "procon_bypass_man/support/yaml_writer"
 require_relative "procon_bypass_man/support/safe_timeout"
 require_relative "procon_bypass_man/support/compress_array"
 require_relative "procon_bypass_man/support/uptime"
@@ -26,7 +27,9 @@ require_relative "procon_bypass_man/background"
 require_relative "procon_bypass_man/commands"
 require_relative "procon_bypass_man/bypass"
 require_relative "procon_bypass_man/domains"
+require_relative "procon_bypass_man/never_exit_accidentally"
 require_relative "procon_bypass_man/device_connector"
+require_relative "procon_bypass_man/device_procon_finder"
 require_relative "procon_bypass_man/device_status"
 require_relative "procon_bypass_man/runner"
 require_relative "procon_bypass_man/processor"
@@ -47,10 +50,11 @@ Thread.abort_on_exception = true
 
 module ProconBypassMan
   extend ProconBypassMan::Configuration::ClassMethods
+  extend ProconBypassMan::NeverExitAccidentally
 
   class CouldNotLoadConfigError < StandardError; end
-  class NotFoundProconError < StandardError; end
   class ConnectionError < StandardError; end
+  class NotFoundRequiredFilesError < StandardError; end
   class FirstConnectionError < ConnectionError; end
   class EternalConnectionError < ConnectionError; end
 
@@ -61,22 +65,31 @@ module ProconBypassMan
     ProconBypassMan::Websocket::PbmJobClient.start!
 
     ProconBypassMan::PrintMessageCommand.execute(text: "PBMを起動しています")
-    ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting_path)
     initialize_pbm
+    ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting_path)
     gadget, procon = ProconBypassMan::ConnectDeviceCommand.execute!
-    Runner.new(gadget: gadget, procon: procon).run
-  rescue ProconBypassMan::CouldNotLoadConfigError
-    ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。設定ファイルの読み込みに失敗しました")
-    ProconBypassMan::DeviceStatus.change_to_setting_syntax_error_and_shutdown!
+    Runner.new(gadget: gadget, procon: procon).run # ここでblockingする
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     FileUtils.rm_rf(ProconBypassMan.digest_path)
-    exit 1
-  rescue ProconBypassMan::NotFoundProconError
-    ProconBypassMan::SendErrorCommand.execute(error: "プロコンが見つかりませんでした。終了します。")
-    ProconBypassMan::DeviceStatus.change_to_procon_not_found_error!
+  rescue ProconBypassMan::NotFoundRequiredFilesError
+    ProconBypassMan::SendErrorCommand.execute(error: "/sys/kernel/config/usb_gadget/proconディレクトリがありませんでした。処理を終了します。")
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     FileUtils.rm_rf(ProconBypassMan.digest_path)
-    exit 1
+    exit 1 # 前提条件を満たしていないので絶対に落とす
+  rescue ProconBypassMan::CouldNotLoadConfigError
+    ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。設定ファイルの読み込みに失敗しました")
+    ProconBypassMan::DeviceStatus.change_to_setting_syntax_error_and_shutdown!
+    ProconBypassMan.exit_if_allow(1) do
+      FileUtils.rm_rf(ProconBypassMan.pid_path)
+      FileUtils.rm_rf(ProconBypassMan.digest_path)
+    end
+  rescue ProconBypassMan::ConnectDeviceCommand::NotFoundProconError
+    ProconBypassMan::SendErrorCommand.execute(error: "プロコンが見つかりませんでした。")
+    ProconBypassMan::DeviceStatus.change_to_procon_not_found_error!
+    ProconBypassMan.exit_if_allow(1) do
+      FileUtils.rm_rf(ProconBypassMan.pid_path)
+      FileUtils.rm_rf(ProconBypassMan.digest_path)
+    end
   rescue ProconBypassMan::ConnectionError
     begin
       raise

data/project_template/app.rb

@@ -5,7 +5,7 @@ require 'bundler/inline'
 gemfile do
   source 'https://rubygems.org'
   git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-  gem 'procon_bypass_man', '0.1.18'
+  gem 'procon_bypass_man', '0.1.20.1'
 end
 
 ProconBypassMan.configure do |config|
@@ -15,6 +15,10 @@ ProconBypassMan.configure do |config|
   # webからProconBypassManを操作できるwebサービス
   # config.api_servers = ['https://pbm-cloud.herokuapp.com']
   config.enable_critical_error_logging = true
+  # pbm-cloudで使う場合はnever_exitにtrueをセットしてください. trueがセットされている場合、不慮の事故が発生してもプロセスが終了しなくなります
+  config.never_exit_accidentally = true
+  # 操作が高頻度で固まるときは、 gadget_to_procon_interval の数値は大きくしてください
+  config.bypass_mode = { mode: :normal, gadget_to_procon_interval: 0.5 }
 end
 
 ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")

data/project_template/setting.yml

@@ -1,35 +1,19 @@
 version: 1.0
 setting: |-
-  fast_return = ProconBypassMan::Plugin::Splatoon2::Macro::FastReturn
-  guruguru = ProconBypassMan::Plugin::Splatoon2::Mode::Guruguru
-
-  install_macro_plugin fast_return
-  install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::JumpToUpKey
-  install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::JumpToRightKey
-  install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::JumpToLeftKey
-  install_mode_plugin guruguru
-
   prefix_keys_for_changing_layer [:zr, :zl, :l]
 
-  layer :up, mode: :manual do
-    # flip :zr, if_pressed: :zr, force_neutral: :zl
+  layer :up do
     flip :zr, if_pressed: :zr, force_neutral: :zl
-    flip :zl, if_pressed: [:y, :b, :zl]
     flip :a, if_pressed: [:a]
     flip :down, if_pressed: :down
-    macro fast_return.name, if_pressed: [:y, :b, :down]
-    macro ProconBypassMan::Plugin::Splatoon2::Macro::JumpToUpKey, if_pressed: [:y, :b, :up]
-    macro ProconBypassMan::Plugin::Splatoon2::Macro::JumpToRightKey, if_pressed: [:y, :b, :right]
-    macro ProconBypassMan::Plugin::Splatoon2::Macro::JumpToLeftKey, if_pressed: [:y, :b, :left]
     remap :l, to: :zr
   end
-  layer :right, mode: guruguru.name
+
+  layer :right do
+  end
+
   layer :left do
-  # flip :zr, if_pressed: :zr, force_neutral: :zl
-    remap :l, to: :zr
   end
+
   layer :down do
-    # flip :zl
-    # flip :zr, if_pressed: :zr, force_neutral: :zl, flip_interval: "1F"
-    remap :l, to: :zr
   end

data/sig/main.rbs

@@ -185,10 +185,13 @@ class ProconBypassMan::Configuration
     def cache: () -> ProconBypassMan::OnMemoryCache
 
     def config: () -> ProconBypassMan::Configuration
+
+    def never_exit_accidentally: () -> bool
   end
 
   attr_reader api_server: untyped
   attr_reader api_servers: untyped
+  attr_writer never_exit_accidentally: bool
 
   attr_accessor enable_critical_error_logging: bool
 
@@ -226,6 +229,8 @@ class ProconBypassMan::Configuration
   def raw_setting: () -> untyped
 
   def verbose_bypass_log: () -> bool
+
+  def never_exit_accidentally: () -> bool
 end