openc3 5.18.0 → 5.19.0

data/ext/openc3/ext/structure/structure.c

@@ -15,7 +15,7 @@
 
 /*
 # 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
@@ -69,7 +69,9 @@ static ID id_method_class2 = 0;
 
 static ID id_ivar_buffer = 0;
 static ID id_ivar_bit_offset = 0;
+static ID id_ivar_original_bit_offset = 0;
 static ID id_ivar_bit_size = 0;
+static ID id_ivar_variable_bit_size = 0;
 static ID id_ivar_array_size = 0;
 static ID id_ivar_endianness = 0;
 static ID id_ivar_data_type = 0;
@@ -384,7 +386,7 @@ static void write_bitfield(int lower_bound, int upper_bound, int bit_offset, int
   memcpy(&buffer[lower_bound], write_value, num_bytes);
 }
 
-/* Check the bit size and bit offset for problems. Recalulate the bit offset
+/* Check the bit size and bit offset for problems. Recalculate the bit offset
  * and return back through the passed in pointer. */
 static void check_bit_offset_and_size(VALUE self, VALUE type_param, VALUE bit_offset_param, VALUE bit_size_param, VALUE data_type_param, VALUE buffer_param, int *new_bit_offset)
 {
@@ -1140,7 +1142,7 @@ static VALUE binary_accessor_write(VALUE self, VALUE value, VALUE param_bit_offs
         c_value = NUM2ULL(value);
         break;
       }
-      /* If the passed endianess doesn't match the host we reverse the bytes.
+      /* If the passed endianness doesn't match the host we reverse the bytes.
        * Then shift the result over so it's at the bottom of the long long value. */
       if (param_endianness != HOST_ENDIANNESS)
       {
@@ -1360,92 +1362,86 @@ static VALUE read_item(int argc, VALUE *argv, VALUE self)
  */
 static VALUE structure_item_spaceship(VALUE self, VALUE other_item)
 {
-  int bit_offset = 0;
-  int other_bit_offset = 0;
-  int bit_size = 0;
-  int other_bit_size = 0;
+  int original_bit_offset = 0;
+  int other_original_bit_offset = 0;
   int create_index = 0;
   int other_create_index = 0;
-  int have_create_index = 0;
-  volatile VALUE v_create_index = Qnil;
-  volatile VALUE v_other_create_index = Qnil;
+  volatile VALUE data_type = Qnil;
+  volatile VALUE other_data_type = Qnil;
+  volatile VALUE variable_bit_size = Qnil;
+  volatile VALUE other_variable_bit_size = Qnil;
 
   if (!RTEST(rb_funcall(other_item, id_method_kind_of, 1, cStructureItem)))
   {
     return Qnil;
   }
 
-  bit_offset = FIX2INT(rb_ivar_get(self, id_ivar_bit_offset));
-  other_bit_offset = FIX2INT(rb_ivar_get(other_item, id_ivar_bit_offset));
+  original_bit_offset = FIX2INT(rb_ivar_get(self, id_ivar_original_bit_offset));
+  other_original_bit_offset = FIX2INT(rb_ivar_get(other_item, id_ivar_original_bit_offset));
 
-  v_create_index = rb_ivar_get(self, id_ivar_create_index);
-  v_other_create_index = rb_ivar_get(other_item, id_ivar_create_index);
-  if (RTEST(v_create_index) && RTEST(v_other_create_index))
-  {
-    create_index = FIX2INT(v_create_index);
-    other_create_index = FIX2INT(v_other_create_index);
-    have_create_index = 1;
-  }
+  create_index = FIX2INT(rb_ivar_get(self, id_ivar_create_index));
+  other_create_index = FIX2INT(rb_ivar_get(other_item, id_ivar_create_index));
+
+  data_type = rb_ivar_get(self, id_ivar_data_type);
+  other_data_type = rb_ivar_get(other_item, id_ivar_data_type);
 
-  /* Handle same bit offset case */
-  if ((bit_offset == 0) && (other_bit_offset == 0))
+  variable_bit_size = rb_ivar_get(self, id_ivar_variable_bit_size);
+  other_variable_bit_size = rb_ivar_get(other_item, id_ivar_variable_bit_size);
+
+  /* Derived items should be first in the list with multiple derived sorted
+   * by create_index */
+  if (data_type == symbol_DERIVED)
   {
-    /* Both bit_offsets are 0 so sort by bit_size
-     * This allows derived items with bit_size of 0 to be listed first
-     * Compare based on bit size */
-    bit_size = FIX2INT(rb_ivar_get(self, id_ivar_bit_size));
-    other_bit_size = FIX2INT(rb_ivar_get(other_item, id_ivar_bit_size));
-    if (bit_size == other_bit_size)
+    if (other_data_type != symbol_DERIVED)
     {
-      if (have_create_index)
+      return INT2FIX(-1);
+    }
+    else
+    {
+      if (create_index <= other_create_index)
       {
-        if (create_index <= other_create_index)
-        {
-          return INT2FIX(-1);
-        }
-        else
-        {
-          return INT2FIX(1);
-        }
+        return INT2FIX(-1);
       }
       else
       {
-        return INT2FIX(0);
+        return INT2FIX(1);
       }
     }
-    if (bit_size < other_bit_size)
-    {
-      return INT2FIX(-1);
-    }
-    else
-    {
-      return INT2FIX(1);
-    }
+  }
+  else if (other_data_type == symbol_DERIVED)
+  {
+    return INT2FIX(1);
   }
 
-  /* Handle different bit offsets */
-  if (((bit_offset >= 0) && (other_bit_offset >= 0)) || ((bit_offset < 0) && (other_bit_offset < 0)))
+  /* Handle non-derived items */
+  if (((original_bit_offset >= 0) && (other_original_bit_offset >= 0)) || ((original_bit_offset < 0) && (other_original_bit_offset < 0)))
   {
     /* Both Have Same Sign */
-    if (bit_offset == other_bit_offset)
+    if (original_bit_offset == other_original_bit_offset)
     {
-      if (have_create_index)
+      if (RTEST(variable_bit_size))
       {
-        if (create_index <= other_create_index)
+        if (!RTEST(other_variable_bit_size))
         {
           return INT2FIX(-1);
         }
-        else
-        {
-          return INT2FIX(1);
-        }
+        /* If both variable_bit_size use create index */
+      }
+      else if (RTEST(other_variable_bit_size))
+      {
+        return INT2FIX(1);
+      }
+
+      if (create_index <= other_create_index)
+      {
+        return INT2FIX(-1);
       }
       else
       {
-        return INT2FIX(0);
+        return INT2FIX(1);
       }
     }
-    else if (bit_offset < other_bit_offset)
+    else if (original_bit_offset <= other_original_bit_offset)
     {
       return INT2FIX(-1);
     }
@@ -1457,25 +1453,7 @@ static VALUE structure_item_spaceship(VALUE self, VALUE other_item)
   else
   {
     /* Different Signs */
-    if (bit_offset == other_bit_offset)
-    {
-      if (have_create_index)
-      {
-        if (create_index <= other_create_index)
-        {
-          return INT2FIX(-1);
-        }
-        else
-        {
-          return INT2FIX(1);
-        }
-      }
-      else
-      {
-        return INT2FIX(0);
-      }
-    }
-    else if (bit_offset < other_bit_offset)
+    if (original_bit_offset < other_original_bit_offset)
     {
       return INT2FIX(1);
     }
@@ -1649,7 +1627,9 @@ void Init_structure(void)
 
   id_ivar_buffer = rb_intern("@buffer");
   id_ivar_bit_offset = rb_intern("@bit_offset");
+  id_ivar_original_bit_offset = rb_intern("@original_bit_offset");
   id_ivar_bit_size = rb_intern("@bit_size");
+  id_ivar_variable_bit_size = rb_intern("@variable_bit_size");
   id_ivar_array_size = rb_intern("@array_size");
   id_ivar_endianness = rb_intern("@endianness");
   id_ivar_data_type = rb_intern("@data_type");

data/lib/openc3/accessors/binary_accessor.rb

@@ -108,7 +108,7 @@ module OpenC3
 
     # Store the host endianness so that it only has to be determined once
     HOST_ENDIANNESS = get_host_endianness()
-    # Valid endianess
+    # Valid endianness
     ENDIANNESS = [:BIG_ENDIAN, :LITTLE_ENDIAN]
 
     def handle_read_variable_bit_size(item, _buffer)
@@ -749,7 +749,7 @@ module OpenC3
       end
 
 
-      # Check the bit size and bit offset for problems. Recalulate the bit offset
+      # Check the bit size and bit offset for problems. Recalculate the bit offset
       # and return back through the passed in pointer.
       def self.check_bit_offset_and_size(read_or_write, given_bit_offset, given_bit_size, data_type, buffer)
         bit_offset = given_bit_offset
@@ -1104,7 +1104,7 @@ module OpenC3
             # Remove extra bytes from old buffer
             buffer[(upper_bound + 1)..old_upper_bound] = ''
           elsif upper_bound > old_upper_bound
-            # Grow buffer and preserve bytes at end of buffer if necesssary
+            # Grow buffer and preserve bytes at end of buffer if necessary
             buffer_length = buffer.length
             diff = upper_bound - old_upper_bound
             buffer << (ZERO_STRING * diff)
@@ -1408,7 +1408,7 @@ 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

data/lib/openc3/accessors/form_accessor.rb

@@ -45,7 +45,7 @@ module OpenC3
       ary = URI.decode_www_form(buffer)
 
       # Remove existing item and bad keys from array
-      ary.reject! {|key, ary_value| (key == item.key) or (key.to_s[0] == "\u0000")}
+      ary.reject! {|key, _ary_value| (key == item.key) or (key.to_s[0] == "\u0000")}
 
       if Array === value
         value.each do |value_value|
@@ -79,7 +79,7 @@ module OpenC3
       return true
     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

data/lib/openc3/accessors/http_accessor.rb

@@ -169,7 +169,7 @@ module OpenC3
       return @body_accessor.enforce_short_buffer_allowed
     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)
       case item.name

data/lib/openc3/accessors/json_accessor.rb

@@ -22,9 +22,11 @@ require 'openc3/io/json_rpc'
 require 'openc3/accessors/accessor'
 
 # Monkey patch JsonPath to enable create_additions and allow_nan to support binary strings, and NaN, Infinity, -Infinity
-class JsonPath
-  def self.process_object(obj_or_str, opts = {})
-    obj_or_str.is_a?(String) ? MultiJson.decode(obj_or_str, max_nesting: opts[:max_nesting], create_additions: true, allow_nan: true) : obj_or_str
+OpenC3.disable_warnings do
+  class JsonPath
+    def self.process_object(obj_or_str, opts = {})
+      obj_or_str.is_a?(String) ? MultiJson.decode(obj_or_str, max_nesting: opts[:max_nesting], create_additions: true, allow_nan: true) : obj_or_str
+    end
   end
 end
 
@@ -161,7 +163,7 @@ module OpenC3
       return true
     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

data/lib/openc3/accessors/template_accessor.rb

@@ -38,21 +38,18 @@ module OpenC3
       # Convert the template into a Regexp for reading each item
       template = @packet.template.dup
       template_items = template.scan(Regexp.new("#{escaped_left_char}.*?#{escaped_right_char}"))
-      escaped_read_template = template
-      if @left_char != '('
-        escaped_read_template = escaped_read_template.gsub('(', '\(')
-      end
-      if @right_char != ')'
-        escaped_read_template = escaped_read_template.gsub(')', '\)')
-      end
+      escaped_read_template = Regexp.escape(template)
 
       @item_keys = []
       template_items.each do |item|
         @item_keys << item[1..-2]
+        # If they're using parens we have to escape them
+        # since we're working with the already escaped template
+        item = "\\#{item}" if @left_char == '('
+        item = "#{item[0..-2]}\\)" if @right_char == ')'
         escaped_read_template.gsub!(item, "(.*)")
       end
       @read_regexp = Regexp.new(escaped_read_template)
-
       @configured = true
     end
 
@@ -141,7 +138,7 @@ module OpenC3
       return true
     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

data/lib/openc3/accessors/xml_accessor.rb

@@ -88,7 +88,7 @@ module OpenC3
       return true
     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

data/lib/openc3/api/cmd_api.rb

@@ -452,7 +452,8 @@ module OpenC3
       return [target_name, command_name, parameter_name]
     end
 
-    def _cmd_implementation(method_name, *args, range_check:, hazardous_check:, raw:, timeout: nil, log_message: nil, manual: false,
+    # NOTE: When adding new keywords to this method, make sure to update script/commands.rb
+    def _cmd_implementation(method_name, *args, range_check:, hazardous_check:, raw:, timeout: nil, log_message: nil, manual: false, validate: true,
                             scope: $openc3_scope, token: $openc3_token, **kwargs)
       extract_string_kwargs_to_args(args, kwargs)
       unless [nil, true, false].include?(log_message)
@@ -484,7 +485,24 @@ module OpenC3
       target_name = target_name.upcase
       cmd_name = cmd_name.upcase
       cmd_params = cmd_params.transform_keys(&:upcase)
-      authorize(permission: 'cmd', target_name: target_name, packet_name: cmd_name, manual: manual, scope: scope, token: token)
+      user = authorize(permission: 'cmd', target_name: target_name, packet_name: cmd_name, manual: manual, scope: scope, token: token)
+      if user.nil?
+        user = {}
+        user['username'] = ENV['OPENC3_MICROSERVICE_NAME']
+
+        # Get the caller stack trace to determine the point in the code where the command was called
+        # This code works but ultimately we didn't want to overload 'username' and take a performance hit
+        # caller.each do |frame|
+        #   # Look for the following line in the stack trace which indicates custom code
+        #   # /tmp/d20240827-62-8e57pf/targets/INST/lib/example_limits_response.rb:31:in `call'
+        #   if frame.include?("/targets/#{target_name}")
+        #     user = {}
+        #     # username is the name of the custom code file
+        #     user['username'] = frame.split("/targets/")[-1].split(':')[0]
+        #     break
+        #   end
+        # end
+      end
       packet = TargetModel.packet(target_name, cmd_name, type: :CMD, scope: scope)
       if packet['disabled']
         error = DisabledError.new
@@ -493,14 +511,6 @@ module OpenC3
         raise error
       end
 
-      command = {
-        'target_name' => target_name,
-        'cmd_name' => cmd_name,
-        'cmd_params' => cmd_params,
-        'range_check' => range_check.to_s,
-        'hazardous_check' => hazardous_check.to_s,
-        'raw' => raw.to_s
-      }
       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
@@ -513,9 +523,23 @@ module OpenC3
           end
         end
       end
+      cmd_string = _build_cmd_output_string(method_name, target_name, cmd_name, cmd_params, packet)
       if log_message
-        Logger.info(_build_cmd_output_string(method_name, target_name, cmd_name, cmd_params, packet), scope: scope)
+        Logger.info(cmd_string, scope: scope)
       end
+
+      username = user && user['username'] ? user['username'] : 'anonymous'
+      command = {
+        'target_name' => target_name,
+        'cmd_name' => cmd_name,
+        'cmd_params' => cmd_params,
+        'range_check' => range_check.to_s,
+        'hazardous_check' => hazardous_check.to_s,
+        'raw' => raw.to_s,
+        'cmd_string' => cmd_string,
+        'username' => username,
+        'validate' => validate.to_s
+      }
       CommandTopic.send_command(command, timeout: timeout, scope: scope)
     end
 

data/lib/openc3/api/limits_api.rb

@@ -107,7 +107,7 @@ module OpenC3
     # Favor the first syntax where possible as it is more succinct.
     #
     # @param args [String|Array<String>] See the description for calling style
-    # @return [Boolean] Whether limits are enable for the itme
+    # @return [Boolean] Whether limits are enable for the item
     def limits_enabled?(*args, manual: false, scope: $openc3_scope, token: $openc3_token)
       target_name, packet_name, item_name = _tlm_process_args(args, 'limits_enabled?', scope: scope)
       authorize(permission: 'tlm', target_name: target_name, packet_name: packet_name, manual: manual, scope: scope, token: token)

data/lib/openc3/config/config_parser.rb

@@ -190,7 +190,7 @@ module OpenC3
     # @param remove_quotes [Boolean] Whether to remove beginning and ending single
     #   or double quote characters from parameters.
     # @param run_erb [Boolean] Whether or not to run ERB on the file
-    # @param variables [Hash] variables to pash to ERB context
+    # @param variables [Hash] variables to push to ERB context
     # @param block [Block] The block to yield to
     # @yieldparam keyword [String] The keyword in the current parsed line
     # @yieldparam parameters [Array<String>] The parameters in the current parsed line

data/lib/openc3/conversions/segmented_polynomial_conversion.rb

@@ -17,7 +17,7 @@
 # All changes Copyright 2022, 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/conversions/conversion'
@@ -42,7 +42,7 @@ module OpenC3
       attr_reader :coeffs
 
       # Creates a polynomial conversion segment. Multiple Segments are used to
-      # implemnt a {SegmentedPolynomialConversion}.
+      # implement a {SegmentedPolynomialConversion}.
       #
       # @param lower_bound [Integer] The value at which point this polynomial conversion
       #   should apply. All values >= to this value will be converted using the
@@ -60,16 +60,16 @@ module OpenC3
       # @param other_segment [Segment] The segment to compare
       # @return [Integer] 1 if self.lower_bound > other_segment.lower_bound, 0
       #   if they are equal, -1 if self.lower_bound < other_segment.lower_bound
-      def <=>(other_segment)
-        return other_segment.lower_bound <=> @lower_bound
+      def <=>(other)
+        return other.lower_bound <=> @lower_bound
       end
 
       # Implement equality operator primarily for ease of testing
       #
       # @param segment [Segment] Other segment
-      def ==(other_segment)
-        @lower_bound == other_segment.lower_bound &&
-          @coeffs == other_segment.coeffs
+      def ==(other)
+        @lower_bound == other.lower_bound &&
+          @coeffs == other.coeffs
       end
 
       # Perform the polynomial conversion

data/lib/openc3/core_ext/array.rb

@@ -17,7 +17,7 @@
 # All changes Copyright 2022, 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/ext/array' if RUBY_ENGINE == 'ruby' and !ENV['OPENC3_NO_EXT']
@@ -306,10 +306,10 @@ class Array
   #   which are arrays containing the first value that is found in the bucket,
   #   the last value found in the bucket, and the total number of values in the
   #   bucket.
-  def histogram(num_buckets = nil, numeric = false, &block)
+  def histogram(num_buckets = nil, numeric = false, &)
     buckets = {}
 
-    # Count the occurance of each value
+    # Count the occurrence of each value
     self.each do |value|
       buckets[value] ||= 0
       buckets[value] += 1
@@ -338,7 +338,7 @@ class Array
         integers      = true if first_value.kind_of?(Integer) and last_value.kind_of?(Integer)
         if integers
           bucket_size = bucket_size.ceil
-          last_value = first_value + bucket_size * num_buckets - 1
+          last_value = first_value + (bucket_size * num_buckets) - 1
           delta = last_value - first_value
           (delta + 1).times do |index|
             buckets[first_value + index] ||= 0
@@ -406,7 +406,7 @@ class Array
             last_index = sorted_buckets.length - 1 if last_index > (sorted_buckets.length - 1)
           end
           sum = 0
-          sorted_buckets[first_index..last_index].each { |key, value| sum += value }
+          sorted_buckets[first_index..last_index].each { |_key, value| sum += value }
           reduced_buckets[bucket_index] = [sorted_buckets[first_index][0], sorted_buckets[last_index][0], sum]
           first_index = first_index + bucket_sizes[bucket_index]
         end

data/lib/openc3/core_ext/exception.rb

@@ -14,14 +14,21 @@
 # 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 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 # OpenC3 specific additions to the Ruby Exception class
 class Exception
+  def filtered
+    backtrace = self.backtrace.select do |line|
+      !line.include?('lib/ruby/gems')
+    end
+    return "#{self.message}\n#{backtrace.join("\n")}"
+  end
+
   # @param hide_runtime_error_class [Boolean] Whether to hide the Exception
   #   error class if the class is RuntimeError. Other classes will continue to
   #   be printed.

data/lib/openc3/core_ext/string.rb

@@ -63,7 +63,7 @@ class String
   # @param unprintable_character [String] The string to output when data in the
   #   binary String does not result in a printable ASCII character. Only used if
   #   show_ascii is true.
-  # @param line_separator [String] The string used to end a line.  Normaly newline.
+  # @param line_separator [String] The string used to end a line. Normally newline.
   def formatted(
     word_size = 1,
     words_per_line = 16,
@@ -149,7 +149,7 @@ class String
     string
   end
 
-  # Uses the String each_line method to interate through the lines and removes
+  # Uses the String each_line method to iterate through the lines and removes
   # the line specified.
   #
   # @param line_number [Integer] The line to remove from the string (1 based)

data/lib/openc3/interfaces/http_server_interface.rb

@@ -75,6 +75,7 @@ module OpenC3
                 # No HTTP_STATUS - Leave at default
               end
 
+              # http_accessor stores all the pseudo-derived HTTP configuration in extra
               if packet.extra
                 headers = packet.extra['HTTP_HEADERS']
                 if headers

data/lib/openc3/interfaces/interface.rb

@@ -258,7 +258,7 @@ module OpenC3
       first = true
       loop do
         # Protocols may have cached data for a packet, so initially just inject a blank string
-        # Otherwise we can hold off outputing other packets where all the data has already
+        # Otherwise we can hold off outputting other packets where all the data has already
         # been received
         extra = nil
         if !first or @read_protocols.length <= 0

data/lib/openc3/interfaces/linc_interface.rb

@@ -128,11 +128,11 @@ module OpenC3
       raise "Interface not connected" unless connected?()
 
       # Add a GUID to the GUID field if its defined
-      # A GUID means it's an asychronous packet type.
+      # A GUID means it's an asynchronous packet type.
       if @fieldname_guid
         guid = get_guid(packet)
       else
-        # If @fieldname_guid is not defined (syncronous) we don't care what the
+        # If @fieldname_guid is not defined (synchronous) we don't care what the
         # GUID is because we're not trying to match it up with anything.
         # As soon as we get a response we free the command.
         guid = 0
@@ -323,7 +323,7 @@ module OpenC3
       # first looks up the handshake before removing it.
       @handshakes_mutex.synchronize do
         if @fieldname_guid
-          # A GUID means it's an asychronous packet type.
+          # A GUID means it's an asynchronous packet type.
           # So look at the list of incoming handshakes and pick off (deleting)
           # the handshake from the list if it's for this command.
           #

data/lib/openc3/io/json_api.rb

@@ -40,13 +40,18 @@ module OpenC3
     # pull openc3-cosmos-script-runner-api url from environment variables
     def _generate_url(microservice_name:, prefix:, schema: 'http', hostname: nil, port:, scope: $openc3_scope)
       prefix = '/' + prefix unless prefix[0] == '/'
-      if ENV['KUBERNETES_SERVICE_HOST']
-        hostname = "#{scope}__USER__#{microservice_name}" unless hostname
-        hostname = hostname.downcase.gsub("__", "-").gsub("_", "-")
-        return "#{schema}://#{hostname}-service:#{port.to_i}#{prefix}"
-      else
-        hostname = 'openc3-operator' unless hostname
+      if ENV['OPENC3_OPERATOR_HOSTNAME']
+        hostname = ENV['OPENC3_OPERATOR_HOSTNAME'] unless hostname
         return "#{schema}://#{hostname}:#{port.to_i}#{prefix}"
+      else
+        if ENV['KUBERNETES_SERVICE_HOST']
+          hostname = "#{scope}__USER__#{microservice_name}" unless hostname
+          hostname = hostname.downcase.gsub("__", "-").gsub("_", "-")
+          return "#{schema}://#{hostname}-service:#{port.to_i}#{prefix}"
+        else
+          hostname = 'openc3-operator' unless hostname
+          return "#{schema}://#{hostname}:#{port.to_i}#{prefix}"
+        end
       end
     end
 

data/lib/openc3/io/json_rpc.rb

@@ -214,7 +214,7 @@ module OpenC3
 
   # Represents a JSON Remote Procedure Call Request
   class JsonRpcRequest < JsonRpc
-    DANGEROUS_METHODS = ['__send__', 'send', 'instance_eval', 'instance_exec']
+    DANGEROUS_METHODS = Set['__send__', 'send', 'instance_eval', 'instance_exec']
 
     # @param method_name [String] The name of the method to call
     # @param method_params [Array<String>] Array of strings which represent the