openc3 6.8.1 → 6.9.1

data/lib/openc3/interfaces/serial_interface.rb

@@ -108,5 +108,19 @@ module OpenC3
         @data_bits = option_values[0].to_i
       end
     end
+
+    def details
+      result = super()
+      result['write_port_name'] = @write_port_name
+      result['read_port_name'] = @read_port_name
+      result['baud_rate'] = @baud_rate
+      result['parity'] = @parity
+      result['stop_bits'] = @stop_bits
+      result['write_timeout'] = @write_timeout
+      result['read_timeout'] = @read_timeout
+      result['flow_control'] = @flow_control
+      result['data_bits'] = @data_bits
+      return result
+    end
   end
 end

data/lib/openc3/interfaces/simulated_target_interface.rb

@@ -158,7 +158,7 @@ module OpenC3
       super()
     end
 
-    protected
+    # protected
 
     def first_pending_packet
       packet = nil

data/lib/openc3/interfaces/tcpip_client_interface.rb

@@ -49,9 +49,13 @@ module OpenC3
 
       @hostname = hostname
       @write_port = ConfigParser.handle_nil(write_port)
+      @write_port = Integer(@write_port) if @write_port
       @read_port = ConfigParser.handle_nil(read_port)
-      @write_timeout = write_timeout
-      @read_timeout = read_timeout
+      @read_port = Integer(@read_port) if @read_port
+      @write_timeout = ConfigParser.handle_nil(write_timeout)
+      @write_timeout = Float(@write_timeout) if @write_timeout
+      @read_timeout = ConfigParser.handle_nil(read_timeout)
+      @read_timeout = Float(@read_timeout) if @read_timeout
       @read_allowed = false unless @read_port
       @write_allowed = false unless @write_port
       @write_raw_allowed = false unless @write_port
@@ -90,5 +94,15 @@ module OpenC3
       end
       super()
     end
+
+    def details
+      result = super()
+      result['hostname'] = @hostname
+      result['write_port'] = @write_port
+      result['read_port'] = @read_port
+      result['write_timeout'] = @write_timeout
+      result['read_timeout'] = @read_timeout
+      return result
+    end
   end
 end

data/lib/openc3/interfaces/tcpip_server_interface.rb

@@ -297,7 +297,7 @@ module OpenC3
       end
     end
 
-    protected
+    # protected
 
     def shutdown_interfaces(interface_infos)
       @connection_mutex.synchronize do
@@ -626,5 +626,15 @@ module OpenC3
         end
       end # connection_mutex.synchronize
     end
+
+    def details
+      result = super()
+      result['write_port'] = @write_port
+      result['read_port'] = @read_port
+      result['write_timeout'] = @write_timeout
+      result['read_timeout'] = @read_timeout
+      result['listen_address'] = @listen_address
+      return result
+    end
   end
 end

data/lib/openc3/interfaces/udp_interface.rb

@@ -189,5 +189,19 @@ module OpenC3
       @write_socket.write(data, @write_timeout)
       return data, extra
     end
+
+    def details
+      result = super()
+      result['hostname'] = @hostname
+      result['write_dest_port'] = @write_dest_port
+      result['read_port'] = @read_port
+      result['write_src_port'] = @write_src_port
+      result['interface_address'] = @interface_address
+      result['ttl'] = @ttl
+      result['write_timeout'] = @write_timeout
+      result['read_timeout'] = @read_timeout
+      result['bind_address'] = @bind_address
+      return result
+    end
   end
 end

data/lib/openc3/io/json_api_object.rb

@@ -184,7 +184,7 @@ module OpenC3
       if !data.nil? and !data.is_a?(Hash) and !data.is_a?(String)
         raise JsonApiError, "incorrect type for keyword 'data' MUST be Hash or String: #{data}"
       end
-      return kwargs[:json] ? JSON.generate(data) : data
+      return kwargs[:json] ? JSON.generate(data, allow_nan: true) : data
     end
 
     # NOTE: This is a helper method and should not be called directly

