openc3 6.9.2 → 6.10.0

data/lib/openc3/system/target.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
@@ -68,12 +68,6 @@ module OpenC3
     # @return [Integer] The number of telemetry packets received from this target
     attr_accessor :tlm_cnt
 
-    # @return [Boolean] Indicates if all command packets identify using different fields
-    attr_accessor :cmd_unique_id_mode
-
-    # @return [Boolean] Indicates if telemetry packets identify using different fields
-    attr_accessor :tlm_unique_id_mode
-
     # @return [String] Id of the target configuration
     attr_accessor :id
 
@@ -91,13 +85,10 @@ module OpenC3
       @ignored_parameters = []
       @ignored_items = []
       @cmd_tlm_files = []
-      # @auto_screen_substitute = false
       @interface = nil
       @routers = []
       @cmd_cnt = 0
       @tlm_cnt = 0
-      @cmd_unique_id_mode = false
-      @tlm_unique_id_mode = false
       @name = target_name.clone.upcase.freeze
       get_target_dir(path, gem_path)
       process_target_config_file()
@@ -174,20 +165,8 @@ module OpenC3
 
           @cmd_tlm_files << filename
 
-          # when 'AUTO_SCREEN_SUBSTITUTE'
-          # usage = "#{keyword}"
-          # parser.verify_num_parameters(0, 0, usage)
-          # @auto_screen_substitute = true
-
-        when 'CMD_UNIQUE_ID_MODE'
-          usage = "#{keyword}"
-          parser.verify_num_parameters(0, 0, usage)
-          @cmd_unique_id_mode = true
-
-        when 'TLM_UNIQUE_ID_MODE'
-          usage = "#{keyword}"
-          parser.verify_num_parameters(0, 0, usage)
-          @tlm_unique_id_mode = true
+        when 'CMD_UNIQUE_ID_MODE', 'TLM_UNIQUE_ID_MODE'
+          # Deprecated - Now autodetected
 
         else
           # blank lines will have a nil keyword and should not raise an exception
@@ -202,15 +181,7 @@ module OpenC3
       config['requires'] = @requires
       config['ignored_parameters'] = @ignored_parameters
       config['ignored_items'] = @ignored_items
-      # config['auto_screen_substitute'] = true if @auto_screen_substitute
       config['cmd_tlm_files'] = @cmd_tlm_files
-      # config['filename'] = @filename
-      # config['interface'] = @interface.name if @interface
-      # config['dir'] = @dir
-      # config['cmd_cnt'] = @cmd_cnt
-      # config['tlm_cnt'] = @tlm_cnt
-      config['cmd_unique_id_mode'] = true if @cmd_unique_id_mode
-      config['tlm_unique_id_mode'] = true if @tlm_unique_id_mode
       config['id'] = @id
       config
     end

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

@@ -226,7 +226,7 @@ module OpenC3
     # (see PacketConfig#start_item)
     def start_item(parser)
       finish_item
-      @current_item = TableItemParser.parse(parser, @current_packet, @warnings)
+      @current_item = TableItemParser.parse(parser, self, @current_packet, @warnings)
     end
 
     # If the table is ROW_COLUMN all currently defined items are
@@ -266,6 +266,14 @@ module OpenC3
               item.default = @defaults[index].to_f
             when :STRING, :BLOCK
               item.default = @defaults[index]
+            when :BOOL
+              item.default = ConfigParser.handle_true_false(@defaults[index])
+            when :ARRAY, :OBJECT, :ANY
+              begin
+                item.default = JSON.parse(@defaults[index], allow_nan: true)
+              rescue Exception
+                item.default = @defaults[index]
+              end
             end
           end
         end

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

@@ -30,8 +30,8 @@ module OpenC3
     # @param parser [ConfigParser] Configuration parser
     # @param table [Table] Table all parsed items should be added to
     # # @param warnings [Array<String>] Array of warning strings from PacketConfig
-    def self.parse(parser, table, warnings)
-      parser = TableItemParser.new(parser, warnings)
+    def self.parse(parser, table_config, table, warnings)
+      parser = TableItemParser.new(parser, table_config, warnings)
       parser.verify_parameters(PacketConfig::COMMAND)
       parser.create_table_item(table)
     end

data/lib/openc3/top_level.rb

@@ -26,7 +26,6 @@ require 'digest'
 require 'open3'
 require 'openc3/core_ext'
 require 'openc3/version'
-require 'openc3/utilities/logger'
 require 'socket'
 require 'pathname'
 
@@ -107,6 +106,8 @@ module OpenC3
     end
   end
 
+  require 'openc3/utilities/logger'
+
   # Creates a marshal file by serializing the given obj
   #
   # @param marshal_filename [String] Name of the marshal file to create
@@ -551,30 +552,55 @@ module OpenC3
   end
 end
 
