openc3 6.8.1 → 6.9.1

data/lib/openc3/script/script_runner.rb

@@ -34,7 +34,7 @@ module OpenC3
       if response.nil? || response.status != 200
         _script_response_error(response, "Script list request failed", scope: scope)
       else
-        scripts = JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+        scripts = JSON.parse(response.body, allow_nan: true, create_additions: true)
         # Remove the '*' from the script names
         return scripts.each { |script| script.gsub!(/\*$/, '') }
       end
@@ -50,7 +50,7 @@ module OpenC3
       if response.nil? || response.status != 200
         _script_response_error(response, "Script syntax check request failed", scope: scope)
       else
-        result = JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+        result = JSON.parse(response.body, allow_nan: true, create_additions: true)
         if result['title'] == "Syntax Check Successful"
           result['success'] = true
         else
@@ -66,7 +66,7 @@ module OpenC3
       if response.nil? || response.status != 200
         _script_response_error(response, "Failed to get #{filename}", scope: scope)
       else
-        result = JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+        result = JSON.parse(response.body, allow_nan: true, create_additions: true)
         return result['contents']
       end
     end
@@ -142,9 +142,9 @@ module OpenC3
       if response.nil? || response.status != 200
         _script_response_error(response, "Script instrumented request failed", scope: scope)
       else
-        result = JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+        result = JSON.parse(response.body, allow_nan: true, create_additions: true)
         if result['title'] == "Instrumented Script"
-          parsed = JSON.parse(result['description'], :allow_nan => true, :create_additions => true)
+          parsed = JSON.parse(result['description'], allow_nan: true, create_additions: true)
           return parsed.join("\n")
         else
           raise result.inspect
@@ -158,7 +158,7 @@ module OpenC3
       if response.nil? || response.status != 200
         _script_response_error(response, "Script create request failed", scope: scope)
       else
-        return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+        return JSON.parse(response.body, allow_nan: true, create_additions: true)
       end
     end
 
@@ -178,7 +178,7 @@ module OpenC3
       if response.nil? || response.status != 200
         _script_response_error(response, "Running script list request failed", scope: scope)
       else
-        return JSON.parse(response.body, :allow_nan => true, :create_additions => true)['items']
+        return JSON.parse(response.body, allow_nan: true, create_additions: true)['items']
       end
     end
 
@@ -188,7 +188,7 @@ module OpenC3
       if response.nil? || response.status != 200
         _script_response_error(response, "Running script show request failed", scope: scope)
       else
-        return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+        return JSON.parse(response.body, allow_nan: true, create_additions: true)
       end
     end
     alias running_script_get script_get # Deprecated alias for compatibility
@@ -275,7 +275,7 @@ module OpenC3
       if response.nil? || response.status != 200
         _script_response_error(response, "Completed script list request failed", scope: scope)
       else
-        return JSON.parse(response.body, :allow_nan => true, :create_additions => true)['items']
+        return JSON.parse(response.body, allow_nan: true, create_additions: true)['items']
       end
     end
   end

data/lib/openc3/script/storage.rb

@@ -199,7 +199,7 @@ module OpenC3
       if response.nil? || response.status != 201
         raise "Failed to get presigned URL for #{endpoint}"
       end
-      JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+      JSON.parse(response.body, allow_nan: true, create_additions: true)
     end
   end
 end

data/lib/openc3/script/tables.rb

@@ -40,10 +40,10 @@ module OpenC3
     def _tables_handle_response(response, error_message)
       return nil if response.nil?
       if response.status >= 400
-        result = JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+        result = JSON.parse(response.body, allow_nan: true, create_additions: true)
         raise "#{error_message} due to #{result['message']}"
       end
-      return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+      return JSON.parse(response.body, allow_nan: true, create_additions: true)
     end
   end
 end

data/lib/openc3/script/web_socket_api.rb

@@ -91,8 +91,8 @@ module OpenC3
       unless @subscribed
         json_hash = {}
         json_hash['command'] = 'subscribe'
-        json_hash['identifier'] = JSON.generate(@identifier)
-        @stream.write(JSON.generate(json_hash))
+        json_hash['identifier'] = JSON.generate(@identifier, allow_nan: true)
+        @stream.write(JSON.generate(json_hash, allow_nan: true))
         @subscribed = true
       end
     end
