openc3 6.5.1 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99470dde632de3fe5fd6db9eaf4d529b117ac3d7ff8bcdb77fec5e7451c20b77
-  data.tar.gz: e8bfd360f210fef3a41c14605b561f9b6072b07b01dec9e2479069594fc67502
+  metadata.gz: d08bcc3b92811101e2096aa443b5459835d0396aba80b1067c8147388ec050e6
+  data.tar.gz: 2820795b23e3da0530d0306ee2665d69bb5ad86f494609ced199f985929c56f2
 SHA512:
-  metadata.gz: 63177085f3628d368fe69a17a15bdbbb2d46fcf6b9eccc45cf32744cf4ff709925480176cc140026a55f0593c343f7a62ae435c858532a2a5c9e3d1d4d8cdfeb
-  data.tar.gz: 3f55acbf143f0d8307d47533998cbc63144935226e6c0b774537321c2fe62b81a19949e3169ca4a53a1032b3132e13a23fabf5707625d9c7c24e273caa7f26b3
+  metadata.gz: 181ce42f3c55f78ee8e6adf3cc7145326974c8239a82478b501def91314169cacb62a9e53c4d0d760e0b0125a1b77e437127f7992d7e4fe42838035640b87dbe
+  data.tar.gz: 957334977c15e7d8e3fe49d14bec6c2e11c7cba09bbaea70cefe3f85a408255f1e7f2620b642c6f7a137d6ff9bdc1b4b49007fca58a9c6c5f9562b81daa0263e

data/data/config/param_item_modifiers.yaml

@@ -76,3 +76,6 @@ VARIABLE_BIT_SIZE:
       required: false
       description: Offset in Bits to Apply to Length Field Value. Defaults to 0
       values: \d+
+OBFUSCATE:
+  summary: Hides the item value in the UI, text logs, and raw binary file
+  since: 6.6.0

data/lib/openc3/api/cmd_api.rb

@@ -30,9 +30,11 @@ require 'openc3/topics/command_decom_topic'
 require 'openc3/topics/decom_interface_topic'
 require 'openc3/topics/interface_topic'
 require 'openc3/script/extract'
+require 'openc3/utilities/cmd_log'
 
 module OpenC3
   module Api
