openc3 6.10.1 → 6.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b9dccfc06d5de8e5605e77c5590365bebcbe339fb63fa61402cfa3d55834961
-  data.tar.gz: 45927a89e2ff628b31c0c153b57a7a177560f2ca00a3f76af70f981af1899d8a
+  metadata.gz: f5cc7320f928c8941c9d4ecc2a4bc04eade3ebde86c278dfdad90aa7ac24f9d2
+  data.tar.gz: eb9cd8b34986f982c187dbccbdf0c4067f61df733161cab067a5c689b1ba53a9
 SHA512:
-  metadata.gz: 4e8b6f535c5015a123bf92c4b8b2a437008b9eebb27f56693f291215785d35fef59d45bf89d04d561fd38c399ecdceb254d9b963161d8ab587aeba16ae15d935
-  data.tar.gz: 9b9f097230caa46397699dbc145740023190028d3cdf4355882a53fbedbc04988283d3634d1027c3e334f68b38d8d9bb961ced95d537e10d0e678f124f960318
+  metadata.gz: 5973122351e2b191d365092984db9c23ad877c8fc71c7173b014fa3a5ae363258a2eeca7863571d9206be0f781ff361586843eac57d7fa56065fef515398c06b
+  data.tar.gz: 7b664d2a9a8615a5c651002b412cd7248ca0b33e67f6af0618b04354f3ea080b5d81f7d8031ea4e98a013ca2ca4714e3fdb6b30ae5302223d7bdafd88d8c63bb

data/data/config/command_modifiers.yaml

@@ -100,6 +100,7 @@ STRUCTURE:
   modifiers:
     <%= MetaConfigParser.load('parameter_modifiers.yaml').to_meta_config_yaml(4) %>
   summary: Adds and flattens a structure (generally a virtual packet) into the current packet. The specific named item is BLOCK type and hidden.
+  since: 6.10.0
   parameters:
     - name: Name
       required: true
@@ -134,6 +135,7 @@ APPEND_STRUCTURE:
   modifiers:
     <%= MetaConfigParser.load('parameter_modifiers.yaml').to_meta_config_yaml(4) %>
   summary: Adds and flattens a structure (generally a virtual packet) into the current packet. The specific named item is BLOCK type and hidden.
+  since: 6.10.0
   parameters:
     - name: Name
       required: true

data/data/config/plugins.yaml

@@ -92,7 +92,8 @@ WIDGET:
 SCRIPT_ENGINE:
   summary: Define a script engine to add language support to Script Runner
   example: SCRIPT_ENGINE .print print_script_engine.py
