openc3 5.14.2 → 5.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eaf09072832c752cd1c0ae08160f9a5ef5bb24e585f10ee8be31d22c54ce2e7
-  data.tar.gz: 17fbccdaf92dd9c6e7fae704ca4bacadef88b026c5023d7dbb69583a19f6fe3e
+  metadata.gz: e965c2b2463c93d4f1831b6d6cdfc53cae47bac8297e4335be407e420b37545e
+  data.tar.gz: 1f4a4d4f367daf99411d70d693f511a6550f911787d46f0602e6bc440edc19c5
 SHA512:
-  metadata.gz: 92e1bfa1bbd283c4e94d49627ea8bfe6be9423ff88bc1a5453af778fb10dc3cefd78b2cef6b553fa6d1aa6f21559e70413e5343ec546b93841c62c124a3840a1
-  data.tar.gz: ac243f0b29ee7cccd5c809c5625a084cb54a3920b283402ddc7da8ce4178816d9ce75d44cb8af8154438a846ff116dec41b27cd5623ef5ded506c0c2d320e590
+  metadata.gz: 37956addc6a7019369e710ea02fcf8c71b114b049e83eeef7b7a0c2e99f17c2f685311db55697cb31a518bea8cc815647d370d0bdb9640259d76df86b79dff9a
+  data.tar.gz: f90a6beae03680d8fdc256ea2bf4dc937667a4a9d29bc6d3daccd33de02ea485ce808a52ed73a1ce251e0a9a7dc9ef3e9ccf1acdbe5ab8fa360f2dfbfbb104d8

data/bin/openc3cli

@@ -471,7 +471,7 @@ def load_plugin(plugin_file_path, scope:, plugin_hash_file: nil, force: false)
         OpenC3::LocalMode.update_local_plugin(plugin_file_path, plugin_hash, scope: scope)
       end
     rescue => e
-      abort("Error installing plugin: #{scope}: #{plugin_file_path}\n#{e.message}")
+      abort("Error installing plugin: #{scope}: #{plugin_file_path}\n#{e.formatted}")
     end
   else
     # Outside Cluster

data/data/config/_id_items.yaml

@@ -4,13 +4,12 @@
   description:
     Bit size of this telemetry item. Zero or Negative values may be used
     to indicate that a string fills the packet up to the offset from the end of
-    the packet specified by this value. If Bit Offset is 0 and Bit Size is 0 then
-    this is a derived parameter and the Data Type must be set to 'DERIVED'.
+    the packet specified by this value.
   values: \d+
 - name: Data Type
   required: true
   description: Data Type of this telemetry item
-  values: <%= %w(INT UINT FLOAT STRING BLOCK DERIVED) %>
+  values: <%= %w(INT UINT FLOAT STRING BLOCK) %>
 - name: ID Value
   required: true
   description: The value of this telemetry item that uniquely identifies this telemetry packet

data/data/config/telemetry_modifiers.yaml

@@ -45,7 +45,6 @@ ID_ITEM:
       required: true
       description: Bit offset into the telemetry packet of the Most Significant Bit of this item.
         May be negative to indicate on offset from the end of the packet.
-        Always use a bit offset of 0 for derived item.
       values: '[-]?\d+'
     <%= MetaConfigParser.load('_id_items.yaml').to_meta_config_yaml(4) %>
 APPEND_ID_ITEM:

data/lib/openc3/accessors/accessor.rb

@@ -74,18 +74,18 @@ module OpenC3
       return false
     end
 
-    # If this is true it will enfore that COSMOS DERIVED items must have a
+    # If this is true it will enforce that COSMOS DERIVED items must have a
     # write_conversion to be written
     def enforce_derived_write_conversion(_item)
       return true
     end
 
     def self.read_item(_item, _buffer)
-      raise "Must be defined by subclass"
+      raise "Must be defined by subclass if needed"
     end
 
     def self.write_item(_item, _value, _buffer)