+    include OpenC3::CmdLog
     WHITELIST ||= []
     WHITELIST.concat([
                        'cmd',
@@ -500,6 +502,7 @@ module OpenC3
         #   end
         # end
       end
+
       packet = TargetModel.packet(target_name, cmd_name, type: :CMD, scope: scope)
       if packet['disabled']
         error = DisabledError.new
@@ -507,7 +510,6 @@ module OpenC3
         error.cmd_name = cmd_name
         raise error
       end
-
       if log_message.nil? # This means the default was used, no argument was passed
         log_message = true # Default is true
         # If the packet has the DISABLE_MESSAGES keyword then no messages by default
@@ -520,7 +522,6 @@ module OpenC3
           end
         end
       end
-
       cmd_string = _build_cmd_output_string(method_name, target_name, cmd_name, cmd_params, packet)
       username = user && user['username'] ? user['username'] : 'anonymous'
       command = {
@@ -535,52 +536,11 @@ module OpenC3
         'validate' => validate.to_s,
         'manual' => manual.to_s,
         'log_message' => log_message.to_s,
+        'obfuscated_items' => packet['obfuscated_items'].to_s
       }
       CommandTopic.send_command(command, timeout: timeout, scope: scope)
+      return command
     end
 
-    def _build_cmd_output_string(method_name, target_name, cmd_name, cmd_params, packet)
-      output_string = "#{method_name}(\""
-      output_string << (target_name + ' ' + cmd_name)
-      if cmd_params.nil? or cmd_params.empty?
-        output_string << '")'
-      else
-        params = []
-        cmd_params.each do |key, value|
-          next if Packet::RESERVED_ITEM_NAMES.include?(key)
-
-          item = packet['items'].find { |find_item| find_item['name'] == key.to_s }
-
-          begin
-            item_type = item['data_type'].intern
-          rescue
-            item_type = nil
-          end
-
-          if value.is_a?(String)
-            value = value.dup
-            if item_type == :BLOCK or item_type == :STRING
-              if !value.is_printable?
-                value = "0x" + value.simple_formatted
-              else
-                value = value.inspect
-              end
-            else
-              value = value.convert_to_value.to_s
-            end
-            if value.length > 256
-              value = value[0..255] + "...'"
-            end
-            value.tr!('"', "'")
-          elsif value.is_a?(Array)
-            value = "[#{value.join(", ")}]"
-          end
-          params << "#{key} #{value}"
-        end
-        params = params.join(", ")
-        output_string << (' with ' + params + '")')
-      end
-      return output_string
-    end
   end
 end

data/lib/openc3/microservices/interface_microservice.rb

@@ -297,6 +297,8 @@ module OpenC3
 
                 @interface.write(command)
 
+                command.obfuscate
+                
                 if command.validator and validate
                   begin
                     result, reason = command.validator.post_check(command)

data/lib/openc3/packets/commands.rb

@@ -24,6 +24,7 @@
 # See https://github.com/OpenC3/cosmos/pull/1963
 
 require 'openc3/packets/packet_config'
+require 'openc3/utilities/cmd_log'
 
 module OpenC3
   # Commands uses PacketConfig to parse the command and telemetry
@@ -37,6 +38,7 @@ module OpenC3
   # Packet or PacketItem objects. While there are some overlapping methods between
   # the two, these are separate interfaces into the system.
   class Commands
+    include OpenC3::CmdLog
     attr_accessor :config
 
     LATEST_PACKET_NAME = 'LATEST'.freeze
@@ -203,60 +205,16 @@ module OpenC3
         raw = false
       end
       items.delete_if { |item_name, _item_value| ignored_parameters.include?(item_name) }
-      return build_cmd_output_string(packet.target_name, packet.packet_name, items, raw)
+      return build_cmd_output_string(packet.target_name, packet.packet_name, items, raw, packet)
     end
 
-    def build_cmd_output_string(target_name, cmd_name, cmd_params, raw = false)
-      if raw
-        output_string = 'cmd_raw("'
-      else
-        output_string = 'cmd("'
-      end
+    def build_cmd_output_string(target_name, cmd_name, cmd_params, raw = false, packet)
+      method_name = raw ? "cmd_raw" : "cmd"
       target_name = 'UNKNOWN' unless target_name
       cmd_name = 'UNKNOWN' unless cmd_name
-      output_string << (target_name + ' ' + cmd_name)
-      if cmd_params.nil? or cmd_params.empty?
-        output_string << '")'
-      else
-        begin
-          command_items = packet(target_name, cmd_name).items
-        rescue
-        end
-
-        params = []
-        cmd_params.each do |key, value|
-          next if Packet::RESERVED_ITEM_NAMES.include?(key)
-
-          begin
-            item_type = command_items[key].data_type
-          rescue
-            item_type = nil
-          end
+      packet_hash = packet ? packet.as_json : {}
 
-          if value.is_a?(String)
-            value = value.dup
-            if item_type == :BLOCK or item_type == :STRING
-              if !value.is_printable?
-                value = "0x" + value.simple_formatted
-              else
-                value = value.inspect
-              end
-            else
-              value = value.convert_to_value.to_s
-            end
-            if value.length > 256
-              value = value[0..255] + "...'"
-            end
-            value.tr!('"', "'")
-          elsif value.is_a?(Array)
-            value = "[#{value.join(", ")}]"
-          end
-          params << "#{key} #{value}"
-        end
-        params = params.join(", ")
-        output_string << (' with ' + params + '")')
-      end
-      return output_string
+      _build_cmd_output_string(method_name, target_name, cmd_name, cmd_params, packet_hash)
     end
 
     # Returns whether the given command is hazardous. Commands are hazardous

data/lib/openc3/packets/packet.rb

@@ -156,6 +156,7 @@ module OpenC3
         @virtual = false
         @restricted = false
         @validator = nil
+        @obfuscated_items = []
       end
 
       # Sets the target name this packet is associated with. Unidentified packets
@@ -556,6 +557,7 @@ module OpenC3
       item = super(item)
       update_id_items(item)
       update_limits_items_cache(item)
+      update_obfuscated_items_cache(item)
       item
     end
 
@@ -905,6 +907,7 @@ module OpenC3
       @short_buffer_allowed = false
       @id_items = nil
       @limits_items = nil
+      @obfuscated_items = []
       new_items = {}
       new_sorted_items = []
       @items.each do |name, item|
@@ -957,6 +960,21 @@ module OpenC3
       end
     end
 
+    # Add an item to the obfuscate items cache if necessary.
+    # You MUST call this after adding obfuscation to an item
+    # This is an optimization so we don't have to iterate through all the items when
+    # checking for obfuscation.
+    def update_obfuscated_items_cache(item)
+      if item.obfuscate
+        @obfuscated_items ||= []
+        @obfuscated_items_hash ||= {}
+        unless @obfuscated_items_hash[item]
+          @obfuscated_items << item
+          @obfuscated_items_hash[item] = true
+        end
+      end
+    end
+
     # Return an array of arrays indicating all items in the packet that are out of limits
     #   [[target name, packet name, item name, item limits state], ...]
     #
@@ -1158,6 +1176,7 @@ module OpenC3
       config['validator'] = @validator.class.to_s if @validator
       config['template'] = Base64.encode64(@template) if @template
       config['config_name'] = self.config_name
+      config['obfuscated_items'] = @obfuscated_items&.map(&:name) || []
 
       if @processors
         processors = []
@@ -1287,6 +1306,52 @@ module OpenC3
       end
     end
 
+    def obfuscate()
+      return unless @buffer
+      return unless @obfuscated_items
+
+      @obfuscated_items.each do |item|
+        next if item.data_type == :DERIVED
+
+        begin
+          current_value = read(item.name, :RAW)
+          
+          case current_value
+          when Array
+            # For arrays, create a new array of zeros with the same size
+            case item.data_type
+              when :INT, :UINT
+                obfuscated_value = Array.new(current_value.size, 0)
+              when :FLOAT
+                obfuscated_value = Array.new(current_value.size, 0.0)
+              when :STRING, :BLOCK
+                obfuscated_value = Array.new(current_value.size) { |i| 
+                  "\x00" * current_value[i].length if current_value[i]
+                }
+            else
+              obfuscated_value = Array.new(current_value.size, 0)
+            end
+          when String
+            # For strings/blocks, create null bytes of the same length
+            obfuscated_value = "\x00" * current_value.length
+          else
+            case item.data_type
+            when :INT, :UINT
+              obfuscated_value = 0
+            when :FLOAT
+              obfuscated_value = 0.0
+            else
+              obfuscated_value = 0
+            end
+          end
+          write(item.name, obfuscated_value, :RAW)
+        rescue => e
+          Logger.instance.error "#{item.name} obfuscation failed with error: #{e.message}"
+          next
+        end
+      end
+    end
+
     protected
 
     def handle_limits_states(item, value)
@@ -1404,4 +1469,4 @@ module OpenC3
       item
     end
   end
-end
+end

data/lib/openc3/packets/packet_config.rb

@@ -14,7 +14,7 @@
 # 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
@@ -234,7 +234,8 @@ module OpenC3
               'POLY_WRITE_CONVERSION', 'SEG_POLY_READ_CONVERSION', 'SEG_POLY_WRITE_CONVERSION',\
               'GENERIC_READ_CONVERSION_START', 'GENERIC_WRITE_CONVERSION_START', 'REQUIRED',\
               'LIMITS', 'LIMITS_RESPONSE', 'UNITS', 'FORMAT_STRING', 'DESCRIPTION',\
-              'MINIMUM_VALUE', 'MAXIMUM_VALUE', 'DEFAULT_VALUE', 'OVERFLOW', 'OVERLAP', 'KEY', 'VARIABLE_BIT_SIZE'
+              'MINIMUM_VALUE', 'MAXIMUM_VALUE', 'DEFAULT_VALUE', 'OVERFLOW', 'OVERLAP', 'KEY', 'VARIABLE_BIT_SIZE',\
+              'OBFUSCATE'
             raise parser.error("No current item for #{keyword}") unless @current_item
 
             process_current_item(parser, keyword, params)
@@ -692,6 +693,13 @@ module OpenC3
         @current_item.units_full = params[0]
         @current_item.units = params[1]
 
+      # Obfuscate the parameter in logs
+      when 'OBFUSCATE'
+        usage = "OBFUSCATE"
+        parser.verify_num_parameters(0, 0, usage)
+        @current_item.obfuscate = true
+        @current_packet.update_obfuscated_items_cache(@current_item)
+
       # Update the description for the current telemetry item
       when 'DESCRIPTION'
         usage = "DESCRIPTION <DESCRIPTION>"

data/lib/openc3/packets/packet_item.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 2025, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -93,6 +93,9 @@ module OpenC3
     # @return [PacketItemLimits] All information regarding limits for this PacketItem
     attr_reader :limits
 
+    # @return [Boolean] Whether the parameter must be obfuscated from logs or not
+    attr_accessor :obfuscate
+
     # (see StructureItem#initialize)
     # It also initializes the attributes of the PacketItem.
     def initialize(name, bit_offset, bit_size, data_type, endianness, array_size = nil, overflow = :ERROR)
@@ -109,6 +112,7 @@ module OpenC3
       @range = nil
       @required = false
       @hazardous = nil
+      @obfuscate = false
       @messages_disabled = nil
       @state_colors = nil
       @limits = PacketItemLimits.new
@@ -314,6 +318,7 @@ module OpenC3
       item.state_colors = self.state_colors.clone if self.state_colors
       item.limits = self.limits.clone if self.limits
       item.meta = self.meta.clone if @meta
+      item.obfuscate = self.obfuscate.clone if @obfuscate
       item
     end
     alias dup clone
@@ -345,6 +350,7 @@ module OpenC3
       hash['limits'] = self.limits.to_hash
       hash['meta'] = nil
       hash['meta'] = @meta if @meta
+      hash['obfuscate'] = self.obfuscate
       hash
     end
 
@@ -404,6 +410,7 @@ module OpenC3
       config << "    FORMAT_STRING #{self.format_string.to_s.quote_if_necessary}\n" if self.format_string
       config << "    UNITS #{self.units_full.to_s.quote_if_necessary} #{self.units.to_s.quote_if_necessary}\n" if self.units
       config << "    OVERFLOW #{self.overflow}\n" if self.overflow != :ERROR
+      config << "    OBFUSCATE\n" if self.obfuscate
 
       if @states
         @states.each do |state_name, state_value|
@@ -512,6 +519,7 @@ module OpenC3
 
       config['meta'] = @meta if @meta
       config['variable_bit_size'] = @variable_bit_size if @variable_bit_size
+      config['obfuscate'] = self.obfuscate
       config
     end
 
@@ -573,6 +581,7 @@ module OpenC3
         item.limits.values = values if values.length > 0
       end
       item.meta = hash['meta']
+      item.obfuscate = hash['obfuscate']
       item.variable_bit_size = hash['variable_bit_size']
       item
     end

data/lib/openc3/script/commands.rb

@@ -14,12 +14,13 @@
 # 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 'openc3/packets/packet'
 require 'openc3/script/extract'
 
@@ -30,7 +31,14 @@ module OpenC3
     private
 
     # Format the command like it appears in a script
-    def _cmd_string(target_name, cmd_name, cmd_params, raw)
+    def _cmd_string(target_name, cmd_name, cmd_params, raw, obfuscated_items)
+      # Normally obfuscated_items is returned as an Array formatted as a JSON string
+      # because we're hitting the API server, but in the case of a disconnect command, it is an Array
+      if obfuscated_items and obfuscated_items.is_a?(String)
+        obfuscated_items = JSON.parse(obfuscated_items)
+      elsif !obfuscated_items
+        obfuscated_items = []
+      end
       output_string = $disconnect ? 'DISCONNECT: ' : ''
       if raw
         output_string += 'cmd_raw("'
@@ -44,18 +52,21 @@ module OpenC3
         params = []
         cmd_params.each do |key, value|
           next if Packet::RESERVED_ITEM_NAMES.include?(key)
-
-          if value.is_a?(String)
-            if !value.is_printable?
-              value = "BINARY"
-            elsif value.length > 256
-              value = value[0..255] + "...'"
+          if obfuscated_items and obfuscated_items.is_a?(Array) and obfuscated_items.include?(key)
+            params << "#{key} *****"
+          else
+            if value.is_a?(String)
+              if !value.is_printable?
+                value = "BINARY"
+              elsif value.length > 256
+                value = value[0..255] + "...'"
+              end
+              value.tr!('"', "'")
+            elsif value.is_a?(Array)
+              value = "[#{value.join(", ")}]"
             end
-            value.tr!('"', "'")
-          elsif value.is_a?(Array)
-            value = "[#{value.join(", ")}]"
+            params << "#{key} #{value}"
           end
-          params << "#{key} #{value}"
         end
         params = params.join(", ")
         output_string += ' with ' + params + '")'
@@ -65,14 +76,14 @@ module OpenC3
 
     # Log any warnings about disabling checks and log the command itself
     # NOTE: This is a helper method and should not be called directly
-    def _log_cmd(target_name, cmd_name, cmd_params, raw, no_range, no_hazardous)
+    def _log_cmd(cmd, raw, no_range, no_hazardous)
       if no_range
-        puts "WARN: Command #{target_name} #{cmd_name} being sent ignoring range checks"
+        puts "WARN: Command #{cmd['target_name']} #{cmd['cmd_name']} being sent ignoring range checks"
       end
       if no_hazardous
-        puts "WARN: Command #{target_name} #{cmd_name} being sent ignoring hazardous warnings"
+        puts "WARN: Command #{cmd['target_name']} #{cmd['cmd_name']} being sent ignoring hazardous warnings"
       end
-      puts _cmd_string(target_name, cmd_name, cmd_params, raw)
+      puts _cmd_string(cmd['target_name'], cmd['cmd_name'], cmd['cmd_params'], raw, cmd['obfuscated_items'])
     end
 
     def _cmd_disconnect(cmd, raw, no_range, no_hazardous, *args, scope: $openc3_scope)
@@ -94,14 +105,17 @@ module OpenC3
 
       # Get the command and validate the parameters
       command = $api_server.get_cmd(target_name, cmd_name, scope: scope)
+      # This returns a packet hash instead of the command hash so add missing fields
+      command['cmd_name'] = cmd_name
+      command['cmd_params'] = cmd_params
       cmd_params.each do |param_name, _param_value|
         param = command['items'].find { |item| item['name'] == param_name }
         unless param
           raise "Packet item '#{target_name} #{cmd_name} #{param_name}' does not exist"
         end
       end
-      _log_cmd(target_name, cmd_name, cmd_params, raw, no_range, no_hazardous)
-    end
+      _log_cmd(command, raw, no_range, no_hazardous)
+   end
 
     # Send the command and log the results
     # This method signature has to include the keyword params present in cmd_api.rb _cmd_implementation()
@@ -113,30 +127,29 @@ module OpenC3
       raw = cmd.include?('raw')
       no_range = cmd.include?('no_range') || cmd.include?('no_checks')
       no_hazardous = cmd.include?('no_hazardous') || cmd.include?('no_checks')
-
       if $disconnect
         _cmd_disconnect(cmd, raw, no_range, no_hazardous, *args, scope: scope)
       else
         begin
           begin
-            target_name, cmd_name, cmd_params = $api_server.method_missing(cmd, *args, timeout: timeout, log_message: log_message, validate: validate, scope: scope, token: token)
+            command = $api_server.method_missing(cmd, *args, timeout: timeout, log_message: log_message, validate: validate, scope: scope, token: token)
             if log_message.nil? or log_message
-              _log_cmd(target_name, cmd_name, cmd_params, raw, no_range, no_hazardous)
+              _log_cmd(command, raw, no_range, no_hazardous)
             end
           rescue HazardousError => e
             # This opens a prompt at which point they can cancel and stop the script
             # or say Yes and send the command. Thus we don't care about the return value.
             prompt_for_hazardous(e.target_name, e.cmd_name, e.hazardous_description)
-            target_name, cmd_name, cmd_params = $api_server.method_missing(cmd_no_hazardous, *args, timeout: timeout, log_message: log_message, validate: validate, scope: scope, token: token)
+            command = $api_server.method_missing(cmd_no_hazardous, *args, timeout: timeout, log_message: log_message, validate: validate, scope: scope, token: token)
             if log_message.nil? or log_message
-              _log_cmd(target_name, cmd_name, cmd_params, raw, no_range, no_hazardous)
+              _log_cmd(command, raw, no_range, no_hazardous)
             end
           end
         rescue CriticalCmdError => e
           # This should not return until the critical command has been approved
-          prompt_for_critical_cmd(e.uuid, e.username, e.target_name, e.cmd_name, e.cmd_params, e.cmd_string)
+          prompt_for_critical_cmd(e.uuid, e.command['username'], e.command['target_name'], e.command['cmd_name'], e.command['cmd_params'], e.command['cmd_string'])
           if log_message.nil? or log_message
-            _log_cmd(e.target_name, e.cmd_name, e.cmd_params, raw, no_range, no_hazardous)
+            _log_cmd(e.command, raw, no_range, no_hazardous)
           end
         end
       end

data/lib/openc3/tools/table_manager/table_config.rb

@@ -14,10 +14,10 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2025, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'openc3/config/config_parser'
@@ -169,7 +169,7 @@ module OpenC3
                'GENERIC_WRITE_CONVERSION_START', 'REQUIRED', 'LIMITS',
                'LIMITS_RESPONSE', 'UNITS', 'FORMAT_STRING', 'DESCRIPTION',
                'HIDDEN', 'MINIMUM_VALUE', 'MAXIMUM_VALUE', 'DEFAULT_VALUE',
-               'OVERFLOW', 'UNEDITABLE'
+               'OVERFLOW', 'UNEDITABLE', 'OBFUSCATE'
             unless @current_item
               raise parser.error("No current item for #{keyword}")
             end

data/lib/openc3/top_level.rb

@@ -14,7 +14,7 @@
 # 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
@@ -51,11 +51,7 @@ end
 
 class CriticalCmdError < StandardError
   attr_accessor :uuid
-  attr_accessor :username
-  attr_accessor :target_name
-  attr_accessor :cmd_name
-  attr_accessor :cmd_params
-  attr_accessor :cmd_string
+  attr_accessor :command
 end
 
 # If a disabled command is sent through the {OpenC3::Api} this error is raised.

data/lib/openc3/topics/command_topic.rb

@@ -14,7 +14,7 @@
 # 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
@@ -41,7 +41,7 @@ module OpenC3
     end
 
     # @param command [Hash] Command hash structure read to be written to a topic
-    def self.send_command(command, timeout: COMMAND_ACK_TIMEOUT_S, scope:)
+    def self.send_command(command, timeout: COMMAND_ACK_TIMEOUT_S, scope:, obfuscated_items: [])
       timeout = COMMAND_ACK_TIMEOUT_S unless timeout
       ack_topic = "{#{scope}__ACKCMD}TARGET__#{command['target_name']}"
       Topic.update_topic_offsets([ack_topic])
@@ -50,17 +50,18 @@ module OpenC3
       command['cmd_params'] = JSON.generate(command['cmd_params'].as_json(:allow_nan => true))
       OpenC3.inject_context(command)
       cmd_id = Topic.write_topic("{#{scope}__CMD}TARGET__#{command['target_name']}", command, '*', 100)
+      command["cmd_params"] = cmd_params # Restore the original cmd_params Hash
       time = Time.now
       while (Time.now - time) < timeout
         Topic.read_topics([ack_topic]) do |_topic, _msg_id, msg_hash, _redis|
           if msg_hash["id"] == cmd_id
             if msg_hash["result"] == "SUCCESS"
-              return [command['target_name'], command['cmd_name'], cmd_params]
+              return command
             # Check for HazardousError which is a special case
             elsif msg_hash["result"].include?("HazardousError")
-              raise_hazardous_error(msg_hash, command['target_name'], command['cmd_name'], cmd_params)
+              raise_hazardous_error(msg_hash, command)
             elsif msg_hash["result"].include?("CriticalCmdError")
-              raise_critical_cmd_error(msg_hash, command['username'], command['target_name'], command['cmd_name'], cmd_params, command['cmd_string'])
+              raise_critical_cmd_error(msg_hash, command)
             else
               raise msg_hash["result"]
             end
@@ -74,14 +75,14 @@ module OpenC3
     # PRIVATE implementation details
     ###########################################################################
 
-    def self.raise_hazardous_error(msg_hash, target_name, cmd_name, cmd_params)
+    def self.raise_hazardous_error(msg_hash, command)
       _, description, formatted = msg_hash["result"].split("\n")
       # Create and populate a new HazardousError and raise it up
       # The _cmd method in script/commands.rb rescues this and calls prompt_for_hazardous
       error = HazardousError.new
-      error.target_name = target_name
-      error.cmd_name = cmd_name
-      error.cmd_params = cmd_params
+      error.target_name = command["target_name"]
+      error.cmd_name = command["cmd_name"]
+      error.cmd_params = command["cmd_params"]
       error.hazardous_description = description
       error.formatted = formatted
 
@@ -89,17 +90,13 @@ module OpenC3
       raise error
     end
 
-    def self.raise_critical_cmd_error(msg_hash, username, target_name, cmd_name, cmd_params, cmd_string)
+    def self.raise_critical_cmd_error(msg_hash, command)
       _, uuid = msg_hash["result"].split("\n")
       # Create and populate a new CriticalCmdError and raise it up
       # The _cmd method in script/commands.rb rescues this and calls prompt_for_critical_cmd
       error = CriticalCmdError.new
       error.uuid = uuid
-      error.username = username
-      error.target_name = target_name
-      error.cmd_name = cmd_name
-      error.cmd_params = cmd_params
-      error.cmd_string = cmd_string
+      error.command = command
       raise error
     end
   end

data/lib/openc3/utilities/cmd_log.rb

@@ -0,0 +1,70 @@
+# encoding: ascii-8bit
+
+# Copyright 2025 OpenC3, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU Affero General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# This file may also be used under the terms of a commercial license
+# if purchased from OpenC3, Inc.
+
+require 'openc3/packets/packet'
+
+module OpenC3
+  module CmdLog
+    def _build_cmd_output_string(method_name, target_name, cmd_name, cmd_params, packet)
+      output_string = "#{method_name}(\""
+      output_string << (target_name + ' ' + cmd_name)
+      if cmd_params.nil? or cmd_params.empty?
+        output_string << '")'
+      else
+        params = []
+        cmd_params.each do |key, value|
+          next if Packet::RESERVED_ITEM_NAMES.include?(key)
+
+          item = packet['items'].find { |find_item| find_item['name'] == key.to_s }
+          begin
+            item_type = item['data_type'].intern
+          rescue
+            item_type = nil
+          end
+
+          if (item and item['obfuscate'])
+            params << "#{key} *****"
+          else
+            if value.is_a?(String)
+              value = value.dup
+              if item_type == :BLOCK or item_type == :STRING
+                if !value.is_printable?
+                  value = "0x" + value.simple_formatted
+                else
+                  value = value.inspect
+                end
+              else
+                value = value.convert_to_value.to_s
+              end
+              if value.length > 256
+                value = value[0..255] + "...'"
+              end
+              value.tr!('"', "'")
+            elsif value.is_a?(Array)
+              value = "[#{value.join(", ")}]"
+            end
+            params << "#{key} #{value}"
+          end
+        end
+        params = params.join(", ")
+        output_string << (' with ' + params + '")')
+      end
+      return output_string
+    end
+  end
+end

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '6.5.1'
+OPENC3_VERSION = '6.6.0'
 module OpenC3
   module Version
     MAJOR = '6'
-    MINOR = '5'
-    PATCH = '1'
+    MINOR = '6'
+    PATCH = '0'
     OTHER = ''
-    BUILD = 'bccc9a29582eed0d565be2c5135676ce87c066f8'
+    BUILD = 'ceee2aabacbdfe57fe8b5de3580358db2ae3a19a'
   end
-  VERSION = '6.5.1'
-  GEM_VERSION = '6.5.1'
+  VERSION = '6.6.0'
+  GEM_VERSION = '6.6.0'
 end

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "6.5.1",
+  "version": "6.6.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -23,7 +23,7 @@
     "@angular/platform-browser-dynamic": "^18.2.6",
     "@angular/router": "^18.2.6",
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.5.1",
+    "@openc3/js-common": "6.6.0",
     "rxjs": "~7.8.0",
     "single-spa": "^5.9.5",
     "single-spa-angular": "^9.2.0",

data/templates/tool_react/package.json

@@ -16,7 +16,7 @@
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.11.0",
     "@mui/material": "^6.1.1",
-    "@openc3/js-common": "6.5.1",
+    "@openc3/js-common": "6.6.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "single-spa-react": "^5.1.4"

data/templates/tool_svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.5.1",
+    "@openc3/js-common": "6.6.0",
     "@smui/button": "^7.0.0",
     "@smui/common": "^7.0.0",
     "@smui/card": "^7.0.0",

data/templates/tool_vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "6.5.1",
+  "version": "6.6.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.5.1",
-    "@openc3/vue-common": "6.5.1",
+    "@openc3/js-common": "6.6.0",
+    "@openc3/vue-common": "6.6.0",
     "axios": "^1.7.7",
     "date-fns": "^4.1.0",
     "lodash": "^4.17.21",

data/templates/widget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= widget_name %>",
-  "version": "6.5.1",
+  "version": "6.6.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/vue-common": "6.5.1",
+    "@openc3/vue-common": "6.6.0",
     "vuetify": "^3.7.1"
   },
   "devDependencies": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 6.5.1
+  version: 6.6.0
 platform: ruby
 authors:
 - Ryan Melton
@@ -766,20 +766,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: simplecov_json_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 description: |2
       OpenC3 provides all the functionality needed to send
       commands to and receive data from one or more embedded systems
@@ -1156,6 +1142,7 @@ files:
 - lib/openc3/utilities/bucket_require.rb
 - lib/openc3/utilities/bucket_utilities.rb
 - lib/openc3/utilities/cli_generator.rb
+- lib/openc3/utilities/cmd_log.rb
 - lib/openc3/utilities/cosmos_rails_formatter.rb
 - lib/openc3/utilities/crc.rb
 - lib/openc3/utilities/csv.rb