@@ -102,8 +102,8 @@ module OpenC3
       if @subscribed
         json_hash = {}
         json_hash['command'] = 'unsubscribe'
-        json_hash['identifier'] = JSON.generate(@identifier)
-        @stream.write(JSON.generate(json_hash))
+        json_hash['identifier'] = JSON.generate(@identifier, allow_nan: true)
+        @stream.write(JSON.generate(json_hash, allow_nan: true))
         @subscribed = false
       end
     end
@@ -112,9 +112,9 @@ module OpenC3
     def write_action(data_hash)
       json_hash = {}
       json_hash['command'] = 'message'
-      json_hash['identifier'] = JSON.generate(@identifier)
-      json_hash['data'] = JSON.generate(data_hash)
-      write(JSON.generate(json_hash))
+      json_hash['identifier'] = JSON.generate(@identifier, allow_nan: true)
+      json_hash['data'] = JSON.generate(data_hash, allow_nan: true)
+      write(JSON.generate(json_hash, allow_nan: true))
     end
 
     # General write to the websocket

data/lib/openc3/tools/cmd_tlm_server/interface_thread.rb

@@ -210,18 +210,6 @@ module OpenC3
       rescue => e
         Logger.error "Problem writing to router #{router.name} - #{e.class}:#{e.message}"
       end
-
-      # Write to packet log writers
-      if packet.stored and !@interface.stored_packet_log_writer_pairs.empty?
-        @interface.stored_packet_log_writer_pairs.each do |packet_log_writer_pair|
-          packet_log_writer_pair.tlm_log_writer.write(packet)
-        end
-      else
-        @interface.packet_log_writer_pairs.each do |packet_log_writer_pair|
-          # Write errors are handled by the log writer
-          packet_log_writer_pair.tlm_log_writer.write(packet)
-        end
-      end
     end
 
     def handle_connection_failed(connect_error)

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

@@ -191,7 +191,7 @@ module OpenC3
           end
         end
       end
-      json.as_json(:allow_nan => true)
+      json.as_json()
     end
 
     def self.load_binary(config, data)

data/lib/openc3/topics/command_decom_topic.rb

@@ -39,8 +39,8 @@ module OpenC3
         json_hash[item.name + "__F"] = packet.read_item(item, :FORMATTED) if item.format_string
         json_hash[item.name + "__U"] = packet.read_item(item, :WITH_UNITS) if item.units
       end
-      json_hash['extra'] = JSON.generate(packet.extra.as_json(:allow_nan => true))
-      msg_hash['json_data'] = JSON.generate(json_hash.as_json(:allow_nan => true))
+      json_hash['extra'] = JSON.generate(packet.extra.as_json, allow_nan: true)
+      msg_hash['json_data'] = JSON.generate(json_hash.as_json, allow_nan: true)
       EphemeralStoreQueued.write_topic(topic, msg_hash)
     end
 
@@ -51,7 +51,7 @@ module OpenC3
           msg_hash['received_count'].to_i
         else
           json = msg_hash['json_data']
-          hash = JSON.parse(json, :allow_nan => true, :create_additions => true)
+          hash = JSON.parse(json, allow_nan: true, create_additions: true)
           # Start from the most complex down to the basic raw value
           value = hash["#{param_name}__U"]
           return value if value && type == :WITH_UNITS

data/lib/openc3/topics/command_topic.rb

@@ -47,7 +47,7 @@ module OpenC3
       Topic.update_topic_offsets([ack_topic])
       # Save the existing cmd_params Hash and JSON generate before writing to the topic
       cmd_params = command['cmd_params']
-      command['cmd_params'] = JSON.generate(command['cmd_params'].as_json(:allow_nan => true))
+      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

data/lib/openc3/topics/interface_topic.rb

@@ -42,10 +42,13 @@ module OpenC3
       while true
         Topic.read_topics(InterfaceTopic.topics(interface, scope: scope)) do |topic, msg_id, msg_hash, redis|
           result = yield topic, msg_id, msg_hash, redis