data/lib/openc3/io/json_drb.rb

@@ -336,7 +336,7 @@ module OpenC3
     protected
 
     def process_response(response, start_time)
-      response_data = response.to_json(:allow_nan => true)
+      response_data = response.to_json(allow_nan: true)
       STDOUT.puts response_data if JsonDRb.debug?
       end_time = Time.now.sys
       request_time = end_time - start_time

data/lib/openc3/io/json_drb_object.rb

@@ -62,7 +62,7 @@ module OpenC3
         @log = [nil, nil, nil]
         connect() if !@http
         json_rpc_request = JsonRpcRequest.new(method_name, method_params, keyword_params, @id)
-        data = json_rpc_request.to_json(:allow_nan => true)
+        data = json_rpc_request.to_json(allow_nan: true)
         token = keyword_params[:token]
         response_body = make_request(data: data, token: token)
         if !response_body or response_body.to_s.length < 1

data/lib/openc3/io/json_rpc.rb

@@ -14,13 +14,14 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2024, OpenC3, Inc.
+# All changes Copyright 2025, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'json'
+require 'json/add/string'
 require 'date'
 require 'openc3/core_ext/string'
 
@@ -196,7 +197,7 @@ module OpenC3
     def <=>(other)
       return nil unless other.respond_to?(:as_json)
 
-      self.as_json(:allow_nan => true) <=> other.as_json(:allow_nan => true)
+      self.as_json() <=> other.as_json()
     end
 
     # @param a [Array] Array of options
@@ -267,7 +268,7 @@ module OpenC3
     # @param request_headers [Hash] Request Header to include the auth token
     # @return [JsonRpcRequest]
     def self.from_json(request_data, request_headers)
-      hash = JSON.parse(request_data, :allow_nan => true, :create_additions => true)
+      hash = JSON.parse(request_data, allow_nan: true, create_additions: true)
       hash['keyword_params']['token'] = request_headers['HTTP_AUTHORIZATION'] if request_headers['HTTP_AUTHORIZATION']
       hash['keyword_params']['manual'] = request_headers['HTTP_MANUAL'] if request_headers['HTTP_MANUAL']
       # Verify the jsonrpc version is correct and there is a method and id
@@ -306,7 +307,7 @@ module OpenC3
     def self.from_json(response_data)
       msg = "Invalid JSON-RPC 2.0 Response#{response_data.inspect}\n"
       begin
-        hash = JSON.parse(response_data, :allow_nan => true, :create_additions => true)
+        hash = JSON.parse(response_data, allow_nan: true, create_additions: true)
       rescue
         raise $!, msg, $!.backtrace
       end

data/lib/openc3/logs/packet_log_reader.rb

@@ -201,7 +201,7 @@ module OpenC3
         if cbor
           key_map = CBOR.decode(entry[4..(key_map_length + 3)])
         else
-          key_map = JSON.parse(entry[4..(key_map_length + 3)], :allow_nan => true, :create_additions => true)
+          key_map = JSON.parse(entry[4..(key_map_length + 3)], allow_nan: true, create_additions: true)
         end
         @packets[packet_index] << key_map
         return read(identify_and_define)

data/lib/openc3/logs/packet_log_writer.rb

@@ -215,7 +215,7 @@ module OpenC3
         key_map = @key_map_table[packet_index]
         unless key_map
           parsed = data
-          parsed = JSON.parse(data, :allow_nan => true, :create_additions => true) if String === parsed
+          parsed = JSON.parse(data, allow_nan: true, create_additions: true) if String === parsed
           keys = parsed.keys
           key_map = {}
           reverse_key_map = {}
@@ -227,7 +227,7 @@ module OpenC3
           if @data_format == :CBOR
             write_entry(:KEY_MAP, cmd_or_tlm, target_name, packet_name, nil, nil, key_map.to_cbor, nil)
           else # JSON