-      raise "Must be defined by subclass"
+      raise "Must be defined by subclass if needed"
     end
 
     def self.read_items(items, buffer)

data/lib/openc3/accessors/http_accessor.rb

@@ -176,7 +176,7 @@ module OpenC3
       when 'HTTP_STATUS', 'HTTP_PATH', 'HTTP_METHOD', 'HTTP_PACKET', 'HTTP_ERROR_PACKET', /^HTTP_QUERY_/, /^HTTP_HEADER_/
         return false
       else
-        return @body_accessor.enforce_derived_write_conversion
+        return @body_accessor.enforce_derived_write_conversion(item)
       end
     end
   end

data/lib/openc3/api/cmd_api.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2024, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -41,6 +41,8 @@ module OpenC3
                        'cmd_raw_no_checks',
                        'build_cmd',
                        'build_command', # DEPRECATED
+                       'enable_cmd',
+                       'disable_cmd',
                        'send_raw',
                        'get_all_cmds',
                        'get_all_commands', # DEPRECATED
@@ -131,6 +133,30 @@ module OpenC3
     # build_command is DEPRECATED
     alias build_command build_cmd
 
+    # Helper method for disable_cmd / enable_cmd
+    def _get_and_set_cmd(method, *args, scope: $openc3_scope, token: $openc3_token)
+      target_name, command_name = _extract_target_command_names(method, *args)
+      authorize(permission: 'admin', target_name: target_name, packet_name: command_name, scope: scope, token: token)
+      command = yield TargetModel.packet(target_name, command_name, type: :CMD, scope: scope)
+      TargetModel.set_packet(target_name, command_name, command, type: :CMD, scope: scope)
+    end
+
+    # @since 5.15.1
+    def enable_cmd(*args, scope: $openc3_scope, token: $openc3_token)
+      _get_and_set_cmd('enable_cmd', *args, scope: scope, token: token) do |command|
+        command['disabled'] = false
+        command
+      end
+    end
+
+    # @since 5.15.1
+    def disable_cmd(*args, scope: $openc3_scope, token: $openc3_token)
+      _get_and_set_cmd('disable_cmd', *args, scope: scope, token: token) do |command|
+        command['disabled'] = true
+        command
+      end
+    end
+
     # Send a raw binary string to the specified interface.
     #
     # @param interface_name [String] The interface to send the raw binary
@@ -178,10 +204,21 @@ module OpenC3
     # @since 5.0.6
     # @param target_name [String] Name of the target
     # @return [Array<String>] Array of all command packet names
-    def get_all_cmd_names(target_name, scope: $openc3_scope, token: $openc3_token)
-      target_name = target_name.upcase
-      authorize(permission: 'cmd_info', target_name: target_name, scope: scope, token: token)
-      TargetModel.packet_names(target_name, type: :CMD, scope: scope)
+    def get_all_cmd_names(target_name, hidden: false, scope: $openc3_scope, token: $openc3_token)
+      begin
+        packets = get_all_cmds(target_name, scope: scope, token: token)
+      rescue RuntimeError
+        packets = []
+      end
+      names = []
+      packets.each do |packet|
+        if hidden
+          names << packet['packet_name']
+        else
+          names << packet['packet_name'] unless packet['hidden']
+        end
+      end
+      return names
     end
     # get_all_command_names is DEPRECATED
     alias get_all_command_names get_all_cmd_names
@@ -445,6 +482,12 @@ module OpenC3
       cmd_params = cmd_params.transform_keys(&:upcase)
       authorize(permission: 'cmd', target_name: target_name, packet_name: cmd_name, scope: scope, token: token)
       packet = TargetModel.packet(target_name, cmd_name, type: :CMD, scope: scope)