-          ack_topic = topic.split("__")
-          ack_topic[1] = 'ACK' + ack_topic[1]
-          ack_topic = ack_topic.join("__")
-          Topic.write_topic(ack_topic, { 'result' => result, 'id' => msg_id }, '*', 100)
+          if result
+            # Only ack if we intend to - Disabled targets will not ack
+            ack_topic = topic.split("__")
+            ack_topic[1] = 'ACK' + ack_topic[1]
+            ack_topic = ack_topic.join("__")
+            Topic.write_topic(ack_topic, { 'result' => result, 'id' => msg_id }, '*', 100)
+          end
         end
       end
     end
@@ -75,7 +78,7 @@ module OpenC3
 
     def self.connect_interface(interface_name, *interface_params, scope:)
       if interface_params && !interface_params.empty?
-        Topic.write_topic("{#{scope}__CMD}INTERFACE__#{interface_name}", { 'connect' => 'true', 'params' => JSON.generate(interface_params) }, '*', 100)
+        Topic.write_topic("{#{scope}__CMD}INTERFACE__#{interface_name}", { 'connect' => 'true', 'params' => JSON.generate(interface_params, allow_nan: true) }, '*', 100)
       else
         Topic.write_topic("{#{scope}__CMD}INTERFACE__#{interface_name}", { 'connect' => 'true' }, '*', 100)
       end
@@ -121,5 +124,42 @@ module OpenC3
       data['type'] = type
       Topic.write_topic("{#{scope}__CMD}INTERFACE__#{interface_name}", { 'inject_tlm' => JSON.generate(data, allow_nan: true) }, '*', 100)
     end
+
+    def self.interface_target_enable(interface_name, target_name, cmd_only: false, tlm_only: false, scope:)
+      data = {}
+      data['target_name'] = target_name.to_s.upcase
+      data['cmd_only'] = cmd_only
+      data['tlm_only'] = tlm_only
+      data['action'] = 'enable'
+      Topic.write_topic("{#{scope}__CMD}INTERFACE__#{interface_name}", { 'target_control' => JSON.generate(data, allow_nan: true) }, '*', 100)
+    end
+
+    def self.interface_target_disable(interface_name, target_name, cmd_only: false, tlm_only: false, scope:)
+      data = {}
+      data['target_name'] = target_name.to_s.upcase
+      data['cmd_only'] = cmd_only
+      data['tlm_only'] = tlm_only
+      data['action'] = 'disable'
+      Topic.write_topic("{#{scope}__CMD}INTERFACE__#{interface_name}", { 'target_control' => JSON.generate(data, allow_nan: true) }, '*', 100)
+    end
+
+    def self.interface_details(interface_name, timeout: nil, scope:)
+      interface_name = interface_name.upcase
+
+      timeout = COMMAND_ACK_TIMEOUT_S unless timeout
+      ack_topic = "{#{scope}__ACKCMD}INTERFACE__#{interface_name}"
+      Topic.update_topic_offsets([ack_topic])
+
+      cmd_id = Topic.write_topic("{#{scope}__CMD}INTERFACE__#{interface_name}", { 'interface_details' => 'true' }, '*', 100)
+      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
+            return JSON.parse(msg_hash["result"], :allow_nan => true, :create_additions => true)
+          end
+        end
+      end
+      raise "Timeout of #{timeout}s waiting for cmd ack"
+    end
   end
 end

data/lib/openc3/topics/limits_event_topic.rb

@@ -47,7 +47,7 @@ module OpenC3
         field = "#{event[:target_name]}__#{event[:packet_name]}__#{event[:item_name]}"
         limits_settings = Store.hget("#{scope}__current_limits_settings", field)
         if limits_settings
-          limits_settings = JSON.parse(limits_settings, :allow_nan => true, :create_additions => true)
+          limits_settings = JSON.parse(limits_settings, allow_nan: true, create_additions: true)
         else
           limits_settings = {}
         end
@@ -61,18 +61,18 @@ module OpenC3
         limits_settings[event[:limits_set]] = limits
         limits_settings['persistence_setting'] = event[:persistence] if event[:persistence]
         limits_settings['enabled'] = event[:enabled] if not event[:enabled].nil?
-        Store.hset("#{scope}__current_limits_settings", field, JSON.generate(limits_settings, :allow_nan => true))
+        Store.hset("#{scope}__current_limits_settings", field, JSON.generate(limits_settings, allow_nan: true))
 
       when :LIMITS_ENABLE_STATE
         field = "#{event[:target_name]}__#{event[:packet_name]}__#{event[:item_name]}"
         limits_settings = Store.hget("#{scope}__current_limits_settings", field)
         if limits_settings