-            write_entry(:KEY_MAP, cmd_or_tlm, target_name, packet_name, nil, nil, JSON.generate(key_map, :allow_nan => true), nil)
+            write_entry(:KEY_MAP, cmd_or_tlm, target_name, packet_name, nil, nil, JSON.generate(key_map, allow_nan: true), nil)
           end
         end
       end
@@ -292,7 +292,7 @@ module OpenC3
           key_map = @key_map_table[packet_index]
           if key_map
             # Compress data using key map
-            data = JSON.parse(data, :allow_nan => true, :create_additions => true) if String === data
+            data = JSON.parse(data, allow_nan: true, create_additions: true) if String === data
             compressed = {}
             data.each do |key, value|
               compressed_key = key_map[key]
@@ -303,7 +303,7 @@ module OpenC3
               flags |= OPENC3_CBOR_FLAG_MASK
               data = compressed.to_cbor
             else
-              data = JSON.generate(compressed, :allow_nan => true)
+              data = JSON.generate(compressed, allow_nan: true)
             end
           end
         end
@@ -317,12 +317,12 @@ module OpenC3
         extra_encoded = nil
         if extra
           flags |= OPENC3_EXTRA_FLAG_MASK
-          extra = JSON.parse(extra, :allow_nan => true, :create_additions => true) if String === extra
+          extra = JSON.parse(extra, allow_nan: true, create_additions: true) if String === extra
           length += OPENC3_EXTRA_LENGTH_FIXED_SIZE
           if @data_format == :CBOR
             extra_encoded = extra.as_json.to_cbor
           else
-            extra_encoded = JSON.generate(extra.as_json, :allow_nan => true)
+            extra_encoded = JSON.generate(extra.as_json, allow_nan: true)
           end
           length += extra_encoded.length
         end

data/lib/openc3/microservices/decom_microservice.rb

@@ -202,7 +202,11 @@ module OpenC3
     def limits_change_callback(packet, item, old_limits_state, value, log_change)
       return if @cancel_thread
       # Make a copy because packet_time is frozen
-      packet_time = packet.packet_time.dup
+      if packet.packet_time
+        packet_time = packet.packet_time.dup
+      else
+        packet_time = Time.now.utc
+      end
       if value
         message = "#{packet.target_name} #{packet.packet_name} #{item.name} = #{value} is #{item.limits.state}"
         if item.limits.values

data/lib/openc3/microservices/interface_microservice.rb

@@ -116,7 +116,7 @@ module OpenC3
               @logger.info "#{@interface.name}: Connect requested"
               params = []
               if msg_hash['params']
-                params = JSON.parse(msg_hash['params'], :allow_nan => true, :create_additions => true)
+                params = JSON.parse(msg_hash['params'], allow_nan: true, create_additions: true)
               end
               @interface = @tlm.attempting(*params)
               next 'SUCCESS'
@@ -163,7 +163,7 @@ module OpenC3
               begin
                 @logger.info "#{@interface.name}: interface_cmd: #{params['cmd_name']} #{params['cmd_params'].join(' ')}"
                 @interface.interface_cmd(params['cmd_name'], *params['cmd_params'])
-                InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
+                InterfaceStatusModel.set(@interface.as_json(), queued: true, scope: @scope)
               rescue => e
                 @logger.error "#{@interface.name}: interface_cmd: #{e.formatted}"
                 next e.message
@@ -175,7 +175,7 @@ module OpenC3
               begin
                 @logger.info "#{@interface.name}: protocol_cmd: #{params['cmd_name']} #{params['cmd_params'].join(' ')} read_write: #{params['read_write']} index: #{params['index']}"
                 @interface.protocol_cmd(params['cmd_name'], *params['cmd_params'], read_write: params['read_write'], index: params['index'])