+      if packet['disabled']
+        error = DisabledError.new
+        error.target_name = target_name
+        error.cmd_name = cmd_name
+        raise error
+      end
 
       command = {
         'target_name' => target_name,
@@ -474,7 +517,7 @@ module OpenC3
 
     def _build_cmd_output_string(method_name, target_name, cmd_name, cmd_params, packet)
       output_string = "#{method_name}(\""
-      output_string << target_name + ' ' + cmd_name
+      output_string << (target_name + ' ' + cmd_name)
       if cmd_params.nil? or cmd_params.empty?
         output_string << '")'
       else
@@ -511,7 +554,7 @@ module OpenC3
           params << "#{key} #{value}"
         end
         params = params.join(", ")
-        output_string << ' with ' + params + '")'
+        output_string << (' with ' + params + '")')
       end
       return output_string
     end

data/lib/openc3/api/tlm_api.rb

@@ -139,7 +139,7 @@ module OpenC3
 
       # See if this target has a tlm interface
       interface_name = nil
-      InterfaceModel.all(scope: scope).each do |name, interface|
+      InterfaceModel.all(scope: scope).each do |_name, interface|
         if interface['tlm_target_names'].include? target_name
           interface_name = interface['name']
           break
@@ -287,10 +287,21 @@ module OpenC3
     # @since 5.0.6
     # @param target_name [String] Name of the target
     # @return [Array<String>] Array of all telemetry packet names
-    def get_all_tlm_names(target_name, scope: $openc3_scope, token: $openc3_token)
-      target_name = target_name.upcase
-      authorize(permission: 'cmd_info', target_name: target_name, scope: scope, token: token)
-      TargetModel.packet_names(target_name, type: :TLM, scope: scope)
+    def get_all_tlm_names(target_name, hidden: false, scope: $openc3_scope, token: $openc3_token)
+      begin
+        packets = get_all_tlm(target_name, scope: scope, token: token)
+      rescue RuntimeError
+        packets = []
+      end
+      names = []
+      packets.each do |packet|
+        if hidden
+          names << packet['packet_name']
+        else
+          names << packet['packet_name'] unless packet['hidden']
+        end
+      end
+      return names
     end
     alias get_all_telemetry_names get_all_tlm_names
 

data/lib/openc3/logs/buffered_packet_log_writer.rb

@@ -80,6 +80,11 @@ module OpenC3
     def buffered_write(entry_type, cmd_or_tlm, target_name, packet_name, time_nsec_since_epoch, stored, data, id = nil, redis_topic = nil, redis_offset = '0-0', received_time_nsec_since_epoch: nil, extra: nil)
       case entry_type
       when :RAW_PACKET, :JSON_PACKET
+        # If we have data in the buffer, a file should always be open so that cycle time logic will run
+        unless @file
+          @mutex.synchronize { start_new_file() }
+        end
+
         @buffer << [entry_type, cmd_or_tlm, target_name, packet_name, time_nsec_since_epoch, stored, data, id, redis_topic, redis_offset, received_time_nsec_since_epoch, extra]
         @buffer.sort! {|entry1, entry2| entry1[4] <=> entry2[4] }
         if @buffer.length >= @buffer_depth

data/lib/openc3/logs/packet_log_reader.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2024, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -96,9 +96,9 @@ module OpenC3
       @max_read_size = @file.size
       @max_read_size = MAX_READ_SIZE if @max_read_size > MAX_READ_SIZE
       return read_file_header()
-    rescue => err
+    rescue => e
       close()
-      raise err
+      raise e
     end
 
     # Closes the current log file
@@ -134,9 +134,8 @@ module OpenC3
 
       if flags & OPENC3_ENTRY_TYPE_MASK == OPENC3_JSON_PACKET_ENTRY_TYPE_MASK
         packet_index, time_nsec_since_epoch = entry[2..11].unpack('nQ>')
-        next_offset = 12
         received_time_nsec_since_epoch, extra, json_data = handle_received_time_extra_and_data(entry, time_nsec_since_epoch, includes_received_time, includes_extra, cbor)
-        lookup_cmd_or_tlm, target_name, packet_name, id, key_map = @packets[packet_index]
+        lookup_cmd_or_tlm, target_name, packet_name, _id, key_map = @packets[packet_index]
         if cmd_or_tlm != lookup_cmd_or_tlm
           raise "Packet type mismatch, packet:#{cmd_or_tlm}, lookup:#{lookup_cmd_or_tlm}"
         end
@@ -148,8 +147,8 @@ module OpenC3
         end
       elsif flags & OPENC3_ENTRY_TYPE_MASK == OPENC3_RAW_PACKET_ENTRY_TYPE_MASK
         packet_index, time_nsec_since_epoch = entry[2..11].unpack('nQ>')
-        received_time_nsec_since_epoch, extra, packet_data = handle_received_time_extra_and_data(entry, time_nsec_since_epoch, includes_received_time, includes_extra, cbor)
-        lookup_cmd_or_tlm, target_name, packet_name, id = @packets[packet_index]
+        received_time_nsec_since_epoch, _extra, packet_data = handle_received_time_extra_and_data(entry, time_nsec_since_epoch, includes_received_time, includes_extra, cbor)
+        lookup_cmd_or_tlm, target_name, packet_name, _id = @packets[packet_index]
         if cmd_or_tlm != lookup_cmd_or_tlm
           raise "Packet type mismatch, packet:#{cmd_or_tlm}, lookup:#{lookup_cmd_or_tlm}"
         end
@@ -220,9 +219,9 @@ module OpenC3
       else
         raise "Invalid Entry Flags: #{flags}"
       end
-    rescue => err
+    rescue => e
       close()
-      raise err
+      raise e
     end
 
     # @return [Integer] The size of the log file being processed

data/lib/openc3/microservices/interface_microservice.rb

@@ -126,7 +126,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), scope: @scope)
+                InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
               rescue => e
                 @logger.error "#{@interface.name}: interface_cmd: #{e.formatted}"
                 next e.message