-          limits_settings = JSON.parse(limits_settings, :allow_nan => true, :create_additions => true)
+          limits_settings = JSON.parse(limits_settings, allow_nan: true, create_additions: true)
         else
           limits_settings = {}
         end
         limits_settings['enabled'] = event[:enabled]
-        Store.hset("#{scope}__current_limits_settings", field, JSON.generate(limits_settings, :allow_nan => true))
+        Store.hset("#{scope}__current_limits_settings", field, JSON.generate(limits_settings, allow_nan: true))
 
       when :LIMITS_SET
         sets = sets(scope: scope)
@@ -86,7 +86,7 @@ module OpenC3
         raise "Invalid limits event type '#{event[:type]}'"
       end
 
-      Topic.write_topic("#{scope}__openc3_limits_events", {event: JSON.generate(event, :allow_nan => true)}, '*', 1000)
+      Topic.write_topic("#{scope}__openc3_limits_events", {event: JSON.generate(event, allow_nan: true)}, '*', 1000)
     end
 
     # Remove the JSON encoding to return hashes directly
@@ -106,7 +106,7 @@ module OpenC3
       end
       parsed_result = []
       final_result.each do |offset, hash|
-        parsed_result << [offset, JSON.parse(hash['event'], :allow_nan => true, :create_additions => true)]
+        parsed_result << [offset, JSON.parse(hash['event'], allow_nan: true, create_additions: true)]
       end
       return parsed_result
     end
@@ -175,7 +175,7 @@ module OpenC3
         if target
           packet = target[packet_name]
           if packet
-            limits_settings = JSON.parse(limits_settings, :allow_nan => true, :create_additions => true)
+            limits_settings = JSON.parse(limits_settings, allow_nan: true, create_additions: true)
             enabled = limits_settings['enabled']
             persistence = limits_settings['persistence_setting']
             limits_settings.each do |limits_set, settings|
@@ -199,7 +199,7 @@ module OpenC3
       telemetry = System.telemetry.all
       topics = ["#{scope}__openc3_limits_events"]
       Topic.read_topics(topics, nil, block_ms) do |_topic, _msg_id, event, _redis|
-        event = JSON.parse(event['event'], :allow_nan => true, :create_additions => true)
+        event = JSON.parse(event['event'], allow_nan: true, create_additions: true)
         case event['type']
         when 'LIMITS_CHANGE'
           # Ignore

data/lib/openc3/topics/router_topic.rb

@@ -24,6 +24,8 @@ require 'openc3/topics/topic'
 
 module OpenC3
   class RouterTopic < Topic
+    COMMAND_ACK_TIMEOUT_S = 30
+
     # Generate a list of topics for this router. This includes the router itself
     # and all the targets which are assigned to this router.
     def self.topics(router, scope:)
@@ -41,11 +43,11 @@ module OpenC3
       while true
         Topic.read_topics(RouterTopic.topics(router, scope: scope)) do |topic, msg_id, msg_hash, redis|
           result = yield topic, msg_id, msg_hash, redis
-          if /CMD}ROUTER/.match?(topic)
+          if result and /CMD}ROUTER/.match?(topic)
             ack_topic = topic.split("__")
             ack_topic[1] = 'ACK' + ack_topic[1]
             ack_topic = ack_topic.join("__")
-            Topic.write_topic(ack_topic, { 'result' => result }, msg_id, 100)
+            Topic.write_topic(ack_topic, { 'result' => result, 'id' => msg_id }, msg_id, 100)
           end
         end
       end
@@ -65,7 +67,7 @@ module OpenC3
 
     def self.connect_router(router_name, *router_params, scope:)
       if router_params && !router_params.empty?
-        Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'connect' => 'true', 'params' => JSON.generate(router_params) }, '*', 100)
+        Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'connect' => 'true', 'params' => JSON.generate(router_params, allow_nan: true) }, '*', 100)
       else
         Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'connect' => 'true' }, '*', 100)
       end
@@ -102,5 +104,42 @@ module OpenC3
       data['index'] = index
       Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'protocol_cmd' => JSON.generate(data, allow_nan: true) }, '*', 100)
     end