-                InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
+                InterfaceStatusModel.set(@interface.as_json(), queued: true, scope: @scope)
               rescue => e
                 @logger.error "#{@interface.name}: protocol_cmd: #{e.formatted}"
                 next e.message
@@ -196,16 +196,45 @@ module OpenC3
                 next "Critical command #{msg_hash['release_critical']} not found"
               end
             end
+            if msg_hash.key?('target_control')
+              begin
+                params = JSON.parse(msg_hash['target_control'], allow_nan: true, create_additions: true)
+                target_name = params['target_name']
+                cmd_only = params['cmd_only']
+                tlm_only = params['tlm_only']
+                action = params['action']
+                if action == 'disable'
+                  @interface.cmd_target_enabled[target_name] = false unless tlm_only
+                  @interface.tlm_target_enabled[target_name] = false unless cmd_only
+                  @logger.info "#{@interface.name}: target_disable: #{target_name} cmd_only:#{cmd_only} tlm_only:#{tlm_only}"
+                else # enable
+                  @interface.cmd_target_enabled[target_name] = true unless tlm_only
+                  @interface.tlm_target_enabled[target_name] = true unless cmd_only
+                  @logger.info "#{@interface.name}: target_enable: #{target_name} cmd_only:#{cmd_only} tlm_only:#{tlm_only}"
+                end
+              rescue => e
+                @logger.error "#{@interface.name}: target_control: #{e.formatted}"
+                next e.message
+              end
+              next 'SUCCESS'
+            end
+            if msg_hash.key?('interface_details')
+              next @interface.details.as_json.to_json(allow_nan: true)
+            end
           end
 
           target_name = msg_hash['target_name']
+          if target_name and not @interface.cmd_target_enabled[target_name]
+            next nil # Return and don't ack given target_name if disabled
+          end
+
           cmd_name = msg_hash['cmd_name']
           manual = ConfigParser.handle_true_false(msg_hash['manual'])
           cmd_params = nil
           cmd_buffer = nil
           hazardous_check = nil
           if msg_hash['cmd_params']
-            cmd_params = JSON.parse(msg_hash['cmd_params'], :allow_nan => true, :create_additions => true)
+            cmd_params = JSON.parse(msg_hash['cmd_params'], allow_nan: true, create_additions: true)
             range_check = ConfigParser.handle_true_false(msg_hash['range_check'])
             raw = ConfigParser.handle_true_false(msg_hash['raw'])
             hazardous_check = ConfigParser.handle_true_false(msg_hash['hazardous_check'])
@@ -230,10 +259,15 @@ module OpenC3
               else
                 raise "Invalid command received:\n #{msg_hash}"
               end
-              orig_command = System.commands.packet(command.target_name, command.packet_name)
-              orig_command.received_count = TargetModel.increment_command_count(command.target_name, command.packet_name, 1, scope: @scope)
-              command.received_count = orig_command.received_count
-              command.received_time = Time.now
+
+              if @interface.cmd_target_enabled[command.target_name]
+                orig_command = System.commands.packet(command.target_name, command.packet_name)
+                orig_command.received_count = TargetModel.increment_command_count(command.target_name, command.packet_name, 1, scope: @scope)
+                command.received_count = orig_command.received_count
+                command.received_time = Time.now
+              else
+                next nil # Don't ack disabled targets
+              end
             rescue => e
               @logger.error "#{@interface.name}: #{msg_hash}"
               @logger.error "#{@interface.name}: #{e.formatted}"
@@ -312,7 +346,7 @@ module OpenC3
 
                 CommandDecomTopic.write_packet(command, scope: @scope)
                 CommandTopic.write_packet(command, scope: @scope)
-                InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
+                InterfaceStatusModel.set(@interface.as_json(), queued: true, scope: @scope)
 
                 # Explicitly check for false to allow nil to represent unknown
                 if result == false
@@ -391,7 +425,7 @@ module OpenC3
             @logger.info "#{@router.name}: Connect requested"
             params = []
             if msg_hash['params']