@@ -138,7 +138,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), scope: @scope)
+                InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
               rescue => e
                 @logger.error "#{@interface.name}: protocol_cmd: #{e.formatted}"
                 next e.message
@@ -206,7 +206,7 @@ module OpenC3
                 @interface.write(command)
                 CommandTopic.write_packet(command, scope: @scope)
                 CommandDecomTopic.write_packet(command, scope: @scope)
-                InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), scope: @scope)
+                InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
                 next 'SUCCESS'
               else
                 next "Interface not connected: #{@interface.name}"
@@ -298,7 +298,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), scope: @scope)
+              RouterStatusModel.set(@router.as_json(:allow_nan => true), queued: true, scope: @scope)
             rescue => e
               @logger.error "#{@router.name}: router_cmd: #{e.formatted}"
               next e.message
@@ -310,7 +310,7 @@ 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), scope: @scope)
+              RouterStatusModel.set(@router.as_json(:allow_nan => true), queued: true, scope: @scope)
             rescue => e
               @logger.error "#{@router.name}: protoco_cmd: #{e.formatted}"
               next e.message
@@ -335,7 +335,7 @@ module OpenC3
 
           begin
             @router.write(packet)
-            RouterStatusModel.set(@router.as_json(:allow_nan => true), scope: @scope)
+            RouterStatusModel.set(@router.as_json(:allow_nan => true), queued: true, scope: @scope)
             next 'SUCCESS'
           rescue => e
             @logger.error "#{@router.name}: #{e.formatted}"
@@ -352,6 +352,7 @@ module OpenC3
     def initialize(name)
       @mutex = Mutex.new
       super(name)
+
       @interface_or_router = self.class.name.to_s.split("Microservice")[0].upcase.split("::")[-1]
       if @interface_or_router == 'INTERFACE'
         @metric.set(name: 'interface_tlm_total', value: @count, type: 'counter')
@@ -359,7 +360,6 @@ module OpenC3
         @metric.set(name: 'router_cmd_total', value: @count, type: 'counter')
       end
 
-      @scope = name.split("__")[0]
       interface_name = name.split("__")[2]
       if @interface_or_router == 'INTERFACE'
         @interface = InterfaceModel.get_model(name: interface_name, scope: @scope).build