-# The following code makes most older COSMOS 5 plugins still work with OpenC3
+# The following code makes most older COSMOS plugins still work with OpenC3
 # New plugins should only use openc3 paths and module OpenC3
 unless ENV['OPENC3_NO_COSMOS_COMPATIBILITY']
   Cosmos = OpenC3
   ENV['COSMOS_SCOPE'] = ENV['OPENC3_SCOPE']
-  module CosmosCompatibility
-    def require(*args)
-      filename = args[0]
-      if filename[0..6] == "cosmos/"
-        filename[0..6] = "openc3/"
+
+  # Don't apply the compatibility layer in test environments to avoid conflicts with RSpec
+  unless defined?(RSpec) || ENV['RAILS_ENV'] == 'test' || ENV['RACK_ENV'] == 'test'
+    module CosmosCompatibility
+      # Validates the filename after cosmos->openc3 transformation
+      def safe_openc3_path?(filename)
+        return false unless filename.is_a?(String)
+        # Only validate paths that start with "openc3/" (transformed from "cosmos/")
+        return true unless filename.start_with?("openc3/")
+        # Disallow any ".." or "." path traversal
+        return false if filename.include?("..") || filename.include?("./") || filename.include?("/.") || filename.include?("\\") || filename.include?("//")
+        # Disallow absolute paths (Unix and Windows)
+        return false if filename.start_with?("/") || filename =~ /^[a-zA-Z]:[\\\/]/
+        # Disallow special characters (allow word chars, dash, slash, dot)
+        return false unless filename =~ /\A[\w\-\/\.]+\z/
+        true
       end