+
+    def self.router_target_enable(router_name, target_name, cmd_only: false, tlm_only: false, scope:)
+      data = {}
+      data['target_name'] = target_name.to_s.upcase
+      data['cmd_only'] = cmd_only
+      data['tlm_only'] = tlm_only
+      data['action'] = 'enable'
+      Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'target_control' => JSON.generate(data, allow_nan: true) }, '*', 100)
+    end
+
+    def self.router_target_disable(router_name, target_name, cmd_only: false, tlm_only: false, scope:)
+      data = {}
+      data['target_name'] = target_name.to_s.upcase
+      data['cmd_only'] = cmd_only
+      data['tlm_only'] = tlm_only
+      data['action'] = 'disable'
+      Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'target_control' => JSON.generate(data, allow_nan: true) }, '*', 100)
+    end
+
+    def self.router_details(router_name, timeout: nil, scope:)
+      router_name = router_name.upcase
+
+      timeout = COMMAND_ACK_TIMEOUT_S unless timeout
+      ack_topic = "{#{scope}__ACKCMD}ROUTER__#{router_name}"
+      Topic.update_topic_offsets([ack_topic])
+
+      cmd_id = Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'router_details' => 'true' }, '*', 100)
+      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
+            return JSON.parse(msg_hash["result"], :allow_nan => true, :create_additions => true)
+          end
+        end
+      end
+      raise "Timeout of #{timeout}s waiting for cmd ack"
+    end
   end
 end

data/lib/openc3/topics/system_events_topic.rb

@@ -28,7 +28,7 @@ module OpenC3
 
     def self.write(type, event)
       event['type'] = type
-      Topic.write_topic(PRIMARY_KEY, {event: JSON.generate(event)}, '*', 1000)
+      Topic.write_topic(PRIMARY_KEY, {event: JSON.generate(event, allow_nan: true)}, '*', 1000)
     end
 
     def self.read()

data/lib/openc3/topics/telemetry_decom_topic.rb

@@ -42,7 +42,7 @@ module OpenC3
           :target_name => packet.target_name,
           :packet_name => packet.packet_name,
           :received_count => packet.received_count,
-          :json_data => JSON.generate(json_hash.as_json(:allow_nan => true)),
+          :json_data => JSON.generate(json_hash.as_json, allow_nan: true),
         }
         Topic.write_topic("#{scope}__DECOM__{#{packet.target_name}}__#{packet.packet_name}", msg_hash, id)
 

data/lib/openc3/utilities/authentication.rb

@@ -161,7 +161,7 @@ module OpenC3
       @log[1] = "response status: #{resp.status} header: #{resp.headers} body: #{resp.body}"
       STDOUT.puts @log[1] if JsonDRb.debug?
       if resp.status >= 200 && resp.status <= 299
-        return JSON.parse(resp.body, :allow_nan => true, :create_additions => true)
+        return JSON.parse(resp.body, allow_nan: true, create_additions: true)
       elsif resp.status >= 500 && resp.status <= 599
         raise OpenC3AuthenticationRetryableError, "authentication request retryable #{@log[0]} ::: #{@log[1]}"
       else

data/lib/openc3/utilities/cosmos_rails_formatter.rb

@@ -50,11 +50,10 @@ module OpenC3
           other[:exception_backtrace] = payload[:exception_object].backtrace.as_json
         end
       end
-      # This happens for a separate exception log entry which we want to not include the backtrace a second time
       if log.exception
-        message = "Exception was raised - #{log.exception.class}:#{log.exception.message}" unless message
+        message = "Exception was raised - #{log.exception.class}:#{log.exception.message}:#{log.exception.backtrace.join(":")}" unless message
       end
-      return OpenC3::Logger.build_log_data(log.level.to_s.upcase, message, user: username, type: OpenC3::Logger::LOG, url: nil, other: other).as_json(:allow_nan => true).to_json(:allow_nan => true)
+      return OpenC3::Logger.build_log_data(log.level.to_s.upcase, message, user: username, type: OpenC3::Logger::LOG, url: nil, other: other).as_json().to_json(allow_nan: true)
     end
   end
 end

data/lib/openc3/utilities/local_mode.rb

@@ -170,7 +170,7 @@ module OpenC3
             if gem_name == local_gem_name
               # Gems match - Do the names match?
               data = File.read(plugin_instance)
-              json = JSON.parse(data, :allow_nan => true, :create_additions => true)
+              json = JSON.parse(data, allow_nan: true, create_additions: true)
 
               found = false
               found_models.each do |name, _model_details|