@@ -400,6 +400,17 @@ module OpenC3
         RouterStatusModel.set(@interface.as_json(:allow_nan => true), scope: @scope)
       end
 
+      @queued = false
+      @interface.options.each do |option_name, option_values|
+        case option_name.upcase
+        when 'OPTIMIZE_THROUGHPUT'
+          @queued = true
+          update_interval = option_values[0].to_f
+          EphemeralStoreQueued.instance.set_update_interval(update_interval)
+          StoreQueued.instance.set_update_interval(update_interval)
+        end
+      end
+
       @interface_thread_sleeper = Sleeper.new
       @cancel_thread = false
       @connection_failed_messages = []
@@ -432,9 +443,9 @@ module OpenC3
 
       @interface.state = 'ATTEMPTING'
       if @interface_or_router == 'INTERFACE'
-        InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), scope: @scope)
+        InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
       else
-        RouterStatusModel.set(@interface.as_json(:allow_nan => true), scope: @scope)
+        RouterStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
       end
       @interface # Return the interface/router since we may have recreated it
     # Need to rescue Exception so we cover LoadError
@@ -507,15 +518,15 @@ module OpenC3
         disconnect(false)
       end
       if @interface_or_router == 'INTERFACE'
-        InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), scope: @scope)
+        InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
       else
-        RouterStatusModel.set(@interface.as_json(:allow_nan => true), scope: @scope)
+        RouterStatusModel.set(@interface.as_json(:allow_nan => true), 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), scope: @scope)
+      InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
       packet.received_time = Time.now.sys unless packet.received_time
 
       if packet.stored
@@ -557,7 +568,7 @@ module OpenC3
         unknown_packet.extra = packet.extra
         packet = unknown_packet
         json_hash = CvtModel.build_json_from_packet(packet)
-        CvtModel.set(json_hash, target_name: packet.target_name, packet_name: packet.packet_name, scope: @scope)
+        CvtModel.set(json_hash, target_name: packet.target_name, packet_name: packet.packet_name, queued: @queued, scope: @scope)
         num_bytes_to_print = [UNKNOWN_BYTES_TO_PRINT, packet.length].min
         data = packet.buffer(false)[0..(num_bytes_to_print - 1)]
         prefix = data.each_byte.map { | byte | sprintf("%02X", byte) }.join()
@@ -566,7 +577,7 @@ module OpenC3
 
       # Write to stream
       packet.received_count += 1
-      TelemetryTopic.write_packet(packet, scope: @scope)
+      TelemetryTopic.write_packet(packet, queued: @queued, scope: @scope)
     end
 
     def handle_connection_failed(connect_error)
@@ -629,9 +640,9 @@ module OpenC3
       end
       @interface.state = 'CONNECTED'
       if @interface_or_router == 'INTERFACE'
-        InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), scope: @scope)
+        InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
       else
-        RouterStatusModel.set(@interface.as_json(:allow_nan => true), scope: @scope)
+        RouterStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
       end
       @logger.info "#{@interface.name}: Connection Success"
     end
@@ -661,9 +672,9 @@ module OpenC3
       else
         @interface.state = 'DISCONNECTED'
         if @interface_or_router == 'INTERFACE'
-          InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), scope: @scope)
+          InterfaceStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
         else
-          RouterStatusModel.set(@interface.as_json(:allow_nan => true), scope: @scope)
+          RouterStatusModel.set(@interface.as_json(:allow_nan => true), queued: true, scope: @scope)
         end
       end
     end

data/lib/openc3/microservices/trigger_group_microservice.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2024, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -418,7 +418,7 @@ module OpenC3
         when 'OR'
           return left || right ? 1 : 0
         end
-      rescue ArgumentError => error
+      rescue ArgumentError
         message = "invalid evaluate: (#{left} #{operator} #{right})"
         notify(name: name, severity: 'error', message: message)
         return -1