-              params = JSON.parse(msg_hash['params'], :allow_nan => true, :create_additions => true)
+              params = JSON.parse(msg_hash['params'], allow_nan: true, create_additions: true)
             end
             @router = @tlm.attempting(*params)
           end
@@ -413,7 +447,7 @@ module OpenC3
             begin
               @logger.info "#{@router.name}: router_cmd: #{params['cmd_name']} #{params['cmd_params'].join(' ')}"
               @router.interface_cmd(params['cmd_name'], *params['cmd_params'])
-              RouterStatusModel.set(@router.as_json(:allow_nan => true), queued: true, scope: @scope)
+              RouterStatusModel.set(@router.as_json(), queued: true, scope: @scope)
             rescue => e
               @logger.error "#{@router.name}: router_cmd: #{e.formatted}"
               next e.message
@@ -425,13 +459,38 @@ module OpenC3
             begin
               @logger.info "#{@router.name}: protocol_cmd: #{params['cmd_name']} #{params['cmd_params'].join(' ')} read_write: #{params['read_write']} index: #{params['index']}"
               @router.protocol_cmd(params['cmd_name'], *params['cmd_params'], read_write: params['read_write'], index: params['index'])
-              RouterStatusModel.set(@router.as_json(:allow_nan => true), queued: true, scope: @scope)
+              RouterStatusModel.set(@router.as_json(), queued: true, scope: @scope)
+            rescue => e
+              @logger.error "#{@router.name}: protocol_cmd: #{e.formatted}"
+              next e.message
+            end
+            next 'SUCCESS'
+          end
+          if msg_hash.key?('target_control')
+            begin
+              params = JSON.parse(msg_hash['target_control'], allow_nan: true, create_additions: true)
+              target_name = params['target_name']
+              cmd_only = params['cmd_only']
+              tlm_only = params['tlm_only']
+              action = params['action']
+              if action == 'disable'
+                @router.cmd_target_enabled[target_name] = false unless tlm_only
+                @router.tlm_target_enabled[target_name] = false unless cmd_only
+                @logger.info "#{@router.name}: target_disable: #{target_name} cmd_only:#{cmd_only} tlm_only:#{tlm_only}"
+              else # enable
+                @router.cmd_target_enabled[target_name] = true unless tlm_only
+                @router.tlm_target_enabled[target_name] = true unless cmd_only
+                @logger.info "#{@router.name}: target_enable: #{target_name} cmd_only:#{cmd_only} tlm_only:#{tlm_only}"
+              end
             rescue => e
-              @logger.error "#{@router.name}: protoco_cmd: #{e.formatted}"
+              @logger.error "#{@router.name}: target_control: #{e.formatted}"
               next e.message
             end
             next 'SUCCESS'
           end
+          if msg_hash.key?('router_details')
+            next @router.details.as_json.to_json(allow_nan: true)
+          end
           next 'SUCCESS'
         end
 
@@ -442,20 +501,24 @@ module OpenC3
           target_name = msg_hash["target_name"]
           packet_name = msg_hash["packet_name"]
 
-          packet = System.telemetry.packet(target_name, packet_name)
-          packet.stored = ConfigParser.handle_true_false(msg_hash["stored"])
-          packet.received_time = Time.from_nsec_from_epoch(msg_hash["time"].to_i)
-          packet.received_count = msg_hash["received_count"].to_i
-          packet.buffer = msg_hash["buffer"]
+          if @router.tlm_target_enabled[target_name]
+            packet = System.telemetry.packet(target_name, packet_name)
+            packet.stored = ConfigParser.handle_true_false(msg_hash["stored"])
+            packet.received_time = Time.from_nsec_from_epoch(msg_hash["time"].to_i)
+            packet.received_count = msg_hash["received_count"].to_i
+            packet.buffer = msg_hash["buffer"]
 