@@ -221,7 +221,7 @@ module OpenC3
         if plugin_file_path =~ Regexp.new("^#{OPENC3_LOCAL_MODE_PATH}/#{scope}/")
           # From local init - Always just update the exact one
           File.open(File.join(File.dirname(plugin_file_path), 'plugin_instance.json'), 'wb') do |file|
-            file.write(JSON.pretty_generate(plugin_hash, :allow_nan => true))
+            file.write(JSON.pretty_generate(plugin_hash, allow_nan: true))
           end
         else
           # From online install / update
@@ -247,7 +247,7 @@ module OpenC3
                   if old_plugin_name
                     # And we're updating a plugin
                     data = File.read(plugin_instance)
-                    json = JSON.parse(data, :allow_nan => true, :create_additions => true)
+                    json = JSON.parse(data, allow_nan: true, create_additions: true)
                     if json["name"] == old_plugin_name
                       # Found plugin to update
                       found = true
@@ -301,7 +301,7 @@ module OpenC3
           file.write(data)
         end
         File.open(File.join(full_folder_path, 'plugin_instance.json'), 'wb') do |file|
-          file.write(JSON.pretty_generate(plugin_hash, :allow_nan => true))
+          file.write(JSON.pretty_generate(plugin_hash, allow_nan: true))
         end
       ensure
         FileUtils.remove_entry_secure(temp_dir, true)
@@ -317,7 +317,7 @@ module OpenC3
           plugin_instance = details[:plugin_instance]
           if gems.length == 1 and plugin_instance
             data = File.read(plugin_instance)
-            json = JSON.parse(data, :allow_nan => true, :create_additions => true)
+            json = JSON.parse(data, allow_nan: true, create_additions: true)
             instance_name = json['name']
             if plugin_name == instance_name
               puts "Removing local plugin files: #{full_folder_path}"
@@ -443,7 +443,7 @@ module OpenC3
           data = File.read(config)
           begin
             # Parse just to ensure we have valid JSON
-            JSON.parse(data, :allow_nan => true, :create_additions => true)
+            JSON.parse(data, allow_nan: true, create_additions: true)
             # Only save if the parse was successful
             ToolConfigModel.save_config(parts[-2], File.basename(config, '.json'), data, scope: scope, local_mode: false)
           rescue JSON::ParserError => e
@@ -454,12 +454,12 @@ module OpenC3
     end
 
     def self.save_tool_config(scope, tool, name, data)
-      json = JSON.parse(data, :allow_nan => true, :create_additions => true)
+      json = JSON.parse(data, allow_nan: true, create_additions: true)
       config_path = "#{OPENC3_LOCAL_MODE_PATH}/#{scope}/tool_config/#{tool}/#{name}.json"
       return unless File.expand_path(config_path).start_with?(OPENC3_LOCAL_MODE_PATH)
       FileUtils.mkdir_p(File.dirname(config_path))
       File.open(config_path, 'w') do |file|
-        file.write(JSON.pretty_generate(json, :allow_nan => true))
+        file.write(JSON.pretty_generate(json, allow_nan: true))
       end
     end
 

data/lib/openc3/utilities/logger.rb

@@ -204,14 +204,14 @@ module OpenC3
           case log_level
           when WARN_LEVEL, ERROR_LEVEL, FATAL_LEVEL
             if ENV['OPENC3_LOG_STDERR']
-              $stderr.puts data.as_json(:allow_nan => true).to_json(:allow_nan => true)
+              $stderr.puts data.as_json().to_json(allow_nan: true)
               $stderr.flush
             else
-              $stdout.puts data.as_json(:allow_nan => true).to_json(:allow_nan => true)
+              $stdout.puts data.as_json().to_json(allow_nan: true)
               $stdout.flush
             end
           else
-            $stdout.puts data.as_json(:allow_nan => true).to_json(:allow_nan => true)
+            $stdout.puts data.as_json().to_json(allow_nan: true)
             $stdout.flush
           end
         end

data/lib/openc3/utilities/running_script.rb

@@ -51,13 +51,13 @@ SCRIPT_API = 'script-api'
 
 def running_script_publish(channel_name, data)
   stream_name = [SCRIPT_API, channel_name].compact.join(":")