-  description: Defines a script engine to add language support to Script Runner
+  description: Defines a script engine to add language support to Script Runner. For a realistic example, see our [CSTOL](https://github.com/OpenC3/openc3-cosmos-script-engine-cstol) plugin.
+  since: 6.5.0
   parameters:
     - name: Extension
       description: Extension that will use this script engine

data/data/config/target_config.yaml

@@ -91,13 +91,13 @@ CMD_UNIQUE_ID_MODE:
     Ideally all commands for a target are identified using the exact same bit offset, size,
     and type field in each command. If ANY command identifiers differ then this flag must be set
     to force a brute force identification method.
-  warning: Using this mode significantly slows packet identification
   since: 4.4.0
+  deprecated: Since 6.10.0 this condition is now automatically detected
 TLM_UNIQUE_ID_MODE:
   summary: Telemetry packets identifiers don't all share the same bit offset, size, and type
   description:
     Ideally all telemetry for a target are identified using the exact same bit offset, size,
     and type field in each packet. If ANY telemetry identifiers differ then this flag must be set
     to force a brute force identification method.
-  warning: Using this mode significantly slows packet identification
   since: 4.4.0
+  deprecated: Since 6.10.0 this condition is now automatically detected

data/data/config/telemetry_modifiers.yaml

@@ -90,6 +90,7 @@ STRUCTURE:
   modifiers:
     <%= MetaConfigParser.load('item_modifiers.yaml').to_meta_config_yaml(4) %>
   summary: Adds and flattens a structure (generally a virtual packet) into the current packet. The specific named item is BLOCK type and hidden.
+  since: 6.10.0
   parameters:
     - name: Name
       required: true
@@ -124,6 +125,7 @@ APPEND_STRUCTURE:
   modifiers:
     <%= MetaConfigParser.load('item_modifiers.yaml').to_meta_config_yaml(4) %>
   summary: Adds and flattens a structure (generally a virtual packet) into the current packet. The specific named item is BLOCK type and hidden.
+  since: 6.10.0
   parameters:
     - name: Name
       required: true

data/lib/openc3/core_ext/string.rb

@@ -22,6 +22,7 @@
 
 require 'openc3/packets/binary_accessor'
 require 'openc3/ext/string' if RUBY_ENGINE == 'ruby' and !ENV['OPENC3_NO_EXT']
+require 'yaml'
 
 # OpenC3 specific additions to the Ruby String class
 class String
@@ -40,6 +41,8 @@ class String
   HEX_CHECK_REGEX = /\A\s*0[xX][\dabcdefABCDEF]+\s*\z/
   # Regular expression to identify a String as an Array of numbers
   ARRAY_CHECK_REGEX = /\A\s*\[.*\]\s*\z/
+  # Regular expression to identify a String containing object notation
+  OBJECT_CHECK_REGEX = /\A\s*\{.*\}\s*\z/
 
   # Displays a String containing binary data in a human readable format by
   # converting each byte to the hex representation.
@@ -209,6 +212,11 @@ class String
     if ARRAY_CHECK_REGEX.match?(self) then true else false end
   end
 
+  # @return [Boolean] Whether the String represents an Object
+  def is_object?
+    if OBJECT_CHECK_REGEX.match?(self) then true else false end
+  end
+
   # @return [Boolean] Whether the string contains only printable characters
   def is_printable?
     if NON_PRINTABLE_REGEX.match?(self) then false else true end
@@ -238,9 +246,9 @@ class String
       elsif self.is_hex?
         # Hex
         return_value = Integer(self)
-      elsif self.is_array?
-        # Array
-        return_value = eval(self)
+      elsif self.is_array? or self.is_object?
+        # Array or Object
+        return_value = YAML.safe_load(self)
       end
     rescue Exception
       # Something went wrong so just return the string as is

data/lib/openc3/microservices/microservice.rb

@@ -55,6 +55,7 @@ module OpenC3
           MicroserviceStatusModel.set(microservice.as_json(), scope: microservice.scope)
           microservice.state = 'RUNNING'
           microservice.run
+          Logger.info("Microservice #{name} run method returned cleanly and will now shutdown.")
           microservice.state = 'FINISHED'
         rescue Exception => e
           if SystemExit === e or SignalException === e

data/lib/openc3/packets/packet.rb

@@ -905,6 +905,11 @@ module OpenC3
             write_item(item, item.structure.buffer(false), :RAW, buffer)
           end
         elsif not item.default.nil? and not item.parent_item
+          # Skip writing default for accessor-based items when template is used
+          # The template already contains the correct default value
+          # Only skip if key is explicitly set (different from item name) - this distinguishes
+          # JsonAccessor (key="$.field") from TemplateAccessor (key=name="FIELD")
+          next if item.key and item.key != item.name and @template and use_template
           write_item(item, item.default, :CONVERTED, buffer) unless skip_item_names and upcase_skip_item_names.include?(item.name)
         end
       end
@@ -1233,7 +1238,20 @@ module OpenC3
       # Items with derived items last
       @sorted_items.each do |item|
         if item.data_type != :DERIVED
-          items << item.as_json(*a)
+          item_hash = item.as_json(*a)
+          # For accessor-based items with a template, extract the default from the template
+          # Only extract for items with explicit keys (different from item name) - this distinguishes
+          # JsonAccessor (key="$.field") from TemplateAccessor (key=name="FIELD")
+          if item.key and item.key != item.name and @template
+            begin
+              template_value = read_item_from_template(item)
+              item_hash['default'] = template_value unless template_value.nil?
+            rescue => e
+              # If we can't read from template, keep the original default
+              Logger.debug("Could not read template default for #{@target_name} #{@packet_name} #{item.name}: #{e.message}")
+            end
+          end
+          items << item_hash
         end
       end
       @sorted_items.each do |item|
@@ -1358,6 +1376,56 @@ module OpenC3
 
     protected
 
+    # Read item value from template, handling PythonProxy accessors
+    # For PythonProxy, parse template directly since the proxy's class method returns a string
+    def read_item_from_template(item)
+      accessor_class = @accessor.class
+
+      # For PythonProxy, accessor.class returns the class name as a string
+      # We need to parse the template directly based on the accessor type
+      if accessor_class.is_a?(String)
+        case accessor_class
+        when 'JsonAccessor'
+          return read_json_template_item(item)
+        when 'CborAccessor'
+          return read_cbor_template_item(item)
+        when 'XmlAccessor'
+          return read_xml_template_item(item)
+        else
+          # Unknown accessor type - can't read from template
+          return nil
+        end
+      else
+        # Normal accessor - use the class method
+        return accessor_class.read_item(item, @template)
+      end
+    end
+
+    # Parse JSON template and extract item value using JSONPath key
+    def read_json_template_item(item)
+      require 'json'
+      require 'jsonpath'
+      json_data = JSON.parse(@template.to_s, allow_nan: true, create_additions: true)
+      JsonPath.new(item.key).first(json_data)
+    end
+
+    # Parse CBOR template and extract item value using JSONPath key
+    def read_cbor_template_item(item)
+      require 'cbor'
+      require 'jsonpath'
+      cbor_data = CBOR.decode(@template.to_s)
+      JsonPath.new(item.key).first(cbor_data)
+    end
+
+    # Parse XML template and extract item value using XPath key
+    def read_xml_template_item(item)
+      require 'nokogiri'
+      doc = Nokogiri::XML(@template.to_s)
+      node = doc.xpath(item.key).first
+      return nil unless node
+      node.text
+    end
+
     def handle_limits_states(item, value)
       # Retrieve limits state for the given value
       limits_state = item.state_colors[value]

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '6.10.1'
+OPENC3_VERSION = '6.10.2'
 module OpenC3
   module Version
     MAJOR = '6'
     MINOR = '10'
-    PATCH = '1'
+    PATCH = '2'
     OTHER = ''
-    BUILD = 'df3eb2f0fa9a8c604920ddf426e5b7d1bbcb0433'
+    BUILD = 'f10cec058f400e8a289b54400c3731e01d20357e'
   end
-  VERSION = '6.10.1'
-  GEM_VERSION = '6.10.1'
+  VERSION = '6.10.2'
+  GEM_VERSION = '6.10.2'
 end

data/templates/tool_angular/package.json

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 6.10.1
+  version: 6.10.2
 platform: ruby
 authors:
 - Ryan Melton
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -422,14 +408,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-otlp
   requirement: !ruby/object:Gem::Requirement