-          begin
-            @router.write(packet)
-            RouterStatusModel.set(@router.as_json(:allow_nan => true), queued: true, scope: @scope)
-            next 'SUCCESS'
-          rescue => e
-            @logger.error "#{@router.name}: #{e.formatted}"
-            next e.message
+            begin
+              @router.write(packet)
+              RouterStatusModel.set(@router.as_json(), queued: true, scope: @scope)
+              next 'SUCCESS'
+            rescue => e
+              @logger.error "#{@router.name}: #{e.formatted}"
+              next e.message
+            end
           end
+        else
+          next nil # Don't ack disabled targets
         end
       end
     end
@@ -510,9 +573,9 @@ module OpenC3
         @interface.state = 'DISCONNECTED'
       end
       if @interface_or_router == 'INTERFACE'
-        InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), scope: @scope)
+        InterfaceStatusModel.set(@interface.as_json(), scope: @scope)
       else
-        RouterStatusModel.set(@interface.as_json(:allow_nan => true), scope: @scope)
+        RouterStatusModel.set(@interface.as_json(), scope: @scope)
       end
 
       @queued = false
@@ -576,9 +639,9 @@ module OpenC3
 
       @interface.state = 'ATTEMPTING'
       if @interface_or_router == 'INTERFACE'
-        InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
+        InterfaceStatusModel.set(@interface.as_json(), queued: true, scope: @scope)
       else
-        RouterStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
+        RouterStatusModel.set(@interface.as_json(), queued: true, scope: @scope)
       end
       @interface # Return the interface/router since we may have recreated it
     # Need to rescue Exception so we cover LoadError
@@ -651,15 +714,15 @@ module OpenC3
         disconnect(false)
       end
       if @interface_or_router == 'INTERFACE'
-        InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
+        InterfaceStatusModel.set(@interface.as_json(), queued: true, scope: @scope)
       else
-        RouterStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
+        RouterStatusModel.set(@interface.as_json(), queued: true, scope: @scope)
       end
       @logger.info "#{@interface.name}: Stopped packet reading"
     end
 
     def handle_packet(packet)
-      InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
+      InterfaceStatusModel.set(@interface.as_json(), queued: true, scope: @scope)
       packet.received_time = Time.now.sys unless packet.received_time
 
       if packet.stored
@@ -709,8 +772,10 @@ module OpenC3
       end
 
       # Write to stream
-      sync_tlm_packet_counts(packet)
-      TelemetryTopic.write_packet(packet, queued: @queued, scope: @scope)
+      if @interface.tlm_target_enabled[packet.target_name]
+        sync_tlm_packet_counts(packet)
+        TelemetryTopic.write_packet(packet, queued: @queued, scope: @scope)
+      end
     end
 
     def handle_connection_failed(connection, connect_error)
@@ -774,9 +839,9 @@ module OpenC3
       end
       @interface.state = 'CONNECTED'
       if @interface_or_router == 'INTERFACE'
-        InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
+        InterfaceStatusModel.set(@interface.as_json(), queued: true, scope: @scope)
       else
-        RouterStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
+        RouterStatusModel.set(@interface.as_json(), queued: true, scope: @scope)
       end
       @logger.info "#{@interface.name}: Connection Success"
     end
@@ -806,9 +871,9 @@ module OpenC3
       else
         @interface.state = 'DISCONNECTED'
         if @interface_or_router == 'INTERFACE'
-          InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
+          InterfaceStatusModel.set(@interface.as_json(), queued: true, scope: @scope)
         else
-          RouterStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
+          RouterStatusModel.set(@interface.as_json(), queued: true, scope: @scope)
         end
       end
     end

data/lib/openc3/microservices/microservice.rb

@@ -52,7 +52,7 @@ module OpenC3
       microservice = self.new(name)
       thread = Thread.new do
         begin