-      args[0] = filename
-      super(*args)
-    end
-    def load(*args)
-      filename = args[0]
-      if filename[0..6] == "cosmos/"
-        filename[0..6] = "openc3/"
+
+      def require(*args)
+        filename = args[0]
+        if filename.is_a?(String) && filename.start_with?("cosmos/")
+          filename = filename.sub(/^cosmos\//, "openc3/")
+          unless safe_openc3_path?(filename)
+            raise ArgumentError, "Unsafe path in require after cosmos->openc3 transformation: #{filename.inspect}"
+          end
+          args[0] = filename
+        end
+        super(*args)
+      end
+
+      def load(*args)
+        filename = args[0]
+        if filename.is_a?(String) && filename.start_with?("cosmos/")
+          filename = filename.sub(/^cosmos\//, "openc3/")
+          unless safe_openc3_path?(filename)
+            raise ArgumentError, "Unsafe path in load after cosmos->openc3 transformation: #{filename.inspect}"
+          end
+          args[0] = filename
+        end
+        super(*args)
       end
-      args[0] = filename
-      super(*args)
     end
-  end
-  class Object
-    include CosmosCompatibility
+    class Object
+      include CosmosCompatibility
+    end
   end
 end

data/lib/openc3/topics/decom_interface_topic.rb

@@ -17,6 +17,7 @@
 # if purchased from OpenC3, Inc.
 
 require 'openc3/topics/topic'
+require 'openc3/config/config_parser'
 
 module OpenC3
   class DecomInterfaceTopic < Topic
@@ -58,5 +59,35 @@ module OpenC3
       Topic.write_topic("#{scope}__DECOMINTERFACE__{#{target_name}}",
           { 'inject_tlm' => JSON.generate(data, allow_nan: true) }, '*', 100)
     end
+
+    def self.get_tlm_buffer(target_name, packet_name, timeout: 5, scope:)
+      data = {}
+      data['target_name'] = target_name.to_s.upcase
+      data['packet_name'] = packet_name.to_s.upcase
+      # DecomMicroservice is listening to the DECOMINTERFACE topic and has
+      # the most recent decommed packets including subpackets
+      ack_topic = "{#{scope}__ACKCMD}TARGET__#{target_name}"
+      Topic.update_topic_offsets([ack_topic])
+      decom_id = Topic.write_topic("#{scope}__DECOMINTERFACE__{#{target_name}}",
+          { 'get_tlm_buffer' => JSON.generate(data, allow_nan: 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"] == decom_id
+            if msg_hash["result"] == "SUCCESS"
+              msg_hash["stored"] = ConfigParser.handle_true_false(msg_hash["stored"])
+              extra = msg_hash["extra"]
+              if extra and extra.length > 0
+                msg_hash["extra"] = JSON.parse(extra, allow_nan: true, create_additions: true)
+              end
+              return msg_hash
+            else
+              raise msg_hash["message"]
+            end
+          end
+        end
+      end
+      raise "Timeout of #{timeout}s waiting for ack. Does target '#{target_name}' exist?"
+    end
   end
 end

data/lib/openc3/utilities/env_helper.rb

@@ -0,0 +1,10 @@
+# For simple boolean flags
+class EnvHelper
+  def self.enabled?(key)
+    ['true', '1', 'yes', 'on'].include?(ENV[key].to_s.downcase)
+  end
+
+  def self.set?(key)
+    !ENV[key].to_s.empty?
+  end
+end

data/lib/openc3/utilities/logger.rb

@@ -27,6 +27,7 @@ require 'socket'
 require 'logger'
 require 'time'
 require 'json'
+require 'openc3/utilities/env_helper'
 
 module OpenC3
   # Supports different levels of logging and only writes if the level
@@ -201,19 +202,14 @@ module OpenC3
       @@mutex.synchronize do
         data = build_log_data(log_level, message, user: user, type: type, url: url, other: other, &block)
         if @stdout
-          case log_level
-          when WARN_LEVEL, ERROR_LEVEL, FATAL_LEVEL
-            if ENV['OPENC3_LOG_STDERR']
-              $stderr.puts data.as_json().to_json(allow_nan: true)
-              $stderr.flush
-            else
-              $stdout.puts data.as_json().to_json(allow_nan: true)
-              $stdout.flush
-            end
+          # send warning, error, and fatal to stderr if OPENC3_LOG_STDERR env var is set to 1 or true
+          if [WARN_LEVEL, ERROR_LEVEL, FATAL_LEVEL].include?(log_level) && EnvHelper.enabled?('OPENC3_LOG_STDERR')
+            io = $stderr
           else
-            $stdout.puts data.as_json().to_json(allow_nan: true)
-            $stdout.flush
+            io = $stdout
           end
+          io.puts data.as_json().to_json(allow_nan: true)
+          io.flush
         end
         unless @no_store
           if scope

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '6.9.2'
+OPENC3_VERSION = '6.10.0'
 module OpenC3
   module Version
     MAJOR = '6'
-    MINOR = '9'
-    PATCH = '2'
+    MINOR = '10'
+    PATCH = '0'
     OTHER = ''
-    BUILD = '0b659342611ec28c5dac351032c18442820977a3'
+    BUILD = 'cb022b45a50e7f769e2df3522cf6febbe3ed0998'
   end
-  VERSION = '6.9.2'
-  GEM_VERSION = '6.9.2'
+  VERSION = '6.10.0'
+  GEM_VERSION = '6.10.0'
 end

data/tasks/spec.rake

@@ -25,7 +25,8 @@ begin
 
   desc 'Run all specs with basic output'
   RSpec::Core::RakeTask.new do |t|
-    t.pattern = ['spec/*_spec.rb']
+    # Use ** to recursively find specs in all subdirectories (spec/utilities/, spec/models/, etc.)
+    t.pattern = ['spec/**/*_spec.rb']
     t.rspec_opts = '-f d --warnings'
   end
 rescue LoadError

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "6.9.2",
+  "version": "6.10.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.9.2",
+    "@openc3/js-common": "6.10.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.9.2",
+    "@openc3/js-common": "6.10.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.9.2",
+    "@openc3/js-common": "6.10.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.9.2",
+  "version": "6.10.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.9.2",
-    "@openc3/vue-common": "6.9.2",
+    "@openc3/js-common": "6.10.0",
+    "@openc3/vue-common": "6.10.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.9.2",
+  "version": "6.10.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/vue-common": "6.9.2",
+    "@openc3/vue-common": "6.10.0",
     "vuetify": "^3.7.1"
   },
   "devDependencies": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 6.9.2
+  version: 6.10.0
 platform: ruby
 authors:
 - Ryan Melton
@@ -1080,6 +1080,7 @@ files:
 - lib/openc3/migrations/20241208080001_no_trigger_group.rb
 - lib/openc3/migrations/20250108060000_news_feed.rb
 - lib/openc3/migrations/20250402000000_periodic_only_default.rb
+- lib/openc3/migrations/20251022000000_remove_unique_id.rb
 - lib/openc3/models/activity_model.rb
 - lib/openc3/models/auth_model.rb
 - lib/openc3/models/cvt_model.rb
@@ -1179,6 +1180,7 @@ files:
 - lib/openc3/streams/tcpip_client_stream.rb
 - lib/openc3/streams/tcpip_socket_stream.rb
 - lib/openc3/streams/web_socket_client_stream.rb
+- lib/openc3/subpacketizers/subpacketizer.rb
 - lib/openc3/system.rb
 - lib/openc3/system/system.rb
 - lib/openc3/system/target.rb
@@ -1221,6 +1223,7 @@ files:
 - lib/openc3/utilities/cosmos_rails_formatter.rb
 - lib/openc3/utilities/crc.rb
 - lib/openc3/utilities/csv.rb
+- lib/openc3/utilities/env_helper.rb
 - lib/openc3/utilities/local_bucket.rb
 - lib/openc3/utilities/local_mode.rb
 - lib/openc3/utilities/logger.rb