Send queued via cmd before cmd_no_hazardous_check

openc3-cosmos-cmd-tlm-api/app/controllers/queues_controller.rb

@@ -216,9 +216,18 @@ def exec_command
       index = params[:index]&.to_f
       command_data = model.remove_command(index)
       if command_data
+        hazardous = false
         begin
           token = get_token(command_data['username'], scope: params[:scope])
-          cmd_no_hazardous_check(command_data['value'], queue: false, scope: params[:scope], token: token)
+          if hazardous
+            cmd_no_hazardous_check(command_data['value'], queue: false, scope: params[:scope], token: token)
+          else
+            cmd(command_data['value'], queue: false, scope: params[:scope], token: token)
+          end
+        rescue HazardousError => e
+          # Rescue hazardous error and retry with cmd_no_hazardous_check
+          hazardous = true
+          retry
         rescue StandardError => e
           log_error(e)
           render json: { status: 'error', message: "Failed to execute command: #{e.message}", type: e.class.to_s, backtrace: e.backtrace }, status: 500

openc3-cosmos-cmd-tlm-api/spec/controllers/queues_controller_spec.rb

@@ -542,7 +542,7 @@ def generate_queue_hash
       }
       allow(OpenC3::QueueModel).to receive(:get_model).and_return(queue_model)
       allow(queue_model).to receive(:remove_command).and_return(command_data)
-      allow(controller).to receive(:cmd_no_hazardous_check).with("TEST COMMAND", {queue: false, scope: "DEFAULT", token: anything})
+      allow(controller).to receive(:cmd).with("TEST COMMAND", {queue: false, scope: "DEFAULT", token: anything})
 
       post :exec_command, params: {name: "QUEUE1", scope: "DEFAULT"}
       expect(response).to have_http_status(:ok)
@@ -563,7 +563,7 @@ def generate_queue_hash
       }
       allow(OpenC3::QueueModel).to receive(:get_model).and_return(queue_model)
       allow(queue_model).to receive(:remove_command).and_return(command_data)
-      allow(controller).to receive(:cmd_no_hazardous_check).with("INDEXED COMMAND", {queue: false, scope: "DEFAULT", token: anything})
+      allow(controller).to receive(:cmd).with("INDEXED COMMAND", {queue: false, scope: "DEFAULT", token: anything})
       index = "3.5"
 
       post :exec_command, params: {name: "QUEUE1", index: index, scope: "DEFAULT"}
@@ -620,7 +620,7 @@ def generate_queue_hash
       }
       allow(OpenC3::QueueModel).to receive(:get_model).and_return(queue_model)
       allow(queue_model).to receive(:remove_command).and_return(command_data)
-      allow(controller).to receive(:cmd_no_hazardous_check).with("INTEGER INDEX COMMAND", {queue: false, scope: "DEFAULT", token: anything})
+      allow(controller).to receive(:cmd).with("INTEGER INDEX COMMAND", {queue: false, scope: "DEFAULT", token: anything})
       index = 5
 
       post :exec_command, params: {name: "QUEUE1", index: index, scope: "DEFAULT"}
@@ -639,7 +639,7 @@ def generate_queue_hash
       }
       allow(OpenC3::QueueModel).to receive(:get_model).and_return(queue_model)
       allow(queue_model).to receive(:remove_command).and_return(command_data)
-      allow(controller).to receive(:cmd_no_hazardous_check).with("FRACTIONAL INDEX COMMAND", {queue: false, scope: "DEFAULT", token: anything})
+      allow(controller).to receive(:cmd).with("FRACTIONAL INDEX COMMAND", {queue: false, scope: "DEFAULT", token: anything})
       index = "2.7"
 
       post :exec_command, params: {name: "QUEUE1", index: index, scope: "DEFAULT"}

openc3/lib/openc3/microservices/queue_microservice.rb

@@ -22,6 +22,14 @@
 require 'openc3/script'
 
 module OpenC3
+  module Script
+    private
+    # Override the prompt_for_hazardous method to always return true since there is no user to prompt
+    def prompt_for_hazardous(target_name, cmd_name, hazardous_description)
+      return true
+    end
+  end
+
   # The queue processor runs in a single thread and processes commands via cmd_api.
   class QueueProcessor
     attr_accessor :state
@@ -73,7 +81,9 @@ def process_queued_commands
             token = get_token(username)
             # It's important to set queue: false here to avoid infinite recursion when
             # OPENC3_DEFAULT_QUEUE is set because commands would be re-queued to the default queue
-            cmd_no_hazardous_check(command['value'], queue: false, scope: @scope, token: token)
+            # NOTE: cmd() via script rescues hazardous errors and calls prompt_for_hazardous()
+            # but we've overridden it to always return true and go straight to cmd_no_hazardous_check()
+            cmd(command['value'], queue: false, scope: @scope, token: token)
           end
         rescue StandardError => e
           @logger.error "QueueProcessor failed to process command from queue #{@name}\n#{e.message}"

openc3/spec/microservices/queue_microservice_spec.rb

@@ -161,7 +161,7 @@ module OpenC3
 
       before do
         allow(processor).to receive(:get_token).with('test_user').and_return('test_token')
-        allow(processor).to receive(:cmd_no_hazardous_check)
+        allow(processor).to receive(:cmd)
         processor.state = 'RELEASE'
       end
 
@@ -184,9 +184,9 @@ module OpenC3
         processor.process_queued_commands
 
         expect(Store).to have_received(:bzpopmin).exactly(3).times
-        expect(processor).to have_received(:cmd_no_hazardous_check)
+        expect(processor).to have_received(:cmd)
           .with(command1['value'], queue: false, scope: scope, token: 'test_token')
-        expect(processor).to have_received(:cmd_no_hazardous_check)
+        expect(processor).to have_received(:cmd)
           .with(command2['value'], queue: false, scope: scope, token: 'test_token')
       end
 
@@ -199,16 +199,16 @@ module OpenC3
         processor.process_queued_commands
 
         expect(Store).to have_received(:bzpopmin).once
-        expect(processor).not_to have_received(:cmd_no_hazardous_check)
+        expect(processor).not_to have_received(:cmd)
       end
 
-      it 'handles errors and continues processing when cmd_no_hazardous_check fails' do
+      it 'handles errors and continues processing when cmd fails' do
         allow(Store).to receive(:bzpopmin) do
           processor.state = 'HOLD' if processor.state == 'RELEASE'
           ["#{scope}:QUEUE", command1.to_json, 0]
         end
         allow(processor).to receive(:get_token).with('test_user').and_return('test_token')
-        allow(processor).to receive(:cmd_no_hazardous_check).and_raise(StandardError.new('Command failed'))
+        allow(processor).to receive(:cmd).and_raise(StandardError.new('Command failed'))
         expect(logger).to receive(:error).with(/QueueProcessor failed to process command from queue/)
 
         processor.process_queued_commands

openc3/spec/script/commands_spec.rb

@@ -23,6 +23,7 @@
 require 'spec_helper'
 require 'openc3'
 require 'openc3/script'
+load 'openc3/script/script.rb' # load to prevent prompt_for_hazardous overrides
 require 'openc3/api/api'
 require 'openc3/models/target_model'
 require 'openc3/microservices/interface_microservice'

openc3/spec/spec_helper.rb

@@ -85,8 +85,6 @@ module OpenC3
 end
 
 require 'openc3/top_level'
-require 'openc3/script'
-# require 'openc3/utilities/logger'
 # Create a easy alias to the base of the spec directory
 SPEC_DIR = File.dirname(__FILE__)
 $openc3_scope = ENV['OPENC3_SCOPE']