@@ -447,7 +447,7 @@ module OpenC3
       if visited["#{head.name}__P"][trigger.name]
         # Not sure if this is posible as on create it validates that the dependents are already created
         message = "loop detected from #{head.name} -> #{trigger.name} path: #{visited["#{head.name}__P"]}"
-        notify(name: trigger.name, severity: 'error', message: error.message)
+        notify(name: trigger.name, severity: 'error', message: message)
         return visited["#{trigger.name}__R"] = -1
       end
       trigger.roots.each do | root_trigger_name |
@@ -455,7 +455,7 @@ module OpenC3
         root_trigger = triggers[root_trigger_name]
         if head.name == root_trigger.name
           message = "loop detected from #{head.name} -> #{root_trigger_name} path: #{visited["#{head.name}__P"]}"
-          notify(name: trigger.name, severity: 'error', message: error.message)
+          notify(name: trigger.name, severity: 'error', message: message)
           return visited["#{trigger.name}__R"] = -1
         end
         result = evaluate_trigger(
@@ -474,9 +474,9 @@ module OpenC3
         else
           right = operand_value(operand: trigger.right, other: trigger.left, visited: visited)
         end
-      rescue => error
+      rescue => e
         # This will primarily happen when the user inputs a bad Regexp
-        notify(name: trigger.name, severity: 'error', message: error.message)
+        notify(name: trigger.name, severity: 'error', message: e.message)
         return visited["#{trigger.name}__R"] = -1
       end
       # Convert the standard '==' and '!=' into Ruby Regexp operators
@@ -560,7 +560,7 @@ module OpenC3
       while @read_topic
         begin
           Topic.read_topics(@topics) do |topic, _msg_id, msg_hash, _redis|
-            @logger.debug "TriggerGroupManager block_for_updates: #{topic} #{msg_hash.to_s}"
+            @logger.debug "TriggerGroupManager block_for_updates: #{topic} #{msg_hash}"
             if topic != @share.trigger_base.autonomic_topic
               packet = JsonPacket.new(:TLM, msg_hash['target_name'], msg_hash['packet_name'], msg_hash['time'].to_i, false, msg_hash["json_data"])
               @share.packet_base.add(topic: topic, packet: packet)
@@ -580,7 +580,7 @@ module OpenC3
     def shutdown
       @read_topic = false
       @cancel_thread = true
-      @worker_count.times do | i |
+      @worker_count.times do | _i |
         @queue << nil
       end
     end
@@ -635,7 +635,7 @@ module OpenC3
         begin
           AutonomicTopic.read_topics(@topics) do |_topic, _msg_id, msg_hash, _redis|
             break if @cancel_thread
-            @logger.debug "TriggerGroupMicroservice block_for_updates: #{msg_hash.to_s}"
+            @logger.debug "TriggerGroupMicroservice block_for_updates: #{msg_hash}"
             # Process trigger notifications created by TriggerModel notify
             if msg_hash['type'] == 'trigger'
               data = JSON.parse(msg_hash['data'], :allow_nan => true, :create_additions => true)

data/lib/openc3/models/auth_model.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2024, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -31,11 +31,11 @@ module OpenC3
     @@token_cache = nil
     @@token_cache_time = nil
 
-    def self.is_set?(key = PRIMARY_KEY)
+    def self.set?(key = PRIMARY_KEY)
       Store.exists(key) == 1
     end
 
-    def self.verify(token, permission: nil)
+    def self.verify(token)
       return false if token.nil? or token.empty?
 
       token_hash = hash(token)
@@ -47,7 +47,7 @@ module OpenC3
 
       # Handle a service password - Generally only used by ScriptRunner
       service_password = ENV['OPENC3_SERVICE_PASSWORD']
-      return true if service_password and service_password == token and permission != 'admin'
+      return true if service_password and service_password == token
 
       return false
     end
@@ -55,15 +55,13 @@ module OpenC3
     def self.set(token, old_token, key = PRIMARY_KEY)
       raise "token must not be nil or empty" if token.nil? or token.empty?
 
-      if is_set?(key)
+      if set?(key)
         raise "old_token must not be nil or empty" if old_token.nil? or old_token.empty?
         raise "old_token incorrect" unless verify(old_token)
       end
       Store.set(key, hash(token))
     end
 
-    private
-
     def self.hash(token)
       Digest::SHA2.hexdigest token
     end

data/lib/openc3/models/cvt_model.rb

@@ -21,6 +21,7 @@
 # if purchased from OpenC3, Inc.
 
 require 'openc3/utilities/store'
+require 'openc3/utilities/store_queued'
 require 'openc3/models/target_model'
 
 module OpenC3
@@ -42,12 +43,16 @@ module OpenC3
     end
 
     # Set the current value table for a target, packet
-    def self.set(hash, target_name:, packet_name:, scope: $openc3_scope)
+    def self.set(hash, target_name:, packet_name:, queued: false, scope: $openc3_scope)
       packet_json = JSON.generate(hash.as_json(:allow_nan => true))
       key = "#{scope}__tlm__#{target_name}"
       tgt_pkt_key = key + "__#{packet_name}"
       @@packet_cache[tgt_pkt_key] = [Time.now, hash]
-      Store.hset(key, packet_name, packet_json)
+      if queued
+        StoreQueued.hset(key, packet_name, packet_json)
+      else
+        Store.hset(key, packet_name, packet_json)
+      end
     end
 
     # Get the hash for packet in the CVT
@@ -68,7 +73,7 @@ module OpenC3
     end
 
     # Set an item in the current value table
-    def self.set_item(target_name, packet_name, item_name, value, type:, scope: $openc3_scope)
+    def self.set_item(target_name, packet_name, item_name, value, type:, queued: false, scope: $openc3_scope)
       hash = get(target_name: target_name, packet_name: packet_name, cache_timeout: nil, scope: scope)
       case type
       when :WITH_UNITS
@@ -87,7 +92,7 @@ module OpenC3
       else
         raise "Unknown type '#{type}' for #{target_name} #{packet_name} #{item_name}"
       end
-      set(hash, target_name: target_name, packet_name: packet_name, scope: scope)
+      set(hash, target_name: target_name, packet_name: packet_name, queued: queued, scope: scope)
     end
 
     # Get an item from the current value table

data/lib/openc3/models/gem_model.rb

@@ -102,13 +102,15 @@ module OpenC3
       raise err
     end
 
-    def self.destroy(name)
+    def self.destroy(name, log_and_raise_needed_errors: true)
       gem_name, version = self.extract_name_and_version(name)
       plugin_gem_names = PluginModel.gem_names
       if plugin_gem_names.include?(name)
-        message = "Gem file #{name} can't be uninstalled because needed by installed plugin"
-        Logger.error message
-        raise message
+        if log_and_raise_needed_errors
+          message = "Gem file #{name} can't be uninstalled because needed by installed plugin"
+          Logger.error message
+          raise message
+        end
       else
         begin
           Gem::Uninstaller.new(gem_name, {:version => version, :force => true}).uninstall
@@ -131,7 +133,7 @@ module OpenC3
       GemModel.names.each do |gem_full_name|
         gem_name, gem_version = GemModel.extract_name_and_version(gem_full_name)
         if gem_name == keep_gem_name and gem_version != keep_gem_version
-          GemModel.destroy(gem_full_name)
+          GemModel.destroy(gem_full_name, log_and_raise_needed_errors: false)
         end
       end
     end

data/lib/openc3/models/metric_model.rb

@@ -42,6 +42,14 @@ module OpenC3
       super("#{scope}#{PRIMARY_KEY}")
     end
 
+    # Sets (updates) the redis hash of this model
+    # Queued defaults to true for MetricModel
+    def self.set(json, scope:, queued: true)
+      json[:scope] = scope
+      json.transform_keys!(&:to_sym)
+      self.new(**json).create(force: true, queued: queued)
+    end
+
     def self.destroy(scope:, name:)
       EphemeralStore.hdel("#{scope}#{PRIMARY_KEY}", name)
     end