-          MicroserviceStatusModel.set(microservice.as_json(:allow_nan => true), scope: microservice.scope)
+          MicroserviceStatusModel.set(microservice.as_json(), scope: microservice.scope)
           microservice.state = 'RUNNING'
           microservice.run
           microservice.state = 'FINISHED'
@@ -66,7 +66,7 @@ module OpenC3
           end
           microservice.shutdown # Dying in crash so should try to shutdown
         ensure
-          MicroserviceStatusModel.set(microservice.as_json(:allow_nan => true), scope: microservice.scope)
+          MicroserviceStatusModel.set(microservice.as_json(), scope: microservice.scope)
         end
       end
       ThreadManager.instance.register(thread, shutdown_object: microservice)
@@ -192,7 +192,7 @@ module OpenC3
         @microservice_status_period_seconds = 5
         @microservice_status_thread = Thread.new do
           until @cancel_thread
-            MicroserviceStatusModel.set(as_json(:allow_nan => true), scope: @scope) unless @cancel_thread
+            MicroserviceStatusModel.set(as_json(), scope: @scope) unless @cancel_thread
             break if @microservice_status_sleeper.sleep(@microservice_status_period_seconds)
           end
         rescue Exception => e
@@ -214,7 +214,7 @@ module OpenC3
       @state = state
       @cancel_thread = true
       @microservice_status_sleeper.cancel if @microservice_status_sleeper
-      MicroserviceStatusModel.set(as_json(:allow_nan => true), scope: @scope)
+      MicroserviceStatusModel.set(as_json(), scope: @scope)
       FileUtils.remove_entry_secure(@temp_dir, true)
       @metric.shutdown
       @logger.debug("Shutting down microservice complete: #{@name}")

data/lib/openc3/microservices/queue_microservice.rb

@@ -19,11 +19,21 @@
 require 'openc3/microservices/microservice'
 require 'openc3/topics/queue_topic'
 require 'openc3/utilities/authentication'
-require 'openc3/script'
+require 'openc3/api/api'
 
 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
+    include Api # Provides access to api methods
+
     attr_accessor :state
     attr_reader :name, :scope
 
@@ -35,23 +45,6 @@ module OpenC3
       @cancel_thread = false
     end
 
-    def get_token(username)
-      if ENV['OPENC3_API_CLIENT'].nil?
-        ENV['OPENC3_API_PASSWORD'] ||= ENV['OPENC3_SERVICE_PASSWORD']
-        return OpenC3Authentication.new().token
-      else
-        # Check for offline access token
-        model = nil
-        model = OpenC3::OfflineAccessModel.get_model(name: username, scope: @scope) if username and username != ''
-        if model and model.offline_access_token
-          auth = OpenC3KeycloakAuthentication.new(ENV['OPENC3_KEYCLOAK_URL'])
-          return auth.get_token_from_refresh_token(model.offline_access_token)
-        else
-          return nil
-        end
-      end
-    end
-
     def run
       while true
         if @state == 'RELEASE'
@@ -69,11 +62,11 @@ module OpenC3
           _queue_name, command_data, _timestamp = Store.bzpopmin("#{@scope}:#{@name}", timeout: 0.2)
           if command_data
             command = JSON.parse(command_data)
-            username = command['username']
-            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)
           end
         rescue StandardError => e
           @logger.error "QueueProcessor failed to process command from queue #{@name}\n#{e.message}"

data/lib/openc3/microservices/reducer_microservice.rb

@@ -522,7 +522,7 @@ module OpenC3
       reduce(type, state.raw_keys, state.converted_keys, state.reduced)
       state.reduced.merge!(state.entry_samples)
       time = state.entry_time
-      data = JSON.generate(state.reduced.as_json(:allow_nan => true))
+      data = JSON.generate(state.reduced.as_json, allow_nan: true)
       if type == "minute"
         redis_topic, redis_offset = TelemetryReducedMinuteTopic.write(target_name: target_name, packet_name: packet_name, stored: stored, time: time, data: data, scope: @scope)
       elsif type == "hour"