-  OpenC3::Store.publish(stream_name, JSON.generate(data))
+  OpenC3::Store.publish(stream_name, JSON.generate(data, allow_nan: true))
 end
 
 def running_script_anycable_publish(channel_name, data)
   stream_name = [SCRIPT_API, channel_name].compact.join(":")
-  stream_data = {"stream" => stream_name, "data" => JSON.generate(data)}
-  OpenC3::Store.publish("__anycable__", JSON.generate(stream_data))
+  stream_data = {"stream" => stream_name, "data" => JSON.generate(data, allow_nan: true)}
+  OpenC3::Store.publish("__anycable__", JSON.generate(stream_data, allow_nan: true))
 end
 
 module OpenC3
@@ -458,8 +458,8 @@ class RunningScript
       start_time: start_time, # Time the script started ISO format
       end_time: nil, # Time the script ended ISO format
       disconnect: disconnect, # Disconnect is set to true if the script is running in a disconnected mode
-      environment: status_environment.as_json(:allow_nan => true).to_json(:allow_nan => true), # nil or Hash of key/value pairs for environment variables
-      suite_runner: suite_runner ? suite_runner.as_json(:allow_nan => true).to_json(:allow_nan => true) : nil,
+      environment: status_environment, # hash of environment variables set for the script
+      suite_runner: suite_runner ? suite_runner : nil, # current suite information if any
       errors: nil, # array of errors that occurred during the script run
       pid: nil, # pid of the script process - set by the script itself when it starts
       script_engine: script_engine, # script engine filename
@@ -770,7 +770,6 @@ class RunningScript
 
   def run
     if @script_status.suite_runner
-      @script_status.suite_runner = JSON.parse(@script_status.suite_runner, :allow_nan => true, :create_additions => true) # Convert to hash
       if @script_status.suite_runner['options']
         parse_options(@script_status.suite_runner['options'])
       else
@@ -1050,7 +1049,7 @@ class RunningScript
       line_count = 0
       string.each_line(chomp: true) do |out_line|
         begin
-          json = JSON.parse(out_line, :allow_nan => true, :create_additions => true)
+          json = JSON.parse(out_line, allow_nan: true, create_additions: true)
           time_formatted = Time.parse(json["@timestamp"]).sys.formatted if json["@timestamp"]
           if json["log"]
             out_line = json["log"]
@@ -1082,7 +1081,7 @@ class RunningScript
       else
         published_lines = lines_to_write
       end
-      running_script_anycable_publish("running-script-channel:#{@script_status.id}", { type: :output, line: published_lines.as_json(:allow_nan => true), color: color })
+      running_script_anycable_publish("running-script-channel:#{@script_status.id}", { type: :output, line: published_lines.as_json(), color: color })
       # Add to the message log
       message_log.write(lines_to_write)
     end

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '6.8.1'
+OPENC3_VERSION = '6.9.1'
 module OpenC3
   module Version
     MAJOR = '6'
-    MINOR = '8'
+    MINOR = '9'
     PATCH = '1'
     OTHER = ''
-    BUILD = 'cd2a90541ad224d1dd22e28b4f6a9c0630db26ba'
+    BUILD = 'e1529f7b88799a9f85f31378db40a48b6c106899'
   end
-  VERSION = '6.8.1'
-  GEM_VERSION = '6.8.1'
+  VERSION = '6.9.1'
+  GEM_VERSION = '6.9.1'
 end

data/templates/plugin/README.md

@@ -15,9 +15,9 @@ Update this comment with your own description.
    - VERSION is required
    - gem file will be built locally
 
-## Building tool / widget plugins using a local Ruby/Node/Yarn/Rake Environment
+## Building tool / widget plugins using a local Ruby/Node/pnpm/Rake Environment
 
-1. yarn
+1. pnpm install --frozen-lockfile --ignore-scripts
 1. rake build VERSION=1.0.0
 
 ## Building tool / widget plugins using Docker and the openc3-node container
@@ -36,7 +36,7 @@ Windows:
 docker run -it -v %cd%:/openc3/local -w /openc3/local docker.io/openc3inc/openc3-node sh
 ```
 
-1. yarn
+1. pnpm install --frozen-lockfile --ignore-scripts
 1. rake build VERSION=1.0.0
 
 ## Installing into OpenC3 COSMOS